瀏覽代碼

修改攻击目标bug

SZAND\msx_2 7 月之前
父節點
當前提交
2731fdd670
共有 26 個文件被更改,包括 61 次插入598 次删除
  1. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Arrow.prefab
  2. 1 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Assassin.prefab
  3. 1 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Cook.prefab
  4. 3 15
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Float.prefab
  5. 2 14
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Invisible.prefab
  6. 1 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab
  7. 1 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab
  8. 1 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab
  9. 7 16
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab
  10. 1 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab
  11. 3 15
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab
  12. 1 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab
  13. 1 13
      ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Sword.prefab
  14. 5 17
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab
  15. 2 14
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab
  16. 2 14
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yang.prefab
  17. 2 14
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yin.prefab
  18. 2 14
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab
  19. 2 14
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Assassin.prefab
  20. 2 97
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Cook.prefab
  21. 4 16
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Float.prefab
  22. 1 178
      ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Invisible.prefab
  23. 2 14
      ActionTowerDefense/Assets/Resources/Prefab/Player.prefab
  24. 9 5
      ActionTowerDefense/Assets/Scripts/Characters/AttackController.cs
  25. 4 11
      ActionTowerDefense/Assets/Scripts/Characters/Character.cs
  26. 0 25
      ActionTowerDefense/Assets/Scripts/Characters/MoveCharacter.cs

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/Arrow.prefab

@@ -145,7 +145,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9a4a2dbc1e482cd4b9f1532e1fddcb30, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  canStop: 1
+  canStop: 0
   stopTime: 1.5
   owner: {fileID: 0}
   rb: {fileID: 0}

+ 1 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Assassin.prefab

@@ -237,7 +237,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 8367450352918568419}
   uiHp: {fileID: 6433555643392153575}
   beHitTrigger: {fileID: 5333142802677931907}
-  attackController: {fileID: 0}
+  attackController: {fileID: 2331422536550154850}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -297,18 +297,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: b9f534ba9bc2a434496af5761e952f26, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

+ 1 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Cook.prefab

@@ -815,7 +815,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 4543619153787591511}
   uiHp: {fileID: 5991788786426416620}
   beHitTrigger: {fileID: 3377671071202039733}
-  attackController: {fileID: 0}
+  attackController: {fileID: 2632591438531452536}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -877,18 +877,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: b9f534ba9bc2a434496af5761e952f26, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

+ 3 - 15
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Float.prefab

@@ -1031,7 +1031,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 2616922587087395095}
   uiHp: {fileID: 3586716274361854270}
   beHitTrigger: {fileID: 9020361017135710302}
-  attackController: {fileID: 0}
+  attackController: {fileID: 5999551841298446105}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -1095,18 +1095,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: b9f534ba9bc2a434496af5761e952f26, type: 3}
   soulStartSpeed: 1
   isInvisible: 0
@@ -1167,13 +1155,13 @@ MonoBehaviour:
   armorPiercing: 0
   Attack_summonInfos:
   - damage: 140
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   Attack_marchInfos:
   - damage: 140
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0

+ 2 - 14
ActionTowerDefense/Assets/Resources/Prefab/Enemy/ESpirits_Invisible.prefab

@@ -241,7 +241,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 8367450352918568419}
   uiHp: {fileID: 6433555643392153575}
   beHitTrigger: {fileID: 5333142802677931907}
-  attackController: {fileID: 0}
+  attackController: {fileID: 2630197856728929402}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -299,18 +299,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: b9f534ba9bc2a434496af5761e952f26, type: 3}
   soulStartSpeed: 1
   isInvisible: 0
@@ -360,7 +348,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 

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

@@ -241,7 +241,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 7970625495845499240}
   uiHp: {fileID: 5757877461832872043}
   beHitTrigger: {fileID: 6427563181875878110}
-  attackController: {fileID: 0}
+  attackController: {fileID: 1837193195824484407}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -301,18 +301,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

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

@@ -241,7 +241,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 7970625495845499240}
   uiHp: {fileID: 5757877461832872043}
   beHitTrigger: {fileID: 6427563181875878110}
-  attackController: {fileID: 0}
+  attackController: {fileID: 8283553518372576850}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -301,18 +301,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

+ 1 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab

@@ -451,7 +451,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 4543619153787591511}
   uiHp: {fileID: 478072938412589135}
   beHitTrigger: {fileID: 3377671071202039733}
-  attackController: {fileID: 0}
+  attackController: {fileID: 2979723395943220326}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -511,18 +511,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

+ 7 - 16
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab

@@ -1063,7 +1063,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 2616922587087395095}
   uiHp: {fileID: 3586716274361854270}
   beHitTrigger: {fileID: 9020361017135710302}
-  attackController: {fileID: 0}
+  attackController: {fileID: 3979041853861796194}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -1123,18 +1123,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0
@@ -1227,13 +1215,13 @@ MonoBehaviour:
   armorPiercing: 0
   Attack_summonInfos:
   - damage: 60
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   Attack_marchInfos:
   - damage: 60
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
@@ -1250,7 +1238,10 @@ MonoBehaviour:
   curKeyNum: 0
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
-  shootPos: []
+  shootPos:
+  - {fileID: 8482269351142858204}
+  - {fileID: 776105162125788029}
+  - {fileID: 6220414675483084992}
   shootTrack: 1
   shootAlwaysTrack: 0
   targetTypes: 010000000200000003000000

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

@@ -241,7 +241,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 7970625495845499240}
   uiHp: {fileID: 5757877461832872043}
   beHitTrigger: {fileID: 6427563181875878110}
-  attackController: {fileID: 0}
+  attackController: {fileID: 7875272022194174294}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -301,18 +301,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

+ 3 - 15
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Arrow.prefab

@@ -1063,7 +1063,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 2616922587087395095}
   uiHp: {fileID: 3586716274361854270}
   beHitTrigger: {fileID: 9020361017135710302}
-  attackController: {fileID: 0}
+  attackController: {fileID: 4949568809887596492}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -1123,18 +1123,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0
@@ -1239,13 +1227,13 @@ MonoBehaviour:
   armorPiercing: 0
   Attack_summonInfos:
   - damage: 100
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   Attack_marchInfos:
   - damage: 100
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0

+ 1 - 13
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Giant.prefab

@@ -451,7 +451,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 4543619153787591511}
   uiHp: {fileID: 478072938412589135}
   beHitTrigger: {fileID: 3377671071202039733}
-  attackController: {fileID: 0}
+  attackController: {fileID: 4125623970707066689}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -511,18 +511,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

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

@@ -241,7 +241,7 @@ MonoBehaviour:
   bodyCollider: {fileID: 7970625495845499240}
   uiHp: {fileID: 5757877461832872043}
   beHitTrigger: {fileID: 6427563181875878110}
-  attackController: {fileID: 0}
+  attackController: {fileID: -7295283406575541792}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -301,18 +301,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

+ 5 - 17
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -293,7 +293,7 @@ Animator:
   m_GameObject: {fileID: 2234394376273647362}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 526bbfde36d00fe4c8e7ff0b15e6ccd8, type: 2}
+  m_Controller: {fileID: 9100000, guid: 2951b5820f17f3f4fb10e136bb42a4c6, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
@@ -1062,8 +1062,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 3566347593191160092}
   bodyCollider: {fileID: 2616922587087395095}
   uiHp: {fileID: 3586716274361854270}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 9020361017135710302}
+  attackController: {fileID: 6589564398742701796}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -1123,18 +1123,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
   isInvisible: 0
@@ -1237,13 +1225,13 @@ MonoBehaviour:
   armorPiercing: 30
   Attack_summonInfos:
   - damage: 80
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   Attack_marchInfos:
   - damage: 30
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0

+ 2 - 14
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -451,8 +451,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 2932762729738363159}
   bodyCollider: {fileID: 4543619153787591511}
   uiHp: {fileID: 478072938412589135}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 3377671071202039733}
+  attackController: {fileID: 2926401350687575888}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -512,18 +512,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
   isInvisible: 0

+ 2 - 14
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yang.prefab

@@ -506,8 +506,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 2932762729738363159}
   bodyCollider: {fileID: 4543619153787591511}
   uiHp: {fileID: 478072938412589135}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 3377671071202039733}
+  attackController: {fileID: 7709923136427189747}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -567,18 +567,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

+ 2 - 14
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yin.prefab

@@ -506,8 +506,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 2932762729738363159}
   bodyCollider: {fileID: 4543619153787591511}
   uiHp: {fileID: 478072938412589135}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 3377671071202039733}
+  attackController: {fileID: 1452653278887011952}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -567,18 +567,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
   isInvisible: 0

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

@@ -187,8 +187,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 5104552355235513707}
   bodyCollider: {fileID: 8367450352918568419}
   uiHp: {fileID: 6433555643392153575}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 5333142802677931907}
+  attackController: {fileID: 6797330787108410633}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -248,18 +248,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
   isInvisible: 0

+ 2 - 14
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Assassin.prefab

@@ -300,8 +300,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 5104552355235513707}
   bodyCollider: {fileID: 8367450352918568419}
   uiHp: {fileID: 6433555643392153575}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 5333142802677931907}
+  attackController: {fileID: 4054907704943730342}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -360,18 +360,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
   isInvisible: 0

+ 2 - 97
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Cook.prefab

@@ -712,7 +712,6 @@ Transform:
   - {fileID: 3103190932458336017}
   - {fileID: 8922289277778709813}
   - {fileID: 2332805625535433500}
-  - {fileID: 4787598481067778054}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -741,8 +740,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 2932762729738363159}
   bodyCollider: {fileID: 4543619153787591511}
   uiHp: {fileID: 3402650366513594425}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 3377671071202039733}
+  attackController: {fileID: 6737250509459065531}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -759,10 +758,6 @@ MonoBehaviour:
   armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
-  isSpirit: 1
-  isTran: 0
-  pc: {fileID: 0}
-  hptp: 0
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -807,18 +802,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
   isInvisible: 0
@@ -1434,84 +1417,6 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
---- !u!1001 &1578058741337959003
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 5440846222648032754}
-    m_Modifications:
-    - target: {fileID: 242266596801799417, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.02
-      objectReference: {fileID: 0}
-    - target: {fileID: 242266596801799417, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3686068518676410985, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_Name
-      value: TranCookUltimate
-      objectReference: {fileID: 0}
-    - target: {fileID: 4119800954199137642, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: stopAction
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6238492018599546919, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 2.15
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
---- !u!4 &4787598481067778054 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6311393983886559837, guid: ec2b0f2494c993b47b700be0384a7d84, type: 3}
-  m_PrefabInstance: {fileID: 1578058741337959003}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7402103045636655245
 PrefabInstance:
   m_ObjectHideFlags: 0

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

@@ -1080,8 +1080,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 3566347593191160092}
   bodyCollider: {fileID: 2616922587087395095}
   uiHp: {fileID: 3586716274361854270}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 9020361017135710302}
+  attackController: {fileID: 8765360524165072884}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 0
@@ -1142,18 +1142,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
   isInvisible: 0
@@ -1228,13 +1216,13 @@ MonoBehaviour:
   armorPiercing: 0
   Attack_summonInfos:
   - damage: 100
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   Attack_marchInfos:
   - damage: 100
-    attackDir: {x: 0, y: 0, z: 0}
+    attackDir: {x: -1, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0

+ 1 - 178
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Spirits_Invisible.prefab

@@ -134,9 +134,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2437299196472462364}
   - component: {fileID: 99850206658526686}
-  - component: {fileID: 2437299196472462353}
   - component: {fileID: 2472120008162019348}
-  - component: {fileID: 3534920898304496309}
   m_Layer: 7
   m_Name: Spirits_Invisible
   m_TagString: Demonic
@@ -178,7 +176,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   notOut: 0
-  demonic: {fileID: 2437299196472462353}
+  demonic: {fileID: 0}
   state: 0
   rb: {fileID: 2472120008162019348}
   moveSpeed: 5
@@ -202,142 +200,6 @@ MonoBehaviour:
   stayTime: 30
   time: 0
   getSoulDistance: 15
---- !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: 2
-  totalAttack_summonTime: 0.5
-  totalAttack_marchTime: 0.5
-  dieKeepTime: 0
-  rb: {fileID: 2472120008162019348}
-  bodyTrans: {fileID: 2730232521377132808}
-  beSearchTrigger: {fileID: 1317309795988277421}
-  searchTrigger: {fileID: 5104552355235513707}
-  bodyCollider: {fileID: 8367450352918568419}
-  uiHp: {fileID: 6433555643392153575}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
-  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: 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: 0
-  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}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
-  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: 12000
-  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 &2472120008162019348
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -354,45 +216,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 0
---- !u!114 &3534920898304496309
-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: 0
-  armorPiercing: 0
-  Attack_summonInfos: []
-  Attack_marchInfos: []
-  isNonAttack: 0
-  addAttackEffect: {fileID: 0}
-  curDamage1: 
-  curDamage2: 
-  attackTrigger: {fileID: 0}
-  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 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 14
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -652,8 +652,8 @@ MonoBehaviour:
   searchTrigger: {fileID: 2246792914537570827}
   bodyCollider: {fileID: 458160094715212641}
   uiHp: {fileID: 205997967}
-  beHitTrigger: {fileID: 0}
-  attackController: {fileID: 0}
+  beHitTrigger: {fileID: 7995092481582001509}
+  attackController: {fileID: 3896813473903261645}
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
   state: 1
@@ -713,18 +713,6 @@ MonoBehaviour:
   isFloat: 0
   normalFallSpeed: 10
   effect: {fileID: 0}
-  playerMe: {fileID: 0}
-  playerAni: {fileID: 0}
-  playerCol: {fileID: 0}
-  playerTran: {fileID: 0}
-  playerBst: {fileID: 0}
-  playerBullet: {fileID: 0}
-  playerST: {fileID: 0}
-  playerFoot: {fileID: 0}
-  playerSpinee: {fileID: 0}
-  playerMesh: {fileID: 0}
-  playerMats: []
-  playerOut: []
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
   isInvisible: 0

+ 9 - 5
ActionTowerDefense/Assets/Scripts/Characters/AttackController.cs

@@ -82,10 +82,7 @@ public class AttackController : MonoBehaviour
 
     [Header("Ä¿±ê")]
     public List<TargetType> targetTypes;
-    [HideInInspector]
-    public Character targetCharacter;
-    [HideInInspector]
-    public Character attackTarget;
+    [DisplayOnly]
     public List<Character> beTargetCharacter = new List<Character>(); //±»ÄÄÐ©Ëø¶¨
     public float getDistanceOffset = 0f;
 
@@ -112,6 +109,11 @@ public class AttackController : MonoBehaviour
         }
     }
 
+    public void ChooseAttack()
+    {
+
+    }
+
     public void SetNextKeyTimes()
     {
         if (curKeyNum < keyTimes.Count)
@@ -248,6 +250,8 @@ public class AttackController : MonoBehaviour
         {
             bullet.canTransmit = true;
         }
-        bullet.BeShoot(owner, shootPos[shootId].position, attackDir, attackInfo.damage, attackInfo.force, attackInfo.changeHurt, attackInfo.repelValue, shootTrack, shootAlwaysTrack, attackTarget ? attackTarget : null);
+        bullet.BeShoot(owner, shootPos[shootId].position, attackDir, attackInfo.damage, 
+            attackInfo.force, attackInfo.changeHurt, attackInfo.repelValue, shootTrack, 
+            shootAlwaysTrack, owner.attackTarget ? owner.attackTarget : null);
     }
 }

+ 4 - 11
ActionTowerDefense/Assets/Scripts/Characters/Character.cs

@@ -61,7 +61,7 @@ public class Character : MonoBehaviour
     public BeHitTrigger beHitTrigger;
     public AttackController attackController;    
 
-    [HideInInspector]
+    [DisplayOnly]
     public Character targetCharacter;
     [HideInInspector]
     public Character attackTarget;
@@ -129,13 +129,10 @@ public class Character : MonoBehaviour
         uiHp.Show(hp, totalHp);
         ChangeState(CharacterState.Idle);
 
-        if (attackController == null)
+        if (attackController != null)
         {
-            attackController = GetComponent<AttackController>();
+            attackController.Init();
         }
-        attackController.Init();
-        attackTarget = attackController.attackTarget;
-        targetCharacter = attackController.targetCharacter;
     }
 
     public virtual void FixedUpdate()
@@ -155,12 +152,12 @@ public class Character : MonoBehaviour
     public virtual void ChangeState(CharacterState newState)
     {
     }
+    
     public void DebugAttackFrom(string attackFrom, int damage)
     {
         Debug.Log(attackFrom + "对" + gameObject.name + "造成了" + damage.ToString() + "点伤害");
     }
 
-
     public virtual void BeHit(int damage, Vector3 force, bool changeHurt, float repelValue)
     {
         //无敌状态下免伤
@@ -195,16 +192,12 @@ public class Character : MonoBehaviour
         }
     }
 
-
-
     public virtual Vector3 GetMoveDir()
     {
         Vector3 moveDir = Vector3.zero;
         return moveDir;
     }
 
-
-
     public virtual void SetSortingOrder(int order)
     {
         meshRenderer.sortingOrder = order;

+ 0 - 25
ActionTowerDefense/Assets/Scripts/Characters/MoveCharacter.cs

@@ -86,20 +86,6 @@ public class MoveCharacter : Character
     private float continueTime;
     private bool isTempt;
 
-    [Header("±äÉíǰ¼ÇÂ¼Íæ¼ÒÊôÐÔ")]
-    public SkeletonMecanim playerMe;
-    public Animator playerAni;
-    public Animator playerCol;
-    public Transform playerTran;
-    public BeSearchTrigger playerBst;
-    public GameObject playerBullet;
-    public SearchTrigger playerST;
-    public Foot playerFoot;
-    public GameObject playerSpinee;
-    public MeshRenderer playerMesh;
-    public Material[] playerMats;
-    public Material[] playerOut;
-
     [Header("Ȑ")]
     public GameObject soulPrefab;
     public float soulStartSpeed = 1f;
@@ -135,17 +121,6 @@ public class MoveCharacter : Character
 
     private void Start()
     {
-        playerMe = mecanim;
-        playerAni = ani;
-        playerTran = bodyTrans;
-        playerBst = beSearchTrigger;
-        playerBullet = attackController.bulletPrefab;
-        playerST = searchTrigger;
-        playerFoot = foot;
-        playerSpinee = spinee;
-        playerMesh = mesh;
-        playerMats = mats;
-        playerOut = outlineMats;
         newTotalWeakTime = totalWeakTime;
     }