Quellcode durchsuchen

即将把攻击参数迁移到attackMethod

SZAND\msx_2 vor 7 Monaten
Ursprung
Commit
f5218fe843
26 geänderte Dateien mit 625 neuen und 1631 gelöschten Zeilen
  1. 0 18
      ActionTowerDefense/Assets/Editor/ChooseAttackInfo.cs
  2. 0 11
      ActionTowerDefense/Assets/Editor/ChooseAttackInfo.cs.meta
  3. 47 9
      ActionTowerDefense/Assets/Resources/Prefab/Conduct/Demonic_BigGiant.prefab
  4. 4 200
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Assassin.prefab
  5. 3 174
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Cook.prefab
  6. 4 208
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Float.prefab
  7. 3 217
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Invisible.prefab
  8. 25 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab
  9. 25 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab
  10. 25 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab
  11. 26 3
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab
  12. 25 5
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab
  13. 37 12
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab
  14. 29 11
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab
  15. 34 14
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Sword.prefab
  16. 56 12
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab
  17. 47 11
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab
  18. 47 11
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yang.prefab
  19. 47 11
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yin.prefab
  20. 52 14
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab
  21. 4 193
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Assassin.prefab
  22. 3 171
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Cook.prefab
  23. 4 198
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Float.prefab
  24. 0 38
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Invisible.prefab
  25. 0 25
      ActionTowerDefense/Assets/Scenes/Game.unity
  26. 78 50
      ActionTowerDefense/Assets/Scripts/Characters/AttackController.cs

+ 0 - 18
ActionTowerDefense/Assets/Editor/ChooseAttackInfo.cs

@@ -1,18 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ChooseAttackInfo : MonoBehaviour
-{
-    // Start is called before the first frame update
-    void Start()
-    {
-        
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
-}

+ 0 - 11
ActionTowerDefense/Assets/Editor/ChooseAttackInfo.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: db2ac6a07ed200e4d88a0e57325b1c8e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 47 - 9
ActionTowerDefense/Assets/Resources/Prefab/Conduct/Demonic_BigGiant.prefab

@@ -590,22 +590,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 1.2666668
+      startKeyTime: 0.20000002
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 2
-  - aniName: attack_summon
+      endKeyTime: 0.6666667
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 1
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 0.20000002
+      startKeyTime: 1.2666668
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 0.6666667
+      endKeyTime: 2
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
@@ -621,7 +623,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -640,6 +641,43 @@ MonoBehaviour:
   targetTypes: 040000000500000006000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 50
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+  - id: 1
+    attackName: "\u884C\u519B\u5F0F\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 50
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -45,7 +45,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 21f006d2c845e2e43bce70ea7a2d8dcc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: -677743004047987606}
+  owner: {fileID: 0}
   trigDemonicList: []
   trigTowerList: []
   trigPlayerList: []
@@ -138,7 +138,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 492983f5b77df7e4b82cba32bc74fb94, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: -677743004047987606}
+  owner: {fileID: 0}
   hitRate: 1
 --- !u!1 &2437299196472462361
 GameObject:
@@ -149,10 +149,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2437299196472462364}
-  - component: {fileID: 5510835220043209849}
   - component: {fileID: 2437299196472462355}
-  - component: {fileID: -677743004047987606}
-  - component: {fileID: 2331422536550154850}
   m_Layer: 8
   m_Name: ESpirits_Assassin
   m_TagString: Enemy
@@ -179,22 +176,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5510835220043209849
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8fffee8590142d54b994ff113fd4c4ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  time: 5
-  attackCD: 5
-  state: 0
-  enemy: {fileID: -677743004047987606}
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -211,183 +192,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 2
---- !u!114 &-677743004047987606
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7475a7d33f657b146a4994b1e02710ad, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mecanim: {fileID: 5617185463097218335}
-  meshRenderer: {fileID: 2459340336965010942}
-  ani: {fileID: 6496896669866891404}
-  totalDieKeepTime: 0
-  totalAttack_summonTime: 1.3333
-  totalAttack_marchTime: 0.9667
-  dieKeepTime: 0
-  rb: {fileID: 2437299196472462355}
-  bodyTrans: {fileID: 2730232521377132808}
-  beSearchTrigger: {fileID: 1317309795988277421}
-  searchTrigger: {fileID: 5104552355235513707}
-  bodyCollider: {fileID: 8367450352918568419}
-  uiHp: {fileID: 6433555643392153575}
-  beHitTrigger: {fileID: 5333142802677931907}
-  attackController: {fileID: 2331422536550154850}
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  state: 1
-  totalHp: 3000
-  hp: 3000
-  isDie: 0
-  isRevive: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  showInjuryNum: 1
-  canFly: 0
-  armor: 0
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: eb0e26c1a9cf9a14799273e742b98d21, type: 2}
-  outline1Mats:
-  - {fileID: 2100000, guid: c0377aa9339c7e24b94d247d135c8875, type: 2}
-  foot: {fileID: 2437299196663985756}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
-  canMove: 1
-  moveSpeed: 14.11635
-  totalBeRepelValue: 30
-  beRepelValue: 0
-  weakTime: 0
-  totalWeakTime: 5
-  newTotalWeakTime: 0
-  weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
-  easyToGetHit: 0.2
-  isDamageReduction: 0
-  reductionDegree: 0
-  reductionEffect: {fileID: 0}
-  decelerationRatio: 1
-  comaTime: 5
-  pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 9
-  minHeight: 4
-  floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
-  effect: {fileID: 0}
-  soulPrefab: {fileID: 1723151111827507807, guid: b9f534ba9bc2a434496af5761e952f26, type: 3}
-  soulStartSpeed: 1
-  isInvisible: 0
-  invisibleTime: 0
-  velocityAddition: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  isSustainedInjury: 0
-  sustainedInjuryTime: 0
-  sustainedInjury_IntervalTime: 0
-  sustainedInjury_damage: 0
-  heavyDamage: 0
-  id: 0
-  baseSortingOrder: 9000
-  isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
-  jumpSpeed: 9
-  maxMoveSpeed: 15
-  minMoveSpeed: 10
-  runSpeed: 0
-  isBeBlownUp: 0
-  isBeReboundedX: 0
-  isBeReboundedY: 0
-  reboundXSpeed: 0
-  reboundYSpeed: 0
-  wallDamage: 0
-  willBeComa: 0
-  willComaTime: 0
-  comaDamage: 0
-  type: 1
-  searchState: 0
-  attackDistance: 1.5
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
-  attackRatio: 0
-  dropSoulMax: 3
-  dropSoulMin: 1
-  dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 0
---- !u!114 &2331422536550154850
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  attackKeys: []
-  attackType: 0
-  canHitFly: 1
-  armorPiercing: 50
-  Attack_summonInfos:
-  - damage: 500
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 200
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  isNonAttack: 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: []
-  shootTrack: 0
-  shootAlwaysTrack: 0
-  targetTypes: 010000000200000003000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  beTargetCharacter: []
-  getDistanceOffset: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -650,7 +454,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ff1eeae99d9b8142acd628550a50e26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: -677743004047987606}
+  owner: {fileID: 0}
 --- !u!1 &6594324537872882015
 GameObject:
   m_ObjectHideFlags: 0
@@ -1150,7 +954,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8b2c8973c65adf4448805aa906f6ad29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: -677743004047987606}
+  owner: {fileID: 0}
   attackerID: 0
 --- !u!1 &8802879426389446295
 GameObject:

+ 3 - 174
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Cook.prefab

@@ -269,7 +269,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8b2c8973c65adf4448805aa906f6ad29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 6081378874369820973}
+  owner: {fileID: 0}
   attackerID: 0
 --- !u!1 &2885380845639701439
 GameObject:
@@ -522,7 +522,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ff1eeae99d9b8142acd628550a50e26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 6081378874369820973}
+  owner: {fileID: 0}
 --- !u!1 &4543619153787591511
 GameObject:
   m_ObjectHideFlags: 0
@@ -743,8 +743,6 @@ GameObject:
   m_Component:
   - component: {fileID: 5440846222648032754}
   - component: {fileID: 5440846222648032765}
-  - component: {fileID: 6081378874369820973}
-  - component: {fileID: 2632591438531452536}
   m_Layer: 8
   m_Name: ESpirits_Cook
   m_TagString: Enemy
@@ -789,175 +787,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 0
---- !u!114 &6081378874369820973
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5440846222648032759}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7475a7d33f657b146a4994b1e02710ad, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mecanim: {fileID: 7573527827155227431}
-  meshRenderer: {fileID: 9134347361501008817}
-  ani: {fileID: 3333436509305836838}
-  totalDieKeepTime: 1.3333
-  totalAttack_summonTime: 3.3333
-  totalAttack_marchTime: 0.9667
-  dieKeepTime: 0
-  rb: {fileID: 5440846222648032765}
-  bodyTrans: {fileID: 6459001683917408033}
-  beSearchTrigger: {fileID: 4259433079752244006}
-  searchTrigger: {fileID: 2932762729738363159}
-  bodyCollider: {fileID: 4543619153787591511}
-  uiHp: {fileID: 5991788786426416620}
-  beHitTrigger: {fileID: 3377671071202039733}
-  attackController: {fileID: 2632591438531452536}
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  state: 1
-  totalHp: 1000
-  hp: 1000
-  isDie: 0
-  isRevive: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  showInjuryNum: 1
-  canFly: 0
-  armor: 0
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
-  - {fileID: 2100000, guid: 98fc94309ab120b4c83b2cebb9226222, type: 2}
-  outline1Mats:
-  - {fileID: 2100000, guid: 29ff9a6abfa104b479ba1b83d927d484, type: 2}
-  - {fileID: 2100000, guid: 10086c4b51acddf48b22318a9f8f6c7b, type: 2}
-  foot: {fileID: 5440846222604650418}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
-  canMove: 0
-  moveSpeed: 1.5262532
-  totalBeRepelValue: 30
-  beRepelValue: 2
-  weakTime: 0
-  totalWeakTime: 0
-  newTotalWeakTime: 0
-  weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
-  easyToGetHit: 0.2
-  isDamageReduction: 0
-  reductionDegree: 0.2
-  reductionEffect: {fileID: 0}
-  decelerationRatio: 1
-  comaTime: 5
-  pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 9
-  minHeight: 4
-  floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
-  effect: {fileID: 0}
-  soulPrefab: {fileID: 1723151111827507807, guid: b9f534ba9bc2a434496af5761e952f26, type: 3}
-  soulStartSpeed: 1
-  isInvisible: 0
-  invisibleTime: 0
-  velocityAddition: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  isSustainedInjury: 0
-  sustainedInjuryTime: 0
-  sustainedInjury_IntervalTime: 0
-  sustainedInjury_damage: 0
-  heavyDamage: 0
-  id: 0
-  baseSortingOrder: 2000
-  isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
-  jumpSpeed: 9
-  maxMoveSpeed: 2
-  minMoveSpeed: 1
-  runSpeed: 4
-  isBeBlownUp: 0
-  isBeReboundedX: 0
-  isBeReboundedY: 0
-  reboundXSpeed: 0
-  reboundYSpeed: 0
-  wallDamage: 0
-  willBeComa: 0
-  willComaTime: 0
-  comaDamage: 0
-  type: 2
-  searchState: 0
-  attackDistance: 1.5
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
-  attackRatio: 0
-  dropSoulMax: 3
-  dropSoulMin: 1
-  dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 0
---- !u!114 &2632591438531452536
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5440846222648032759}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  attackKeys: []
-  attackType: 0
-  canHitFly: 0
-  armorPiercing: 0
-  Attack_summonInfos: []
-  Attack_marchInfos: []
-  isNonAttack: 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: []
-  shootTrack: 0
-  shootAlwaysTrack: 0
-  targetTypes: 
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  beTargetCharacter: []
-  getDistanceOffset: 0
 --- !u!1 &6026815487321357762
 GameObject:
   m_ObjectHideFlags: 0
@@ -1080,7 +909,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 21f006d2c845e2e43bce70ea7a2d8dcc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 6081378874369820973}
+  owner: {fileID: 0}
   trigDemonicList: []
   trigTowerList: []
   trigPlayerList: []

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

@@ -89,7 +89,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8b2c8973c65adf4448805aa906f6ad29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 3755986111268942620}
+  owner: {fileID: 0}
   attackerID: 0
 --- !u!1 &1637528673901708253
 GameObject:
@@ -579,7 +579,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 21f006d2c845e2e43bce70ea7a2d8dcc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 3755986111268942620}
+  owner: {fileID: 0}
   trigDemonicList: []
   trigTowerList: []
   trigPlayerList: []
@@ -660,7 +660,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ff1eeae99d9b8142acd628550a50e26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 3755986111268942620}
+  owner: {fileID: 0}
 --- !u!1 &6911591061214860228
 GameObject:
   m_ObjectHideFlags: 0
@@ -734,7 +734,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 492983f5b77df7e4b82cba32bc74fb94, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 3755986111268942620}
+  owner: {fileID: 0}
   hitRate: 1
 --- !u!1 &7414577738945366659
 GameObject:
@@ -940,10 +940,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8639832132491289354}
-  - component: {fileID: 3243918499672884867}
   - component: {fileID: 8639832132491289349}
-  - component: {fileID: 3755986111268942620}
-  - component: {fileID: 5999551841298446105}
   m_Layer: 8
   m_Name: ESpirits_Float
   m_TagString: Enemy
@@ -969,26 +966,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3243918499672884867
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 87a71f18bf09266429ae26405a98d030, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maxHeight: 8
-  minHeight: 6
-  intervalTime: 20
-  firstAttackTime: 2
-  followTime: 2.5
-  lockTime: 2
-  fe: {fileID: 417478504669294145, guid: 02b1e6b47bb4c89439b1c58b29b4445a, type: 3}
-  lockEffect: {fileID: 7959709114612421421, guid: 6d10e54fe2c6a92468d4458f98fea44e, type: 3}
 --- !u!54 &8639832132491289349
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1005,187 +982,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 124
   m_CollisionDetection: 0
---- !u!114 &3755986111268942620
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7475a7d33f657b146a4994b1e02710ad, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mecanim: {fileID: 3354085511906294621}
-  meshRenderer: {fileID: 5313599660676682037}
-  ani: {fileID: 5978259926173120695}
-  totalDieKeepTime: 0
-  totalAttack_summonTime: 1.8667
-  totalAttack_marchTime: 1.8667
-  dieKeepTime: 0
-  rb: {fileID: 8639832132491289349}
-  bodyTrans: {fileID: 5769591908339262981}
-  beSearchTrigger: {fileID: 316813748882225178}
-  searchTrigger: {fileID: 3566347593191160092}
-  bodyCollider: {fileID: 2616922587087395095}
-  uiHp: {fileID: 3586716274361854270}
-  beHitTrigger: {fileID: 9020361017135710302}
-  attackController: {fileID: 5999551841298446105}
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  state: 1
-  totalHp: 2000
-  hp: 2000
-  isDie: 0
-  isRevive: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  showInjuryNum: 1
-  canFly: 1
-  armor: 0
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
-  - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
-  - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
-  outline1Mats:
-  - {fileID: 2100000, guid: 648084fec8d73b041b2b71e496093462, type: 2}
-  - {fileID: 2100000, guid: bf37c470b67b1de4f9019b086d9baaa4, type: 2}
-  - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
-  foot: {fileID: 8639832132450015562}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
-  canMove: 1
-  moveSpeed: 8.887278
-  totalBeRepelValue: 20
-  beRepelValue: 0
-  weakTime: 0
-  totalWeakTime: 10
-  newTotalWeakTime: 0
-  weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
-  easyToGetHit: 0.2
-  isDamageReduction: 0
-  reductionDegree: 0
-  reductionEffect: {fileID: 0}
-  decelerationRatio: 1
-  comaTime: 5
-  pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 9
-  minHeight: 4
-  floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
-  effect: {fileID: 0}
-  soulPrefab: {fileID: 1723151111827507807, guid: b9f534ba9bc2a434496af5761e952f26, type: 3}
-  soulStartSpeed: 1
-  isInvisible: 0
-  invisibleTime: 0
-  velocityAddition: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  isSustainedInjury: 0
-  sustainedInjuryTime: 0
-  sustainedInjury_IntervalTime: 0
-  sustainedInjury_damage: 0
-  heavyDamage: 0
-  id: 0
-  baseSortingOrder: 7000
-  isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
-  jumpSpeed: 10
-  maxMoveSpeed: 12
-  minMoveSpeed: 8
-  runSpeed: 0
-  isBeBlownUp: 0
-  isBeReboundedX: 0
-  isBeReboundedY: 0
-  reboundXSpeed: 0
-  reboundYSpeed: 0
-  wallDamage: 0
-  willBeComa: 0
-  willComaTime: 0
-  comaDamage: 0
-  type: 0
-  searchState: 0
-  attackDistance: 10
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
-  attackRatio: 0
-  dropSoulMax: 3
-  dropSoulMin: 1
-  dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 1
---- !u!114 &5999551841298446105
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  attackKeys: []
-  attackType: 1
-  canHitFly: 1
-  armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 140
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 140
-    attackDir: {x: -1, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  isNonAttack: 0
-  addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
-  attackTrigger: {fileID: 6302563696363480178}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
-  isAttackTriggerOn: 0
-  bulletPrefab: {fileID: 7473170563405908938, guid: 5a7a8caaf3e79ec4f814d34467f0bf46, type: 3}
-  shootPos: []
-  shootTrack: 1
-  shootAlwaysTrack: 0
-  targetTypes: 010000000200000003000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  beTargetCharacter: []
-  getDistanceOffset: 0
 --- !u!1 &8685077959943580725
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 217
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Invisible.prefab

@@ -134,10 +134,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2437299196472462364}
-  - component: {fileID: 3269304469610989911}
   - component: {fileID: 2437299196472462355}
-  - component: {fileID: 3231703488858309205}
-  - component: {fileID: 2630197856728929402}
   m_Layer: 8
   m_Name: ESpirits_Invisible
   m_TagString: Enemy
@@ -163,42 +160,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3269304469610989911
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 63bf8474172e7124b9a3bba45d4101b0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  state: 0
-  rb: {fileID: 2437299196472462355}
-  moveSpeed: 5
-  findSoulSpeed: 10
-  minSpeed: 5
-  upSpeed: 5
-  boomSpeed: 0
-  altitude: 7
-  randomRageY: 5
-  randomRageX: 5
-  offsetY: 0
-  offsetX: 0
-  targetPos: {x: 0, y: 0, z: 0}
-  stopsNumber: 3
-  nowNumber: 0
-  nowPlayer: 0
-  back: 20
-  hp: 0
-  enemy: {fileID: 3231703488858309205}
-  posx: 0
-  targetSoul: {fileID: 0}
-  followNumber: 5
-  haveSoulNumber: 0
-  followEffect: {fileID: 4700054336262876788}
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -215,181 +176,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 0
---- !u!114 &3231703488858309205
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7475a7d33f657b146a4994b1e02710ad, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mecanim: {fileID: 4509017029252731830}
-  meshRenderer: {fileID: 5962745018198423514}
-  ani: {fileID: 2559904981682034569}
-  totalDieKeepTime: 0
-  totalAttack_summonTime: 0.5
-  totalAttack_marchTime: 0.5
-  dieKeepTime: 0
-  rb: {fileID: 2437299196472462355}
-  bodyTrans: {fileID: 2730232521377132808}
-  beSearchTrigger: {fileID: 1317309795988277421}
-  searchTrigger: {fileID: 5104552355235513707}
-  bodyCollider: {fileID: 8367450352918568419}
-  uiHp: {fileID: 6433555643392153575}
-  beHitTrigger: {fileID: 5333142802677931907}
-  attackController: {fileID: 2630197856728929402}
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  state: 0
-  totalHp: 5000
-  hp: 0
-  isDie: 0
-  isRevive: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  showInjuryNum: 1
-  canFly: 1
-  armor: 0
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats: []
-  outline1Mats: []
-  foot: {fileID: 2437299196663985756}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
-  canMove: 0
-  moveSpeed: 5
-  totalBeRepelValue: 20
-  beRepelValue: 0
-  weakTime: 0
-  totalWeakTime: 10
-  newTotalWeakTime: 0
-  weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
-  easyToGetHit: 0.2
-  isDamageReduction: 0
-  reductionDegree: 0
-  reductionEffect: {fileID: 0}
-  decelerationRatio: 1
-  comaTime: 5
-  pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 9
-  minHeight: 4
-  floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
-  effect: {fileID: 0}
-  soulPrefab: {fileID: 1723151111827507807, guid: b9f534ba9bc2a434496af5761e952f26, type: 3}
-  soulStartSpeed: 1
-  isInvisible: 0
-  invisibleTime: 0
-  velocityAddition: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  isSustainedInjury: 0
-  sustainedInjuryTime: 0
-  sustainedInjury_IntervalTime: 0
-  sustainedInjury_damage: 0
-  heavyDamage: 0
-  id: 0
-  baseSortingOrder: 1100
-  isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
-  jumpSpeed: 10
-  maxMoveSpeed: 12
-  minMoveSpeed: 8
-  runSpeed: 0
-  isBeBlownUp: 0
-  isBeReboundedX: 0
-  isBeReboundedY: 0
-  reboundXSpeed: 0
-  reboundYSpeed: 0
-  wallDamage: 0
-  willBeComa: 0
-  willComaTime: 0
-  comaDamage: 0
-  type: 3
-  searchState: 0
-  attackDistance: 10
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
-  attackRatio: 0
-  dropSoulMax: 3
-  dropSoulMin: 1
-  dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 0
---- !u!114 &2630197856728929402
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  attackKeys: []
-  attackType: 0
-  canHitFly: 0
-  armorPiercing: 0
-  Attack_summonInfos:
-  - damage: 500
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  Attack_marchInfos:
-  - damage: 500
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  isNonAttack: 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: []
-  shootTrack: 0
-  shootAlwaysTrack: 0
-  targetTypes: 010000000200000003000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  beTargetCharacter: []
-  getDistanceOffset: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -777,7 +563,7 @@ MonoBehaviour:
   rotateSpeed: 90
   soul: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soul1: {fileID: 7282297442632128276}
-  eSpirits: {fileID: 3269304469610989911}
+  eSpirits: {fileID: 0}
   soulsList: []
   distance: 1.5
   isTransfiguration: 0
@@ -1282,11 +1068,11 @@ PrefabInstance:
     - target: {fileID: 3300381806182711281, guid: a956ce2c24a9a8b4b98cbf27ef623367, type: 3}
       propertyPath: owner
       value: 
-      objectReference: {fileID: 3231703488858309205}
+      objectReference: {fileID: 0}
     - target: {fileID: 4201428945599059759, guid: a956ce2c24a9a8b4b98cbf27ef623367, type: 3}
       propertyPath: owner
       value: 
-      objectReference: {fileID: 3231703488858309205}
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a956ce2c24a9a8b4b98cbf27ef623367, type: 3}
 --- !u!114 &2061548984477852820 stripped

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

@@ -356,17 +356,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 1.1
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.3333334
-  - aniName: attack_summon
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 1.1
       endType: 1
@@ -387,7 +389,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -406,6 +407,25 @@ MonoBehaviour:
   targetTypes: 010000000300000002000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u5934\u69CC"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 30
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 010000000300000002000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0

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

@@ -372,17 +372,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_fire_on
       startKeyTime: 1
       endType: 1
       endKeyName: attack_fire_off
       endKeyTime: 1.6333
-  - aniName: attack_summon
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_fire_on
       startKeyTime: 1
       endType: 1
@@ -403,7 +405,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -422,6 +423,25 @@ MonoBehaviour:
   targetTypes: 010000000300000002000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u55B7\u706B"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 60
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 010000000200000003000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -582,17 +582,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 1.1
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.3333334
-  - aniName: attack_summon
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 1.1
       endType: 1
@@ -613,7 +615,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -632,6 +633,25 @@ MonoBehaviour:
   targetTypes: 010000000200000003000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u5934\u69CC"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 40
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 010000000200000003000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

+ 26 - 3
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab

@@ -1196,7 +1196,8 @@ MonoBehaviour:
   attackKeys:
   - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.43333337
       endType: 1
@@ -1204,7 +1205,8 @@ MonoBehaviour:
       endKeyTime: 0.6666667
   - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.43333337
       endType: 1
@@ -1225,7 +1227,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -1247,3 +1248,25 @@ MonoBehaviour:
   targetTypes: 010000000200000003000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u5C04\u7BAD"
+    attackType: 1
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 60
+      attackDir: {x: -1, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 010000000200000003000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
+    shootPos:
+    - {fileID: 8482269351142858204}
+    - {fileID: 776105162125788029}
+    - {fileID: 6220414675483084992}
+    shootTrack: 1
+    shootAlwaysTrack: 0

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

@@ -372,17 +372,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.6666667
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.1333334
-  - aniName: attack_summon
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.6666667
       endType: 1
@@ -403,7 +405,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -422,6 +423,25 @@ MonoBehaviour:
   targetTypes: 010000000200000003000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u8F6C\u5708\u5708"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 100
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 010000000200000003000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

+ 37 - 12
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab

@@ -1194,34 +1194,38 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
-    keys:
-    - attackType: 0
-      startKeyName: attack_on
-      startKeyTime: 0.10000001
-      endType: 1
-      endKeyName: attack_off
-      endKeyTime: 0.33333334
   - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.033333335
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.10000001
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.16666667
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.23333335
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.3
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.36666667
+  - aniName: attack_march
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.10000001
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.33333334
   attackType: 1
   canHitFly: 1
   armorPiercing: 0
@@ -1237,7 +1241,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -1256,3 +1259,25 @@ MonoBehaviour:
   targetTypes: 010000000200000003000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u5C04\u7BAD"
+    attackType: 1
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 100
+      attackDir: {x: -1, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 010000000200000003000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
+    shootPos:
+    - {fileID: 8482269351142858204}
+    - {fileID: 776105162125788029}
+    - {fileID: 6220414675483084992}
+    shootTrack: 1
+    shootAlwaysTrack: 0

+ 29 - 11
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab

@@ -582,22 +582,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 1.2666668
+      startKeyTime: 0.20000002
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 2
-  - aniName: attack_summon
+      endKeyTime: 0.6666667
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 0.20000002
+      startKeyTime: 1.2666668
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 0.6666667
+      endKeyTime: 2
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
@@ -613,7 +615,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -630,10 +631,27 @@ MonoBehaviour:
   shootTrack: 0
   shootAlwaysTrack: 0
   targetTypes: 010000000200000003000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 20
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 010000000200000003000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

+ 34 - 14
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Sword.prefab

@@ -372,34 +372,38 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
-    keys:
-    - attackType: 0
-      startKeyName: attack_on
-      startKeyTime: 1.1333
-      endType: 1
-      endKeyName: attack_off
-      endKeyTime: 1.3333
   - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.1
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.2
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.3667
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.5333
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.7667
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.8667
+  - aniName: attack_march
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1333
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
@@ -415,7 +419,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -432,10 +435,27 @@ MonoBehaviour:
   shootTrack: 0
   shootAlwaysTrack: 0
   targetTypes: 010000000200000003000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u6325\u68D2\u5B50"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 100
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 010000000200000003000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

+ 56 - 12
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -1192,34 +1192,38 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
-    keys:
-    - attackType: 0
-      startKeyName: attack_on
-      startKeyTime: 0.10000001
-      endType: 1
-      endKeyName: attack_off
-      endKeyTime: 0.33333334
   - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.033333335
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.10000001
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.16666667
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.23333335
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.3
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.36666667
+  - aniName: attack_march
+    keys:
+    - attackMethod: 1
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.10000001
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.33333334
   attackType: 1
   canHitFly: 1
   armorPiercing: 30
@@ -1235,7 +1239,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -1257,3 +1260,44 @@ MonoBehaviour:
   targetTypes: 040000000500000006000000
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u8D77\u624B\u4E09\u8FDE\u53D1"
+    attackType: 1
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 80
+      attackDir: {x: -1, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 30
+    bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
+    shootPos:
+    - {fileID: 8482269351142858204}
+    - {fileID: 776105162125788029}
+    - {fileID: 6220414675483084992}
+    shootTrack: 1
+    shootAlwaysTrack: 0
+  - id: 1
+    attackName: "\u5C04\u7BAD"
+    attackType: 1
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 30
+      attackDir: {x: -1, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 30
+    bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
+    shootPos:
+    - {fileID: 8482269351142858204}
+    shootTrack: 1
+    shootAlwaysTrack: 0

+ 47 - 11
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -581,22 +581,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 1.2666668
+      startKeyTime: 0.20000002
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 2
-  - aniName: attack_summon
+      endKeyTime: 0.6666667
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 1
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 0.20000002
+      startKeyTime: 1.2666668
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 0.6666667
+      endKeyTime: 2
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
@@ -612,7 +614,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -629,10 +630,45 @@ MonoBehaviour:
   shootTrack: 0
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 20
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+  - id: 1
+    attackName: "\u884C\u519B\u5F0F\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 20
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

+ 47 - 11
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yang.prefab

@@ -636,22 +636,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 1.2666668
+      startKeyTime: 0.20000002
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 2
-  - aniName: attack_summon
+      endKeyTime: 0.6666667
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 1
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 0.20000002
+      startKeyTime: 1.2666668
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 0.6666667
+      endKeyTime: 2
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
@@ -667,7 +669,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -684,10 +685,45 @@ MonoBehaviour:
   shootTrack: 0
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 20
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+  - id: 1
+    attackName: "\u884C\u519B\u5F0F\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 20
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

+ 47 - 11
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yin.prefab

@@ -636,22 +636,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 1.2666668
+      startKeyTime: 0.20000002
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 2
-  - aniName: attack_summon
+      endKeyTime: 0.6666667
+  - aniName: attack_march
     keys:
-    - attackType: 0
+    - attackMethod: 1
+      attackType: 0
       startKeyName: attack_on
-      startKeyTime: 0.20000002
+      startKeyTime: 1.2666668
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 0.6666667
+      endKeyTime: 2
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
@@ -667,7 +669,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -684,10 +685,45 @@ MonoBehaviour:
   shootTrack: 0
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u8D77\u624B\u5F0F\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 20
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+  - id: 1
+    attackName: "\u884C\u519B\u5F0F\u6376\u5730"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 20
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

+ 52 - 14
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -317,34 +317,38 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_march
-    keys:
-    - attackType: 0
-      startKeyName: attack_on
-      startKeyTime: 1.1333
-      endType: 1
-      endKeyName: attack_off
-      endKeyTime: 1.3333
   - aniName: attack_summon
     keys:
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.1
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.2
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.3667
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.5333
-    - attackType: 0
+    - attackMethod: 0
+      attackType: 0
       startKeyName: attack_on
       startKeyTime: 0.7667
       endType: 1
       endKeyName: attack_off
       endKeyTime: 0.8667
+  - aniName: attack_march
+    keys:
+    - attackMethod: 1
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.1333
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.3333
   attackType: 0
   canHitFly: 1
   armorPiercing: 0
@@ -360,7 +364,6 @@ MonoBehaviour:
     force: 0
     changeHurt: 0
     repelValue: 0
-  isNonAttack: 0
   addAttackEffect: {fileID: 0}
   curDamage1: 
   curDamage2: 
@@ -377,10 +380,45 @@ MonoBehaviour:
   shootTrack: 0
   shootAlwaysTrack: 0
   targetTypes: 040000000500000006000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
   beTargetCharacter: []
   getDistanceOffset: 0
+  attackMethod:
+  - id: 0
+    attackName: "\u8D77\u624B\u5F0F\u6325\u68D2\u5B50"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 80
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
+  - id: 1
+    attackName: "\u884C\u519B\u5F0F\u6325\u68D2\u5B50"
+    attackType: 0
+    attackEffect: {fileID: 0}
+    attackInfo:
+      damage: 80
+      attackDir: {x: 0, y: 0, z: 0}
+      force: 0
+      changeHurt: 0
+      repelValue: 0
+    curDamage: 0
+    targetTypes: 040000000500000006000000
+    canHitFly: 1
+    armorPiercing: 0
+    bulletPrefab: {fileID: 0}
+    shootPos: []
+    shootTrack: 0
+    shootAlwaysTrack: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -45,7 +45,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 21f006d2c845e2e43bce70ea7a2d8dcc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 2437299196472462353}
+  owner: {fileID: 0}
   trigDemonicList: []
   trigTowerList: []
   trigPlayerList: []
@@ -138,7 +138,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 492983f5b77df7e4b82cba32bc74fb94, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 2437299196472462353}
+  owner: {fileID: 0}
   hitRate: 1
 --- !u!1 &1211519247569146355
 GameObject:
@@ -233,10 +233,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2437299196472462364}
-  - component: {fileID: 4121013642250487013}
-  - component: {fileID: 2437299196472462353}
   - component: {fileID: 2437299196472462355}
-  - component: {fileID: 4054907704943730342}
   m_Layer: 7
   m_Name: Spirits_Assassin
   m_TagString: Demonic
@@ -263,143 +260,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4121013642250487013
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 650247f9c3a070a419cde11fb87b7afe, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &2437299196472462353
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mecanim: {fileID: 5617185463097218335}
-  meshRenderer: {fileID: 0}
-  ani: {fileID: 6496896669866891404}
-  totalDieKeepTime: 0
-  totalAttack_summonTime: 1.3333
-  totalAttack_marchTime: 0.9667
-  dieKeepTime: 0
-  rb: {fileID: 2437299196472462355}
-  bodyTrans: {fileID: 2730232521377132808}
-  beSearchTrigger: {fileID: 1317309795988277421}
-  searchTrigger: {fileID: 5104552355235513707}
-  bodyCollider: {fileID: 8367450352918568419}
-  uiHp: {fileID: 6433555643392153575}
-  beHitTrigger: {fileID: 5333142802677931907}
-  attackController: {fileID: 4054907704943730342}
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  state: 0
-  totalHp: 1000
-  hp: 0
-  isDie: 0
-  isRevive: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  showInjuryNum: 0
-  canFly: 0
-  armor: 0
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: eb0e26c1a9cf9a14799273e742b98d21, type: 2}
-  outline1Mats: []
-  foot: {fileID: 2437299196663985756}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
-  canMove: 1
-  moveSpeed: 10
-  totalBeRepelValue: 100
-  beRepelValue: 0
-  weakTime: 0
-  totalWeakTime: 3
-  newTotalWeakTime: 0
-  weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
-  easyToGetHit: 0.2
-  isDamageReduction: 0
-  reductionDegree: 0
-  reductionEffect: {fileID: 0}
-  decelerationRatio: 1
-  comaTime: 5
-  pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 12
-  minHeight: 7
-  floatTime: 10
-  maxRotateSpeed: 10
-  minRotateSpeed: 4
-  isFloat: 0
-  normalFallSpeed: 10
-  effect: {fileID: 0}
-  soulPrefab: {fileID: 0}
-  soulStartSpeed: 1
-  isInvisible: 0
-  invisibleTime: 0
-  velocityAddition: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  isSustainedInjury: 0
-  sustainedInjuryTime: 0
-  sustainedInjury_IntervalTime: 0
-  sustainedInjury_damage: 0
-  heavyDamage: 0
-  player: {fileID: 0}
-  playerID: 0
-  id: 0
-  costMp: 1
-  totalSummonTime: 0.5
-  isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
-  baseSortingOrder: 10000
-  runSpeed: 0
-  isReturnSoulTower: 0
-  origSoulPos: {x: 0, y: 0, z: 0}
-  isRecorded: 0
-  searchState: 0
-  soulCollector: {fileID: 0}
-  attackDistance: 1.5
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
-  adsorbSpeed: 0
-  adsorbTarget: {x: 0, y: 0, z: 0}
-  effectPrefab: {fileID: 0}
-  dropSoulMax: 3
-  dropSoulMin: 1
-  dropSoulAngle: 60
-  upFirstAfterWeaknessOrNot: 0
-  isBeBlownUp: 0
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -416,55 +276,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 0
---- !u!114 &4054907704943730342
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  attackKeys: []
-  attackType: 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
-    attackDir: {x: 0, y: 0, z: 0}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  isNonAttack: 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: []
-  shootTrack: 0
-  shootAlwaysTrack: 0
-  targetTypes: 040000000500000006000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  beTargetCharacter: []
-  getDistanceOffset: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -844,7 +655,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ff1eeae99d9b8142acd628550a50e26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 2437299196472462353}
+  owner: {fileID: 0}
 --- !u!1 &6594324537872882015
 GameObject:
   m_ObjectHideFlags: 0
@@ -1344,7 +1155,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8b2c8973c65adf4448805aa906f6ad29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 2437299196472462353}
+  owner: {fileID: 0}
   attackerID: 0
 --- !u!1 &8802879426389446295
 GameObject:

+ 3 - 171
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Cook.prefab

@@ -270,7 +270,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8b2c8973c65adf4448805aa906f6ad29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 5440846222648032767}
+  owner: {fileID: 0}
   attackerID: 0
 --- !u!1 &3483054690158852324
 GameObject:
@@ -465,7 +465,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ff1eeae99d9b8142acd628550a50e26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 5440846222648032767}
+  owner: {fileID: 0}
 --- !u!1 &4543619153787591511
 GameObject:
   m_ObjectHideFlags: 0
@@ -685,9 +685,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5440846222648032754}
-  - component: {fileID: 5440846222648032767}
   - component: {fileID: 5440846222648032765}
-  - component: {fileID: 6737250509459065531}
   m_Layer: 0
   m_Name: Spirits_Cook
   m_TagString: Demonic
@@ -715,133 +713,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &5440846222648032767
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5440846222648032759}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mecanim: {fileID: 7573527827155227431}
-  meshRenderer: {fileID: 0}
-  ani: {fileID: 3333436509305836838}
-  totalDieKeepTime: 1.3333
-  totalAttack_summonTime: 3.3333
-  totalAttack_marchTime: 0.9667
-  dieKeepTime: 0
-  rb: {fileID: 5440846222648032765}
-  bodyTrans: {fileID: 6459001683917408033}
-  beSearchTrigger: {fileID: 4259433079752244006}
-  searchTrigger: {fileID: 2932762729738363159}
-  bodyCollider: {fileID: 4543619153787591511}
-  uiHp: {fileID: 3402650366513594425}
-  beHitTrigger: {fileID: 3377671071202039733}
-  attackController: {fileID: 6737250509459065531}
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  state: 0
-  totalHp: 1000
-  hp: 0
-  isDie: 0
-  isRevive: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  showInjuryNum: 0
-  canFly: 0
-  armor: 0
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
-  - {fileID: 2100000, guid: 98fc94309ab120b4c83b2cebb9226222, type: 2}
-  - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
-  outline1Mats: []
-  foot: {fileID: 5440846222604650418}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
-  canMove: 0
-  moveSpeed: 1
-  totalBeRepelValue: 100
-  beRepelValue: 0
-  weakTime: 0
-  totalWeakTime: 3
-  newTotalWeakTime: 0
-  weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
-  easyToGetHit: 0.2
-  isDamageReduction: 0
-  reductionDegree: 0
-  reductionEffect: {fileID: 0}
-  decelerationRatio: 1
-  comaTime: 5
-  pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 12
-  minHeight: 7
-  floatTime: 10
-  maxRotateSpeed: 10
-  minRotateSpeed: 4
-  isFloat: 0
-  normalFallSpeed: 10
-  effect: {fileID: 0}
-  soulPrefab: {fileID: 0}
-  soulStartSpeed: 1
-  isInvisible: 0
-  invisibleTime: 0
-  velocityAddition: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  isSustainedInjury: 0
-  sustainedInjuryTime: 0
-  sustainedInjury_IntervalTime: 0
-  sustainedInjury_damage: 0
-  heavyDamage: 0
-  player: {fileID: 0}
-  playerID: 0
-  id: 0
-  costMp: 1
-  totalSummonTime: 0.5
-  isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
-  baseSortingOrder: 2500
-  runSpeed: 4
-  isReturnSoulTower: 0
-  origSoulPos: {x: 0, y: 0, z: 0}
-  isRecorded: 0
-  searchState: 0
-  soulCollector: {fileID: 0}
-  attackDistance: 0
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
-  adsorbSpeed: 0
-  adsorbTarget: {x: 0, y: 0, z: 0}
-  effectPrefab: {fileID: 0}
-  dropSoulMax: 3
-  dropSoulMin: 1
-  dropSoulAngle: 60
-  upFirstAfterWeaknessOrNot: 0
-  isBeBlownUp: 0
 --- !u!54 &5440846222648032765
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -858,45 +729,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 0
---- !u!114 &6737250509459065531
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5440846222648032759}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  attackKeys: []
-  attackType: 0
-  canHitFly: 0
-  armorPiercing: 0
-  Attack_summonInfos: []
-  Attack_marchInfos: []
-  isNonAttack: 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: []
-  shootTrack: 0
-  shootAlwaysTrack: 0
-  targetTypes: 
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  beTargetCharacter: []
-  getDistanceOffset: 0
 --- !u!1 &6026815487321357762
 GameObject:
   m_ObjectHideFlags: 0
@@ -1019,7 +851,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 21f006d2c845e2e43bce70ea7a2d8dcc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 5440846222648032767}
+  owner: {fileID: 0}
   trigDemonicList: []
   trigTowerList: []
   trigPlayerList: []

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

@@ -89,7 +89,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8b2c8973c65adf4448805aa906f6ad29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 8639832132491289351}
+  owner: {fileID: 0}
   attackerID: 0
 --- !u!1 &1637528673901708253
 GameObject:
@@ -579,7 +579,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 21f006d2c845e2e43bce70ea7a2d8dcc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 8639832132491289351}
+  owner: {fileID: 0}
   trigDemonicList: []
   trigTowerList: []
   trigPlayerList: []
@@ -660,7 +660,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ff1eeae99d9b8142acd628550a50e26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 8639832132491289351}
+  owner: {fileID: 0}
 --- !u!1 &6911591061214860228
 GameObject:
   m_ObjectHideFlags: 0
@@ -734,7 +734,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 492983f5b77df7e4b82cba32bc74fb94, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 8639832132491289351}
+  owner: {fileID: 0}
   hitRate: 1
 --- !u!1 &7279936714574197028
 GameObject:
@@ -1011,10 +1011,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8639832132491289354}
-  - component: {fileID: 3290368322717680010}
-  - component: {fileID: 8639832132491289351}
   - component: {fileID: 8639832132491289349}
-  - component: {fileID: 8765360524165072884}
   m_Layer: 7
   m_Name: Spirits_Float
   m_TagString: Demonic
@@ -1040,148 +1037,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3290368322717680010
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e4ee37ae96a7315419ecbfe1bb3c43e9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maxHeight: 8
-  minHeight: 6
-  effect: {fileID: 417478504669294145, guid: 243eb0eff66414445990654286d861d1, type: 3}
---- !u!114 &8639832132491289351
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  mecanim: {fileID: 3354085511906294621}
-  meshRenderer: {fileID: 0}
-  ani: {fileID: 5978259926173120695}
-  totalDieKeepTime: 0
-  totalAttack_summonTime: 1.8667
-  totalAttack_marchTime: 1.8667
-  dieKeepTime: 0
-  rb: {fileID: 8639832132491289349}
-  bodyTrans: {fileID: 5769591908339262981}
-  beSearchTrigger: {fileID: 316813748882225178}
-  searchTrigger: {fileID: 3566347593191160092}
-  bodyCollider: {fileID: 2616922587087395095}
-  uiHp: {fileID: 3586716274361854270}
-  beHitTrigger: {fileID: 9020361017135710302}
-  attackController: {fileID: 8765360524165072884}
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  state: 0
-  totalHp: 100
-  hp: 0
-  isDie: 0
-  isRevive: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
-  invincibleTime: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  showInjuryNum: 0
-  canFly: 1
-  armor: 0
-  ls: {fileID: 0}
-  isInSoulTower: 0
-  beLarger: 0
-  toLargeSize: 0
-  cookEffect: {fileID: 0}
-  Attack_summonShootCanTransmit: 0
-  debugAttackFrom: 0
-  matState: 1
-  spinee: {fileID: 0}
-  mesh: {fileID: 0}
-  mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
-  - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
-  - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
-  outline1Mats: []
-  foot: {fileID: 8639832132450015562}
-  extraRiseGravity: -28.8
-  extraFallGravity: -14.4
-  canMove: 1
-  moveSpeed: 8
-  totalBeRepelValue: 100
-  beRepelValue: 0
-  weakTime: 0
-  totalWeakTime: 3
-  newTotalWeakTime: 0
-  weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
-  easyToGetHit: 0.2
-  isDamageReduction: 0
-  reductionDegree: 0
-  reductionEffect: {fileID: 0}
-  decelerationRatio: 1
-  comaTime: 5
-  pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 12
-  minHeight: 7
-  floatTime: 10
-  maxRotateSpeed: 10
-  minRotateSpeed: 4
-  isFloat: 0
-  normalFallSpeed: 10
-  effect: {fileID: 0}
-  soulPrefab: {fileID: 0}
-  soulStartSpeed: 1
-  isInvisible: 0
-  invisibleTime: 0
-  velocityAddition: 0
-  haveTransmit: 0
-  transmitTime: 0
-  portalsController: {fileID: 0}
-  isSustainedInjury: 0
-  sustainedInjuryTime: 0
-  sustainedInjury_IntervalTime: 0
-  sustainedInjury_damage: 0
-  heavyDamage: 0
-  player: {fileID: 0}
-  playerID: 0
-  id: 0
-  costMp: 1
-  totalSummonTime: 0.5
-  isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
-  baseSortingOrder: 8000
-  runSpeed: 0
-  isReturnSoulTower: 0
-  origSoulPos: {x: 0, y: 0, z: 0}
-  isRecorded: 0
-  searchState: 0
-  soulCollector: {fileID: 0}
-  attackDistance: 10
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
-  adsorbSpeed: 0
-  adsorbTarget: {x: 0, y: 0, z: 0}
-  effectPrefab: {fileID: 0}
-  dropSoulMax: 3
-  dropSoulMin: 1
-  dropSoulAngle: 60
-  upFirstAfterWeaknessOrNot: 0
-  isBeBlownUp: 0
 --- !u!54 &8639832132491289349
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1198,52 +1053,3 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 124
   m_CollisionDetection: 0
---- !u!114 &8765360524165072884
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  attackKeys: []
-  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}
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-  isNonAttack: 0
-  addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
-  attackTrigger: {fileID: 2344504702192423467}
-  keyTimes: []
-  attackTime: 0
-  attackKeyCount: 0
-  nextStartKeyTime: 0
-  nextEndKeyTime: 0
-  curKeyNum: 0
-  isAttackTriggerOn: 0
-  bulletPrefab: {fileID: 0}
-  shootPos: []
-  shootTrack: 0
-  shootAlwaysTrack: 0
-  targetTypes: 040000000500000006000000
-  targetCharacter: {fileID: 0}
-  attackTarget: {fileID: 0}
-  beTargetCharacter: []
-  getDistanceOffset: 0

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

@@ -133,7 +133,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2437299196472462364}
-  - component: {fileID: 99850206658526686}
   - component: {fileID: 2472120008162019348}
   m_Layer: 7
   m_Name: Spirits_Invisible
@@ -163,43 +162,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &99850206658526686
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 74184ac344480774a943b27464c85129, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  notOut: 0
-  demonic: {fileID: 0}
-  state: 0
-  rb: {fileID: 2472120008162019348}
-  moveSpeed: 5
-  findSoulSpeed: 10
-  minSpeed: 5
-  upSpeed: 5
-  boomSpeed: 0
-  altitude: 7
-  randomRageY: 5
-  randomRageX: 5
-  offsetY: 0
-  offsetX: 0
-  targetPos: {x: 0, y: 0, z: 0}
-  back: 20
-  posx: 0
-  targetSoul: {fileID: 0}
-  followNumber: 5
-  haveSoulNumber: 0
-  followEffect: {fileID: 4610496197409361392}
-  backSoulX: 5
-  stayTime: 30
-  time: 0
-  getSoulDistance: 15
 --- !u!54 &2472120008162019348
 Rigidbody:
   m_ObjectHideFlags: 0

+ 0 - 25
ActionTowerDefense/Assets/Scenes/Game.unity

@@ -32832,16 +32832,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 64db22f573a8bce45bffcb284c431f20, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  doorOrig: {fileID: 6768741358348549837}
-  doorSpecial: {fileID: 3360956086587234430}
-  door: {fileID: 0}
-  canCount: 1
-  col: {fileID: 0}
-  intervalTime: 30
-  pastTime: 0
-  maxSpirits: 0
-  greenLions: {fileID: 1507415183}
-  lions: []
 --- !u!1 &7232179490363835475
 GameObject:
   m_ObjectHideFlags: 0
@@ -32871,21 +32861,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9fa0b5d582a623449abd75e775018012, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  doorController: {fileID: 7175282025644772593}
-  spirits:
-  - {spiritPrefab: {fileID: 8639832132491289359, guid: 4af781eb437434d48b6ad6d3816771e8, type: 3}, type: 0, quality: 0, corpse: 15, introduction: {fileID: 0}, ultimateTimes: 1, tranHp: 1500}
-  - {spiritPrefab: {fileID: 5440846222648032759, guid: 60377cb19b4e5e2479fc1a15ec044a7d, type: 3}, type: 2, quality: 0, corpse: 20, introduction: {fileID: 0}, ultimateTimes: 1, tranHp: 2000}
-  - {spiritPrefab: {fileID: 2437299196472462361, guid: 379837406bb87e445bf55a9b3ec14e6c, type: 3}, type: 1, quality: 0, corpse: 25, introduction: {fileID: 0}, ultimateTimes: 2, tranHp: 2500}
-  - {spiritPrefab: {fileID: 2437299196472462361, guid: 8489325390fb140489cba3dec98fd048, type: 3}, type: 3, quality: 0, corpse: 20, introduction: {fileID: 0}, ultimateTimes: 1, tranHp: 2000}
-  times: 0
-  qualityBackgrounds:
-  - {fileID: 5828154296873993895, guid: 7fdfcd4011577684fb53b87f7dcbf8ec, type: 3}
-  - {fileID: 7102925310079278345, guid: 09b955d55353c724e81b2dc27dcecc28, type: 3}
-  - {fileID: 8517101868754928651, guid: b9e89573dc6c2fa4fb25cddacde70043, type: 3}
-  poses: {fileID: 1803098782}
-  maxPos: 6
-  index: 0
-  canSummon: 0
 --- !u!114 &7582378586151668411
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 78 - 50
ActionTowerDefense/Assets/Scripts/Characters/AttackController.cs

@@ -9,7 +9,9 @@ public class AttackController : MonoBehaviour
     {
         Melee = 0,      //近战
         Shoot = 1,      //射击
-        Dash = 2,       //英灵刺客
+        Special = 2,    //非普攻
+
+        Dash = 3,       //英灵刺客,后面请删掉
     }
 
     [System.Serializable]
@@ -28,6 +30,7 @@ public class AttackController : MonoBehaviour
     [System.Serializable]
     public struct AttackKeyType
     {
+        public int attackMethod;
         public KeyType attackType;
         public string startKeyName;
         public float startKeyTime;
@@ -36,6 +39,31 @@ public class AttackController : MonoBehaviour
         public float endKeyTime;
     }
 
+    [System.Serializable]
+    public struct AttackMethod
+    {
+        public int id;
+        [Header("攻击名称")]
+        public string attackName;
+        [Header("攻击类型")]
+        public AttackType attackType;
+        [Header("攻击特效")]
+        public GameObject attackEffect;
+        [Header("攻击参数")]
+        public AttackInfo attackInfo;
+        [DisplayOnly]
+        public float curDamage;
+        [Header("目标")]
+        public List<TargetType> targetTypes;
+        public bool canHitFly;
+        public int armorPiercing;               //穿甲率
+        [Header("远程单位")]
+        public GameObject bulletPrefab;         //子弹
+        public List<Transform> shootPos;        //子弹发射位置
+        public bool shootTrack;                 //是否初始时瞄准目标
+        public bool shootAlwaysTrack;           //是否始终追踪
+    }
+    
     private Character owner;
 
     [Header("所有攻击帧事件及时间")]
@@ -46,39 +74,37 @@ public class AttackController : MonoBehaviour
 
     [Header("攻击参数")]
     public bool canHitFly;
-    public int armorPiercing;                   //穿甲率
+    public int armorPiercing;                       //穿甲率
     public List<AttackInfo> Attack_summonInfos;
     public List<AttackInfo> Attack_marchInfos;
     //以下信息不在面板显示
     [HideInInspector]
-    public bool isNonAttack = false;            //无普攻
-    [HideInInspector]
     public GameObject addAttackEffect;
     [DisplayOnly]
     public int[] curDamage1;
     [DisplayOnly]
     public int[] curDamage2;
 
-    [Header("攻击动画")]
+    [Header("攻击范围")]
     public AttackTrigger attackTrigger;
-    public List<float> keyTimes;                //所有的帧事件时间
+    public List<float> keyTimes;                    //所有的帧事件时间
     [DisplayOnly]
-    public float attackTime;                    //攻击剩余时间
+    public float attackTime;                        //攻击剩余时间
     //以下信息不在面板显示
     [HideInInspector]
-    public float attackKeyCount;                //攻击进行时间
+    public float attackKeyCount;                    //攻击进行时间
     [HideInInspector]
     public float nextStartKeyTime, nextEndKeyTime;
     [HideInInspector]
-    public int curKeyNum;                       //当前锁定到第几个帧事件
+    public int curKeyNum;                           //当前锁定到第几个帧事件
     [HideInInspector]
-    public bool isAttackTriggerOn = false;      //当前Attack Trigger是否开启
+    public bool isAttackTriggerOn = false;          //当前Attack Trigger是否开启
 
     [Header("远程单位")]
-    public GameObject bulletPrefab;             //子弹
-    public List<Transform> shootPos;            //子弹发射位置
-    public bool shootTrack = false;             //是否初始时瞄准目标
-    public bool shootAlwaysTrack = false;       //是否始终追踪
+    public GameObject bulletPrefab;                 //子弹
+    public List<Transform> shootPos;                //子弹发射位置
+    public bool shootTrack = false;                 //是否初始时瞄准目标
+    public bool shootAlwaysTrack = false;           //是否始终追踪
 
     [Header("目标")]
     public List<TargetType> targetTypes;
@@ -86,6 +112,9 @@ public class AttackController : MonoBehaviour
     public List<Character> beTargetCharacter = new List<Character>(); //被哪些锁定
     public float getDistanceOffset = 0f;
 
+    [Header("攻击模式")]
+    public List<AttackMethod> attackMethod;
+
     public void Init()
     {
         owner = GetComponent<Character>();
@@ -127,49 +156,47 @@ public class AttackController : MonoBehaviour
     public virtual void Attack_summon()
     {
         owner.ani.Play("attack_summon", 0, 0);
-        if (!isNonAttack)
+        if (attackType == AttackType.Shoot)
         {
-            if (attackType == AttackType.Shoot)
-            {
-                attackTrigger.isShoot = true;
-                attackTrigger.GetComponent<Collider>().enabled = false;
-                attackTrigger.type = AttackTrigger.attackTpye.summon;
-            }
-            attackTime = owner.totalAttack_summonTime;
-            attackKeyCount = 0;
-            keyTimes = new List<float>();
-            foreach (SpineAniKey sak in attackKeys)
+            attackTrigger.isShoot = true;
+            attackTrigger.GetComponent<Collider>().enabled = false;
+            attackTrigger.type = AttackTrigger.attackTpye.summon;
+        }
+        attackTime = owner.totalAttack_summonTime;
+        attackKeyCount = 0;
+        keyTimes = new List<float>();
+        foreach (SpineAniKey sak in attackKeys)
+        {
+            if (sak.aniName == "attack_summon")
             {
-                if (sak.aniName == "attack_summon")
+                foreach (AttackKeyType akt in sak.keys)
                 {
-                    foreach (AttackKeyType akt in sak.keys)
-                    {
-                        keyTimes.Add(akt.startKeyTime);
-                        keyTimes.Add(akt.endKeyTime);
-                    }
+                    keyTimes.Add(akt.startKeyTime);
+                    keyTimes.Add(akt.endKeyTime);
                 }
+                break;
             }
-            curKeyNum = 0;
-            SetNextKeyTimes();
+        }
+        curKeyNum = 0;
+        SetNextKeyTimes();
 
-            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;
-                    if (owner.bodyTrans.localScale.x < 0)
-                    {
-                        attackDir.x = -attackDir.x;
-                    }
-                    attackTrigger.force = attackDir * Attack_summonInfos[0].force;
-                    break;
-                default:
-                    break;
-            }
-            owner.ChangeState(CharacterState.Attack);
+        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;
+                if (owner.bodyTrans.localScale.x < 0)
+                {
+                    attackDir.x = -attackDir.x;
+                }
+                attackTrigger.force = attackDir * Attack_summonInfos[0].force;
+                break;
+            default:
+                break;
         }
+        owner.ChangeState(CharacterState.Attack);
     }
 
     public virtual void Attack_march()
@@ -208,6 +235,7 @@ public class AttackController : MonoBehaviour
                 {
                     keyTimes.Add(akt.startKeyTime);
                     keyTimes.Add(akt.endKeyTime);
+                    break;
                 }
             }
         }