修改行军式伤害计算公式，改为以起手式伤害的10%来计算，增加攻击速度属性

ActionTowerDefense/Assets/Scripts/Characters/AttackController.cs

@@ -525,8 +525,10 @@ public class AttackController : MonoBehaviour
 
     public void JudgeTriggerOnOff()
     {
-        attackTime -= Time.deltaTime;
-        attackKeyCount += Time.deltaTime;
+        if (owner is Demonic) attackTime -= Time.deltaTime * (1 + GameManager.instance.attackSpeed / 100f);
+        else attackTime -= Time.deltaTime;
+        if (owner is Demonic) attackKeyCount += Time.deltaTime * (1 + GameManager.instance.attackSpeed / 100f);
+        else attackKeyCount += Time.deltaTime;
         if (!isAttackTriggerOn && attackKeyCount >= nextStartKeyTime && attackKeyCount <= nextEndKeyTime)
         {
             if (curAttackMethod.attackType == AttackType.Special)

ActionTowerDefense/Assets/Scripts/Characters/Demonic.cs

@@ -288,7 +288,7 @@ public class Demonic : MoveCharacter
                 }
                 if (isAttack)
                 {
-                    if (pastAttackTime >= attackController.attackInterval)
+                    if (pastAttackTime * (1 + GameManager.instance.attackSpeed/100f) >= attackController.attackInterval)
                     {
                         Attack_march();
                     }
@@ -336,7 +336,7 @@ public class Demonic : MoveCharacter
             case CharacterState.Run:
                 if (isAttack)
                 {
-                    if (pastAttackTime >= attackController.attackInterval)
+                    if (pastAttackTime * (1 + GameManager.instance.attackSpeed / 100f) >= attackController.attackInterval)
                     {
                         Attack_march();
                     }
@@ -404,7 +404,7 @@ public class Demonic : MoveCharacter
             case CharacterState.Rush:
                 if (isAttack)
                 {
-                    if (pastAttackTime >= attackController.attackInterval)
+                    if (pastAttackTime * (1 + GameManager.instance.attackSpeed / 100f) >= attackController.attackInterval)
                     {
                         Attack_march();
                     }
@@ -696,6 +696,7 @@ public class Demonic : MoveCharacter
                 }
                 attackController.isAttackTriggerOn = false;
                 attackController.curAttackMethod.attackTrigger.gameObject.SetActive(false);
+                ani.speed = 1;
                 break;
             case CharacterState.Die:
                 isDie = false;
@@ -807,6 +808,7 @@ public class Demonic : MoveCharacter
 
     public virtual void Attack_summon()
     {
+        ani.speed = 1 * (1 + GameManager.instance.attackSpeed / 100f);
         if (needToAdjustFlyHeight && canFly)
         {
             flyHeight = Random.Range(minFlyHeight, maxFlyHeight);
@@ -825,6 +827,7 @@ public class Demonic : MoveCharacter
 
     public virtual void Attack_march()
     {
+        ani.speed = 1 * (1 + GameManager.instance.attackSpeed / 100f);
         CheckTurn(GetMoveDir().x);
         attackController.Attack_march();
         if (attackController.attackMarchId + 1 < attackController.attackMethod_march.Length)
@@ -892,7 +895,15 @@ public class Demonic : MoveCharacter
     /// <summary>
     /// 在子类具体实现，用于处理每种士兵单独的逻辑
     /// </summary>
-    public virtual void AfterInit() { }
+    public virtual void AfterInit()
+    {
+        for (int i = 0; i < attackController.attackMethod_march.Length; i++)
+        {
+            AttackInfo attackInfo = attackController.attackMethod_march[i].attackInfo;
+            attackInfo.damage = (int)(attackController.attackMethod_summon[i].attackInfo.damage/10f);
+            if (attackInfo.damage < 1) attackInfo.damage = 1;
+        }
+    }
 }
 
 [System.Flags]

ActionTowerDefense/Assets/Scripts/GameManager.cs

@@ -187,10 +187,10 @@ public class GameManager : MonoBehaviour
     [FoldoutGroup("Rogue")] [LabelText("闪避")] public int dodge;
     [FoldoutGroup("Rogue")] [LabelText("血量上限")] public int totalHp;
     [FoldoutGroup("Rogue")] [LabelText("金币获得增加")] public int increasedGoldGain;
-    [FoldoutGroup("Rogue")] [LabelText("经验获得增加")] public int increasedEXPGain;
     [FoldoutGroup("Rogue")] [LabelText("冲刺次数")] public int dashCharges;
     [FoldoutGroup("Rogue")] [LabelText("蓝量")] public int totalMp;
     [FoldoutGroup("Rogue")] [LabelText("回蓝速度")] public int mpRegen;
+    [FoldoutGroup("Rogue")] [LabelText("攻击速度")] public float attackSpeed;
 
     //[FoldoutGroup("Rogue")] [LabelText("击落伤害")] public int downDamage;
     //[FoldoutGroup("Rogue")] [LabelText("击飞伤害")] public int blowUpDamage;
@@ -449,7 +449,7 @@ public class GameManager : MonoBehaviour
             switch (treasure.type[i])
             {
                 case "伤害加成":
-                    damageScale += (int)data;
+                    damageScale += data;
                     foreach (DemonicAttributes demonicAttribute in demonicAttributes)
                     {
                         demonicAttribute.ownDamage += (int)(data * demonicAttribute.damageGainEfficiency);
@@ -511,8 +511,11 @@ public class GameManager : MonoBehaviour
                 case "金币获得增加":
                     increasedGoldGain += (int)data;
                     break;
-                case "经验获得增加":
-                    increasedEXPGain += (int)data;
+                //case "经验获得增加":
+                //    increasedEXPGain += (int)data;
+                //    break;
+                case "攻速":
+                    attackSpeed += data;
                     break;
                 case "冲刺次数":
                     dashCharges += (int)data;

ActionTowerDefense/Assets/Scripts/Rougue/SoldierEXP.cs

@@ -65,7 +65,7 @@ public class SoldierEXP : MonoBehaviour
                 {
                     return;
                 }
-                ssexp[i].curEXP += Mathf.RoundToInt(exp * (1 + GameManager.instance.increasedEXPGain/100f));
+                ssexp[i].curEXP += Mathf.RoundToInt(exp/* * (1 + GameManager.instance.increasedEXPGain/100f)*/);
                 JudgeEXP(st);
                 break;
             }

ActionTowerDefense/GenerateDatas/json/cfgtreasure.json

@@ -125,13 +125,13 @@
     "SpriteName": "9",
     "Quality": 0,
     "Tag": [],
-    "Attribute": "经验获得增加+5%",
+    "Attribute": "攻击速度增加+6%",
     "Price": 100,
     "Type": [
-      "经验获得增加"
+      "攻速"
     ],
     "Data": [
-      5
+      6
     ]
   },
   {
@@ -323,13 +323,13 @@
     "Tag": [
       1
     ],
-    "Attribute": "经验获得增加+10%",
+    "Attribute": "攻击速度增加+12%",
     "Price": 200,
     "Type": [
-      "经验获得增加"
+      "攻速"
     ],
     "Data": [
-      10
+      12
     ]
   },
   {
@@ -537,13 +537,13 @@
       3,
       4
     ],
-    "Attribute": "经验获得增加+15%",
+    "Attribute": "攻击速度增加+18%",
     "Price": 280,
     "Type": [
-      "经验获得增加"
+      "攻速"
     ],
     "Data": [
-      15
+      18
     ]
   },
   {
@@ -754,13 +754,13 @@
       1,
       1
     ],
-    "Attribute": "经验获得增加+20%",
+    "Attribute": "攻击速度增加+24%",
     "Price": 360,
     "Type": [
-      "经验获得增加"
+      "攻速"
     ],
     "Data": [
-      20
+      24
     ]
   },
   {

ActionTowerDefense/Luban/.cache.meta

@@ -5,8 +5,6 @@ D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgCreateEnemy3.cs,783D8132F3C1264
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgCreateEnemy4.cs,62C7E271ECBF7FD76285ECBC134F2518,1411,1755056555305
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgCreateEnemy5.cs,D3C353D6CB939D6EC5E83E76FD788BA4,1411,1755056555308
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgCreateEnemy6.cs,BE5ABED2FAD9CBCDB46E6624D105DE9,1411,1755056555300
-D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgCreateEnemy7.cs,F24276191D329CFD49BE3CFE63A6369,1411,1755056555303
-D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgCreateEnemy8.cs,4E33E8C4126981D54EE97C5D68E6E5D,1411,1755056555308
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgEnemy.cs,AA55E3EA298642B35239B74ED55BFBB,1840,1755056555303
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgSoldierLevel.cs,A08CC235369146A3251A76BCCA2B9E,1381,1755056555300
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/CfgTreasure.cs,B39E7CDE64BF828AFDC9D90D6CE9E0,1859,1758081545603
@@ -17,36 +15,30 @@ D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleCreateEnemy3Config.cs,62C861
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleCreateEnemy4Config.cs,D079D6FB6A18917E7E19BF7B692ED378,5798,1755056555293
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleCreateEnemy5Config.cs,8ED240EDCF42ED6594C86117E3C47,5797,1755056555306
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleCreateEnemy6Config.cs,25EC17F3A3796E4A52411973B98D7BA2,5795,1755056555296
-D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleCreateEnemy7Config.cs,361FA82BE8AFCDEF0C6D7259A898FC,5796,1755056555304
-D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleCreateEnemy8Config.cs,781D8666082D85C9399EF8B2D4CA311,5797,1755056555302
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs,2F7D45D76818E475F333EF8985A4392,5333,1758081545593
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleSoldierLevel.cs,C2FD42AC3F2F7D669FA6B62941C4622B,4028,1755056555307
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleTreasureConfig.cs,1FB93C4C3ED22087511AACB14BDCA05A,4862,1758081545602
-D:/Projects/Act/ActionTowerDefense/Assets/Gen/Tables.cs,9EA34C9AB837D1D9DAA146EB55BCC711,4029,1758081545606
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy0.json,D96663651AA4BDBDD65D51AEDABE75D,21854,1760406145736
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy1.json,A284AD7AECD67F4ABC5471A664F3F6,22937,1760492507938
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy2.json,3ABD9F4FE45DC939AB53749C75E23B95,30656,1760492507939
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy3.json,67AB9DE973F24778175C63A197C0B672,23693,1760492507939
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy4.json,45A04F4E6112E9558D4BF71A93BFA238,21100,1760492507939
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy5.json,91DF5F226055E8149FB9C90744588C1,21125,1760492507940
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy6.json,EA9435F6D4C8D666676E0021AC733,21129,1760492507940
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy7.json,C9F028B5B2C2E417703D1D87289863A7,21504,1758964132450
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy8.json,36429DB9822B4EBC55F38C7826B6F,20398,1758964132442
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,8CB172BCC5C76C7CC759231BB565A3EB,5545,1760675459281
+D:/Projects/Act/ActionTowerDefense/Assets/Gen/Tables.cs,E8BFA53D69146130DA7792A7349723,3477,1761098056782
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy0.json,43838CFEA92D251220BFDD722A46E84,21950,1761031681952
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy1.json,D73C78FFD3CF8FC99AEF257B4171BAC7,22973,1761031681953
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy2.json,B664D913947BB924F19958AFF4DE7A7,30746,1761012401099
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy3.json,9C70A7A2C36CDC6EB5AE89659CC8029,23863,1761012401100
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy4.json,53CC64DD58B4A37992CA3778B6EBDAB8,21200,1761012401100
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy5.json,5E30FC69BA15B9B4FAC37640AE761142,21135,1761031681953
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy6.json,D333F2CF8E9E94BE4721CFCE5D1B5,21179,1761031681954
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,E69A4CC4EA7CA596CF880A489838FE4,6264,1761036470027
 D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgsoldierlevel.json,3E6E2D89634AB53738E43FC60CB443C,21157,1759917336547
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgtreasure.json,77291BF8C3B1AC287D3540B07492C562,12494,1760675459281
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgtreasure.json,E37A95CBB46B7DD4C6D1B5389E6F3E22,12446,1761098056791
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/__beans__.xlsx,98987DA7288FEE34BCD08EA883D425E,9603,1754989782470
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/__enums__.xlsx,D95915E233EB1E4EB87BE0557A2BFDD,9879,1754989782470
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/__tables__.xlsx,8A6D31578964EE61B1CEFC0BE7038C7,10572,1757390419350
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/宝物表.xlsx,A65347C448D256A75CF288108423E3,13743,1760675441218
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,5C3822108A627C70163BC155DB541E,11982,1760415526892
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/__tables__.xlsx,8316D1AD714AEE794DF51B62D388F4F,10574,1761031681958
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/宝物表.xlsx,436582C3D848340498512656C51E68,13777,1761098034572
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,ED6AE7A8D1CAB61FF87AA6F22D72142,12237,1761036470028
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/士兵等级属性表.xlsx,DDD81A154B1E21118EAE9DE1C8DC6F,15235,1759917329774
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表0.xlsx,7D663BC328F233A2AF233B3FCDC6B1C,23113,1760406145744
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表1.xlsx,4178704E0A6D35555EAE5C5F8C1E9A,20656,1760492507941
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表2.xlsx,14A364F957B96CC1F6F2D3582AAF28C,22205,1760492507941
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表3.xlsx,212EE7A118AC8E348A39BE07E7AD618,20454,1760492507942
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表4.xlsx,A2ABDE63C62A819529CF7101EAD2226,20150,1760492507943
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表5.xlsx,151935E72BEA5180542FE939BE6B3FF3,20186,1760492507943
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表6.xlsx,8021D43668AC66DCB38397E0814F1741,20021,1760492507944
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表7.xlsx,76F768C2FB565DF97AE233FD189E40CE,19714,1757407799145
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表8.xlsx,EA98AC2BFB990354EE7F567951FEB,19737,1757407799146
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表0.xlsx,AB3428B910A276D96DF17E8B8EAC98D,23162,1761031681955
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表1.xlsx,78DC3E1FDAE14129867BE2D58BA7A2F,20663,1761031681956
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表2.xlsx,9A922212FC03D60C7157F5D3BE08097,22214,1761012401103
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表3.xlsx,CE83504F858BD5F3DA5E159FEA6A37C4,20501,1761012401103
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表4.xlsx,72DA2B62CD717004A9EDDD1BB702DB0,20151,1761012401104
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表5.xlsx,75CF69ABC25EF6D25AF38B4ED71A02D,20190,1761031681957
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表6.xlsx,A613A0684C76C26D49ADC434E98E3591,20042,1761031681957