大修
This commit is contained in:
@@ -91,7 +91,7 @@ namespace MoreMountains.Feedbacks
|
||||
{
|
||||
if(ResetVelocityOnPlay)
|
||||
{
|
||||
rb.velocity = Vector3.zero;
|
||||
rb.linearVelocity = Vector3.zero;
|
||||
}
|
||||
|
||||
if (ForwardForce)
|
||||
|
||||
@@ -92,7 +92,7 @@ namespace MoreMountains.Feedbacks
|
||||
{
|
||||
if(ResetVelocityOnPlay)
|
||||
{
|
||||
rb.velocity = Vector2.zero;
|
||||
rb.linearVelocity = Vector2.zero;
|
||||
}
|
||||
|
||||
switch (Mode)
|
||||
|
||||
@@ -186,11 +186,11 @@ namespace MoreMountains.Tools
|
||||
switch (Mode)
|
||||
{
|
||||
case Modes.Rigidbody:
|
||||
Velocity = _rigidbody.velocity;
|
||||
Velocity = _rigidbody.linearVelocity;
|
||||
break;
|
||||
|
||||
case Modes.Rigidbody2D:
|
||||
Velocity = _rigidbody2D.velocity;
|
||||
Velocity = _rigidbody2D.linearVelocity;
|
||||
break;
|
||||
|
||||
case Modes.Position:
|
||||
|
||||
@@ -63,13 +63,13 @@ namespace MoreMountains.Tools
|
||||
{
|
||||
if (_mode == "2D")
|
||||
{
|
||||
return(_rigidbody2D.velocity);
|
||||
return(_rigidbody2D.linearVelocity);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_mode == "3D")
|
||||
{
|
||||
return(_rigidbody.velocity);
|
||||
return(_rigidbody.linearVelocity);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -80,10 +80,10 @@ namespace MoreMountains.Tools
|
||||
set
|
||||
{
|
||||
if (_mode == "2D") {
|
||||
_rigidbody2D.velocity = value;
|
||||
_rigidbody2D.linearVelocity = value;
|
||||
}
|
||||
if (_mode == "3D") {
|
||||
_rigidbody.velocity = value;
|
||||
_rigidbody.linearVelocity = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -41,6 +41,7 @@ Material:
|
||||
disabledShaderPasses:
|
||||
- DepthOnly
|
||||
- SHADOWCASTER
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -103,6 +104,7 @@ Material:
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _AddPrecomputedVelocity: 0
|
||||
- _AlphaClip: 0
|
||||
- _AlphaToMask: 0
|
||||
- _Blend: 0
|
||||
@@ -134,6 +136,7 @@ Material:
|
||||
- _Surface: 1
|
||||
- _UVSec: 0
|
||||
- _WorkflowMode: 0
|
||||
- _XRMotionVectorsPass: 1
|
||||
- _ZWrite: 0
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
@@ -141,3 +144,4 @@ Material:
|
||||
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace MoreMountains.Tools
|
||||
{
|
||||
public override void OnGUI(Rect position, SerializedProperty serializedProperty, GUIContent label)
|
||||
{
|
||||
string[] navMeshAreaNames = GameObjectUtility.GetNavMeshAreaNames();
|
||||
string[] navMeshAreaNames = UnityEngine.AI.NavMesh.GetAreaNames();
|
||||
float positionWidth = position.width;
|
||||
int maskValue = serializedProperty.intValue;
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ namespace Lofelt.NiceVibrations
|
||||
|
||||
protected virtual void HitWall()
|
||||
{
|
||||
float amplitude = _rigidBody.velocity.magnitude / 100f;
|
||||
float amplitude = _rigidBody.linearVelocity.magnitude / 100f;
|
||||
HapticPatterns.PlayEmphasis(amplitude, 0.7f);
|
||||
EmphasisAudioSource.volume = amplitude;
|
||||
StartCoroutine(LogoShaker.Shake(0.2f));
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace Lofelt.NiceVibrations
|
||||
|
||||
_direction = (collider.transform.position - this.transform.position).normalized;
|
||||
_direction.y = 1f;
|
||||
collider.attachedRigidbody.velocity = Vector2.zero;
|
||||
collider.attachedRigidbody.linearVelocity = Vector2.zero;
|
||||
collider.attachedRigidbody.AddForce(_direction * Force);
|
||||
TargetBall.HitPusher();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user