wgl 7 місяців тому
батько
коміт
595bc2e1c7
25 змінених файлів з 693 додано та 1137 видалено
  1. 18 15
      ActionTowerDefense/Assets/Resources/Prefab/BaGua/Demonic_Giant_Yang.prefab
  2. 18 15
      ActionTowerDefense/Assets/Resources/Prefab/BaGua/Demonic_Giant_Yin.prefab
  3. 12 20
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab
  4. 18 15
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab
  5. 16 14
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab
  6. 17 14
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Assassin.prefab
  7. 17 14
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Cook.prefab
  8. 13 21
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Float.prefab
  9. 16 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Invisible.prefab
  10. 13 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab
  11. 13 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab
  12. 15 15
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab
  13. 13 21
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab
  14. 13 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab
  15. 13 21
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab
  16. 18 15
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab
  17. 16 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Sword.prefab
  18. 18 15
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab
  19. 69 142
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab
  20. 54 111
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab
  21. 45 100
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Invisible.prefab
  22. 65 136
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Assassin.prefab
  23. 74 147
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab
  24. 56 110
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab
  25. 53 111
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Invisible.prefab

+ 18 - 15
ActionTowerDefense/Assets/Resources/Prefab/BaGua/Demonic_Giant_Yang.prefab

@@ -92,6 +92,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -512,6 +513,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 2
@@ -519,27 +521,28 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 3.6
-  totalAttack2Time: 4
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 10
-    attackDir: {x: -2, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 31
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 31
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 040000000500000006000000
@@ -556,7 +559,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 18 - 15
ActionTowerDefense/Assets/Resources/Prefab/BaGua/Demonic_Giant_Yin.prefab

@@ -92,6 +92,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -512,6 +513,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 2
@@ -519,27 +521,28 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 3.6
-  totalAttack2Time: 4
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 10
-    attackDir: {x: -2, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 31
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 31
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 040000000500000006000000
@@ -556,7 +559,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 12 - 20
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab

@@ -1001,6 +1001,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -1008,8 +1009,8 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.8
-  totalAttack2Time: 1.3
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 1
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
   shootPos:
@@ -1017,30 +1018,21 @@ MonoBehaviour:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   shootTrack: 1
-  attack1Infos:
-  - damage: 200
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 0
-    repelValue: 0
-  - damage: 200
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 0
-    repelValue: 0
-  - damage: 200
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
     repelValue: 0
-  attack2Infos:
-  - damage: 30
-    attackDir: {x: -1, y: 0, z: 0}
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   attackTriggers: []
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 040000000500000006000000
@@ -1057,7 +1049,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 1
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 18 - 15
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab

@@ -92,6 +92,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -457,6 +458,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -464,27 +466,28 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 3.6
-  totalAttack2Time: 4
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 10
-    attackDir: {x: -2, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 31
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 31
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 040000000500000006000000
@@ -501,7 +504,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 16 - 14
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab

@@ -196,6 +196,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -203,27 +204,28 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 200
-    attackDir: {x: -3, y: 1, z: 0}
-    force: 10000
-    changeHurt: 1
-    repelValue: 52
-  attack2Infos:
-  - damage: 50
-    attackDir: {x: -3, y: 1, z: 0}
-    force: 1000
-    changeHurt: 1
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
     repelValue: 0
   attackTriggers:
   - {fileID: 4347565098670608659}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 040000000500000006000000
@@ -240,7 +242,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 17 - 14
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Assassin.prefab

@@ -246,6 +246,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -253,27 +254,28 @@ MonoBehaviour:
   canHitFly: 0
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 600
-    attackDir: {x: 0, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
-  attack2Infos:
-  - damage: 220
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 10
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 4347565098670608659}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 010000000300000002000000
@@ -290,7 +292,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
@@ -725,6 +727,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}

+ 17 - 14
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Cook.prefab

@@ -92,6 +92,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -832,6 +833,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -839,27 +841,28 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 1
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 200
-    attackDir: {x: 0, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
-  attack2Infos:
-  - damage: 50
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 10
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 010000000300000004000000
@@ -876,7 +879,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 13 - 21
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Float.prefab

@@ -1040,6 +1040,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -1047,8 +1048,8 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.8
-  totalAttack2Time: 1.3
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 1
   bulletPrefab: {fileID: 7473170563405908938, guid: 5a7a8caaf3e79ec4f814d34467f0bf46, type: 3}
   shootPos:
@@ -1056,30 +1057,21 @@ MonoBehaviour:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   shootTrack: 1
-  attack1Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
     repelValue: 0
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
-    changeHurt: 0
-    repelValue: 0
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
-    changeHurt: 1
-    repelValue: 0
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
     repelValue: 0
   attackTriggers: []
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 010000000300000002000000
@@ -1096,7 +1088,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 16 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Invisible.prefab

@@ -249,6 +249,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -256,26 +257,27 @@ MonoBehaviour:
   canHitFly: 0
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.8
-  totalAttack2Time: 1.3
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 1
-  attack1Infos:
-  - damage: 400
-    attackDir: {x: 2, y: 1, z: 0}
-    force: 1000
-    changeHurt: 1
-    repelValue: 10
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: 2, y: 1, z: 0}
-    force: 1000
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
     repelValue: 0
   attackTriggers: []
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 010000000300000002000000
@@ -292,7 +294,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
@@ -727,6 +729,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}

+ 13 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab

@@ -254,24 +254,24 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 50
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 50
-  attack2Infos:
-  - damage: 50
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 50
+    repelValue: 0
   attackTriggers:
   - {fileID: 2280520615464243483}
   addAttackEffect: {fileID: 0}
@@ -292,7 +292,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 13 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab

@@ -254,24 +254,24 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 40
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 50
-  attack2Infos:
-  - damage: 40
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 50
+    repelValue: 0
   attackTriggers:
   - {fileID: 2280520615464243483}
   addAttackEffect: {fileID: 0}
@@ -292,7 +292,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 15 - 15
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab

@@ -465,24 +465,24 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 3.6
-  totalAttack2Time: 4
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   addAttackEffect: {fileID: 0}
@@ -503,7 +503,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 13 - 21
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab

@@ -1001,6 +1001,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -1008,8 +1009,8 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.8
-  totalAttack2Time: 1.3
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 1
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
   shootPos:
@@ -1017,30 +1018,21 @@ MonoBehaviour:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   shootTrack: 1
-  attack1Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
     repelValue: 0
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
-    changeHurt: 0
-    repelValue: 0
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
-    changeHurt: 1
-    repelValue: 0
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
     repelValue: 0
   attackTriggers: []
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 010000000300000002000000
@@ -1057,7 +1049,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 1
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 13 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab

@@ -254,24 +254,24 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 50
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 50
-  attack2Infos:
-  - damage: 50
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 50
+    repelValue: 0
   attackTriggers:
   - {fileID: 2280520615464243483}
   addAttackEffect: {fileID: 0}
@@ -292,7 +292,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 13 - 21
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab

@@ -1001,6 +1001,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -1008,8 +1009,8 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.8
-  totalAttack2Time: 1.3
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 1
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
   shootPos:
@@ -1017,30 +1018,21 @@ MonoBehaviour:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   shootTrack: 1
-  attack1Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
     repelValue: 0
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
-    changeHurt: 0
-    repelValue: 0
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
-    changeHurt: 1
-    repelValue: 0
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
     repelValue: 0
   attackTriggers: []
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 010000000300000002000000
@@ -1057,7 +1049,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 1
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 18 - 15
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab

@@ -92,6 +92,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -456,6 +457,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -463,27 +465,28 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 3.6
-  totalAttack2Time: 4
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
-  attack2Infos:
-  - damage: 10
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 010000000200000003000000
@@ -500,7 +503,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 16 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Sword.prefab

@@ -166,6 +166,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -245,6 +246,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -252,27 +254,28 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 50
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 50
-  attack2Infos:
-  - damage: 50
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 1000
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 50
+    repelValue: 0
   attackTriggers:
   - {fileID: 2280520615464243483}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 010000000300000002000000
@@ -289,7 +292,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}

+ 18 - 15
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab

@@ -324,6 +324,7 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
   canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 2
@@ -331,27 +332,28 @@ MonoBehaviour:
   canHitFly: 0
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 2
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 200
-    attackDir: {x: 2, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 100
-  attack2Infos:
-  - damage: 50
-    attackDir: {x: -2, y: 1, z: 0}
-    force: 1000
-    changeHurt: 1
-    repelValue: 50
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 4347565098670608659}
   addAttackEffect: {fileID: 0}
+  armorPiercing: 0
   curDamage1: 
   curDamage2: 
   targetTypes: 040000000500000006000000
@@ -368,7 +370,7 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
@@ -915,6 +917,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}

+ 69 - 142
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab

@@ -34,6 +34,7 @@ RectTransform:
   m_Children:
   - {fileID: 7032149864581384072}
   m_Father: {fileID: 3103190932458336017}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -129,7 +130,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 650183981426157255}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -139,6 +139,7 @@ Transform:
   - {fileID: 901824162977467732}
   - {fileID: 7708229159683865768}
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1322232727721152541
 GameObject:
@@ -165,13 +166,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1322232727721152541}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &77275286589392561
 BoxCollider:
@@ -181,18 +182,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1322232727721152541}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0, y: 0, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7729941002223262554
 MonoBehaviour:
@@ -207,6 +200,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -214,6 +208,7 @@ MonoBehaviour:
   repelValue: 0
   offsetY: 1
   hitRate: 1
+  onlyFlyCanWeak: 0
 --- !u!1 &2460330936527559963
 GameObject:
   m_ObjectHideFlags: 0
@@ -239,13 +234,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2460330936527559963}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &5217712517297835056
 BoxCollider:
@@ -255,18 +250,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2460330936527559963}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 2.132753, y: 2.3543785, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.024625063, y: 1.1450654, z: 0}
 --- !u!114 &3377671071202039733
 MonoBehaviour:
@@ -313,6 +300,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1544714013328383648}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -390,17 +378,15 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
-  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
-  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -443,13 +429,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4480734502875862885}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 2.16, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &637278332454425733
 BoxCollider:
@@ -459,18 +445,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4480734502875862885}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 4.4262385, y: 4.7369604, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.039123774, y: 0.081486225, z: 0}
 --- !u!114 &4259433079752244006
 MonoBehaviour:
@@ -509,13 +487,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4543619153787591511}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &925594141286007562
 BoxCollider:
@@ -525,18 +503,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4543619153787591511}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 2.1781316, y: 2.2643359, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.014367342, y: 1.1206616, z: 0}
 --- !u!1 &4579126894259554924
 GameObject:
@@ -562,13 +532,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4579126894259554924}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 7.64, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8092833306629620455
 BoxCollider:
@@ -578,18 +548,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4579126894259554924}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3.8787084, y: 1, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: -1.2794268, y: 0, z: 0}
 --- !u!1 &5041915139224979942
 GameObject:
@@ -615,7 +577,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5041915139224979942}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -627,10 +588,11 @@ Transform:
   - {fileID: 8927539278125731317}
   - {fileID: 6069085609270885073}
   m_Father: {fileID: 6459001683917408033}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &2776251058442384869
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -644,12 +606,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 1
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &5440846222604650419
 GameObject:
   m_ObjectHideFlags: 0
@@ -675,13 +635,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222604650419}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &5440846222604650429
 BoxCollider:
@@ -691,18 +651,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222604650419}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 1, y: 0.003, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &5440846222604650418
 MonoBehaviour:
@@ -747,7 +699,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222648032759}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 8.01, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -760,6 +711,7 @@ Transform:
   - {fileID: 2332805625535433500}
   - {fileID: 4787598481067778054}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5440846222648032767
 MonoBehaviour:
@@ -795,6 +747,8 @@ MonoBehaviour:
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
+  canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 0
@@ -802,18 +756,30 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 1
   attackTime: 0
-  totalAttack1Time: 0
-  totalAttack2Time: 0
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos: []
-  attack2Infos: []
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   addAttackEffect: {fileID: 0}
-  curDamage: 
+  armorPiercing: 0
+  curDamage1: 
+  curDamage2: 
   targetTypes: 010000000300000004000000
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
@@ -828,7 +794,8 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
+  debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -847,6 +814,7 @@ MonoBehaviour:
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 3
+  newTotalWeakTime: 0
   weakHitRate: 2
   weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
@@ -897,7 +865,6 @@ MonoBehaviour:
   id: 0
   costMp: 1
   totalSummonTime: 0.5
-  canFly: 0
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -919,6 +886,7 @@ MonoBehaviour:
   dropSoulMin: 1
   dropSoulAngle: 60
   upFirstAfterWeaknessOrNot: 0
+  isBeBlownUp: 0
 --- !u!54 &5440846222648032765
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -926,21 +894,10 @@ Rigidbody:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222648032759}
-  serializedVersion: 4
+  serializedVersion: 2
   m_Mass: 50
   m_Drag: 0.1
   m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
   m_UseGravity: 1
   m_IsKinematic: 0
   m_Interpolate: 0
@@ -978,6 +935,7 @@ RectTransform:
   m_Children:
   - {fileID: 5649507295576249902}
   m_Father: {fileID: 3103190932458336017}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1047,13 +1005,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6139679835290116115}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2932762729738363159
 MonoBehaviour:
@@ -1085,18 +1043,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6139679835290116115}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 5, y: 10, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 5, z: 0}
 --- !u!1 &6824693000491653481
 GameObject:
@@ -1129,6 +1079,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1104288316767999960}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1200,13 +1151,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7208291223413765209}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.72, y: 0.72, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6459001683917408033}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8447137249705371152
 MeshFilter:
@@ -1233,9 +1184,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1266,7 +1214,7 @@ MeshRenderer:
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &3333436509305836838
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1280,12 +1228,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &7573527827155227431
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1321,6 +1267,9 @@ MonoBehaviour:
     materialsInsideMask: []
     materialsOutsideMask: []
   disableRenderingOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   translator:
     autoReset: 1
     useCustomMixMode: 1
@@ -1351,13 +1300,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7219392564388260375}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1.96, y: 7.08, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &4017189360880258370
 BoxCollider:
@@ -1367,18 +1316,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7219392564388260375}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3.8787084, y: 1, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: -1.2794268, y: 0, z: 0}
 --- !u!1 &8560672494665079236
 GameObject:
@@ -1414,6 +1355,7 @@ RectTransform:
   - {fileID: 1104288316767999960}
   - {fileID: 1544714013328383648}
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1437,9 +1379,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -1488,7 +1428,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 5440846222648032754}
     m_Modifications:
     - target: {fileID: 242266596801799417, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
@@ -1556,9 +1495,6 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
 --- !u!4 &4787598481067778054 stripped
 Transform:
@@ -1570,7 +1506,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 6459001683917408033}
     m_Modifications:
     - target: {fileID: 373118178179337039, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
@@ -1716,12 +1651,6 @@ PrefabInstance:
     m_RemovedComponents:
     - {fileID: 4733725822632215198, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
     - {fileID: 9128107806917823098, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 8830340756041430554, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1935850126738216375}
   m_SourcePrefab: {fileID: 100100000, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}
 --- !u!1 &2031723359074680471 stripped
 GameObject:
@@ -1730,7 +1659,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
 --- !u!95 &1935850126738216375
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1744,12 +1673,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!4 &7708229159683865768 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 882894729606411301, guid: d26ff3d697c558f49a8b4c4ba7bffd00, type: 3}

+ 54 - 111
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab

@@ -23,13 +23,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 608566006687189219}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.5, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1190225091429982147
 GameObject:
@@ -56,13 +56,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1190225091429982147}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8507032990732667563
 BoxCollider:
@@ -72,18 +72,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1190225091429982147}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 1}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0.792, z: 0}
 --- !u!114 &9020361017135710302
 MonoBehaviour:
@@ -133,6 +125,7 @@ RectTransform:
   m_Children:
   - {fileID: 5104997452083766110}
   m_Father: {fileID: 152626645726552729}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -232,13 +225,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2234394376273647362}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.36, y: 0.36, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5769591908339262981}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3791886041281981973
 MeshFilter:
@@ -265,9 +258,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -297,7 +287,7 @@ MeshRenderer:
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &5978259926173120695
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -311,12 +301,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &3354085511906294621
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -352,6 +340,9 @@ MonoBehaviour:
     materialsInsideMask: []
     materialsOutsideMask: []
   disableRenderingOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   translator:
     autoReset: 1
     useCustomMixMode: 1
@@ -381,13 +372,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2475269063027159835}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.5, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2616922587087395095
 GameObject:
@@ -413,13 +404,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2616922587087395095}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &7144185533164728569
 BoxCollider:
@@ -429,18 +420,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2616922587087395095}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 1}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0.792, z: 0}
 --- !u!1 &2623922659733331491
 GameObject:
@@ -473,6 +456,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4847391198550739967}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -540,7 +524,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3041216575519132682}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -549,6 +532,7 @@ Transform:
   - {fileID: 2983912410871356969}
   - {fileID: 6561999689701501378}
   m_Father: {fileID: 8639832132491289354}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5307676761346103599
 GameObject:
@@ -575,13 +559,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5307676761346103599}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8639832132491289354}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3566347593191160092
 MonoBehaviour:
@@ -613,18 +597,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5307676761346103599}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 40, y: 20, z: 1}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &5388987656270167698
 GameObject:
@@ -651,13 +627,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5388987656270167698}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0.792, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6832657651774999176
 BoxCollider:
@@ -667,18 +643,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5388987656270167698}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 1}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &316813748882225178
 MonoBehaviour:
@@ -718,7 +686,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6911591061214860228}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -732,10 +699,11 @@ Transform:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   m_Father: {fileID: 5769591908339262981}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &6864986857343475389
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -749,12 +717,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &7514976921726773167
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -803,6 +769,7 @@ RectTransform:
   m_Children:
   - {fileID: 4847391198550739967}
   m_Father: {fileID: 8639832132491289354}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -826,9 +793,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -895,13 +860,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8534270758388991037}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.5, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8639832132450015563
 GameObject:
@@ -928,13 +893,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639832132450015563}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8639832132450015557
 BoxCollider:
@@ -944,18 +909,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639832132450015563}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.432, y: 0.003, z: 1}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &8639832132450015562
 MonoBehaviour:
@@ -1001,7 +958,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639832132491289359}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 8.01, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -1011,6 +967,7 @@ Transform:
   - {fileID: 5016048881761595890}
   - {fileID: 152626645726552729}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3290368322717680010
 MonoBehaviour:
@@ -1061,6 +1018,8 @@ MonoBehaviour:
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
+  canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 2
@@ -1068,8 +1027,8 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.8
-  totalAttack2Time: 1.3
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 1
   bulletPrefab: {fileID: 7473170563405908938, guid: 5a7a8caaf3e79ec4f814d34467f0bf46, type: 3}
   shootPos:
@@ -1077,35 +1036,28 @@ MonoBehaviour:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   shootTrack: 1
-  attack1Infos:
-  - damage: 20
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 0
-    repelValue: 10
-  - damage: 20
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 10
-  - damage: 20
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
-  attack2Infos:
-  - damage: 20
-    attackDir: {x: -1, y: 0, z: 0}
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
-    repelValue: 10
+    repelValue: 0
   attackTriggers: []
   addAttackEffect: {fileID: 0}
-  curDamage: 
+  armorPiercing: 0
+  curDamage1: 
+  curDamage2: 
   targetTypes: 040000000500000006000000
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   beTargetCharacter: []
+  getDistanceOffset: 0
   isSpirit: 1
   isTran: 0
   pc: {fileID: 0}
@@ -1115,7 +1067,8 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
+  debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -1134,6 +1087,7 @@ MonoBehaviour:
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 3
+  newTotalWeakTime: 0
   weakHitRate: 2
   weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
@@ -1184,7 +1138,6 @@ MonoBehaviour:
   id: 0
   costMp: 1
   totalSummonTime: 0.5
-  canFly: 1
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -1206,6 +1159,7 @@ MonoBehaviour:
   dropSoulMin: 1
   dropSoulAngle: 60
   upFirstAfterWeaknessOrNot: 0
+  isBeBlownUp: 0
 --- !u!54 &8639832132491289349
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1213,21 +1167,10 @@ Rigidbody:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639832132491289359}
-  serializedVersion: 4
+  serializedVersion: 2
   m_Mass: 10
   m_Drag: 0.1
   m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
   m_UseGravity: 0
   m_IsKinematic: 0
   m_Interpolate: 0

+ 45 - 100
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Invisible.prefab

@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 78415308861180513}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5104552355235513707
 MonoBehaviour:
@@ -63,18 +63,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 78415308861180513}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 40, y: 3, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 1.5, z: 0}
 --- !u!1 &1090663073729466903
 GameObject:
@@ -100,7 +92,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1090663073729466903}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -111,10 +102,11 @@ Transform:
   - {fileID: 5718990486604556333}
   - {fileID: 2288379621507428556}
   m_Father: {fileID: 2730232521377132808}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7460010523729932468
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -128,12 +120,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 1
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &2437299196472462361
 GameObject:
   m_ObjectHideFlags: 0
@@ -160,7 +150,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196472462361}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -173,6 +162,7 @@ Transform:
   - {fileID: 1025279407892114208}
   - {fileID: 8507731236713456294}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &99850206658526686
 MonoBehaviour:
@@ -245,6 +235,8 @@ MonoBehaviour:
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 0
+  canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 2
@@ -252,19 +244,19 @@ MonoBehaviour:
   canHitFly: 0
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 2
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
+  Attack_summonInfos:
   - damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  attack2Infos:
+  Attack_marchInfos:
   - damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
@@ -273,11 +265,14 @@ MonoBehaviour:
   attackTriggers:
   - {fileID: 0}
   addAttackEffect: {fileID: 0}
-  curDamage: 
+  armorPiercing: 0
+  curDamage1: 
+  curDamage2: 
   targetTypes: 040000000500000006000000
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   beTargetCharacter: []
+  getDistanceOffset: 0
   isSpirit: 1
   isTran: 0
   pc: {fileID: 0}
@@ -287,7 +282,8 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
+  debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -303,6 +299,7 @@ MonoBehaviour:
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 3
+  newTotalWeakTime: 0
   weakHitRate: 2
   weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
@@ -353,7 +350,6 @@ MonoBehaviour:
   id: 0
   costMp: 1
   totalSummonTime: 0.5
-  canFly: 1
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -375,6 +371,7 @@ MonoBehaviour:
   dropSoulMin: 1
   dropSoulAngle: 60
   upFirstAfterWeaknessOrNot: 0
+  isBeBlownUp: 0
 --- !u!54 &2472120008162019348
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -382,21 +379,10 @@ Rigidbody:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196472462361}
-  serializedVersion: 4
+  serializedVersion: 2
   m_Mass: 10
   m_Drag: 0.1
   m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
   m_UseGravity: 0
   m_IsKinematic: 0
   m_Interpolate: 0
@@ -427,13 +413,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196663985757}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2437299196663985747
 BoxCollider:
@@ -443,18 +429,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196663985757}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.432, y: 0.003, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &2437299196663985756
 MonoBehaviour:
@@ -497,7 +475,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5216717017252562314}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -506,6 +483,7 @@ Transform:
   - {fileID: 1971427318739414964}
   - {fileID: 7794457276998281569}
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5854255137085934375
 GameObject:
@@ -541,6 +519,7 @@ RectTransform:
   m_Children:
   - {fileID: 5150648748656367320}
   m_Father: {fileID: 8507731236713456294}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -638,13 +617,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6526817785665782971}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0.792, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &5683702269505879586
 BoxCollider:
@@ -654,18 +633,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6526817785665782971}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1317309795988277421
 MonoBehaviour:
@@ -707,13 +678,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7669620205589286043}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.36, y: 0.36, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2730232521377132808}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &2070274865187464477
 MeshFilter:
@@ -740,9 +711,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -770,7 +738,7 @@ MeshRenderer:
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &6496896669866891404
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -784,12 +752,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &5617185463097218335
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -825,6 +791,9 @@ MonoBehaviour:
     materialsInsideMask: []
     materialsOutsideMask: []
   disableRenderingOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   translator:
     autoReset: 1
     useCustomMixMode: 1
@@ -864,6 +833,7 @@ RectTransform:
   m_Children:
   - {fileID: 6098794361404217704}
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -887,9 +857,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -957,13 +925,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8367450352918568419}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &3529304715442735116
 BoxCollider:
@@ -973,18 +941,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8367450352918568419}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3, y: 3, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &8769150919382874379
 GameObject:
@@ -1011,13 +971,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8769150919382874379}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6353082427811530657
 BoxCollider:
@@ -1027,18 +987,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8769150919382874379}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0.792, z: 0}
 --- !u!114 &5333142802677931907
 MonoBehaviour:
@@ -1085,6 +1037,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6098794361404217704}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1153,13 +1106,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9098219392703443186}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4610496197409361392
 MonoBehaviour:
@@ -1197,7 +1150,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 2437299196472462364}
     m_Modifications:
     - target: {fileID: 1723151111827507803, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
@@ -1259,9 +1211,6 @@ PrefabInstance:
     m_RemovedComponents:
     - {fileID: 1723151111827507800, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
     - {fileID: 1723151111827507801, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
 --- !u!4 &1025279407892114208 stripped
 Transform:
@@ -1278,7 +1227,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 2437299196472462364}
     m_Modifications:
     - target: {fileID: 7473170563405908937, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
@@ -1330,9 +1278,6 @@ PrefabInstance:
       value: Invisible_effc
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
 --- !u!4 &9430913901011754 stripped
 Transform:

+ 65 - 136
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Assassin.prefab

@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 78415308861180513}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5104552355235513707
 MonoBehaviour:
@@ -63,18 +63,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 78415308861180513}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 40, y: 3, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 1.5, z: 0}
 --- !u!1 &1090663073729466903
 GameObject:
@@ -101,7 +93,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1090663073729466903}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -114,10 +105,11 @@ Transform:
   - {fileID: 2288379621507428556}
   - {fileID: 3856686709615606825}
   m_Father: {fileID: 2730232521377132808}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7460010523729932468
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -131,12 +123,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 1
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &5468727661494241160
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -177,7 +167,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196472462361}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 8.01, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -188,6 +177,7 @@ Transform:
   - {fileID: 2736598004543142215}
   - {fileID: 8507731236713456294}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8277178250940990889
 MonoBehaviour:
@@ -247,6 +237,8 @@ MonoBehaviour:
   invincibleTime: 0
   injuryNumText: {fileID: 0}
   showInjuryNum: 0
+  canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 2
@@ -254,32 +246,35 @@ MonoBehaviour:
   canHitFly: 0
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 2
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
-  - damage: 600
-    attackDir: {x: 0, y: 1, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
-  attack2Infos:
-  - damage: 50
-    attackDir: {x: -2, y: 1, z: 0}
-    force: 1000
-    changeHurt: 1
-    repelValue: 50
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
   attackTriggers:
   - {fileID: 4347565098670608659}
   addAttackEffect: {fileID: 0}
-  curDamage: 
+  armorPiercing: 0
+  curDamage1: 
+  curDamage2: 
   targetTypes: 0400000005000000
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   beTargetCharacter: []
+  getDistanceOffset: 0
   isSpirit: 1
   isTran: 1
   pc: {fileID: 0}
@@ -289,7 +284,8 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
+  debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -307,6 +303,7 @@ MonoBehaviour:
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 3
+  newTotalWeakTime: 0
   weakHitRate: 2
   weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
@@ -357,7 +354,6 @@ MonoBehaviour:
   id: 0
   costMp: 1
   totalSummonTime: 0.5
-  canFly: 0
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -379,6 +375,7 @@ MonoBehaviour:
   dropSoulMin: 1
   dropSoulAngle: 60
   upFirstAfterWeaknessOrNot: 0
+  isBeBlownUp: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -404,13 +401,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196663985757}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2437299196663985747
 BoxCollider:
@@ -420,18 +417,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196663985757}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.52, y: 0.003, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: -0.035, y: 0, z: 0}
 --- !u!114 &2437299196663985756
 MonoBehaviour:
@@ -474,7 +463,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3811492645662986714}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 1, w: 0}
   m_LocalPosition: {x: 0, y: 0.5, z: 0}
   m_LocalScale: {x: 1, y: 3, z: 1}
@@ -483,6 +471,7 @@ Transform:
   - {fileID: 210492870461920642}
   - {fileID: 703830862921612864}
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180}
 --- !u!1 &5216717017252562314
 GameObject:
@@ -507,7 +496,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5216717017252562314}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -517,6 +505,7 @@ Transform:
   - {fileID: 7794457276998281569}
   - {fileID: 4705723435026192113}
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5724427844924032099
 GameObject:
@@ -542,13 +531,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5724427844924032099}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 1.114, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 0.2, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2736598004543142215}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &5084821423994405064
 SpriteRenderer:
@@ -567,9 +556,6 @@ SpriteRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -639,6 +625,7 @@ RectTransform:
   m_Children:
   - {fileID: 5150648748656367320}
   m_Father: {fileID: 8507731236713456294}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -736,13 +723,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6526817785665782971}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &5683702269505879586
 BoxCollider:
@@ -752,18 +739,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6526817785665782971}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.78, y: 1.82, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.09, y: 0.91, z: 0}
 --- !u!114 &1317309795988277421
 MonoBehaviour:
@@ -803,13 +782,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6594324537872882015}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1970364359111705892
 BoxCollider:
@@ -819,18 +798,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6594324537872882015}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 2.5, y: 2, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: -1.5, y: 1, z: 0}
 --- !u!114 &4347565098670608659
 MonoBehaviour:
@@ -845,6 +816,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -852,6 +824,7 @@ MonoBehaviour:
   repelValue: 0
   offsetY: 1
   hitRate: 1
+  onlyFlyCanWeak: 0
 --- !u!1 &6718313986988356132
 GameObject:
   m_ObjectHideFlags: 0
@@ -878,13 +851,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6718313986988356132}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 2730232521377132808}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &504592824178922966
 BoxCollider:
@@ -894,18 +867,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6718313986988356132}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3.86, y: 2.37, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 1.04, z: 0}
 --- !u!54 &4048445949627445710
 Rigidbody:
@@ -914,21 +879,10 @@ Rigidbody:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6718313986988356132}
-  serializedVersion: 4
+  serializedVersion: 2
   m_Mass: 1
   m_Drag: 0
   m_AngularDrag: 0.05
-  m_CenterOfMass: {x: 0, y: 0, z: 0}
-  m_InertiaTensor: {x: 1, y: 1, z: 1}
-  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ImplicitCom: 1
-  m_ImplicitTensor: 1
   m_UseGravity: 0
   m_IsKinematic: 0
   m_Interpolate: 0
@@ -985,13 +939,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6907704218149488799}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1.2, y: 0.1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2736598004543142215}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &7011887945378649641
 SpriteRenderer:
@@ -1010,9 +964,6 @@ SpriteRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1075,13 +1026,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7669620205589286043}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.36, y: 0.36, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2730232521377132808}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &2070274865187464477
 MeshFilter:
@@ -1108,9 +1059,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1138,7 +1086,7 @@ MeshRenderer:
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &6496896669866891404
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1152,12 +1100,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &5617185463097218335
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1193,6 +1139,9 @@ MonoBehaviour:
     materialsInsideMask: []
     materialsOutsideMask: []
   disableRenderingOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   translator:
     autoReset: 1
     useCustomMixMode: 1
@@ -1232,6 +1181,7 @@ RectTransform:
   m_Children:
   - {fileID: 6098794361404217704}
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1255,9 +1205,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -1325,13 +1273,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8367450352918568419}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &3529304715442735116
 BoxCollider:
@@ -1341,18 +1289,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8367450352918568419}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.78, y: 1.82, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.09, y: 0.91, z: 0}
 --- !u!1 &8769150919382874379
 GameObject:
@@ -1379,13 +1319,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8769150919382874379}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6353082427811530657
 BoxCollider:
@@ -1395,18 +1335,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8769150919382874379}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.78, y: 1.82, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.09, y: 0.91, z: 0}
 --- !u!114 &5333142802677931907
 MonoBehaviour:
@@ -1453,6 +1385,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6098794361404217704}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1502,7 +1435,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 7794457276998281569}
     m_Modifications:
     - target: {fileID: 3086552803727018989, guid: b4bf188276a397e44bb17112d3d3d013, type: 3}
@@ -1554,9 +1486,6 @@ PrefabInstance:
       value: SoulCollector
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b4bf188276a397e44bb17112d3d3d013, type: 3}
 --- !u!4 &3856686709615606825 stripped
 Transform:

+ 74 - 147
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab

@@ -34,6 +34,7 @@ RectTransform:
   m_Children:
   - {fileID: 7032149864581384072}
   m_Father: {fileID: 3103190932458336017}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -129,7 +130,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 650183981426157255}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -138,6 +138,7 @@ Transform:
   - {fileID: 3262389902459024245}
   - {fileID: 901824162977467732}
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1322232727721152541
 GameObject:
@@ -164,13 +165,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1322232727721152541}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &77275286589392561
 BoxCollider:
@@ -180,18 +181,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1322232727721152541}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0, y: 0, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &7729941002223262554
 MonoBehaviour:
@@ -206,6 +199,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -213,6 +207,7 @@ MonoBehaviour:
   repelValue: 0
   offsetY: 1
   hitRate: 1
+  onlyFlyCanWeak: 0
 --- !u!1 &2460330936527559963
 GameObject:
   m_ObjectHideFlags: 0
@@ -238,13 +233,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2460330936527559963}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &5217712517297835056
 BoxCollider:
@@ -254,18 +249,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2460330936527559963}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 2.132753, y: 2.3543785, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.024625063, y: 1.1450654, z: 0}
 --- !u!114 &3377671071202039733
 MonoBehaviour:
@@ -306,13 +293,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2885380845639701439}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &5459908402034348056
 BoxCollider:
@@ -322,18 +309,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2885380845639701439}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 0
-  serializedVersion: 3
-  m_Size: {x: 8.747494, y: 11.766387, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: -0.09219003, y: 3.3589406, z: 0}
 --- !u!114 &6880746539854057010
 MonoBehaviour:
@@ -382,6 +361,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1544714013328383648}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -459,17 +439,15 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 0
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
-  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
-  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -512,13 +490,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4480734502875862885}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 2.16, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &637278332454425733
 BoxCollider:
@@ -528,18 +506,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4480734502875862885}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 4.4262385, y: 4.7369604, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.039123774, y: 0.081486225, z: 0}
 --- !u!114 &4259433079752244006
 MonoBehaviour:
@@ -578,13 +548,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4543619153787591511}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &925594141286007562
 BoxCollider:
@@ -594,18 +564,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4543619153787591511}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 2.1781316, y: 2.2643359, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0.014367342, y: 1.1206616, z: 0}
 --- !u!1 &4579126894259554924
 GameObject:
@@ -631,13 +593,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4579126894259554924}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 7.64, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8092833306629620455
 BoxCollider:
@@ -647,18 +609,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4579126894259554924}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3.8787084, y: 1, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: -1.2794268, y: 0, z: 0}
 --- !u!1 &4737949113454210572
 GameObject:
@@ -683,13 +637,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4737949113454210572}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.5, y: 3.16, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5041915139224979942
 GameObject:
@@ -716,7 +670,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5041915139224979942}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -732,10 +685,11 @@ Transform:
   - {fileID: 697789059294945267}
   - {fileID: 730397711949894839}
   m_Father: {fileID: 6459001683917408033}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &2776251058442384869
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -749,12 +703,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 1
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &741016000238553314
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -795,13 +747,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222604650419}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &5440846222604650429
 BoxCollider:
@@ -811,18 +763,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222604650419}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 1, y: 0.003, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &5440846222604650418
 MonoBehaviour:
@@ -867,7 +811,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5440846222648032759}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 8.01, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -881,6 +824,7 @@ Transform:
   - {fileID: 2332805625535433500}
   - {fileID: 8293271340656275251}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5440846222648032767
 MonoBehaviour:
@@ -916,6 +860,8 @@ MonoBehaviour:
   invincibleTime: 0
   injuryNumText: {fileID: 0}
   showInjuryNum: 0
+  canFly: 0
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 1.34
@@ -923,8 +869,8 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 1
   attackTime: 0
-  totalAttack1Time: 0
-  totalAttack2Time: 5
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 1
   bulletPrefab: {fileID: 6827689530009399248, guid: 263e3d90178b89146933e46f2fce55df, type: 3}
   shootPos:
@@ -932,21 +878,29 @@ MonoBehaviour:
   - {fileID: 8584174517298651636}
   - {fileID: 697789059294945267}
   shootTrack: 1
-  attack1Infos: []
-  attack2Infos:
-  - damage: 100
-    attackDir: {x: -1, y: 0, z: 0}
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
-    repelValue: 10
+    repelValue: 0
   attackTriggers:
   - {fileID: 7729941002223262554}
   addAttackEffect: {fileID: 0}
-  curDamage: 
+  armorPiercing: 0
+  curDamage1: 
+  curDamage2: 
   targetTypes: 
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   beTargetCharacter: []
+  getDistanceOffset: 0
   isSpirit: 1
   isTran: 1
   pc: {fileID: 0}
@@ -956,7 +910,8 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
+  debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -978,6 +933,7 @@ MonoBehaviour:
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 3
+  newTotalWeakTime: 0
   weakHitRate: 2
   weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
@@ -1028,7 +984,6 @@ MonoBehaviour:
   id: 0
   costMp: 1
   totalSummonTime: 0.5
-  canFly: 0
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -1050,6 +1005,7 @@ MonoBehaviour:
   dropSoulMin: 1
   dropSoulAngle: 60
   upFirstAfterWeaknessOrNot: 0
+  isBeBlownUp: 0
 --- !u!114 &1527607760671059063
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1096,6 +1052,7 @@ RectTransform:
   m_Children:
   - {fileID: 5649507295576249902}
   m_Father: {fileID: 3103190932458336017}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1165,13 +1122,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6139679835290116115}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2932762729738363159
 MonoBehaviour:
@@ -1203,18 +1160,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6139679835290116115}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0, y: 0, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &6634581959313469539
 GameObject:
@@ -1239,13 +1188,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6634581959313469539}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.5, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6824693000491653481
 GameObject:
@@ -1278,6 +1227,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1104288316767999960}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1349,13 +1299,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7208291223413765209}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.72, y: 0.72, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6459001683917408033}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8447137249705371152
 MeshFilter:
@@ -1382,9 +1332,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1415,7 +1362,7 @@ MeshRenderer:
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &3333436509305836838
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1429,12 +1376,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &7573527827155227431
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1470,6 +1415,9 @@ MonoBehaviour:
     materialsInsideMask: []
     materialsOutsideMask: []
   disableRenderingOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   translator:
     autoReset: 1
     useCustomMixMode: 1
@@ -1500,13 +1448,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7219392564388260375}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1.96, y: 7.08, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &4017189360880258370
 BoxCollider:
@@ -1516,18 +1464,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7219392564388260375}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3.8787084, y: 1, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: -1.2794268, y: 0, z: 0}
 --- !u!1 &7668134880740974023
 GameObject:
@@ -1554,13 +1494,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7668134880740974023}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &182665286776120973
 MonoBehaviour:
@@ -1583,18 +1523,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7668134880740974023}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3, y: 3, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 1, z: 0}
 --- !u!1 &8394595816922499954
 GameObject:
@@ -1619,13 +1551,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8394595816922499954}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.5, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 901824162977467732}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8560672494665079236
 GameObject:
@@ -1661,6 +1593,7 @@ RectTransform:
   - {fileID: 1104288316767999960}
   - {fileID: 1544714013328383648}
   m_Father: {fileID: 5440846222648032754}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1684,9 +1617,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 25
-  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -1735,7 +1666,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 5440846222648032754}
     m_Modifications:
     - target: {fileID: 1090797644703272320, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
@@ -1799,9 +1729,6 @@ PrefabInstance:
       value: 2.2
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
 --- !u!4 &8293271340656275251 stripped
 Transform:

+ 56 - 110
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab

@@ -23,13 +23,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 608566006687189219}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.5, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1190225091429982147
 GameObject:
@@ -56,13 +56,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1190225091429982147}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8507032990732667563
 BoxCollider:
@@ -72,18 +72,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1190225091429982147}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0.792, z: 0}
 --- !u!114 &9020361017135710302
 MonoBehaviour:
@@ -133,6 +125,7 @@ RectTransform:
   m_Children:
   - {fileID: 5104997452083766110}
   m_Father: {fileID: 152626645726552729}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -232,13 +225,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2234394376273647362}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.36, y: 0.36, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5769591908339262981}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3791886041281981973
 MeshFilter:
@@ -265,9 +258,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -297,7 +287,7 @@ MeshRenderer:
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &5978259926173120695
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -311,12 +301,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &3354085511906294621
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -352,6 +340,9 @@ MonoBehaviour:
     materialsInsideMask: []
     materialsOutsideMask: []
   disableRenderingOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   translator:
     autoReset: 1
     useCustomMixMode: 1
@@ -381,13 +372,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2475269063027159835}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.5, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2616922587087395095
 GameObject:
@@ -413,13 +404,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2616922587087395095}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &7144185533164728569
 BoxCollider:
@@ -429,18 +420,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2616922587087395095}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0.792, z: 0}
 --- !u!1 &2623922659733331491
 GameObject:
@@ -473,6 +456,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4847391198550739967}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -540,7 +524,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3041216575519132682}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -549,6 +532,7 @@ Transform:
   - {fileID: 2983912410871356969}
   - {fileID: 6561999689701501378}
   m_Father: {fileID: 8639832132491289354}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4119178927446429342
 GameObject:
@@ -575,13 +559,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4119178927446429342}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5892967253400679892
 MonoBehaviour:
@@ -604,18 +588,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4119178927446429342}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3, y: 3, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 1, z: 0}
 --- !u!1 &5307676761346103599
 GameObject:
@@ -642,13 +618,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5307676761346103599}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8639832132491289354}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &3566347593191160092
 MonoBehaviour:
@@ -680,18 +656,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5307676761346103599}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 40, y: 20, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &5388987656270167698
 GameObject:
@@ -718,13 +686,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5388987656270167698}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0.792, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6832657651774999176
 BoxCollider:
@@ -734,18 +702,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5388987656270167698}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &316813748882225178
 MonoBehaviour:
@@ -785,7 +745,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6911591061214860228}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -800,10 +759,11 @@ Transform:
   - {fileID: 6220414675483084992}
   - {fileID: 6440736511392024558}
   m_Father: {fileID: 5769591908339262981}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &6864986857343475389
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -817,12 +777,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &7514976921726773167
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -871,6 +829,7 @@ RectTransform:
   m_Children:
   - {fileID: 4847391198550739967}
   m_Father: {fileID: 8639832132491289354}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -894,9 +853,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -963,13 +920,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8534270758388991037}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.5, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8639832132450015563
 GameObject:
@@ -996,13 +953,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639832132450015563}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6561999689701501378}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &8639832132450015557
 BoxCollider:
@@ -1012,18 +969,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639832132450015563}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.432, y: 0.003, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &8639832132450015562
 MonoBehaviour:
@@ -1069,7 +1018,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639832132491289359}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 8.01, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -1079,6 +1027,7 @@ Transform:
   - {fileID: 5016048881761595890}
   - {fileID: 152626645726552729}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8713055958562902552
 MonoBehaviour:
@@ -1147,6 +1096,8 @@ MonoBehaviour:
   invincibleTime: 0
   injuryNumText: {fileID: 0}
   showInjuryNum: 0
+  canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 2
@@ -1154,8 +1105,8 @@ MonoBehaviour:
   canHitFly: 1
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.8
-  totalAttack2Time: 1.3
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 1
   bulletPrefab: {fileID: 7473170563405908938, guid: 5a7a8caaf3e79ec4f814d34467f0bf46, type: 3}
   shootPos:
@@ -1163,35 +1114,28 @@ MonoBehaviour:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   shootTrack: 1
-  attack1Infos:
-  - damage: 200
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 0
-    repelValue: 10
-  - damage: 20
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
+  Attack_summonInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
     changeHurt: 0
-    repelValue: 10
-  - damage: 20
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 100
-    changeHurt: 1
-    repelValue: 10
-  attack2Infos:
-  - damage: 200
-    attackDir: {x: -1, y: 0, z: 0}
+    repelValue: 0
+  Attack_marchInfos:
+  - damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
-    repelValue: 10
+    repelValue: 0
   attackTriggers: []
   addAttackEffect: {fileID: 0}
-  curDamage: 
+  armorPiercing: 0
+  curDamage1: 
+  curDamage2: 
   targetTypes: 0400000005000000
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   beTargetCharacter: []
+  getDistanceOffset: 0
   isSpirit: 1
   isTran: 1
   pc: {fileID: 0}
@@ -1201,7 +1145,8 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
+  debugAttackFrom: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -1223,6 +1168,7 @@ MonoBehaviour:
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 3
+  newTotalWeakTime: 0
   weakHitRate: 2
   weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
@@ -1273,7 +1219,6 @@ MonoBehaviour:
   id: 0
   costMp: 1
   totalSummonTime: 0.5
-  canFly: 1
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -1295,3 +1240,4 @@ MonoBehaviour:
   dropSoulMin: 1
   dropSoulAngle: 60
   upFirstAfterWeaknessOrNot: 0
+  isBeBlownUp: 0

+ 53 - 111
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Invisible.prefab

@@ -25,13 +25,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 78415308861180513}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &5104552355235513707
 MonoBehaviour:
@@ -63,18 +63,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 78415308861180513}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 40, y: 3, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 1.5, z: 0}
 --- !u!1 &286913089395434820
 GameObject:
@@ -99,13 +91,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 286913089395434820}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -2, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2730232521377132808}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1090663073729466903
 GameObject:
@@ -131,7 +123,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1090663073729466903}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -144,10 +135,11 @@ Transform:
   - {fileID: 2288379621507428556}
   - {fileID: 1612853358034343079}
   m_Father: {fileID: 2730232521377132808}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7460010523729932468
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -161,12 +153,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 1
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &2437299196472462361
 GameObject:
   m_ObjectHideFlags: 0
@@ -192,7 +182,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196472462361}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -205,6 +194,7 @@ Transform:
   - {fileID: 2465817539840671398}
   - {fileID: 8507731236713456294}
   m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6801157681521274923
 MonoBehaviour:
@@ -257,6 +247,8 @@ MonoBehaviour:
   invincibleTime: 0
   injuryNumText: {fileID: 0}
   showInjuryNum: 0
+  canFly: 1
+  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   totalDieKeepTime: 2
@@ -264,19 +256,19 @@ MonoBehaviour:
   canHitFly: 0
   isNonAttack: 0
   attackTime: 0
-  totalAttack1Time: 1.25
-  totalAttack2Time: 1.8
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
   attackType: 2
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
-  attack1Infos:
+  Attack_summonInfos:
   - damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  attack2Infos:
+  Attack_marchInfos:
   - damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
@@ -285,11 +277,14 @@ MonoBehaviour:
   attackTriggers:
   - {fileID: 4347565098670608659}
   addAttackEffect: {fileID: 0}
-  curDamage: 
+  armorPiercing: 0
+  curDamage1: 
+  curDamage2: 
   targetTypes: 0400000005000000
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   beTargetCharacter: []
+  getDistanceOffset: 0
   isSpirit: 1
   isTran: 1
   pc: {fileID: 0}
@@ -299,7 +294,8 @@ MonoBehaviour:
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
-  attack1ShootCanTransmit: 0
+  Attack_summonShootCanTransmit: 0
+  debugAttackFrom: 0
   matState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -315,6 +311,7 @@ MonoBehaviour:
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 3
+  newTotalWeakTime: 0
   weakHitRate: 2
   weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
@@ -365,7 +362,6 @@ MonoBehaviour:
   id: 0
   costMp: 1
   totalSummonTime: 0.5
-  canFly: 1
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -387,6 +383,7 @@ MonoBehaviour:
   dropSoulMin: 1
   dropSoulAngle: 60
   upFirstAfterWeaknessOrNot: 0
+  isBeBlownUp: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -412,13 +409,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196663985757}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &2437299196663985747
 BoxCollider:
@@ -428,18 +425,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196663985757}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.432, y: 0.003, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &2437299196663985756
 MonoBehaviour:
@@ -482,7 +471,6 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5216717017252562314}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -492,6 +480,7 @@ Transform:
   - {fileID: 7794457276998281569}
   - {fileID: 7644101665628300234}
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5854255137085934375
 GameObject:
@@ -527,6 +516,7 @@ RectTransform:
   m_Children:
   - {fileID: 5150648748656367320}
   m_Father: {fileID: 8507731236713456294}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -624,13 +614,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6526817785665782971}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0.792, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &5683702269505879586
 BoxCollider:
@@ -640,18 +630,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6526817785665782971}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1317309795988277421
 MonoBehaviour:
@@ -691,13 +673,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6594324537872882015}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1970364359111705892
 BoxCollider:
@@ -707,18 +689,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6594324537872882015}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 2.5, y: 2, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: -1.5, y: 1, z: 0}
 --- !u!114 &4347565098670608659
 MonoBehaviour:
@@ -733,6 +707,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -740,6 +715,7 @@ MonoBehaviour:
   repelValue: 0
   offsetY: 1
   hitRate: 1
+  onlyFlyCanWeak: 0
 --- !u!1 &7669620205589286043
 GameObject:
   m_ObjectHideFlags: 0
@@ -767,13 +743,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7669620205589286043}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.36, y: 0.36, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2730232521377132808}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &2070274865187464477
 MeshFilter:
@@ -800,9 +776,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -830,7 +803,7 @@ MeshRenderer:
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &6496896669866891404
 Animator:
-  serializedVersion: 7
+  serializedVersion: 4
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -844,12 +817,10 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
+  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!114 &5617185463097218335
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -885,6 +856,9 @@ MonoBehaviour:
     materialsInsideMask: []
     materialsOutsideMask: []
   disableRenderingOnOverride: 1
+  physicsPositionInheritanceFactor: {x: 1, y: 1}
+  physicsRotationInheritanceFactor: 1
+  physicsMovementRelativeTo: {fileID: 0}
   translator:
     autoReset: 1
     useCustomMixMode: 1
@@ -924,6 +898,7 @@ RectTransform:
   m_Children:
   - {fileID: 6098794361404217704}
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -947,9 +922,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
-  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 1516060329
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -1017,13 +990,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8367450352918568419}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &3529304715442735116
 BoxCollider:
@@ -1033,18 +1006,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8367450352918568419}
   m_Material: {fileID: 13400000, guid: ae11ca82bc783194e8fdded3f8828a76, type: 2}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3, y: 3, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &8639048523182504379
 GameObject:
@@ -1071,13 +1036,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639048523182504379}
-  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &3474542255091444345
 BoxCollider:
@@ -1087,18 +1052,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639048523182504379}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 3, y: 3, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &553725089883875049
 MonoBehaviour:
@@ -1138,13 +1095,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8769150919382874379}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6353082427811530657
 BoxCollider:
@@ -1154,18 +1111,10 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8769150919382874379}
   m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
   m_IsTrigger: 1
-  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 0.72, y: 1.584, z: 20}
+  serializedVersion: 2
+  m_Size: {x: 2, y: 2, z: 2}
   m_Center: {x: 0, y: 0.792, z: 0}
 --- !u!114 &5333142802677931907
 MonoBehaviour:
@@ -1212,6 +1161,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6098794361404217704}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1280,13 +1230,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9098219392703443186}
-  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2437299196472462364}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4610496197409361392
 MonoBehaviour:
@@ -1324,7 +1274,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 2437299196472462364}
     m_Modifications:
     - target: {fileID: 1723151111827507803, guid: a956ce2c24a9a8b4b98cbf27ef623367, type: 3}
@@ -1380,9 +1329,6 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a956ce2c24a9a8b4b98cbf27ef623367, type: 3}
 --- !u!114 &1125884991471150034 stripped
 MonoBehaviour:
@@ -1410,7 +1356,6 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 3
     m_TransformParent: {fileID: 2437299196472462364}
     m_Modifications:
     - target: {fileID: 7473170563405908937, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
@@ -1462,9 +1407,6 @@ PrefabInstance:
       value: Invisible_effc
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7a1ed32670b9b2e4e9b10e0632c36180, type: 3}
 --- !u!4 &9430913901011754 stripped
 Transform: