Quellcode durchsuchen

保存所有动画事件帧时间

SZAND\msx_2 vor 7 Monaten
Ursprung
Commit
accd54551b
24 geänderte Dateien mit 294 neuen und 109 gelöschten Zeilen
  1. 4 3
      ActionTowerDefense/Assets/Editor/SkeletonDataReader.cs
  2. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/Conduct/Demonic_BigGiant.prefab
  3. 0 4
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Assassin.prefab
  4. 0 4
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Cook.prefab
  5. 0 4
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Float.prefab
  6. 0 4
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Invisible.prefab
  7. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab
  8. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab
  9. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab
  10. 20 8
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab
  11. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab
  12. 29 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab
  13. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab
  14. 29 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Sword.prefab
  15. 29 5
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab
  16. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab
  17. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yang.prefab
  18. 17 5
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yin.prefab
  19. 29 5
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab
  20. 0 4
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Assassin.prefab
  21. 0 4
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Float.prefab
  22. 0 4
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Invisible.prefab
  23. 0 4
      ActionTowerDefense/Assets/Resources/Prefab/Player.prefab
  24. 1 1
      ActionTowerDefense/Assets/Scripts/Characters/Character.cs

+ 4 - 3
ActionTowerDefense/Assets/Editor/SkeletonDataReader.cs

@@ -148,9 +148,9 @@ public class SkeletonDataMonitor
         CachePrefab(prefabPath, skeletonData);
     }
 
-
     static Character cha;
     static SkeletonMecanim skeletonMecanim;
+    static AttackController attack;
 
     private static void WriteData(string path)
     {
@@ -159,6 +159,7 @@ public class SkeletonDataMonitor
         try
         {
             cha = prefabInstance.GetComponent<Character>();
+            attack = prefabInstance.GetComponent<AttackController>();
             ReadData(prefabInstance);
             PrefabUtility.SaveAsPrefabAsset(prefabInstance, path);
             UnityEngine.Object.DestroyImmediate(prefabInstance);
@@ -198,7 +199,7 @@ public class SkeletonDataMonitor
             return;
         }
 
-        cha.attackController.attackKeys = new List<AttackController.SpineAniKey>();
+        attack.attackKeys = new List<AttackController.SpineAniKey>();
         // ±éÀúËùÓж¯»­
         foreach (var animation in skeletonData.Animations)
         {
@@ -254,7 +255,7 @@ public class SkeletonDataMonitor
                     }
                 }
             }
-            if (canWrite == 2) cha.attackController.attackKeys.Add(sak);
+            if (canWrite == 2) attack.attackKeys.Add(sak);
         }
     }
 

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/Conduct/Demonic_BigGiant.prefab

@@ -486,10 +486,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -605,7 +601,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.2666668
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 2
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.20000002
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.6666667
   attackType: 0
   canHitFly: 0
   armorPiercing: 0

+ 0 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Assassin.prefab

@@ -254,10 +254,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 1
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}

+ 0 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Cook.prefab

@@ -832,10 +832,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 1
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}

+ 0 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Float.prefab

@@ -1048,10 +1048,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 1
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}

+ 0 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Invisible.prefab

@@ -258,10 +258,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 1
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab

@@ -258,10 +258,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -371,7 +367,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333334
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333334
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab

@@ -258,10 +258,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -387,7 +383,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_fire_on
+      startKeyTime: 1
+      endType: 1
+      endKeyName: attack_fire_off
+      endKeyTime: 1.6333
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_fire_on
+      startKeyTime: 1
+      endType: 1
+      endKeyName: attack_fire_off
+      endKeyTime: 1.6333
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab

@@ -468,10 +468,6 @@ MonoBehaviour:
   armor: 50
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -597,7 +593,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333334
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333334
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 20 - 8
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab

@@ -1052,9 +1052,9 @@ MonoBehaviour:
   mecanim: {fileID: 3354085511906294621}
   meshRenderer: {fileID: 5313599660676682037}
   ani: {fileID: 5978259926173120695}
-  totalDieKeepTime: 0
-  totalAttack_summonTime: 1.8667
-  totalAttack_marchTime: 4
+  totalDieKeepTime: 1
+  totalAttack_summonTime: 1
+  totalAttack_marchTime: 2
   dieKeepTime: 0
   rb: {fileID: 8639832132491289349}
   bodyTrans: {fileID: 5769591908339262981}
@@ -1080,10 +1080,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -1209,7 +1205,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.43333337
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.6666667
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.43333337
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.6666667
   attackType: 1
   canHitFly: 1
   armorPiercing: 0

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab

@@ -258,10 +258,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -387,7 +383,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.6666667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.1333334
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.6666667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.1333334
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 29 - 5
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab

@@ -1080,10 +1080,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -1209,7 +1205,35 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.10000001
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.33333334
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.033333335
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.10000001
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.16666667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.23333335
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.3
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.36666667
   attackType: 1
   canHitFly: 1
   armorPiercing: 0

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab

@@ -468,10 +468,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -597,7 +593,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.2666668
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 2
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.20000002
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.6666667
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 29 - 5
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Sword.prefab

@@ -258,10 +258,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -387,7 +383,35 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1333
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.1
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.2
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.3667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.5333
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.7667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.8667
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 29 - 5
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -1080,10 +1080,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -1207,7 +1203,35 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.10000001
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.33333334
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.033333335
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.10000001
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.16666667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.23333335
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.3
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.36666667
   attackType: 1
   canHitFly: 1
   armorPiercing: 30

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -469,10 +469,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -596,7 +592,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.2666668
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 2
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.20000002
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.6666667
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yang.prefab

@@ -524,10 +524,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -651,7 +647,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.2666668
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 2
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.20000002
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.6666667
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 17 - 5
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yin.prefab

@@ -524,10 +524,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -651,7 +647,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.2666668
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 2
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.20000002
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.6666667
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 29 - 5
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -205,10 +205,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -332,7 +328,35 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1333
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333
+  - aniName: attack_summon
+    keys:
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.1
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.2
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.3667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.5333
+    - attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.7667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.8667
   attackType: 0
   canHitFly: 1
   armorPiercing: 0

+ 0 - 4
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Assassin.prefab

@@ -318,10 +318,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 1
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}

+ 0 - 4
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Float.prefab

@@ -1098,10 +1098,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 1
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}

+ 0 - 4
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Invisible.prefab

@@ -245,10 +245,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 1
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}

+ 0 - 4
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -670,10 +670,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 0
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}

+ 1 - 1
ActionTowerDefense/Assets/Scripts/Characters/Character.cs

@@ -21,6 +21,7 @@ public enum CharacterState
     Sprint = 10,
     Die = 11,
     Weak = 12,
+    SpecialStatus,
 
     Float = 15,             //空中漂浮
 
@@ -28,7 +29,6 @@ public enum CharacterState
 
     LockSoul = 25,          //在锁魂塔中
     Conduct = 26,           //在指挥中
-    SpecialStatus,
 }
 
 public class Character : MonoBehaviour