Sfoglia il codice sorgente

修改player空中跳跃and召唤动画

SZAND\msx_2 6 mesi fa
parent
commit
3498b5e1b7

+ 54 - 54
ActionTowerDefense/Assets/Resources/Spine/Player01/player01_Controller.controller

@@ -213,32 +213,6 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1102 &-8430522046166213857
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: jump air
-  m_Speed: 1.1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 57a53f381edc6a84fb7303c561e33e29, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!74 &-8277495802551791712
 AnimationClip:
   m_ObjectHideFlags: 0
@@ -1154,6 +1128,32 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!1102 &-2105459986110564000
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: jump_air
+  m_Speed: 2
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 57a53f381edc6a84fb7303c561e33e29, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-1761680034948590594
 AnimatorState:
   serializedVersion: 6
@@ -1671,6 +1671,32 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!1102 &2507243071393305045
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: summon_air
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 71558e1bee621944db997eb6928dae30, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1107 &3207458259808438275
 AnimatorStateMachine:
   serializedVersion: 6
@@ -1726,10 +1752,10 @@ AnimatorStateMachine:
     m_State: {fileID: -6136980578178957222}
     m_Position: {x: 560, y: 140, z: 0}
   - serializedVersion: 1
-    m_State: {fileID: -8430522046166213857}
+    m_State: {fileID: 2507243071393305045}
     m_Position: {x: 780, y: 140, z: 0}
   - serializedVersion: 1
-    m_State: {fileID: 8745897807484479804}
+    m_State: {fileID: -2105459986110564000}
     m_Position: {x: 780, y: 190, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
@@ -2241,32 +2267,6 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
---- !u!1102 &8745897807484479804
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: summon air
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 71558e1bee621944db997eb6928dae30, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!1102 &9220035916879395579
 AnimatorState:
   serializedVersion: 6

+ 24 - 3
ActionTowerDefense/Assets/Scripts/Characters/PlayerController.cs

@@ -963,7 +963,14 @@ public class PlayerController : MoveCharacter
             {
                 if (excludeState == CharacterState.Summon)
                 {
-                    ani.Play("summon", 0, 0);
+                    if (foot.TrigGround)
+                    {
+                        ani.Play("summon", 0, 0);
+                    }
+                    else
+                    {
+                        ani.Play("summon_air", 0, 0);
+                    } 
                 }
                 return true;
             }
@@ -1676,7 +1683,14 @@ public class PlayerController : MoveCharacter
                 break;
             case CharacterState.Summon:
                 aniCollider.Play("Summon", 0, 0);
-                ani.Play("summon", 0, 0);
+                if (foot.TrigGround)
+                {
+                    ani.Play("summon", 0, 0);
+                }
+                else
+                {
+                    ani.Play("summon_air", 0, 0);
+                }
                 velocity = Vector3.right * velocityAddition;
                 rb.isKinematic = true;
                 cacheDir = 0;
@@ -1717,7 +1731,14 @@ public class PlayerController : MoveCharacter
                 rb.velocity = Vector3.zero;
                 rb.isKinematic = true;
                 aniCollider.Play("Summon", 0, 0);
-                ani.Play("summon", 0, 0);
+                if (foot.TrigGround)
+                {
+                    ani.Play("summon", 0, 0);
+                }
+                else
+                {
+                    ani.Play("summon_air", 0, 0);
+                }
                 break;
             default:
                 break;