修改怪物

Assets/Res/Config/HeroModelConfig.json

@@ -63,7 +63,7 @@
       "nickName": -1,
       "name": 2,
       "headicon": "icon_tx1001",
-      "model": "Guixiu01",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 248,
@@ -92,18 +92,17 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        -1,
+        -1,
+        50
       ],
       "fa_bao_id": [
-        -1,
+        10010,
         -1,
         -1,
         -1
@@ -121,7 +120,7 @@
       "nickName": -1,
       "name": 3,
       "headicon": "icon_tx1002",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 203,
@@ -150,18 +149,17 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        -1,
+        -1,
+        50
       ],
       "fa_bao_id": [
-        -1,
+        10010,
         -1,
         -1,
         -1
@@ -179,7 +177,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx1003",
-      "model": "Guixiu01",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 225,
@@ -208,18 +206,18 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        -1,
+        -1,
+        50,
+        -1
       ],
       "fa_bao_id": [
-        -1,
+        10010,
         -1,
         -1,
         -1
@@ -237,7 +235,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx1004",
-      "model": "Guixiu01",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
       "attack": 270,
@@ -266,18 +264,18 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        -1,
+        50,
+        -1,
+        -1
       ],
       "fa_bao_id": [
-        -1,
+        10010,
         -1,
         -1,
         -1
@@ -324,15 +322,15 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
         -1,
-        1,
-        10
+        20,
+        -1,
+        -1,
+        -1,
+        50,
+        -1
       ],
       "fa_bao_id": [
         -1,
@@ -382,15 +380,15 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
+        5,
         -1,
-        1,
-        10
+        -1,
+        50,
+        50,
+        -1,
+        -1
       ],
       "fa_bao_id": [
         -1,
@@ -440,15 +438,15 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
+        5,
         -1,
-        1,
-        10
+        20,
+        -1,
+        50,
+        -1,
+        -1
       ],
       "fa_bao_id": [
         -1,
@@ -498,15 +496,15 @@
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
+        5,
         -1,
-        1,
-        10
+        -1,
+        -1,
+        50,
+        -1,
+        -1
       ],
       "fa_bao_id": [
         -1,
@@ -527,7 +525,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5001",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 316,
@@ -555,20 +553,20 @@
         -1
       ],
       "skillActiveLv": [
+        -1,
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
+        20,
         -1,
-        1,
-        10
+        50,
+        -1
       ],
       "fa_bao_id": [
-        3102,
-        3101,
+        10002,
+        10001,
         -1,
         -1
       ],
@@ -585,7 +583,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5002",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 259,
@@ -610,23 +608,23 @@
         1204,
         -1,
         1202,
-        2003
+        -1
       ],
       "skillActiveLv": [
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
         -1,
-        1,
-        10
+        5,
+        -1,
+        20,
+        -1,
+        50,
+        -1
       ],
       "fa_bao_id": [
-        3203,
-        3202,
+        10002,
+        10005,
         -1,
         -1
       ],
@@ -643,7 +641,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5003",
-      "model": "Nanzhu",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 288,
@@ -671,20 +669,20 @@
         1302
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
         -1,
+        5,
+        -1,
+        20,
         -1,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
-        3301,
-        3302,
+        10010,
+        10007,
         -1,
         -1
       ],
@@ -701,7 +699,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5004",
-      "model": "Nanzhu",
+      "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 345,
@@ -723,26 +721,26 @@
         1401,
         -1,
         -1,
-        2005,
+        -1,
         1402,
         -1,
         1403
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
+        -1,
+        5,
         -1,
         -1,
         -1,
+        20,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
-        3301,
-        3302,
+        10002,
+        10010,
         -1,
         -1
       ],
@@ -759,7 +757,7 @@
       "nickName": -1,
       "name": 4,
       "headicon": "icon_tx5005",
-      "model": "Nanzhu",
+      "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
       "attack": 230,
@@ -781,26 +779,26 @@
         1502,
         -1,
         -1,
-        2005,
+        -1,
         1504,
         -1,
         1505
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
+        -1,
+        5,
         -1,
         -1,
         -1,
+        20,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
-        3501,
-        3203,
+        10010,
+        10001,
         -1,
         -1
       ],
@@ -845,16 +843,16 @@
         9044
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
         -1,
+        20,
+        -1,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
         -1,
@@ -903,16 +901,16 @@
         9054
       ],
       "skillActiveLv": [
+        -1,
         1,
-        40,
-        30,
-        70,
-        60,
         -1,
+        5,
         -1,
         -1,
+        20,
+        -1,
         1,
-        10
+        50
       ],
       "fa_bao_id": [
         -1,

Assets/Res/Config/SkillConfig.json

@@ -1909,12 +1909,9 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        3.0,
-        47.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        68.0,
+        5.0
       ],
       "intensifierIndex": [
         2
@@ -1937,12 +1934,9 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        3.0,
-        63.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        90.0,
+        6.0
       ],
       "intensifierIndex": [
         2
@@ -1968,12 +1962,9 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        3.0,
-        81.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        116.0,
+        7.0
       ],
       "intensifierIndex": [
         2
@@ -2005,12 +1996,9 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        3.0,
-        107.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        150.0,
+        8.0
       ],
       "intensifierIndex": [
         2
@@ -2042,12 +2030,9 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        3.0,
-        128.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        178.0,
+        9.0
       ],
       "intensifierIndex": [
         2
@@ -2079,12 +2064,9 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        4.0,
-        120.0,
-        30.0,
-        5.0,
-        6.0,
-        100.0
+        2.0,
+        224.0,
+        10.0
       ],
       "intensifierIndex": [
         2
@@ -5796,8 +5778,8 @@
       "level": 1,
       "effectValue": [
         5.0,
-        50.0,
-        100.0
+        30.0,
+        50.0
       ],
       "intensifierIndex": [
         0
@@ -5824,8 +5806,8 @@
       "level": 2,
       "effectValue": [
         5.0,
-        60.0,
-        120.0
+        40.0,
+        60.0
       ],
       "intensifierIndex": [
         0
@@ -5861,8 +5843,8 @@
       "level": 3,
       "effectValue": [
         5.0,
-        70.0,
-        140.0
+        50.0,
+        70.0
       ],
       "intensifierIndex": [
         0
@@ -5898,8 +5880,8 @@
       "level": 4,
       "effectValue": [
         5.0,
-        80.0,
-        160.0
+        60.0,
+        80.0
       ],
       "intensifierIndex": [
         0
@@ -5935,8 +5917,8 @@
       "level": 5,
       "effectValue": [
         5.0,
-        90.0,
-        180.0
+        70.0,
+        90.0
       ],
       "intensifierIndex": [
         0
@@ -5973,7 +5955,7 @@
       "effectValue": [
         5.0,
         100.0,
-        200.0
+        100.0
       ],
       "intensifierIndex": [
         0
@@ -6006,7 +5988,7 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        120.0,
+        90.0,
         0.0
       ],
       "intensifierIndex": [
@@ -6030,7 +6012,7 @@
       "SkillType": 2,
       "level": 2,
       "effectValue": [
-        130.0,
+        110.0,
         20.0,
         20.0
       ],
@@ -6064,7 +6046,7 @@
       "SkillType": 2,
       "level": 3,
       "effectValue": [
-        140.0,
+        130.0,
         20.0,
         20.0
       ],
@@ -6132,7 +6114,7 @@
       "SkillType": 2,
       "level": 5,
       "effectValue": [
-        160.0,
+        170.0,
         30.0,
         30.0
       ],
@@ -6166,7 +6148,7 @@
       "SkillType": 2,
       "level": 6,
       "effectValue": [
-        170.0,
+        190.0,
         30.0,
         30.0
       ],

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

@@ -66,7 +66,7 @@ namespace GameLogic.Combat.Buff
                 harm += CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     harm, source.CurrCombatHeroInfo.Wood_Proficient);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Null,null,HarmType.Buff);
+                    WuXingType.Wood,null,HarmType.Buff);
             }
         }
 

Assets/Scripts/GameLogic/Combat/CombatTool/CombatReport/CombatReportEntityInfo.cs

@@ -286,7 +286,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 BuffBasic buffBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as BuffBasic;
                 if (buffBasic != null)
                 {
-                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
+                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.ID);
                 }
 
                 string msg =
@@ -311,7 +311,7 @@ namespace GameLogic.Combat.CombatTool.CombatReport
                 BuffBasic buffBasic = heroInjuredEventData.HarmReturnInfo.triggerData.Source as BuffBasic;
                 if (buffBasic != null)
                 {
-                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.buffName);
+                    harmKey = "B" + LanguageManager.Instance.Text(buffBasic.BuffConfig.ID);
                 }
 
                 string msg =

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

@@ -33,7 +33,8 @@ namespace GameLogic.Combat.Skill
                 currTarget.Add(combatHeroHitPoint);
                 int index = Random.Range(3, 9);
                 SpecialDotInfo specialDotInfo = CombatHeroEntity.GetSpecialDotInfo("zdpos" + index);
-                ActivationTimeLineData("1302_fashe", currTarget: currTarget,customizePos:new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i, startTime: i * -0.1f);
+                ActivationTimeLineData("1302_fashe", currTarget: currTarget,
+                    customizePos: new Vector3[] { specialDotInfo.GetWorlPos() }, indexCount: i, startTime: i * -0.1f);
             }
         }
 
@@ -58,8 +59,15 @@ namespace GameLogic.Combat.Skill
             ITimelineFxLogic timelineFxLogic,
             TriggerData triggerData, ISkillFeatures skillFeatures)
         {
+            float addHarm = effectValue[1];
+            b_1003 b1003 = targetEntity.combatHeroEntity.BuffControl.GetBuffBasicForType<b_1003>();
+            if (b1003 != null)
+            {
+                addHarm += b1003.buffCount * effectValue[2];
+            }
+
             long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                effectValue[1]);
+                addHarm);
             HarmReturnInfo harmReturnInfo = CombatCalculateTool.Instance.Harm(CombatHeroEntity, targetEntity, v,
                 AttType.Skill, triggerData,
                 wuXingType, skillFeatures,
@@ -68,7 +76,7 @@ namespace GameLogic.Combat.Skill
             // int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
             if (harmReturnInfo.isHitHero)
             {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1,this);
+                BuffInfo buffInfo = BuffInfo.GetBuffInfo(10031, 1, this);
                 targetEntity.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
             }
         }

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

@@ -47,6 +47,11 @@ namespace GameLogic.Combat.Skill
                         long v2 = CombatCalculateTool.Instance.GetVlaueRatioForLong(v, effectValue[2]);
                         CombatHeroEntity[] allHero =
                             CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
+                        if (allHero == null)
+                        {
+                            return;
+                        }
+
                         for (int i = 0; i < allHero.Length; i++)
                         {
                             if (allHero[i] == target)