攻击模式拆分成功！可以一个怪配置多种攻击方式

ActionTowerDefense/Assets/Resources/Prefab/Conduct/Demonic_BigGiant.prefab

@@ -590,49 +590,42 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_summon
+  - aniName: attack_march
     keys:
     - attackMethod: 0
       attackType: 0
       startKeyName: attack_on
-      startKeyTime: 0.20000002
+      startKeyTime: 1.2666668
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 0.6666667
-  - aniName: attack_march
+      endKeyTime: 2
+  - aniName: attack_summon
     keys:
-    - attackMethod: 1
+    - attackMethod: 0
       attackType: 0
       startKeyName: attack_on
-      startKeyTime: 1.2666668
+      startKeyTime: 0.20000002
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 2
+      endKeyTime: 0.6666667
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 50
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 50
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 7729941002223262554}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -652,7 +645,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -660,6 +653,7 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    curDamage: 0
   - id: 1
     attackName: "\u884C\u519B\u5F0F\u6376\u5730"
     attackType: 0
@@ -670,7 +664,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 0}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -678,6 +672,27 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab

@@ -374,31 +374,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.3333334
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 30
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 30
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 2280520615464243483}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -408,7 +401,7 @@ MonoBehaviour:
   beTargetCharacter: []
   getDistanceOffset: 0
   attackMethod:
-  - id: 0
+  - id: 1
     attackName: "\u5934\u69CC"
     attackType: 0
     attackEffect: {fileID: 0}
@@ -418,7 +411,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 2280520615464243483}
     targetTypes: 010000000300000002000000
     canHitFly: 1
     armorPiercing: 0
@@ -426,6 +419,27 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab

@@ -390,31 +390,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_fire_off
       endKeyTime: 1.6333
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 60
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 60
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 2280520615464243483}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -424,7 +417,7 @@ MonoBehaviour:
   beTargetCharacter: []
   getDistanceOffset: 0
   attackMethod:
-  - id: 0
+  - id: 1
     attackName: "\u55B7\u706B"
     attackType: 0
     attackEffect: {fileID: 0}
@@ -434,7 +427,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 2280520615464243483}
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -442,6 +435,27 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab

@@ -600,31 +600,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.3333334
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 40
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 40
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 7729941002223262554}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -634,7 +627,7 @@ MonoBehaviour:
   beTargetCharacter: []
   getDistanceOffset: 0
   attackMethod:
-  - id: 0
+  - id: 1
     attackName: "\u5934\u69CC"
     attackType: 0
     attackEffect: {fileID: 0}
@@ -644,7 +637,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -652,6 +645,27 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab

@@ -1212,31 +1212,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.6666667
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 1
   canHitFly: 1
   armorPiercing: 30
-  Attack_summonInfos:
-  - damage: 60
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 60
-    attackDir: {x: -1, y: 0, z: 0}
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 8924180071245218248}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
   shootPos:
@@ -1249,7 +1242,7 @@ MonoBehaviour:
   beTargetCharacter: []
   getDistanceOffset: 0
   attackMethod:
-  - id: 0
+  - id: 1
     attackName: "\u5C04\u7BAD"
     attackType: 1
     attackEffect: {fileID: 0}
@@ -1259,7 +1252,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 8924180071245218248}
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -1270,3 +1263,24 @@ MonoBehaviour:
     - {fileID: 6220414675483084992}
     shootTrack: 1
     shootAlwaysTrack: 0
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab

@@ -390,31 +390,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.1333334
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
+  curDamage: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 200
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 100
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
   attackTrigger: {fileID: 2280520615464243483}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -422,9 +415,8 @@ MonoBehaviour:
   shootAlwaysTrack: 0
   targetTypes: 010000000200000003000000
   beTargetCharacter: []
-  getDistanceOffset: 0
   attackMethod:
-  - id: 0
+  - id: 1
     attackName: "\u8F6C\u5708\u5708"
     attackType: 0
     attackEffect: {fileID: 0}
@@ -434,7 +426,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 2280520615464243483}
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -442,6 +434,25 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab

@@ -1226,31 +1226,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.33333334
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 1
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 100
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 100
-    attackDir: {x: -1, y: 0, z: 0}
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 268188960417748479}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
   shootPos: []
@@ -1260,7 +1253,7 @@ MonoBehaviour:
   beTargetCharacter: []
   getDistanceOffset: 0
   attackMethod:
-  - id: 0
+  - id: 1
     attackName: "\u5C04\u7BAD"
     attackType: 1
     attackEffect: {fileID: 0}
@@ -1270,7 +1263,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 268188960417748479}
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -1281,3 +1274,24 @@ MonoBehaviour:
     - {fileID: 6220414675483084992}
     shootTrack: 1
     shootAlwaysTrack: 0
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab

@@ -600,31 +600,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 2
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 20
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 20
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 7729941002223262554}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -634,7 +627,7 @@ MonoBehaviour:
   beTargetCharacter: []
   getDistanceOffset: 0
   attackMethod:
-  - id: 0
+  - id: 1
     attackName: "\u6376\u5730"
     attackType: 0
     attackEffect: {fileID: 0}
@@ -644,7 +637,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -652,6 +645,27 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Sword.prefab

@@ -404,31 +404,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.3333
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 100
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 100
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 2280520615464243483}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -438,7 +431,7 @@ MonoBehaviour:
   beTargetCharacter: []
   getDistanceOffset: 0
   attackMethod:
-  - id: 0
+  - id: 1
     attackName: "\u6325\u68D2\u5B50"
     attackType: 0
     attackEffect: {fileID: 0}
@@ -448,7 +441,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 2280520615464243483}
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -456,6 +449,27 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -1224,31 +1224,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.36666667
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 1
+  curDamage: 0
   canHitFly: 1
   armorPiercing: 100
-  Attack_summonInfos:
-  - damage: 80
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 30
-    attackDir: {x: -1, y: 0, z: 0}
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
   attackTrigger: {fileID: 5755692021491134919}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
   shootPos:
@@ -1259,7 +1252,6 @@ MonoBehaviour:
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
   beTargetCharacter: []
-  getDistanceOffset: 0
   attackMethod:
   - id: 0
     attackName: "\u8D77\u624B\u4E09\u8FDE\u53D1"
@@ -1271,7 +1263,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 5755692021491134919}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 30
@@ -1292,7 +1284,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 5755692021491134919}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 30
@@ -1301,3 +1293,22 @@ MonoBehaviour:
     - {fileID: 8482269351142858204}
     shootTrack: 1
     shootAlwaysTrack: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -599,31 +599,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.6666667
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
+  curDamage: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 20
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 20
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
   attackTrigger: {fileID: 7729941002223262554}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -631,7 +624,6 @@ MonoBehaviour:
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
   beTargetCharacter: []
-  getDistanceOffset: 0
   attackMethod:
   - id: 0
     attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
@@ -643,7 +635,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -661,7 +653,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -669,6 +661,25 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yang.prefab

@@ -654,31 +654,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.6666667
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
+  curDamage: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 20
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 20
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
   attackTrigger: {fileID: 7729941002223262554}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -686,7 +679,6 @@ MonoBehaviour:
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
   beTargetCharacter: []
-  getDistanceOffset: 0
   attackMethod:
   - id: 0
     attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
@@ -698,7 +690,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -716,7 +708,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -724,6 +716,25 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yin.prefab

@@ -654,31 +654,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.6666667
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
+  curDamage: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 20
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 20
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
   attackTrigger: {fileID: 7729941002223262554}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -686,7 +679,6 @@ MonoBehaviour:
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
   beTargetCharacter: []
-  getDistanceOffset: 0
   attackMethod:
   - id: 0
     attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
@@ -698,7 +690,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -716,7 +708,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 7729941002223262554}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -724,6 +716,25 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -349,31 +349,24 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.3333
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 0
+  curDamage: 0
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 80
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 80
+  attackInfo:
+    damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
   attackTrigger: {fileID: 4347565098670608659}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -381,7 +374,6 @@ MonoBehaviour:
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
   beTargetCharacter: []
-  getDistanceOffset: 0
   attackMethod:
   - id: 0
     attackName: "\u8D77\u624B\u5F0F\u6325\u68D2\u5B50"
@@ -393,7 +385,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 4347565098670608659}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -411,7 +403,7 @@ MonoBehaviour:
       force: 0
       changeHurt: 0
       repelValue: 0
-    curDamage: 0
+    attackTrigger: {fileID: 4347565098670608659}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -419,6 +411,25 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -951,22 +951,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys: []
-  attackType: 0
-  canHitFly: 0
-  armorPiercing: 0
-  Attack_summonInfos: []
-  Attack_marchInfos: []
-  isNonAttack: 0
-  addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
-  attackTrigger: {fileID: 1267495056}
   keyTimes: []
   attackTime: 0
   attackKeyCount: 0
   nextStartKeyTime: 0
   nextEndKeyTime: 0
   curKeyNum: 0
+  attackType: 0
+  canHitFly: 0
+  armorPiercing: 0
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+  addAttackEffect: {fileID: 0}
+  curDamage: 0
+  attackTrigger: {fileID: 1267495056}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
   shootPos: []
@@ -974,7 +976,27 @@ MonoBehaviour:
   shootAlwaysTrack: 0
   targetTypes: 
   beTargetCharacter: []
-  getDistanceOffset: 0
+  attackMethod: []
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!1 &3571941039716665622
 GameObject:
   m_ObjectHideFlags: 0
@@ -1512,7 +1534,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4820292395093981591
 Transform:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Tower/EnemyTower.prefab

@@ -336,27 +336,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys: []
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 1
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos: []
-  Attack_marchInfos:
-  - damage: 200
-    attackDir: {x: -1, y: 0, z: 0}
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 0}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 1a8b22d7c1002f9468efb1362b6616a3, type: 3}
   shootPos:
@@ -366,6 +363,47 @@ MonoBehaviour:
   targetTypes: 0100000003000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 1
+    attackName: biu
+    attackType: 1
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 200
+      attackDir: {x: -1, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 0100000003000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 7473170563405908938, guid: 5a7a8caaf3e79ec4f814d34467f0bf46, type: 3}
+    shootPos:
+    - {fileID: 3581793008161308374}
+    shootTrack: 1
+    shootAlwaysTrack: 1
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!1 &3581793009074591723
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Tower/Tower.prefab

@@ -756,27 +756,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys: []
+  keyTimes: []
+  attackTime: 0
+  attackKeyCount: 0
+  nextStartKeyTime: 0
+  nextEndKeyTime: 0
+  curKeyNum: 0
   attackType: 1
   canHitFly: 1
   armorPiercing: 0
-  Attack_summonInfos: []
-  Attack_marchInfos:
-  - damage: 200
-    attackDir: {x: -1, y: 0, z: 0}
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
+  curDamage: 0
   attackTrigger: {fileID: 0}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 1a8b22d7c1002f9468efb1362b6616a3, type: 3}
   shootPos:
@@ -786,6 +783,47 @@ MonoBehaviour:
   targetTypes: 0400000006000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 1
+    attackName: biu
+    attackType: 1
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 200
+      attackDir: {x: -1, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 0400000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 7473170563405908938, guid: 5a7a8caaf3e79ec4f814d34467f0bf46, type: 3}
+    shootPos:
+    - {fileID: 6126647544809975593}
+    shootTrack: 1
+    shootAlwaysTrack: 1
+    curDamage: 0
+  curAttackMethod:
+    id: 0
+    attackName: 
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 0
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    attackTrigger: {fileID: 0}
+    targetTypes: 
+    canHitFly: 0
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+    curDamage: 0
 --- !u!1 &6745549281751514254
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Scripts/Characters/AttackController.cs

@@ -42,6 +42,7 @@ public class AttackController : MonoBehaviour
     [System.Serializable]
     public struct AttackMethod
     {
+        [Header("起手式id=0，行军式id>=1")]
         public int id;
         [Header("攻击名称")]
         public string attackName;
@@ -51,8 +52,7 @@ public class AttackController : MonoBehaviour
         public GameObject attackEffect;
         [Header("攻击参数")]
         public AttackInfo attackInfo;
-        [DisplayOnly]
-        public float curDamage;
+        public AttackTrigger attackTrigger;
         [Header("目标")]
         public List<TargetType> targetTypes;
         public bool canHitFly;
@@ -68,65 +68,66 @@ public class AttackController : MonoBehaviour
 
     [Header("所有攻击帧事件及时间")]
     public List<SpineAniKey> attackKeys;
+    public List<float> keyTimes;                    //所有的帧事件时间
+    [DisplayOnly]
+    public float attackTime;                        //攻击剩余时间
+    [HideInInspector]
+    public float attackKeyCount;                    //攻击进行时间
+    [HideInInspector]
+    public float nextStartKeyTime, nextEndKeyTime;
+    [HideInInspector]
+    public int curKeyNum;                           //当前锁定到第几个帧事件
 
     [Header("攻击类型")]
     public AttackType attackType;
 
     [Header("攻击参数")]
+    [DisplayOnly]
+    public int curDamage;
+    [HideInInspector]
     public bool canHitFly;
+    [HideInInspector]
     public int armorPiercing;                       //穿甲率
-    public List<AttackInfo> Attack_summonInfos;
-    public List<AttackInfo> Attack_marchInfos;
-    //以下信息不在面板显示
+    [HideInInspector]
+    public AttackInfo attackInfo;
     [HideInInspector]
     public GameObject addAttackEffect;
-    [DisplayOnly]
-    public int[] curDamage1;
-    [DisplayOnly]
-    public int[] curDamage2;
 
     [Header("攻击范围")]
-    public AttackTrigger attackTrigger;
-    public List<float> keyTimes;                    //所有的帧事件时间
-    [DisplayOnly]
-    public float attackTime;                        //攻击剩余时间
-    //以下信息不在面板显示
-    [HideInInspector]
-    public float attackKeyCount;                    //攻击进行时间
     [HideInInspector]
-    public float nextStartKeyTime, nextEndKeyTime;
-    [HideInInspector]
-    public int curKeyNum;                           //当前锁定到第几个帧事件
+    public AttackTrigger attackTrigger;
     [HideInInspector]
     public bool isAttackTriggerOn = false;          //当前Attack Trigger是否开启
 
     [Header("远程单位")]
+    [HideInInspector]
     public GameObject bulletPrefab;                 //子弹
+    [HideInInspector]
     public List<Transform> shootPos;                //子弹发射位置
+    [HideInInspector]
     public bool shootTrack = false;                 //是否初始时瞄准目标
+    [HideInInspector]
     public bool shootAlwaysTrack = false;           //是否始终追踪
 
     [Header("目标")]
+    [HideInInspector]
     public List<TargetType> targetTypes;
     [DisplayOnly]
     public List<Character> beTargetCharacter = new List<Character>(); //被哪些锁定
-    public float getDistanceOffset = 0f;
+    //public float getDistanceOffset = 0f;
 
     [Header("攻击模式")]
-    public List<AttackMethod> attackMethod;
+    public AttackMethod[] attackMethod;
+    [DisplayOnly]
+    public AttackMethod curAttackMethod;
 
     public void Init()
     {
         owner = GetComponent<Character>();
-        curDamage1 = new int[Attack_summonInfos.Count];
-        for (int i = 0; i < Attack_summonInfos.Count; i++)
-        {
-            curDamage1[i] = Attack_summonInfos[i].damage;
-        }
-        curDamage2 = new int[Attack_marchInfos.Count];
-        for (int i = 0; i < Attack_marchInfos.Count; i++)
+        if (attackMethod.Length > 0)
         {
-            curDamage2[i] = Attack_marchInfos[i].damage;
+            attackInfo = attackMethod[0].attackInfo;
+            curDamage = attackInfo.damage;
         }
     }
 
@@ -138,10 +139,29 @@ public class AttackController : MonoBehaviour
         }
     }
 
-    public void ChooseAttack()
+    public void ChooseAttack(int id)
     {
-
-    }
+        //默认起手式只使用一次，id=0为起手式
+        if (attackMethod[0].id == 0)
+        {
+            curAttackMethod = attackMethod[id];
+        }
+        else
+        {
+            curAttackMethod = attackMethod[id - 1];
+        }
+        attackType = curAttackMethod.attackType;
+        canHitFly = curAttackMethod.canHitFly;
+        armorPiercing = curAttackMethod.armorPiercing;
+        attackInfo = curAttackMethod.attackInfo;
+        curDamage = attackInfo.damage;
+        attackTrigger = curAttackMethod.attackTrigger;
+        bulletPrefab = curAttackMethod.bulletPrefab;
+        shootPos = curAttackMethod.shootPos;
+        shootTrack = curAttackMethod.shootTrack;
+        shootAlwaysTrack = curAttackMethod.shootTrack;
+        targetTypes = curAttackMethod.targetTypes;
+}
 
     public void SetNextKeyTimes()
     {
@@ -159,8 +179,7 @@ public class AttackController : MonoBehaviour
         if (attackType == AttackType.Shoot)
         {
             attackTrigger.isShoot = true;
-            attackTrigger.GetComponent<Collider>().enabled = false;
-            attackTrigger.type = AttackTrigger.attackTpye.summon;
+            attackTrigger.type = AttackTrigger.attackType.summon;
         }
         attackTime = owner.totalAttack_summonTime;
         attackKeyCount = 0;
@@ -183,15 +202,15 @@ public class AttackController : MonoBehaviour
         switch (attackType)
         {
             case AttackType.Melee:
-                attackTrigger.damage = curDamage1[0];
-                attackTrigger.changeHurt = Attack_summonInfos[0].changeHurt;
-                attackTrigger.repelValue = Attack_summonInfos[0].repelValue;
-                Vector3 attackDir = Attack_summonInfos[0].attackDir.normalized;
+                attackTrigger.damage = curDamage;
+                attackTrigger.changeHurt = attackInfo.changeHurt;
+                attackTrigger.repelValue = attackInfo.repelValue;
+                Vector3 attackDir = attackInfo.attackDir.normalized;
                 if (owner.bodyTrans.localScale.x < 0)
                 {
                     attackDir.x = -attackDir.x;
                 }
-                attackTrigger.force = attackDir * Attack_summonInfos[0].force;
+                attackTrigger.force = attackDir * attackInfo.force;
                 break;
             default:
                 break;
@@ -199,7 +218,7 @@ public class AttackController : MonoBehaviour
         owner.ChangeState(CharacterState.Attack);
     }
 
-    public virtual void Attack_march()
+    public virtual void Attack_march(int id)
     {
         Vector3 leftDir = owner.GetMoveDir();
         if (leftDir.x > 0.3f)
@@ -216,13 +235,12 @@ public class AttackController : MonoBehaviour
                 owner.Turn();
             }
         }
-
+        ChooseAttack(id);
         owner.ani.Play("attack_march", 0, 0);
         if (attackType == AttackType.Shoot)
         {
             attackTrigger.isShoot = true;
-            attackTrigger.GetComponent<Collider>().enabled = false;
-            attackTrigger.type = AttackTrigger.attackTpye.march;
+            attackTrigger.type = AttackTrigger.attackType.march;
         }
         attackTime = owner.totalAttack_marchTime;
         attackKeyCount = 0;
@@ -241,15 +259,15 @@ public class AttackController : MonoBehaviour
         }
         curKeyNum = 0;
         SetNextKeyTimes();
-        attackTrigger.damage = curDamage2[0];
-        attackTrigger.changeHurt = Attack_marchInfos[0].changeHurt;
-        attackTrigger.repelValue = Attack_marchInfos[0].repelValue;
-        Vector3 attackDir = Attack_marchInfos[0].attackDir.normalized;
+        attackTrigger.damage = curDamage;
+        attackTrigger.changeHurt = attackInfo.changeHurt;
+        attackTrigger.repelValue = attackInfo.repelValue;
+        Vector3 attackDir = attackInfo.attackDir.normalized;
         if (owner.bodyTrans.localScale.x < 0)
         {
             attackDir.x = -attackDir.x;
         }
-        attackTrigger.force = attackDir * Attack_marchInfos[0].force;
+        attackTrigger.force = attackDir * attackInfo.force;
 
 
         owner.ChangeState(CharacterState.Attack);
@@ -257,16 +275,6 @@ public class AttackController : MonoBehaviour
 
     public virtual void AttackShootEvent(int attackId, int shootId)
     {
-        AttackInfo attackInfo;
-        if (attackId == 1)
-        {
-            attackInfo = Attack_summonInfos[shootId];
-        }
-        else
-        {
-            attackInfo = Attack_marchInfos[shootId];
-            attackInfo.damage = curDamage2[0];
-        }
         GameObject bulletObj = PoolManager.Instantiate(bulletPrefab);
         Bullet bullet = bulletObj.GetComponent<Bullet>();
         Vector3 attackDir = attackInfo.attackDir.normalized;

ActionTowerDefense/Assets/Scripts/Characters/AttackTrigger.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 
 public class AttackTrigger : MonoBehaviour
 {
-    public enum attackTpye
+    public enum attackType
     {
         summon = 0,
         march = 1,
@@ -13,7 +13,7 @@ public class AttackTrigger : MonoBehaviour
 
     [Header("是否是远程角色")]
     public bool isShoot;
-    public attackTpye type;
+    public attackType type;
 
     public Character owner;
     [Header("是否为单体攻击")]
@@ -110,10 +110,10 @@ public class AttackTrigger : MonoBehaviour
             CharacterColliders cc = GetComponentInParent<CharacterColliders>();
             switch (type)
             {
-                case attackTpye.summon:
+                case attackType.summon:
                     cc.Attack_summonShootEvent(0);
                     break;
-                case attackTpye.march:
+                case attackType.march:
                     cc.Attack_marchShootEvent(0);
                     break;
             }

ActionTowerDefense/Assets/Scripts/Characters/Demonic.cs

@@ -289,7 +289,7 @@ public class Demonic : MoveCharacter
             case CharacterState.Idle:
                 if (isAttack)
                 {
-                    Attack_march();
+                    Attack_march(1);
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -325,7 +325,7 @@ public class Demonic : MoveCharacter
             case CharacterState.Run:
                 if (isAttack)
                 {
-                    Attack_march();
+                    Attack_march(1);
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -385,7 +385,7 @@ public class Demonic : MoveCharacter
             case CharacterState.Rush:
                 if (isAttack)
                 {
-                    Attack_march();
+                    Attack_march(1);
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -811,9 +811,9 @@ public class Demonic : MoveCharacter
         attackTarget = targetCharacter;
     }
 
-    public void Attack_march()
+    public void Attack_march(int id)
     {
-        attackController.Attack_march();
+        attackController.Attack_march(id);
         attackTarget = targetCharacter;
     }
 

ActionTowerDefense/Assets/Scripts/Characters/Enemy.cs

@@ -248,7 +248,7 @@ public class Enemy : MoveCharacter
             case CharacterState.Idle:
                 if (isAttack)
                 {
-                    Attack_march();
+                    Attack_march(1);
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -284,7 +284,7 @@ public class Enemy : MoveCharacter
             case CharacterState.Run:
                 if (isAttack)
                 {
-                    Attack_march();
+                    Attack_march(1);
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -335,7 +335,7 @@ public class Enemy : MoveCharacter
             case CharacterState.Rush:
                 if (isAttack)
                 {
-                    Attack_march();
+                    Attack_march(1);
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -754,15 +754,10 @@ public class Enemy : MoveCharacter
         {
             case SearchState.NoTarget:
                 Character character0 = PlayersInput.instance[0];
-                Character character1 = PlayersInput.instance[1];
                 if (character0 && character0.attackController.beTargetCharacter.Exists(t => t == this))
                 {
                     character0.attackController.beTargetCharacter.Remove(this);
                 }
-                if (character1 && character1.attackController.beTargetCharacter.Exists(t => t == this))
-                {
-                    character1.attackController.beTargetCharacter.Remove(this);
-                }
                 targetCharacter = null;
                 break;
             case SearchState.InSearchScope:
@@ -850,9 +845,9 @@ public class Enemy : MoveCharacter
         attackTarget = targetCharacter;
     }
 
-    public void Attack_march()
+    public void Attack_march(int id)
     {
-        attackController.Attack_march();
+        attackController.Attack_march(id);
         attackTarget = targetCharacter;
     }
     public void ChosePlayer()

ActionTowerDefense/Assets/Scripts/Characters/PlayerController.cs

@@ -888,12 +888,8 @@ public class PlayerController : MoveCharacter
                     }
                     foreach (Demonic d in newGiants)
                     {
-                        int[] damages = d.attackController.curDamage2;
-                        for (int i = 0; i < damages.Length; i++)
-                        {
-                            damages[i] += (int)(addRate * boostNum * damages[i]);
-                        }
-                        d.attackController.curDamage2 = damages;
+                        int damage = d.attackController.curDamage;
+                        d.attackController.curDamage += (int)(addRate * boostNum * damage);
                     }
                     break;
                 //Æø¹¦Ê¦
@@ -1168,11 +1164,9 @@ public class PlayerController : MoveCharacter
     {
         base.OnState();
         cacheJumpTime -= Time.deltaTime;
-        cacheAttackTime -= Time.deltaTime;
         cacheSummonTime -= Time.deltaTime;
         canJumpTime -= Time.deltaTime;
         invincibleTime -= Time.deltaTime;
-        attackController.attackTime -= Time.deltaTime;
         summonTime -= Time.deltaTime;
         rushTime -= Time.deltaTime;
         cacheRushTime -= Time.deltaTime;
@@ -1679,8 +1673,8 @@ public class PlayerController : MoveCharacter
         {
             canJumpTime = leaveGroundCanJumpTime;
         }
-        SearchTarget();
-        attackTarget = targetCharacter;
+        //SearchTarget();
+        //attackTarget = targetCharacter;
 
         if (isMpRepel && floatState == 0)
         {
@@ -2184,11 +2178,11 @@ public class PlayerController : MoveCharacter
         ani.SetInteger("attackState", (int)value);
         aniCollider.Play("Attack_summonKeep", 1, 0);
     }
-
+    /*
     public void SearchTarget()
     {
         targetCharacter = searchTrigger.GetMinDisTarget(attackController.targetTypes, attackController.canHitFly);
-    }
+    }*/
 
     public void ChangeSpirit()
     {

ActionTowerDefense/Assets/Scripts/Characters/SearchTrigger.cs

@@ -203,7 +203,7 @@ public class SearchTrigger : MonoBehaviour
         for (int i = 0; i < list.Count; i++)
         {
             Character character = list[i];
-            float distance = Mathf.Abs(character.transform.position.x - owner.transform.position.x) - character.attackController.getDistanceOffset * character.transform.localScale.y;
+            float distance = Mathf.Abs(character.transform.position.x - owner.transform.position.x);
             if (minDisChar == null || minDistance == -1 || minDistance > distance)
             {
                 minDisChar = character;

ActionTowerDefense/Assets/Scripts/EnemyCreater.cs

@@ -166,9 +166,9 @@ public class EnemyCreater : MonoBehaviour
                     enemyTower.totalHp = (int)(parameter.HP * hpRatio);
                     enemyTower.hp = enemyTower.totalHp;
 
-                    attackInfo = enemyTower.attackController.Attack_marchInfos[0];
+                    attackInfo = enemyTower.attackController.attackInfo;
                     attackInfo.damage = (int)(parameter.Attack_march * attackRatio);
-                    enemyTower.attackController.Attack_marchInfos[0] = attackInfo;
+                    enemyTower.attackController.attackInfo = attackInfo;
                     enemyTower.Init();
                 }
                 if (tower != null)
@@ -178,9 +178,9 @@ public class EnemyCreater : MonoBehaviour
                     tower.totalHp = (int)(parameter.HP * hpRatio);
                     tower.hp = tower.totalHp;
 
-                    attackInfo = tower.attackController.Attack_marchInfos[0];
+                    attackInfo = tower.attackController.attackInfo;
                     attackInfo.damage = (int)(parameter.Attack_march * attackRatio);
-                    tower.attackController.Attack_marchInfos[0] = attackInfo;
+                    tower.attackController.attackInfo = attackInfo;
                     tower.Init();
                 }
                 if (!buildingDic.ContainsKey(gameMapTile.id))
@@ -203,13 +203,14 @@ public class EnemyCreater : MonoBehaviour
                 enemy.hp = enemy.totalHp;
                 enemy.minMoveSpeed = parameter.MinMoveSpeed * moveSpeedRatio;
                 enemy.maxMoveSpeed = parameter.MaxMoveSpeed * moveSpeedRatio;
-                attackInfo = enemy.attackController.Attack_summonInfos[0];
+                /*
+                attackInfo = enemy.attackController.attackMethod[0].attackInfo;
                 attackInfo.damage = (int)(parameter.Attack_summon * attackRatio);
-                enemy.attackController.Attack_summonInfos[0] = attackInfo;
-
-                attackInfo = enemy.attackController.Attack_marchInfos[0];
+                enemy.attackController.attackMethod[0].attackInfo = attackInfo;
+                */
+                attackInfo = enemy.attackController.attackMethod[0].attackInfo;
                 attackInfo.damage = (int)(parameter.Attack_march * attackRatio);
-                enemy.attackController.Attack_marchInfos[0] = attackInfo;
+                enemy.attackController.attackMethod[0].attackInfo = attackInfo;
 
                 if (enemy.canFly)
                 {

ActionTowerDefense/Assets/Scripts/Tower/EnemyTower.cs

@@ -19,7 +19,7 @@ public class EnemyTower : Character
     {
         GameObject bulletObj = PoolManager.Instantiate(attackController.bulletPrefab);
         Bullet bullet = bulletObj.GetComponent<Bullet>();
-        AttackInfo attackInfo = attackController.Attack_marchInfos[0];
+        AttackInfo attackInfo = attackController.attackInfo;
         Vector3 attackDir = attackInfo.attackDir.normalized;
         if (bodyTrans.localScale.x < 0)
         {

ActionTowerDefense/Assets/Scripts/Tower/Tower.cs

@@ -35,7 +35,7 @@ public class Tower : Character
     {
         GameObject bulletObj = PoolManager.Instantiate(attackController.bulletPrefab);
         Bullet bullet = bulletObj.GetComponent<Bullet>();
-        AttackInfo attackInfo = attackController.Attack_marchInfos[0];
+        AttackInfo attackInfo = attackController.attackInfo;
         Vector3 attackDir = attackInfo.attackDir.normalized;
         if (bodyTrans.localScale.x < 0)
         {