暂存

ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab

@@ -862,8 +862,8 @@ MonoBehaviour:
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
-  moveSpeed: 2
-  beRepelValue: 5
+  moveSpeed: 1
+  beRepelValue: 2
   totalBeRepelValue: 30
   weakTime: 0
   totalWeakTime: 0
@@ -891,8 +891,9 @@ MonoBehaviour:
   flyHeight: 0
   flyUpSpeed: 10
   attackRatio: 0
-  maxMoveSpeed: 3
-  minMoveSpeed: 3
+  maxMoveSpeed: 2
+  minMoveSpeed: 1
+  runSpeed: 4
   dropSoul: 3
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1

ActionTowerDefense/Assets/Resources/Prefab/Spirits_Cook.prefab

@@ -833,7 +833,7 @@ MonoBehaviour:
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: 0
   extraFallGravity: 0
-  moveSpeed: 3
+  moveSpeed: 1
   beRepelValue: 0
   totalBeRepelValue: 0
   weakTime: 0
@@ -1158,6 +1158,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
+  - {fileID: 2100000, guid: c44edd2384bd3a24a8358519e8e593f6, type: 2}
   - {fileID: 2100000, guid: 37c58d20311af0c49b01b31d34f4e779, type: 2}
   - {fileID: 2100000, guid: c44edd2384bd3a24a8358519e8e593f6, type: 2}
   - {fileID: 2100000, guid: 37c58d20311af0c49b01b31d34f4e779, type: 2}

ActionTowerDefense/Assets/Resources/Spine/Spirits_Cook/Spirits_Cook_Controller.controller

@@ -86,6 +86,32 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!1102 &-7653950149726570094
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: rush
+  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: 8800263224452789868}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &-7507905662058306646
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -145,7 +171,7 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: -7507905662058306646}
+  - {fileID: 6919930672050039645}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -333,6 +359,28 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!1101 &-3962597994850316431
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1241843281395438793}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.7413882
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-3169665617426775807
 AnimatorState:
   serializedVersion: 6
@@ -344,7 +392,7 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: -3092462060419018639}
+  - {fileID: -128139314448311364}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -404,32 +452,6 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1102 &-2150709281473086400
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: rush
-  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: 8800263224452789868}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!74 &-875856672803879652
 AnimationClip:
   m_ObjectHideFlags: 0
@@ -516,6 +538,28 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!1101 &-128139314448311364
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1241843281395438793}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.6250187
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -785,7 +829,7 @@ AnimatorStateMachine:
     m_Position: {x: 380, y: 0, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -7312835209507622128}
-    m_Position: {x: 361.05396, y: 302.58536, z: 0}
+    m_Position: {x: 370, y: 280, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -3169665617426775807}
     m_Position: {x: 617.9902, y: 98.91638, z: 0}
@@ -796,8 +840,11 @@ AnimatorStateMachine:
     m_State: {fileID: 8907286694885838021}
     m_Position: {x: 612.7679, y: 261.85156, z: 0}
   - serializedVersion: 1
-    m_State: {fileID: -2150709281473086400}
-    m_Position: {x: 668.1241, y: 340.18576, z: 0}
+    m_State: {fileID: -7653950149726570094}
+    m_Position: {x: 729.90515, y: 353.2184, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 7949033646787330816}
+    m_Position: {x: 400, y: 370, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -931,7 +978,7 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: -3121004813010207201}
+  - {fileID: -3962597994850316431}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -947,6 +994,28 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &6919930672050039645
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1241843281395438793}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.92499924
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!74 &7110595576936310136
 AnimationClip:
   m_ObjectHideFlags: 0
@@ -1119,6 +1188,32 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!1102 &7949033646787330816
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: charge
+  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: 2025389843852112835}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!74 &8800263224452789868
 AnimationClip:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Scenes/SampleScene.unity

@@ -327,6 +327,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 481b12dc18964dc4f879c5df3686f5fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  cookNum: 0
+  cooks: []
   mecanim: {fileID: 0}
   meshRenderer: {fileID: 0}
   ani: {fileID: 0}

ActionTowerDefense/Assets/Scripts/Enemy.cs

@@ -35,6 +35,7 @@ public class Enemy : MoveCharacter
 
     public float attackRatio;
     public float maxMoveSpeed, minMoveSpeed;
+    public float runSpeed;
 
     public int dropSoul = 1;
     public GameObject soulPrefab;
@@ -305,7 +306,7 @@ public class Enemy : MoveCharacter
                 if (leftDir.x > 0.3f)
                 {
                     //rb.velocity += Vector3.right * moveAcc * Time.deltaTime;
-                    rb.velocity = Vector3.right * rushSpeed;
+                    rb.velocity = Vector3.right * runSpeed;
                     //if (rb.velocity.x > maxMoveSpeed)
                     //{
                     //    rb.velocity = new Vector3(maxMoveSpeed, rb.velocity.y, rb.velocity.z);
@@ -318,7 +319,7 @@ public class Enemy : MoveCharacter
                 else if (leftDir.x < -0.3f)
                 {
                     //rb.velocity -= Vector3.right * moveAcc * Time.deltaTime;
-                    rb.velocity = Vector3.left * rushSpeed;
+                    rb.velocity = Vector3.left * runSpeed;
                     //if (rb.velocity.x < -maxMoveSpeed)
                     //{
                     //    rb.velocity = new Vector3(-maxMoveSpeed, rb.velocity.y, rb.velocity.z);

ActionTowerDefense/Assets/Scripts/Spirits/ESpirits_Cook.cs

@@ -141,7 +141,7 @@ public class ESpirits_Cook : MonoBehaviour
         //ťŘźŇÂô´Ž
         else if (state == cookState.back && other.gameObject.layer == 8)
         {
-            ChangeState(cookState.sell);
+            ChangeState(cookState.cook);
         }
     }
 
@@ -178,7 +178,6 @@ public class ESpirits_Cook : MonoBehaviour
             case cookState.cook:
                 ene.canMove = false;
                 ani.Play("attack_march", 0, 0);
-                ChangeState(cookState.sell);
                 break;
             //ˇľťŘÖĐ
             case cookState.back:
@@ -228,7 +227,7 @@ public class ESpirits_Cook : MonoBehaviour
             case cookState.back:
                 if (cook.transform.position.x <= destX)
                 {
-                    ChangeState(cookState.sell);
+                    ChangeState(cookState.cook);
                 }
                 break;
             case cookState.cook: