Prechádzať zdrojové kódy

伤害跳字;离卦龙卷风可以打塔

LAPTOP-OM1V99U2\永远de小亡灵 1 rok pred
rodič
commit
c26fa2ac2b
27 zmenil súbory, kde vykonal 214 pridanie a 33 odobranie
  1. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/BaGua/Demonic_Giant_Yang.prefab
  2. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/BaGua/Demonic_Giant_Yin.prefab
  3. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Block/Block.prefab
  4. 8 0
      ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Boss_YuMenGuan.prefab
  5. 14 0
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab
  6. 14 0
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab
  7. 14 0
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab
  8. 5 0
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Assassin.prefab
  9. 10 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab
  10. 5 0
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Float.prefab
  11. 5 0
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Invisible.prefab
  12. 36 26
      ActionTowerDefense/Assets/Resources/Prefab/EnemyTower.prefab
  13. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab
  14. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab
  15. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab
  16. 4 4
      ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNum.prefab
  17. 0 0
      ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNum.prefab.meta
  18. 14 0
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab
  19. 14 0
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab
  20. 16 0
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab
  21. 16 0
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Invisible.prefab
  22. 2 0
      ActionTowerDefense/Assets/Resources/Prefab/Player.prefab
  23. 2 0
      ActionTowerDefense/Assets/Resources/Prefab/Tower.prefab
  24. 1 1
      ActionTowerDefense/Assets/Scripts/BaGua/BaGua_LiGua.cs
  25. 13 0
      ActionTowerDefense/Assets/Scripts/Character.cs
  26. 12 0
      ActionTowerDefense/Assets/Scripts/MoveCharacter.cs
  27. 3 1
      ActionTowerDefense/Assets/Scripts/Spirits/DestroyMiss.cs

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/BaGua/Demonic_Giant_Yang.prefab

@@ -606,6 +606,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 1

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/BaGua/Demonic_Giant_Yin.prefab

@@ -606,6 +606,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 1

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Block/Block.prefab

@@ -242,6 +242,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2.1
   dieKeepTime: 0
   canHitFly: 0

+ 8 - 0
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Boss_YuMenGuan.prefab

@@ -15607,6 +15607,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 0}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 0
@@ -15744,6 +15745,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 0}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 0
@@ -27159,6 +27161,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 0}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 0
@@ -27408,6 +27411,7 @@ MonoBehaviour:
   canNotAddForce: 1
   canNotChangeHurt: 1
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 0
@@ -27489,6 +27493,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   states:
   - coreHp: 3000
     scale: 1

+ 14 - 0
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab

@@ -90,6 +90,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &1637528673901708253
 GameObject:
   m_ObjectHideFlags: 0
@@ -922,6 +923,8 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  myBaGuaTrigger: {fileID: 0}
+  baGuaTrigger: []
 --- !u!1 &8639832132491289359
 GameObject:
   m_ObjectHideFlags: 0
@@ -989,6 +992,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 1
@@ -1095,6 +1099,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   player: {fileID: 0}
   playerID: 0
   id: 0
@@ -1112,6 +1120,12 @@ MonoBehaviour:
   maxAttackDis: 15
   minAttackDis: 9
   needToChange: 1
+  adsorbSpeed: 0
+  adsorbTarget: {x: 0, y: 0, z: 0}
+  effectPrefab: {fileID: 0}
+  dropSoulMax: 3
+  dropSoulMin: 1
+  dropSoulAngle: 60
 --- !u!54 &8639832132491289349
 Rigidbody:
   m_ObjectHideFlags: 0

+ 14 - 0
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab

@@ -158,6 +158,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &4480734502875862885
 GameObject:
   m_ObjectHideFlags: 0
@@ -381,6 +382,8 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  myBaGuaTrigger: {fileID: 0}
+  baGuaTrigger: []
 --- !u!1 &5440846222648032759
 GameObject:
   m_ObjectHideFlags: 0
@@ -448,6 +451,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 1
@@ -542,6 +546,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   player: {fileID: 0}
   playerID: 0
   id: 0
@@ -559,6 +567,12 @@ MonoBehaviour:
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
+  adsorbSpeed: 0
+  adsorbTarget: {x: 0, y: 0, z: 0}
+  effectPrefab: {fileID: 0}
+  dropSoulMax: 3
+  dropSoulMin: 1
+  dropSoulAngle: 60
 --- !u!54 &5440846222648032765
 Rigidbody:
   m_ObjectHideFlags: 0

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

@@ -191,6 +191,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 1
@@ -285,6 +286,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   player: {fileID: 0}
   playerID: 0
   id: 0
@@ -302,6 +307,12 @@ MonoBehaviour:
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
+  adsorbSpeed: 0
+  adsorbTarget: {x: 0, y: 0, z: 0}
+  effectPrefab: {fileID: 0}
+  dropSoulMax: 3
+  dropSoulMin: 1
+  dropSoulAngle: 60
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -379,6 +390,8 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  myBaGuaTrigger: {fileID: 0}
+  baGuaTrigger: []
 --- !u!1 &5216717017252562314
 GameObject:
   m_ObjectHideFlags: 0
@@ -995,6 +1008,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &8802879426389446295
 GameObject:
   m_ObjectHideFlags: 0

+ 5 - 0
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Assassin.prefab

@@ -241,6 +241,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 3
   dieKeepTime: 0
   canHitFly: 0
@@ -335,6 +336,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   id: 0
   sortingOrder: 0
   canFly: 0

+ 10 - 1
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab

@@ -265,6 +265,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &2885380845639701439
 GameObject:
   m_ObjectHideFlags: 0
@@ -737,6 +738,8 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  myBaGuaTrigger: {fileID: 0}
+  baGuaTrigger: []
 --- !u!1 &5440846222648032759
 GameObject:
   m_ObjectHideFlags: 0
@@ -823,6 +826,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 3
   dieKeepTime: 0
   canHitFly: 1
@@ -919,6 +923,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   id: 0
   sortingOrder: 0
   canFly: 0
@@ -936,7 +944,8 @@ MonoBehaviour:
   minAttackDis: 0
   needToChange: 0
   attackRatio: 0
-  dropSoul: 3
+  dropSoulMax: 3
+  dropSoulMin: 1
   dropSoulAngle: 90
   aimEffect: {fileID: 6373916053725309541, guid: 3839706ae501f6f4494a5b38dd4e936e, type: 3}
   dashEffect: {fileID: 2254593709981819441, guid: 3839706ae501f6f4494a5b38dd4e936e, type: 3}

+ 5 - 0
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Float.prefab

@@ -1031,6 +1031,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 1
@@ -1141,6 +1142,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   id: 0
   sortingOrder: 0
   canFly: 1

+ 5 - 0
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Invisible.prefab

@@ -244,6 +244,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 0
@@ -335,6 +336,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   id: 0
   sortingOrder: 0
   canFly: 1

+ 36 - 26
ActionTowerDefense/Assets/Resources/Prefab/EnemyTower.prefab

@@ -289,10 +289,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e36e1845a7796424a82b1e0d9b8de1f9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isTran: 0
-  pc: {fileID: 0}
-  HitCols: []
-  cookNum: 0
   mecanim: {fileID: 0}
   meshRenderer: {fileID: 3581793008366722163}
   ani: {fileID: 3581793008366722162}
@@ -300,16 +296,31 @@ MonoBehaviour:
   rb: {fileID: 3581793008941702771}
   bodyTrans: {fileID: 3581793009506298626}
   beSearchTrigger: {fileID: 3778640999066524515}
+  searchTrigger: {fileID: 3581793009074591734}
+  bodyCollider: {fileID: 0}
   uiHp: {fileID: 3581793008612699030}
   state: 0
+  totalHp: 20000
+  hp: 0
+  isDie: 0
+  isRevive: 0
+  linked: 0
+  canNotAddForce: 0
+  canNotChangeHurt: 0
+  invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  totalDieKeepTime: 2
+  dieKeepTime: 0
+  canHitFly: 0
+  isNonAttack: 0
   attackTime: 0
   totalAttack1Time: 1
   totalAttack2Time: 1
-  isNonAttack: 0
-  hptp: 0
-  isDie: 0
-  totalHp: 20000
-  hp: 0
+  attackType: 1
+  bulletPrefab: {fileID: 7473170563405908938, guid: 1a8b22d7c1002f9468efb1362b6616a3, type: 3}
+  shootPos:
+  - {fileID: 3581793008161308374}
+  shootTrack: 1
   attack1Infos:
   - damage: 100
     attackDir: {x: -1, y: 0, z: 0}
@@ -318,27 +329,21 @@ MonoBehaviour:
     repelValue: 0
   attack2Infos: []
   attackTriggers: []
-  attackType: 1
-  bulletPrefab: {fileID: 7473170563405908938, guid: 1a8b22d7c1002f9468efb1362b6616a3, type: 3}
-  shootPos:
-  - {fileID: 3581793008161308374}
-  dieKeepTime: 0
-  totalDieKeepTime: 2
-  attackTarget: {fileID: 0}
-  shootTrack: 1
-  invincibleTime: 0
-  totalInvincibleTime: 0
+  targetTypes: 0100000003000000
   targetCharacter: {fileID: 0}
+  attackTarget: {fileID: 0}
   beTargetCharacter: []
-  searchTrigger: {fileID: 3581793009074591734}
-  targetTypes: 0100000003000000
-  canHitFly: 0
-  linked: 0
+  isSpirit: 0
+  isTran: 0
+  pc: {fileID: 0}
+  hptp: 0
   joint: {fileID: 0}
   rope: {fileID: 0}
-  hasHpUp: 0
   beLarger: 0
-  attackToFloat: 0
+  toLargeSize: 0
+  cookEffect: {fileID: 0}
+  attack1ShootCanTransmit: 0
+  height: 8
 --- !u!54 &3581793008941702771
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -402,8 +407,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   isCook: 0
+  isEnemy: 0
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -701,6 +708,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &3581793009506298629
 GameObject:
   m_ObjectHideFlags: 0
@@ -805,6 +813,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  smoke: {fileID: 0}
+  hitRate: 1
 --- !u!1 &7102644708960417302
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab

@@ -992,6 +992,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 1

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab

@@ -450,6 +450,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 5
   dieKeepTime: 0
   canHitFly: 1

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab

@@ -240,6 +240,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 3
   dieKeepTime: 0
   canHitFly: 1

+ 4 - 4
ActionTowerDefense/Assets/Resources/Prefab/FX/missUI 1.prefab → ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNum.prefab

@@ -59,7 +59,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 1516060329
-  m_SortingOrder: 0
+  m_SortingOrder: 10
   m_TargetDisplay: 0
 --- !u!114 &8749957310071290871
 MonoBehaviour:
@@ -112,7 +112,7 @@ GameObject:
   - component: {fileID: 5535641789940809310}
   - component: {fileID: 2075992615353979807}
   m_Layer: 0
-  m_Name: missUI 1
+  m_Name: InjuryNum
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -215,7 +215,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: MISS
+  m_text: 999
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -248,7 +248,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 256
   m_textAlignment: 65535

+ 0 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/missUI 1.prefab.meta → ActionTowerDefense/Assets/Resources/Prefab/FX/InjuryNum.prefab.meta


+ 14 - 0
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab

@@ -319,6 +319,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 0
@@ -412,6 +413,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   player: {fileID: 0}
   playerID: 0
   id: 0
@@ -429,6 +434,12 @@ MonoBehaviour:
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
+  adsorbSpeed: 0
+  adsorbTarget: {x: 0, y: 0, z: 0}
+  effectPrefab: {fileID: 0}
+  dropSoulMax: 3
+  dropSoulMin: 1
+  dropSoulAngle: 60
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -506,6 +517,8 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  myBaGuaTrigger: {fileID: 0}
+  baGuaTrigger: []
 --- !u!1 &4395627956063108033
 GameObject:
   m_ObjectHideFlags: 0
@@ -1329,6 +1342,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &8802879426389446295
 GameObject:
   m_ObjectHideFlags: 0

+ 14 - 0
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab

@@ -266,6 +266,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &3483054690158852324
 GameObject:
   m_ObjectHideFlags: 0
@@ -668,6 +669,8 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  myBaGuaTrigger: {fileID: 0}
+  baGuaTrigger: []
 --- !u!1 &5440846222648032759
 GameObject:
   m_ObjectHideFlags: 0
@@ -738,6 +741,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 1.34
   dieKeepTime: 0
   canHitFly: 1
@@ -823,6 +827,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   player: {fileID: 0}
   playerID: 0
   id: 0
@@ -840,6 +848,12 @@ MonoBehaviour:
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
+  adsorbSpeed: 0
+  adsorbTarget: {x: 0, y: 0, z: 0}
+  effectPrefab: {fileID: 0}
+  dropSoulMax: 3
+  dropSoulMin: 1
+  dropSoulAngle: 60
 --- !u!54 &5440846222648032765
 Rigidbody:
   m_ObjectHideFlags: 0

+ 16 - 0
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab

@@ -90,6 +90,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &1637528673901708253
 GameObject:
   m_ObjectHideFlags: 0
@@ -924,6 +925,8 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  myBaGuaTrigger: {fileID: 0}
+  baGuaTrigger: []
 --- !u!1 &8639832132491289359
 GameObject:
   m_ObjectHideFlags: 0
@@ -1007,6 +1010,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 1
@@ -1055,7 +1059,9 @@ MonoBehaviour:
   joint: {fileID: 0}
   rope: {fileID: 0}
   beLarger: 0
+  toLargeSize: 0
   cookEffect: {fileID: 0}
+  attack1ShootCanTransmit: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -1112,6 +1118,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   player: {fileID: 0}
   playerID: 0
   id: 0
@@ -1129,6 +1139,12 @@ MonoBehaviour:
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
+  adsorbSpeed: 0
+  adsorbTarget: {x: 0, y: 0, z: 0}
+  effectPrefab: {fileID: 0}
+  dropSoulMax: 3
+  dropSoulMin: 1
+  dropSoulAngle: 60
 --- !u!54 &8639832132491289349
 Rigidbody:
   m_ObjectHideFlags: 0

+ 16 - 0
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Invisible.prefab

@@ -231,6 +231,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 0
@@ -267,7 +268,9 @@ MonoBehaviour:
   joint: {fileID: 0}
   rope: {fileID: 0}
   beLarger: 0
+  toLargeSize: 0
   cookEffect: {fileID: 0}
+  attack1ShootCanTransmit: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -321,6 +324,10 @@ MonoBehaviour:
   haveTransmit: 0
   transmitTime: 0
   portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
   player: {fileID: 0}
   playerID: 0
   id: 0
@@ -338,6 +345,12 @@ MonoBehaviour:
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
+  adsorbSpeed: 0
+  adsorbTarget: {x: 0, y: 0, z: 0}
+  effectPrefab: {fileID: 0}
+  dropSoulMax: 3
+  dropSoulMin: 1
+  dropSoulAngle: 60
 --- !u!54 &2472120008162019348
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -415,6 +428,8 @@ MonoBehaviour:
   rb: {fileID: 0}
   haveGravity: 1
   trigGroundList: []
+  myBaGuaTrigger: {fileID: 0}
+  baGuaTrigger: []
 --- !u!1 &5216717017252562314
 GameObject:
   m_ObjectHideFlags: 0
@@ -965,6 +980,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &8802879426389446295
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -781,6 +781,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 0.3
   dieKeepTime: 0
   canHitFly: 1
@@ -906,6 +907,7 @@ MonoBehaviour:
   - {fileID: 2437299196472462361, guid: 0e7e5e45ddc25b641963c78f68b041b8, type: 3}
   needCorpses: 14000000140000001400000014000000
   endChange: 0
+  rightDir: {x: 0, y: 0}
   uiMp: {fileID: 8465211090008398057}
   playerRope: {fileID: 112529840073562573, guid: 2f24cd9614ae27e4e9525c04d7c7244f, type: 3}
   eventTrigger: {fileID: 8878694457807976444}

+ 2 - 0
ActionTowerDefense/Assets/Resources/Prefab/Tower.prefab

@@ -59,6 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  attackerID: 0
 --- !u!1 &6126647543755677578
 GameObject:
   m_ObjectHideFlags: 0
@@ -762,6 +763,7 @@ MonoBehaviour:
   canNotAddForce: 0
   canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   totalDieKeepTime: 2
   dieKeepTime: 0
   canHitFly: 0

+ 1 - 1
ActionTowerDefense/Assets/Scripts/BaGua/BaGua_LiGua.cs

@@ -24,7 +24,7 @@ public class BaGua_LiGua : MonoBehaviour
         BeHitTrigger beHitTrigger = other.GetComponent<BeHitTrigger>();
         if (beHitTrigger != null)
         {
-            if (other.gameObject.layer == 8 || other.gameObject.layer == 16)
+            if (other.gameObject.layer == 8 || other.gameObject.layer == 16 || other.gameObject.layer == 10)
             {
                 MoveCharacter character = other.GetComponentInParent<MoveCharacter>();
                 moveCharacrters.Add(character);

+ 13 - 0
ActionTowerDefense/Assets/Scripts/Character.cs

@@ -3,6 +3,7 @@ using Spine;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using TMPro;
 
 //角色状态
 public enum CharacterState
@@ -81,6 +82,7 @@ public class Character : MonoBehaviour
     public bool canNotChangeHurt;   //不会被打虚弱
     [HideInInspector]
     public float invincibleTime;    //无敌时间
+    public GameObject injuryNumText;//伤害跳字
 
     [Header("死亡后多久尸体消失")]
     public float totalDieKeepTime = 2f;
@@ -211,6 +213,17 @@ public class Character : MonoBehaviour
 
         //非无敌状态扣血
         hp -= damage;
+        
+        //伤害跳字
+        GameObject injuryNum = Instantiate(injuryNumText);
+        injuryNum.transform.position = new Vector3(transform.position.x + Random.Range(-1f, 1f), transform.position.y + 1, transform.position.z);
+        TextMeshProUGUI text = injuryNum.GetComponentInChildren<TextMeshProUGUI>();
+        text.text = damage.ToString();
+        if (gameObject.CompareTag("Player"))
+        {
+            text.color = Color.red;
+        }
+
         uiHp.Show(hp, totalHp);
         if (hp <= 0)
         {

+ 12 - 0
ActionTowerDefense/Assets/Scripts/MoveCharacter.cs

@@ -3,6 +3,7 @@ using Spine;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using TMPro;
 
 public class MoveCharacter : Character
 {
@@ -350,6 +351,17 @@ public class MoveCharacter : Character
         }
 
         hp -= damage;
+
+        //É˺¦Ìø×Ö
+        GameObject injuryNum = Instantiate(injuryNumText);
+        injuryNum.transform.position = new Vector3(transform.position.x + Random.Range(-1f, 1f), transform.position.y + 1, transform.position.z);
+        TextMeshProUGUI text = injuryNum.GetComponentInChildren<TextMeshProUGUI>();
+        text.text = damage.ToString();
+        if (gameObject.CompareTag("Player"))
+        {
+            text.color = Color.red;
+        }
+
         uiHp.Show(hp, totalHp);
         if (hp <= 0)
         {

+ 3 - 1
ActionTowerDefense/Assets/Scripts/Spirits/DestroyMiss.cs

@@ -13,7 +13,9 @@ public class DestroyMiss : MonoBehaviour
     {
         time += Time.deltaTime;
         transform.position += Vector3.up * Time.deltaTime;
-        text.color = new Color(1, 1, 1, 1 - time / 2);
+        Color color = text.color;
+        color.a = 1 - time / 2;
+        text.color = color;
         if (time >= stayTime)
         {
             gameObject.SetActive(false);