Revert "出怪调整，士兵攻击调整"

This reverts commit 054e28cf47a9c07661156f36e9f5d25e595b581d.

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

@@ -685,7 +685,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   canBreakWall: 0
-  wallBrealNum: 10
   isShoot: 1
   type: 0
   owner: {fileID: 0}
@@ -1201,13 +1200,6 @@ MonoBehaviour:
   totalDieKeepTime: 0.10000001
   totalAttack_summonTime: 0.7666667
   totalAttack_marchTime: 1.3000001
-  showInjuryNum: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
-  injuryNumPos_summon: {x: 0, y: 1}
-  injuryNumRandom_summon: {x: 1, y: 1}
-  injuryNumPos_march: {x: 0, y: 1}
-  injuryNumRandom_march: {x: 2, y: 2}
   dieKeepTime: 0
   beHitDistance: 0.1
   attackDis: 0
@@ -1216,14 +1208,17 @@ MonoBehaviour:
   state: 0
   totalHp: 100
   hp: 0
-  canFly: 1
-  nowCanFly: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
   isDie: 0
   isRevive: 0
+  canNotAddForce: 0
+  canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   isBeHitBySummonAttack: 0
+  showInjuryNum: 0
+  canFly: 1
+  nowCanFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
@@ -1232,7 +1227,10 @@ MonoBehaviour:
   cookEffect: {fileID: 0}
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
-  hitResistance: 0
+  injuryNumPos_summon: {x: 0, y: 1}
+  injuryNumRandom_summon: {x: 1, y: 1}
+  injuryNumPos_march: {x: 0, y: 1}
+  injuryNumRandom_march: {x: 2, y: 2}
   foot: {fileID: 8639832132450015562}
   attributeStatus: {fileID: 0}
   hitFeedbackSystem: {fileID: 0}
@@ -1241,6 +1239,7 @@ MonoBehaviour:
   extraGroundGravity: -28.8
   velocityAddition: 0
   platformY: 0
+  hitResistance: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -1274,6 +1273,7 @@ MonoBehaviour:
   heavyDamage: 0
   killer: {fileID: 0}
   searchState: 0
+  attackTrigger: {fileID: 5755692021491134919}
   soldierType: 1
   player: {fileID: 0}
   playerID: 0
@@ -1321,7 +1321,39 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.23333335
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.3
+  - aniName: attack_summon
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.03
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.1
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: 
+      startKeyTime: 0.16
+      endType: 0
+      endKeyName: 
+      endKeyTime: 0.23
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: 
+      startKeyTime: 0.3
+      endType: 0
+      endKeyName: 
+      endKeyTime: 0.36
   keyTimes: []
   attackTime: 0
   attackKeyCount: 0
@@ -1395,7 +1427,7 @@ MonoBehaviour:
     attackType: 1
     attackInfo:
       attackValue: 5
-      damage: 15
+      damage: 80
       attackDir: {x: -1, y: 0, z: 0}
       attackEffect: 04000000
       floatState:
@@ -1458,7 +1490,7 @@ MonoBehaviour:
     attackType: 1
     attackInfo:
       attackValue: 0
-      damage: 5
+      damage: 60
       attackDir: {x: -1, y: 0, z: 0}
       attackEffect: 04000000
       floatState:

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

@@ -707,7 +707,25 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 1.4000001
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 1.6000001
+  - aniName: attack_summon
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.26666668
   keyTimes: []
   attackTime: 0
   attackKeyCount: 0

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

@@ -191,13 +191,6 @@ MonoBehaviour:
   totalDieKeepTime: 0.20000002
   totalAttack_summonTime: 1.5000001
   totalAttack_marchTime: 1
-  showInjuryNum: 0
-  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
-  injuryNumPos_summon: {x: 0, y: 1}
-  injuryNumRandom_summon: {x: 1, y: 1}
-  injuryNumPos_march: {x: 0, y: 1}
-  injuryNumRandom_march: {x: 2, y: 2}
   dieKeepTime: 0
   beHitDistance: 0.1
   attackDis: 0
@@ -206,14 +199,17 @@ MonoBehaviour:
   state: 0
   totalHp: 500
   hp: 0
-  canFly: 0
-  nowCanFly: 0
-  canNotAddForce: 0
-  canNotChangeHurt: 0
   isDie: 0
   isRevive: 0
+  canNotAddForce: 0
+  canNotChangeHurt: 0
   invincibleTime: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
   isBeHitBySummonAttack: 0
+  showInjuryNum: 0
+  canFly: 0
+  nowCanFly: 0
   statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
   ls: {fileID: 0}
   isInSoulTower: 0
@@ -222,7 +218,10 @@ MonoBehaviour:
   cookEffect: {fileID: 0}
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
-  hitResistance: 0
+  injuryNumPos_summon: {x: 0, y: 1}
+  injuryNumRandom_summon: {x: 1, y: 1}
+  injuryNumPos_march: {x: 0, y: 1}
+  injuryNumRandom_march: {x: 2, y: 2}
   foot: {fileID: 2437299196663985756}
   attributeStatus: {fileID: 0}
   hitFeedbackSystem: {fileID: 0}
@@ -231,6 +230,7 @@ MonoBehaviour:
   extraGroundGravity: -28.8
   velocityAddition: 0
   platformY: 0
+  hitResistance: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -264,6 +264,8 @@ MonoBehaviour:
   heavyDamage: 0
   killer: {fileID: 0}
   searchState: 0
+  soulCollector: {fileID: 0}
+  attackTrigger: {fileID: 3063112574554332383}
   soldierType: 0
   player: {fileID: 0}
   playerID: 0
@@ -311,7 +313,61 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  attackKeys: []
+  attackKeys:
+  - aniName: attack_march
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.3
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.40000004
+  - aniName: attack_summon
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.43333337
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.53333336
+  - aniName: attack_summon2
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.4666667
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.6
+  - aniName: attack_summon02
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.20000002
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.33333334
+  - aniName: attack_summon03
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.20000002
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.33333334
+  - aniName: attack_summon05
+    keys:
+    - attackMethod: 0
+      attackType: 0
+      startKeyName: attack_on
+      startKeyTime: 0.10000001
+      endType: 1
+      endKeyName: attack_off
+      endKeyTime: 0.33333334
   keyTimes: []
   attackTime: 0
   attackKeyCount: 0
@@ -382,7 +438,7 @@ MonoBehaviour:
     attackType: 0
     attackInfo:
       attackValue: 25
-      damage: 10
+      damage: 50
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 02000000
       floatState:
@@ -442,7 +498,7 @@ MonoBehaviour:
     attackType: 0
     attackInfo:
       attackValue: 0
-      damage: 5
+      damage: 60
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
       floatState:
@@ -692,7 +748,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   canBreakWall: 0
-  wallBrealNum: 10
   isShoot: 0
   type: 1
   owner: {fileID: 0}
@@ -1005,7 +1060,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   canBreakWall: 0
-  wallBrealNum: 10
   isShoot: 0
   type: 0
   owner: {fileID: 0}

ActionTowerDefense/Luban/.cache.meta

@@ -1,20 +1,20 @@
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgCreateEnemy.cs,3A9B470F9A1FA351330EA275C82C399,1404,1746787273581
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgDynamicEnemy.cs,958E9A723CBC3E549EA8B4F9C93AF82,1411,1748599000938
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgEnemy.cs,AA55E3EA298642B35239B74ED55BFBB,1840,1746787273582
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgSoldierLevel.cs,A08CC235369146A3251A76BCCA2B9E,1381,1747275813952
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleCreateEnemyConfig.cs,21FE43B1C3E3CFE1BE2A25FE59E9CBDF,6029,1748599000938
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleDynamicEnemyConfig.cs,A81776F38E1090D076451986C1A62532,4895,1748599000938
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs,B959AABD6E72533BB8F544E6A69E145,4518,1746787273577
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleSoldierLevel.cs,B2EA928C8A7E3109F6DA27E3788EC2A,3366,1748599000938
-D:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/Tables.cs,2FED4377FA3B67E342DDC2243B6CC19,1848,1748599000938
-D:/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy.json,DF057CA86E9BFADC5192B15BD97BDDC,72580,1750488527885
-D:/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgdynamicenemy.json,7B548B80C3626FCC25C9CB1A4C1D1952,4769,1750487638219
-D:/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,2956F1B3686A6E0EAAE77FE2AA6405C,3076,1750405371732
-D:/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgsoldierlevel.json,5948CC244F6A4AAF17E9C7F7E6C7BC,10637,1750402655371
-D:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__beans__.xlsx,98987DA7288FEE34BCD08EA883D425E,9603,1719822101203
-D:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__enums__.xlsx,D95915E233EB1E4EB87BE0557A2BFDD,9879,1732416060877
-D:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__tables__.xlsx,B1D88AC7368453452592134FD3BA0D2,10222,1747988527865
-D:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/出怪表.xlsx,4DEDAC2C70C93EF1512CED74A11CAE,37104,1750488521674
-D:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/动态出怪表.xlsx,65C1FA28B4E8FD3BE89D352AC962770,15388,1750487608836
-D:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,4D58EA7FD1837869EA8BE501DAA7B19,11652,1750405689614
-D:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/士兵等级属性表.xlsx,74C015549C3571CD519A366864FB64DF,15099,1750402648507
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgCreateEnemy.cs,3A9B470F9A1FA351330EA275C82C399,1404,1720757252000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgDynamicEnemy.cs,958E9A723CBC3E549EA8B4F9C93AF82,1411,1747820736000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgEnemy.cs,AA55E3EA298642B35239B74ED55BFBB,1840,1746698838000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgSoldierLevel.cs,A08CC235369146A3251A76BCCA2B9E,1381,1747215484000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleCreateEnemyConfig.cs,21FE43B1C3E3CFE1BE2A25FE59E9CBDF,6029,1748331352000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleDynamicEnemyConfig.cs,A81776F38E1090D076451986C1A62532,4895,1748331352000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs,B959AABD6E72533BB8F544E6A69E145,4518,1746761904000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleSoldierLevel.cs,B2EA928C8A7E3109F6DA27E3788EC2A,3366,1748316138000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Assets/Gen/Tables.cs,2FED4377FA3B67E342DDC2243B6CC19,1848,1747730600000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy.json,955C4EE86A785BDCC67F37CA487D8FAB,44680,1750319996636
+E:/Unity/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgdynamicenemy.json,8D8711E74FD794B48AB9816A9848CE,3572,1750299411607
+E:/Unity/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,ADB17763C631C6F3F82987884374E90,2763,1747714594000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgsoldierlevel.json,A45D0DC42AB5FE19D846E37C84FA453,10646,1750299411607
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__beans__.xlsx,98987DA7288FEE34BCD08EA883D425E,9603,1719819418000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__enums__.xlsx,D95915E233EB1E4EB87BE0557A2BFDD,9879,1732415694000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__tables__.xlsx,B1D88AC7368453452592134FD3BA0D2,10222,1747820754000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/出怪表.xlsx,911D352647834FEBF3D4CB5E0A8FD,21688,1750320355628
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/动态出怪表.xlsx,7632BF4A345BCA5855271B5BF4B453,14702,1748339050000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,AE5D299779B9735D27578E9EC93EF,10148,1747987500000
+E:/Unity/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/士兵等级属性表.xlsx,B853B7A2D9151EC93AF842ED5DE775,13998,1748339050000