修改bug

Assets/Res/Config/SkillConfig.json

@@ -193,7 +193,7 @@
       "level": 1,
       "effectValue": [
         6.0,
-        90.0
+        50.0
       ],
       "intensifierIndex": [
         2
@@ -216,7 +216,7 @@
       "level": 2,
       "effectValue": [
         6.0,
-        90.0,
+        60.0,
         15.0
       ],
       "intensifierIndex": [
@@ -243,7 +243,7 @@
       "level": 3,
       "effectValue": [
         6.0,
-        90.0,
+        70.0,
         15.0
       ],
       "intensifierIndex": [
@@ -273,7 +273,7 @@
       "level": 4,
       "effectValue": [
         6.0,
-        90.0,
+        80.0,
         15.0
       ],
       "intensifierIndex": [
@@ -336,7 +336,7 @@
       "level": 6,
       "effectValue": [
         6.0,
-        90.0,
+        100.0,
         15.0,
         100.0,
         30.0
@@ -739,7 +739,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -763,7 +763,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -797,7 +797,7 @@
       "level": 3,
       "effectValue": [
         4.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -834,7 +834,7 @@
       "level": 4,
       "effectValue": [
         4.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -868,7 +868,7 @@
       "level": 5,
       "effectValue": [
         5.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -905,7 +905,7 @@
       "level": 6,
       "effectValue": [
         5.0,
-        120.0,
+        90.0,
         30.0
       ],
       "intensifierIndex": [
@@ -2965,7 +2965,7 @@
       "effectValue": [
         3.0,
         70.0,
-        20.0
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -2988,8 +2988,8 @@
       "level": 2,
       "effectValue": [
         3.0,
-        70.0,
-        20.0
+        80.0,
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -3022,8 +3022,8 @@
       "level": 3,
       "effectValue": [
         4.0,
-        70.0,
-        20.0
+        80.0,
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -3059,8 +3059,8 @@
       "level": 4,
       "effectValue": [
         4.0,
-        70.0,
-        20.0
+        80.0,
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -3093,8 +3093,8 @@
       "level": 5,
       "effectValue": [
         5.0,
-        70.0,
-        20.0
+        80.0,
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -3131,7 +3131,7 @@
       "effectValue": [
         5.0,
         100.0,
-        20.0
+        60.0
       ],
       "intensifierIndex": [
         2
@@ -7044,7 +7044,7 @@
     {
       "ID": 90010,
       "PieceID": null,
-      "power": 100.0,
+      "power": 300.0,
       "name": 707,
       "dec": 717,
       "attribute": 1,
@@ -7052,7 +7052,7 @@
       "scriptName": "S9001",
       "IDGroup": 9001,
       "timelineName": "BossSk1_timeline_TD",
-      "cd": 6.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -7065,7 +7065,7 @@
         20.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     },
@@ -7080,7 +7080,7 @@
       "scriptName": "S9002",
       "IDGroup": 9002,
       "timelineName": "BossSk2_timeline_TD",
-      "cd": 3.0,
+      "cd": 2.0,
       "SkillType": 1,
       "level": 1,
       "effectValue": [
@@ -7088,7 +7088,7 @@
         60.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     },
@@ -7110,14 +7110,14 @@
         1.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     },
     {
       "ID": 90040,
       "PieceID": null,
-      "power": 100.0,
+      "power": 300.0,
       "name": 710,
       "dec": 720,
       "attribute": 1,
@@ -7132,14 +7132,14 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     },
     {
       "ID": 90050,
       "PieceID": null,
-      "power": 110.0,
+      "power": 300.0,
       "name": 711,
       "dec": 721,
       "attribute": 1,
@@ -7154,7 +7154,7 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        1
       ],
       "PromoteLan": null
     }

Assets/Scenes/testCombat.scene

@@ -2302,7 +2302,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameLogic/Combat/Buff/b_1005.cs

@@ -6,7 +6,7 @@ using GameLogic.Player;
 namespace GameLogic.Combat.Buff
 {
     /// <summary>
-    /// 灼热：每秒对敌人照成火属性灼烧伤害
+    /// 灼热：每秒对敌人照成火属性灼烧伤害,满层后敌人获得灼痛,有灼痛时不在获得
     /// </summary>
     public class b_1005 : BuffBasic
     {
@@ -31,6 +31,21 @@ namespace GameLogic.Combat.Buff
                     WuXingType.Fire,null,HarmType.Buff);
             }
         }
+        protected override void ProUpdateEffect()
+        {
+            if (buffCount >= buffInf.BuffConfig.overlayCount) //最大叠加数量
+            {
+                b_1010 b1010 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1010>();
+                if (b1010 != null)
+                {
+                    return;
+                }
+
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10101, 1);
+                combatHeroEntity.BuffControl.AddBuff(source, buffInfo);
+                // combatHeroEntity.BuffControl.RemoveBuff(this);
+            }
+        }
      
 
         protected override void ProDormancyObj()

Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -375,12 +375,12 @@ namespace GameLogic.Combat.CombatTool
             float p2 = 100;
             if (c < 0) //a被压制
             {
-                p2 = Mathf.Max(100, Mathf.Min(200, 30 + lg_b - lg_a));
+                p2 = Mathf.Max(100, Mathf.Min(200, 130 + lg_b - lg_a));
                 targetHp = GetVlaueRatioForLong(targetHp, p2);
             }
             else if (c > 0)
             {
-                p2 = Mathf.Max(100, Mathf.Min(200, 30 + lg_a - lg_b));
+                p2 = Mathf.Max(100, Mathf.Min(200, 130 + lg_a - lg_b));
                 myHp = GetVlaueRatioForLong(myHp, p2);
             }
 

Assets/Scripts/GameLogic/Combat/Skill/S9002.cs

@@ -20,7 +20,7 @@ namespace GameLogic.Combat.Skill
 
         protected override void ProInitSkill()
         {
-            AddTriggerCallBack("sk1_fashe", Sk1_FaSheProDefaultTimeLineTrigger);
+            // AddTriggerCallBack("sk1_fashe", Sk1_FaSheProDefaultTimeLineTrigger);
         }
 
         protected override void ProUseSkill()
@@ -45,15 +45,15 @@ namespace GameLogic.Combat.Skill
                 effectValue[0]);
         }
 
-        private void Sk1_FaSheProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData,ISkillFeatures skillFeatures)
-        {
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                effectValue[0]);
-            CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,skillFeatures,
-                HarmType.Default);
-        }
+        // private void Sk1_FaSheProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
+        //     ITimelineFxLogic timelineFxLogic,
+        //     TriggerData triggerData,ISkillFeatures skillFeatures)
+        // {
+        //     long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
+        //         effectValue[0]);
+        //     CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v, AttType.Skill, triggerData, wuXingType,skillFeatures,
+        //         HarmType.Default);
+        // }
 
         protected override void ProCombatUpdate(float time)
         {