wgl 7 месяцев назад
Родитель
Сommit
4412365665
16 измененных файлов с 40 добавлено и 40 удалено
  1. 2 2
      ActionTowerDefense/Assets/Animations/Demonic_Arrow/DemonicArrowCollider.controller
  2. 6 6
      ActionTowerDefense/Assets/Animations/Demonic_Arrow/DemonicArrowCollider_Attack1.anim
  3. 2 2
      ActionTowerDefense/Assets/Animations/Demonic_Arrow/DemonicArrowCollider_Attack2.anim
  4. 2 2
      ActionTowerDefense/Assets/Animations/Demonic_Giant/DemonicGiantCollider.controller
  5. 2 2
      ActionTowerDefense/Assets/Animations/EnemyTower/EnemyTowerCollider.controller
  6. 2 2
      ActionTowerDefense/Assets/Animations/Enemy_Arrow/EnemyArrowCollider.controller
  7. 6 6
      ActionTowerDefense/Assets/Animations/Enemy_Arrow/EnemyArrowCollider_Attack1.anim
  8. 2 2
      ActionTowerDefense/Assets/Animations/Enemy_Arrow/EnemyArrowCollider_Attack2.anim
  9. 2 2
      ActionTowerDefense/Assets/Animations/Enemy_Giant/EnemyGiantCollider.controller
  10. 2 2
      ActionTowerDefense/Assets/Animations/Enemy_Sword/EnemySwordCollider.controller
  11. 2 2
      ActionTowerDefense/Assets/Animations/Player/PlayerCollider.controller
  12. 2 2
      ActionTowerDefense/Assets/Animations/Spirits_Assassin/SpiritsAssassinCollider.controller
  13. 2 2
      ActionTowerDefense/Assets/Animations/Spirits_Cook/SpiritsCookCollider.controller
  14. 2 2
      ActionTowerDefense/Assets/Animations/Spirits_Float/SpiritsFloatCollider.controller
  15. 2 2
      ActionTowerDefense/Assets/Animations/Spirits_Invisible/SpiritsInvisibleCollider.controller
  16. 2 2
      ActionTowerDefense/Assets/Animations/Tower/TowerCollider.controller

+ 2 - 2
ActionTowerDefense/Assets/Animations/Demonic_Arrow/DemonicArrowCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -262,7 +262,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 6 - 6
ActionTowerDefense/Assets/Animations/Demonic_Arrow/DemonicArrowCollider_Attack1.anim

@@ -7,7 +7,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: DemonicArrowCollider_Attack1
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -292,23 +292,23 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_Events:
   - time: 0.23333333
-    functionName: Attack1ShootEvent
+    functionName: Attack_summonShootEvent
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
     intParameter: 0
     messageOptions: 0
   - time: 0.41666666
-    functionName: Attack1ShootEvent
+    functionName: Attack_summonShootEvent
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 1
+    intParameter: 0
     messageOptions: 0
   - time: 0.5833333
-    functionName: Attack1ShootEvent
+    functionName: Attack_summonShootEvent
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 2
+    intParameter: 0
     messageOptions: 0

+ 2 - 2
ActionTowerDefense/Assets/Animations/Demonic_Arrow/DemonicArrowCollider_Attack2.anim

@@ -7,7 +7,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: DemonicArrowCollider_Attack2
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -132,7 +132,7 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_Events:
   - time: 0.33333334
-    functionName: Attack2ShootEvent
+    functionName: Attack_marchShootEvent
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0

+ 2 - 2
ActionTowerDefense/Assets/Animations/Demonic_Giant/DemonicGiantCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -291,7 +291,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 2 - 2
ActionTowerDefense/Assets/Animations/EnemyTower/EnemyTowerCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -172,7 +172,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 2 - 2
ActionTowerDefense/Assets/Animations/Enemy_Arrow/EnemyArrowCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -291,7 +291,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 6 - 6
ActionTowerDefense/Assets/Animations/Enemy_Arrow/EnemyArrowCollider_Attack1.anim

@@ -7,7 +7,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: EnemyArrowCollider_Attack1
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -292,23 +292,23 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_Events:
   - time: 0.23333333
-    functionName: Attack1ShootEvent
+    functionName: Attack_summonShootEvent
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
     intParameter: 0
     messageOptions: 0
   - time: 0.41666666
-    functionName: Attack1ShootEvent
+    functionName: Attack_summonShootEvent
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 1
+    intParameter: 0
     messageOptions: 0
   - time: 0.5833333
-    functionName: Attack1ShootEvent
+    functionName: Attack_summonShootEvent
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0
-    intParameter: 2
+    intParameter: 0
     messageOptions: 0

+ 2 - 2
ActionTowerDefense/Assets/Animations/Enemy_Arrow/EnemyArrowCollider_Attack2.anim

@@ -7,7 +7,7 @@ AnimationClip:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: EnemyArrowCollider_Attack2
-  serializedVersion: 6
+  serializedVersion: 7
   m_Legacy: 0
   m_Compressed: 0
   m_UseHighQualityCurve: 1
@@ -132,7 +132,7 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_Events:
   - time: 0.33333334
-    functionName: Attack2ShootEvent
+    functionName: Attack_marchShootEvent
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0

+ 2 - 2
ActionTowerDefense/Assets/Animations/Enemy_Giant/EnemyGiantCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -291,7 +291,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 2 - 2
ActionTowerDefense/Assets/Animations/Enemy_Sword/EnemySwordCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -265,7 +265,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 2 - 2
ActionTowerDefense/Assets/Animations/Player/PlayerCollider.controller

@@ -33,7 +33,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -349,7 +349,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1Keep
+  m_Name: Attack_summonKeep
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 2 - 2
ActionTowerDefense/Assets/Animations/Spirits_Assassin/SpiritsAssassinCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -265,7 +265,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 2 - 2
ActionTowerDefense/Assets/Animations/Spirits_Cook/SpiritsCookCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -284,7 +284,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:

+ 2 - 2
ActionTowerDefense/Assets/Animations/Spirits_Float/SpiritsFloatCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -284,7 +284,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:

+ 2 - 2
ActionTowerDefense/Assets/Animations/Spirits_Invisible/SpiritsInvisibleCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -265,7 +265,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []

+ 2 - 2
ActionTowerDefense/Assets/Animations/Tower/TowerCollider.controller

@@ -7,7 +7,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack1
+  m_Name: Attack_summon
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []
@@ -172,7 +172,7 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Attack2
+  m_Name: Attack_march
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions: []