Ver Fonte

跳字预制体:起手式与行军式分离

SZAND\msx_2 há 5 meses atrás
pai
commit
6585b1c3f4
19 ficheiros alterados com 768 adições e 185 exclusões
  1. 7 3
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1001.prefab
  2. 9 4
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1002.prefab
  3. 40 35
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1003.prefab
  4. 41 35
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1004.prefab
  5. 41 35
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1005.prefab
  6. 6 2
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1006.prefab
  7. 8 3
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1007.prefab
  8. 307 0
      ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNumSummon.prefab
  9. 7 0
      ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNumSummon.prefab.meta
  10. 8 3
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab
  11. 7 3
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab
  12. 8 3
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab
  13. 60 14
      ActionTowerDefense/Assets/Resources/Prefab/Tower/EnemyTower.prefab
  14. 60 14
      ActionTowerDefense/Assets/Resources/Prefab/Tower/Tower.prefab
  15. 19 1
      ActionTowerDefense/Assets/Scripts/Bullet.cs
  16. 9 0
      ActionTowerDefense/Assets/Scripts/Characters/AttackTrigger.cs
  17. 14 1
      ActionTowerDefense/Assets/Scripts/Characters/Character.cs
  18. 11 1
      ActionTowerDefense/Assets/Scripts/Characters/MoveCharacter.cs
  19. 106 28
      ActionTowerDefense/Assets/TextMesh Pro/Resources/Fonts & Materials/AaErMoXingShu-2 SDF.asset

+ 7 - 3
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1001.prefab

@@ -203,6 +203,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -286,6 +287,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 1
   canFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -336,7 +338,7 @@ MonoBehaviour:
   heavyDamage: 0
   killer: {fileID: 0}
   exp: 5
-  id: 0
+  name: 
   baseSortingOrder: 3000
   isBack: 0
   jumpSpeed: 9
@@ -427,6 +429,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -444,7 +447,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u5934\u69CC"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 30
@@ -475,6 +477,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 2280520615464243483}
     attackDistance: 1
     maxAttackDis: 0
@@ -495,7 +498,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -526,6 +528,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0
@@ -923,6 +926,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0

+ 9 - 4
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1002.prefab

@@ -203,6 +203,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -286,6 +287,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 1
   canFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -334,7 +336,9 @@ MonoBehaviour:
   sustainedInjury_IntervalTime: 0
   sustainedInjury_damage: 0
   heavyDamage: 0
-  id: 0
+  killer: {fileID: 0}
+  exp: 0
+  name: 
   baseSortingOrder: 5000
   isBack: 0
   jumpSpeed: 9
@@ -441,6 +445,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -458,7 +463,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u55B7\u706B"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 60
@@ -489,6 +493,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 2280520615464243483}
     attackDistance: 15
     maxAttackDis: 0
@@ -509,7 +514,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -540,6 +544,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0
@@ -860,7 +865,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  canChangeHitStun: 0
   curSpecialStates: -1
   attributeTime: 0
   floatingState: 0
@@ -922,6 +926,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0

+ 40 - 35
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1003.prefab

@@ -127,6 +127,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -208,38 +209,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  haveNewSpecialStates: 0
-  attackInfo:
-    attackValue: 0
-    damage: 0
-    attackDir: {x: 0, y: 0, z: 0}
-    attackEffect: 
-    floatState:
-      time: 0
-      upTime: {x: 0, y: 0}
-      backSpeed: {x: 0, y: 0}
-      rotateSpeed: {x: 0, y: 0}
-      height: {x: 0, y: 0}
-    blowUp:
-      dir: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-    shotDown:
-      dir: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-    weak:
-      time: 0
-    armor:
-      rate: 0
-    vulnerable:
-      rate: 0
-      time: 0
-    changeDamage:
-      rate: 0
-    sustainedInjury:
-      damage: 0
-  attackFrom: {fileID: 0}
   curSpecialStates: -1
   attributeTime: 0
   floatingState: 0
@@ -271,6 +240,38 @@ MonoBehaviour:
   isFreeze: 0
   canFreeze: 0
   curCharacterState: 0
+  attackInfoData:
+    attackValue: 0
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    attackEffect: 
+    floatState:
+      time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
+    blowUp:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    shotDown:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    weak:
+      time: 0
+    armor:
+      rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
+    changeDamage:
+      rate: 0
+    sustainedInjury:
+      damage: 0
+    isDemSummon: 0
+  attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0
 --- !u!1 &4480734502875862885
@@ -572,6 +573,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 1
   canFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -620,7 +622,9 @@ MonoBehaviour:
   sustainedInjury_IntervalTime: 0
   sustainedInjury_damage: 0
   heavyDamage: 0
-  id: 0
+  killer: {fileID: 0}
+  exp: 0
+  name: 
   baseSortingOrder: 1000
   isBack: 0
   jumpSpeed: 10
@@ -727,6 +731,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -744,7 +749,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u5934\u69CC"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 40
@@ -775,6 +779,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 7729941002223262554}
     attackDistance: 3
     maxAttackDis: 0
@@ -795,7 +800,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -826,6 +830,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0

+ 41 - 35
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1004.prefab

@@ -125,6 +125,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -206,38 +207,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  haveNewSpecialStates: 0
-  attackInfo:
-    attackValue: 0
-    damage: 0
-    attackDir: {x: 0, y: 0, z: 0}
-    attackEffect: 
-    floatState:
-      time: 0
-      upTime: {x: 0, y: 0}
-      backSpeed: {x: 0, y: 0}
-      rotateSpeed: {x: 0, y: 0}
-      height: {x: 0, y: 0}
-    blowUp:
-      dir: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-    shotDown:
-      dir: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-    weak:
-      time: 0
-    armor:
-      rate: 0
-    vulnerable:
-      rate: 0
-      time: 0
-    changeDamage:
-      rate: 0
-    sustainedInjury:
-      damage: 0
-  attackFrom: {fileID: 0}
   curSpecialStates: -1
   attributeTime: 0
   floatingState: 0
@@ -269,6 +238,38 @@ MonoBehaviour:
   isFreeze: 0
   canFreeze: 0
   curCharacterState: 0
+  attackInfoData:
+    attackValue: 0
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    attackEffect: 
+    floatState:
+      time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
+    blowUp:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    shotDown:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    weak:
+      time: 0
+    armor:
+      rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
+    changeDamage:
+      rate: 0
+    sustainedInjury:
+      damage: 0
+    isDemSummon: 0
+  attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0
 --- !u!1 &1637528673901708253
@@ -916,6 +917,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 1986582536140952583}
   hitRate: 1
+  isDemSummon: 0
 --- !u!1 &7414577738945366659
 GameObject:
   m_ObjectHideFlags: 0
@@ -1186,6 +1188,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 1
   canFly: 1
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -1234,7 +1237,9 @@ MonoBehaviour:
   sustainedInjury_IntervalTime: 0
   sustainedInjury_damage: 0
   heavyDamage: 0
-  id: 0
+  killer: {fileID: 0}
+  exp: 0
+  name: 
   baseSortingOrder: 7000
   isBack: 0
   jumpSpeed: 10
@@ -1341,6 +1346,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -1361,7 +1367,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u5C04\u7BAD"
     attackType: 1
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 60
@@ -1392,6 +1397,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 8924180071245218248}
     attackDistance: 0
     maxAttackDis: 15
@@ -1415,7 +1421,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -1446,6 +1451,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0

+ 41 - 35
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1005.prefab

@@ -125,6 +125,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -206,38 +207,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  haveNewSpecialStates: 0
-  attackInfo:
-    attackValue: 0
-    damage: 0
-    attackDir: {x: 0, y: 0, z: 0}
-    attackEffect: 
-    floatState:
-      time: 0
-      upTime: {x: 0, y: 0}
-      backSpeed: {x: 0, y: 0}
-      rotateSpeed: {x: 0, y: 0}
-      height: {x: 0, y: 0}
-    blowUp:
-      dir: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-    shotDown:
-      dir: {x: 0, y: 0, z: 0}
-      force: 0
-      time: 0
-    weak:
-      time: 0
-    armor:
-      rate: 0
-    vulnerable:
-      rate: 0
-      time: 0
-    changeDamage:
-      rate: 0
-    sustainedInjury:
-      damage: 0
-  attackFrom: {fileID: 0}
   curSpecialStates: -1
   attributeTime: 0
   floatingState: 0
@@ -269,6 +238,38 @@ MonoBehaviour:
   isFreeze: 0
   canFreeze: 0
   curCharacterState: 0
+  attackInfoData:
+    attackValue: 0
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    attackEffect: 
+    floatState:
+      time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
+    blowUp:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    shotDown:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    weak:
+      time: 0
+    armor:
+      rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
+    changeDamage:
+      rate: 0
+    sustainedInjury:
+      damage: 0
+    isDemSummon: 0
+  attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0
 --- !u!1 &1637528673901708253
@@ -916,6 +917,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 1986582536140952583}
   hitRate: 1
+  isDemSummon: 0
 --- !u!1 &7414577738945366659
 GameObject:
   m_ObjectHideFlags: 0
@@ -1186,6 +1188,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 1
   canFly: 1
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -1234,7 +1237,9 @@ MonoBehaviour:
   sustainedInjury_IntervalTime: 0
   sustainedInjury_damage: 0
   heavyDamage: 0
-  id: 0
+  killer: {fileID: 0}
+  exp: 0
+  name: 
   baseSortingOrder: 7001
   isBack: 0
   jumpSpeed: 10
@@ -1341,6 +1346,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -1361,7 +1367,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u5C04\u7BAD"
     attackType: 2
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 60
@@ -1392,6 +1397,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 8924180071245218248}
     attackDistance: 0
     maxAttackDis: 15
@@ -1415,7 +1421,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -1446,6 +1451,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0

+ 6 - 2
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1006.prefab

@@ -203,6 +203,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -286,6 +287,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 1
   canFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -443,6 +445,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -460,7 +463,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u8F6C\u5708\u5708"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 100
@@ -491,6 +493,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 2280520615464243483}
     attackDistance: 2
     maxAttackDis: 0
@@ -511,7 +514,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -542,6 +544,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0
@@ -923,6 +926,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0

+ 8 - 3
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1007.prefab

@@ -125,6 +125,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -240,6 +241,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0
@@ -915,6 +917,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 1986582536140952583}
   hitRate: 1
+  isDemSummon: 0
 --- !u!1 &7414577738945366659
 GameObject:
   m_ObjectHideFlags: 0
@@ -1185,6 +1188,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 1
   canFly: 1
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -1235,7 +1239,7 @@ MonoBehaviour:
   heavyDamage: 0
   killer: {fileID: 0}
   exp: 10
-  id: 0
+  name: 
   baseSortingOrder: 1001
   isBack: 0
   jumpSpeed: 10
@@ -1342,6 +1346,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -1362,7 +1367,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u5934\u69CC"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 60
@@ -1393,6 +1397,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 8924180071245218248}
     attackDistance: 3
     maxAttackDis: 0
@@ -1416,7 +1421,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -1447,6 +1451,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0

+ 307 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNumSummon.prefab

@@ -0,0 +1,307 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2310204599161248874
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 628417829899537910}
+  - component: {fileID: 5535552714310740448}
+  - component: {fileID: 8749957310071290871}
+  - component: {fileID: 7615439234807295199}
+  - component: {fileID: 2733015194565802992}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &628417829899537910
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.5}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8776407069468589577}
+  m_Father: {fileID: 5535641789940809310}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 785.99994, y: 355.3333}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &5535552714310740448
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 1516060329
+  m_SortingOrder: 10
+  m_TargetDisplay: 0
+--- !u!114 &8749957310071290871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
+--- !u!114 &7615439234807295199
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 6291455
+--- !u!95 &2733015194565802992
+Animator:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 9e00633de3c149847903cd66c493b8d2, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &6467251191553420251
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5535641789940809310}
+  - component: {fileID: 2075992615353979807}
+  m_Layer: 0
+  m_Name: InjuryNumSummon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5535641789940809310
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6467251191553420251}
+  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:
+  - {fileID: 628417829899537910}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2075992615353979807
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6467251191553420251}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a190f6296dae6343a4814ec08eaada3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stayTime: 1
+  time: 0
+  text: {fileID: 2900984280701609507}
+--- !u!1 &8125812590587871954
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8776407069468589577}
+  - component: {fileID: 6940921491709308505}
+  - component: {fileID: 2900984280701609507}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8776407069468589577
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8125812590587871954}
+  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: 628417829899537910}
+  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}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 200, y: 72.34}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6940921491709308505
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8125812590587871954}
+  m_CullTransparentMesh: 1
+--- !u!114 &2900984280701609507
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8125812590587871954}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 999
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: c73d2aa6c5fd9714bb0f31d4332f4a9b, type: 2}
+  m_sharedMaterial: {fileID: -2277492291795952590, guid: c73d2aa6c5fd9714bb0f31d4332f4a9b, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4278248959
+  m_fontColor: {r: 1, g: 0.8999224, b: 0, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 50
+  m_fontSizeBase: 50
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 3
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 0
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

+ 7 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNumSummon.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 71b4c570c9e403d429846b71878a20c4
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 3
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -167,6 +167,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0
@@ -708,6 +709,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -916,6 +918,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 8639832132491289351}
   hitRate: 1
+  isDemSummon: 0
 --- !u!1 &7414577738945366659
 GameObject:
   m_ObjectHideFlags: 0
@@ -1187,6 +1190,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 0
   canFly: 1
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -1359,6 +1363,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -1379,7 +1384,6 @@ MonoBehaviour:
   - id: 0
     attackName: "\u8D77\u624B\u4E09\u8FDE\u53D1"
     attackType: 1
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 5
       damage: 120
@@ -1410,6 +1414,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 5755692021491134919}
     attackDistance: 10
     maxAttackDis: 15
@@ -1432,7 +1437,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u5C04\u7BAD"
     attackType: 1
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 30
@@ -1463,6 +1467,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 5755692021491134919}
     attackDistance: 0
     maxAttackDis: 15
@@ -1484,7 +1489,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -1515,6 +1519,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0

+ 7 - 3
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -127,6 +127,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -242,6 +243,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0
@@ -573,6 +575,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 0
   canFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -731,6 +734,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -748,7 +752,6 @@ MonoBehaviour:
   - id: 0
     attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 13
       damage: 20
@@ -779,6 +782,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 7729941002223262554}
     attackDistance: 3
     maxAttackDis: 0
@@ -798,7 +802,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u884C\u519B\u5F0F\u6376\u5730"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 20
@@ -829,6 +832,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 7729941002223262554}
     attackDistance: 3
     maxAttackDis: 0
@@ -849,7 +853,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -880,6 +883,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0

+ 8 - 3
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -204,6 +204,7 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   showInjuryNum: 0
   canFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
@@ -398,6 +399,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
@@ -415,7 +417,6 @@ MonoBehaviour:
   - id: 0
     attackName: "\u8D77\u624B\u5F0F\u6325\u68D2\u5B50"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 25
       damage: 100
@@ -446,6 +447,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 4347565098670608659}
     attackDistance: 6
     maxAttackDis: 0
@@ -465,7 +467,6 @@ MonoBehaviour:
   - id: 1
     attackName: "\u884C\u519B\u5F0F\u6325\u68D2\u5B50"
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 80
@@ -496,6 +497,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 3063112574554332383}
     attackDistance: 6
     maxAttackDis: 0
@@ -516,7 +518,6 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
       attackValue: 0
       damage: 0
@@ -547,6 +548,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
     attackDistance: 0
     maxAttackDis: 0
@@ -730,6 +732,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -1031,6 +1034,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -1442,6 +1446,7 @@ MonoBehaviour:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   attackFromData: {fileID: 0}
   hitStunTime: 0
   canHitStun: 0

+ 60 - 14
ActionTowerDefense/Assets/Resources/Prefab/Tower/EnemyTower.prefab

@@ -221,6 +221,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 3581793009091440431}
+  pc: {fileID: 0}
+  points: []
 --- !u!1 &3581793008941702770
 GameObject:
   m_ObjectHideFlags: 0
@@ -269,13 +271,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e36e1845a7796424a82b1e0d9b8de1f9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mecanim: {fileID: 0}
-  meshRenderer: {fileID: 3581793008366722163}
-  ani: {fileID: 0}
-  totalDieKeepTime: 2
-  totalAttack_summonTime: 0
-  totalAttack_marchTime: 2
-  dieKeepTime: 0
   rb: {fileID: 3581793008941702771}
   bodyTrans: {fileID: 3581793009506298626}
   beSearchTrigger: {fileID: 3778640999066524515}
@@ -284,6 +279,15 @@ MonoBehaviour:
   uiHp: {fileID: 3581793008612699030}
   beHitTrigger: {fileID: 3581793009363734221}
   attackController: {fileID: 5387518957484100040}
+  mecanim: {fileID: 0}
+  meshRenderer: {fileID: 3581793008366722163}
+  ani: {fileID: 0}
+  totalDieKeepTime: 2
+  totalAttack_summonTime: 0
+  totalAttack_marchTime: 2
+  dieKeepTime: 0
+  beHitDistance: 0
+  attackDis: 0
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -295,9 +299,11 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
+  isBeHitBySummonAttack: 0
   showInjuryNum: 1
   canFly: 0
-  armor: 0
+  statePre: {fileID: 0}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0
@@ -305,7 +311,7 @@ MonoBehaviour:
   cookEffect: {fileID: 0}
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
-  id: 0
+  name: 
   height: 8
 --- !u!54 &3581793008941702771
 Rigidbody:
@@ -343,15 +349,21 @@ MonoBehaviour:
   nextEndKeyTime: 0
   curKeyNum: 0
   attackType: 1
+  attackInterval: 0
   curDamage: 0
   canHitFly: 1
   armorPiercing: 0
   attackInfo:
+    attackValue: 0
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -360,18 +372,23 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
   effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 0}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 1a8b22d7c1002f9468efb1362b6616a3, type: 3}
@@ -385,13 +402,17 @@ MonoBehaviour:
   - id: 1
     attackName: biu
     attackType: 1
-    attackEffect: {fileID: 0}
     attackInfo:
+      attackValue: 0
       damage: 200
       attackDir: {x: -1, y: 0, z: 0}
       attackEffect: 
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -400,21 +421,31 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 0100000003000000
     canHitFly: 1
     armorPiercing: 0
     bulletPrefab: {fileID: 7473170563405908938, guid: 5a7a8caaf3e79ec4f814d34467f0bf46, type: 3}
     shootPos:
     - {fileID: 3581793008161308374}
+    maxUpAngle: 0
+    maxDownAngle: 0
     shootTrack: 1
     shootAlwaysTrack: 1
     skillPrefab: {fileID: 0}
@@ -423,13 +454,17 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
+      attackValue: 0
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -438,20 +473,30 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0
     bulletPrefab: {fileID: 0}
     shootPos: []
+    maxUpAngle: 0
+    maxDownAngle: 0
     shootTrack: 0
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
@@ -806,6 +851,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   attackerID: 0
+  curX: 0
 --- !u!1 &3581793009506298629
 GameObject:
   m_ObjectHideFlags: 0

+ 60 - 14
ActionTowerDefense/Assets/Resources/Prefab/Tower/Tower.prefab

@@ -60,6 +60,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   attackerID: 0
+  curX: 0
 --- !u!1 &6126647543755677578
 GameObject:
   m_ObjectHideFlags: 0
@@ -496,6 +497,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 6126647545538756304}
+  pc: {fileID: 0}
+  points: []
 --- !u!1 &6126647545521899028
 GameObject:
   m_ObjectHideFlags: 0
@@ -688,13 +691,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 87455058f5cb44344ab3d9e2b68a9174, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mecanim: {fileID: 0}
-  meshRenderer: {fileID: 6126647545015389580}
-  ani: {fileID: 0}
-  totalDieKeepTime: 2
-  totalAttack_summonTime: 0.5
-  totalAttack_marchTime: 0.5
-  dieKeepTime: 0
   rb: {fileID: 6126647545658003340}
   bodyTrans: {fileID: 6126647544008014589}
   beSearchTrigger: {fileID: 6745549281751514252}
@@ -703,6 +699,15 @@ MonoBehaviour:
   uiHp: {fileID: 6126647545328450153}
   beHitTrigger: {fileID: 6126647543596982066}
   attackController: {fileID: 3730020453662565364}
+  mecanim: {fileID: 0}
+  meshRenderer: {fileID: 6126647545015389580}
+  ani: {fileID: 0}
+  totalDieKeepTime: 2
+  totalAttack_summonTime: 0.5
+  totalAttack_marchTime: 0.5
+  dieKeepTime: 0
+  beHitDistance: 0
+  attackDis: 0
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -714,9 +719,11 @@ MonoBehaviour:
   canNotChangeHurt: 0
   invincibleTime: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
+  isBeHitBySummonAttack: 0
   showInjuryNum: 0
   canFly: 0
-  armor: 0
+  statePre: {fileID: 0}
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0
@@ -724,7 +731,7 @@ MonoBehaviour:
   cookEffect: {fileID: 0}
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
-  id: 0
+  name: 
   isLockSoul: 0
   height: 8
 --- !u!54 &6126647545658003340
@@ -763,15 +770,21 @@ MonoBehaviour:
   nextEndKeyTime: 0
   curKeyNum: 0
   attackType: 1
+  attackInterval: 0
   curDamage: 0
   canHitFly: 1
   armorPiercing: 0
   attackInfo:
+    attackValue: 0
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -780,18 +793,23 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
       damage: 0
+    isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
   effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 0}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 1a8b22d7c1002f9468efb1362b6616a3, type: 3}
@@ -805,13 +823,17 @@ MonoBehaviour:
   - id: 1
     attackName: biu
     attackType: 1
-    attackEffect: {fileID: 0}
     attackInfo:
+      attackValue: 0
       damage: 200
       attackDir: {x: -1, y: 0, z: 0}
       attackEffect: 
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -820,21 +842,31 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 0400000006000000
     canHitFly: 1
     armorPiercing: 0
     bulletPrefab: {fileID: 7473170563405908938, guid: 5a7a8caaf3e79ec4f814d34467f0bf46, type: 3}
     shootPos:
     - {fileID: 6126647544809975593}
+    maxUpAngle: 0
+    maxDownAngle: 0
     shootTrack: 1
     shootAlwaysTrack: 1
     skillPrefab: {fileID: 0}
@@ -843,13 +875,17 @@ MonoBehaviour:
     id: 0
     attackName: 
     attackType: 0
-    attackEffect: {fileID: 0}
     attackInfo:
+      attackValue: 0
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -858,20 +894,30 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
         damage: 0
+      isDemSummon: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0
     bulletPrefab: {fileID: 0}
     shootPos: []
+    maxUpAngle: 0
+    maxDownAngle: 0
     shootTrack: 0
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}

+ 19 - 1
ActionTowerDefense/Assets/Scripts/Bullet.cs

@@ -133,6 +133,15 @@ public class Bullet : MonoBehaviour
                     switch (bulletType)
                     {
                         case BulletType.Single:
+                            //是被起手式攻击的
+                            if (attackInfo.isDemSummon)
+                            {
+                                hitTrigger.owner.isBeHitBySummonAttack = true;
+                            }
+                            else
+                            {
+                                hitTrigger.owner.isBeHitBySummonAttack = false;
+                            }
                             hitTrigger.BeHit(attackInfo, owner);
                             BeHitEffect(hitTrigger);
                             if (hitTrigger.owner.debugAttackFrom)
@@ -164,7 +173,16 @@ public class Bullet : MonoBehaviour
                             }
                             break;
                         case BulletType.Penetrate:
-                            hitTrigger.BeHit(attackInfo,owner);
+                            //是被起手式攻击的
+                            if (attackInfo.isDemSummon)
+                            {
+                                hitTrigger.owner.isBeHitBySummonAttack = true;
+                            }
+                            else
+                            {
+                                hitTrigger.owner.isBeHitBySummonAttack = false;
+                            }
+                            hitTrigger.BeHit(attackInfo, owner);
                             BeHitEffect(hitTrigger);
                             if (hitTrigger.owner.debugAttackFrom)
                             {

+ 9 - 0
ActionTowerDefense/Assets/Scripts/Characters/AttackTrigger.cs

@@ -62,6 +62,15 @@ public class AttackTrigger : MonoBehaviour
                     return;
                 }
                 {
+                    //ÊDZ»ÆðÊÖʽ¹¥»÷µÄ
+                    if (attackInfo.isDemSummon)
+                    {
+                        hitTrigger.owner.isBeHitBySummonAttack = true;
+                    }
+                    else
+                    {
+                        hitTrigger.owner.isBeHitBySummonAttack = false;
+                    }
                     trigedObjs.Add(hitTrigger);
                     hitTrigger.BeHit(attackInfo, owner);
                     if (hitTrigger.owner.debugAttackFrom)

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

@@ -86,6 +86,9 @@ public class Character : MonoBehaviour
     [DisplayOnly]
     public float invincibleTime;    //无敌时间
     public GameObject injuryNumText;//伤害跳字
+    public GameObject injuryNumTextSummon;//伤害跳字(起手式)
+    [HideInInspector]
+    public bool isBeHitBySummonAttack;
     public bool showInjuryNum;      //伤害跳字开关
     public bool canFly = false;
 
@@ -190,7 +193,17 @@ public class Character : MonoBehaviour
         //伤害跳字
         if (showInjuryNum)
         {
-            GameObject injuryNum = Instantiate(injuryNumText);
+            GameObject injuryNum;
+            //是起手式
+            if (isBeHitBySummonAttack)
+            {
+                injuryNum = Instantiate(injuryNumTextSummon);
+            }
+            //不是起手式
+            else
+            {
+                injuryNum = Instantiate(injuryNumText);
+            }
             injuryNum.transform.position = new Vector3(transform.position.x + Random.Range(-1f, 1f), transform.position.y + 1, transform.position.z);
             TextMeshProUGUI text = injuryNum.GetComponentInChildren<TextMeshProUGUI>();
             text.text = damage.ToString();

+ 11 - 1
ActionTowerDefense/Assets/Scripts/Characters/MoveCharacter.cs

@@ -265,7 +265,17 @@ public class MoveCharacter : Character
         //伤害跳字
         if (showInjuryNum)
         {
-            GameObject injuryNum = Instantiate(injuryNumText);
+            GameObject injuryNum;
+            //是起手式
+            if (isBeHitBySummonAttack)
+            {
+                injuryNum = Instantiate(injuryNumTextSummon);
+            }
+            //不是起手式
+            else
+            {
+                injuryNum = Instantiate(injuryNumText);
+            }
             injuryNum.transform.position = new Vector3(transform.position.x + Random.Range(-1f, 1f), transform.position.y + 1, transform.position.z);
             TextMeshProUGUI text = injuryNum.GetComponentInChildren<TextMeshProUGUI>();
             text.text = damage.ToString();

Diff do ficheiro suprimidas por serem muito extensas
+ 106 - 28
ActionTowerDefense/Assets/TextMesh Pro/Resources/Fonts & Materials/AaErMoXingShu-2 SDF.asset


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff