Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Res/Config/BuffConfig.json

@@ -72,8 +72,8 @@
       "buffGroup": 1005,
       "overlayCount": 15,
       "effectValue": [
-        2.0,
-        1.0
+        1.0,
+        0.5
       ],
       "timeType": 2,
       "buffTime": 15.0,
@@ -517,7 +517,7 @@
       "buffGroup": 1029,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -537,7 +537,7 @@
       "buffGroup": 1030,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -557,7 +557,7 @@
       "buffGroup": 1031,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -577,7 +577,7 @@
       "buffGroup": 1032,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,
@@ -597,7 +597,7 @@
       "buffGroup": 1033,
       "overlayCount": 15,
       "effectValue": [
-        1.0
+        2.0
       ],
       "timeType": 2,
       "buffTime": 30.0,

Assets/Res/Config/EventLinkConfig.json

@@ -8043,12 +8043,256 @@
       "EventConditionMessage": 0,
       "PreShow": 0,
       "PreShowPar": 0,
-      "NPCID": 100,
+      "NPCID": 117,
       "LanID": [
         2652
       ],
       "DialogueType": 0,
       "EventID": 10026,
+      "optionType": 1,
+      "optionPara1": [
+        1002623
+      ],
+      "optionPara2": [
+        2653
+      ],
+      "ResultType": 1,
+      "ResultOptions": [
+        1002623
+      ]
+    },
+    {
+      "ID": 1002623,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 117,
+      "LanID": [
+        2654
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002624
+      ]
+    },
+    {
+      "ID": 1002624,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 117,
+      "LanID": [
+        2655
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002625
+      ]
+    },
+    {
+      "ID": 1002625,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2656
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002626
+      ]
+    },
+    {
+      "ID": 1002626,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 117,
+      "LanID": [
+        2657
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002627
+      ]
+    },
+    {
+      "ID": 1002627,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2658
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002628
+      ]
+    },
+    {
+      "ID": 1002628,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 117,
+      "LanID": [
+        2659
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002629
+      ]
+    },
+    {
+      "ID": 1002629,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2660
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 2,
+      "optionPara1": [
+        1012
+      ],
+      "ResultType": 2,
+      "ResultOptions": [
+        1002630,
+        101
+      ]
+    },
+    {
+      "ID": 1002630,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2661
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002631
+      ]
+    },
+    {
+      "ID": 1002631,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2662
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002632
+      ]
+    },
+    {
+      "ID": 1002632,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2663
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002633
+      ]
+    },
+    {
+      "ID": 1002633,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2664
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002634
+      ]
+    },
+    {
+      "ID": 1002634,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2665
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
+      "optionType": 0,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002635
+      ]
+    },
+    {
+      "ID": 1002635,
+      "conciseEventMessage": 2652,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 100,
+      "LanID": [
+        2666
+      ],
+      "DialogueType": 0,
+      "EventID": 10026,
       "optionType": 0,
       "ResultType": 3,
       "ResultOptions": [

Assets/Res/Config/EventNPC.json

@@ -167,6 +167,12 @@
       "name": 0,
       "ID_1": 0,
       "DaoyouID": 0
+    },
+    {
+      "ID": 117,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
     }
   ]
 }

Assets/Res/Config/FabaoPowerupConfig.json

@@ -3,9 +3,9 @@
     {
       "ID": 1,
       "Power": 100,
-      "HP": 301.75,
-      "DEF": 7.5,
-      "ATK": 15.0,
+      "HP": 452.63,
+      "DEF": 15.0,
+      "ATK": 30.0,
       "NeedLv": 11,
       "PowerupItemIDs": [
         1001,
@@ -20,9 +20,9 @@
     {
       "ID": 2,
       "Power": 126,
-      "HP": 374.65,
-      "DEF": 8.85,
-      "ATK": 17.7,
+      "HP": 544.51,
+      "DEF": 17.15,
+      "ATK": 34.3,
       "NeedLv": 21,
       "PowerupItemIDs": [
         1001,
@@ -37,9 +37,9 @@
     {
       "ID": 3,
       "Power": 159,
-      "HP": 482.4,
-      "DEF": 10.8,
-      "ATK": 21.6,
+      "HP": 722.6,
+      "DEF": 21.57,
+      "ATK": 43.14,
       "NeedLv": 31,
       "PowerupItemIDs": [
         1001,
@@ -54,9 +54,9 @@
     {
       "ID": 4,
       "Power": 200,
-      "HP": 634.5,
-      "DEF": 13.5,
-      "ATK": 27.0,
+      "HP": 956.33,
+      "DEF": 27.13,
+      "ATK": 54.26,
       "NeedLv": 41,
       "PowerupItemIDs": [
         1001,
@@ -71,9 +71,9 @@
     {
       "ID": 5,
       "Power": 252,
-      "HP": 1147.0,
-      "DEF": 23.25,
-      "ATK": 46.5,
+      "HP": 1721.61,
+      "DEF": 46.53,
+      "ATK": 93.06,
       "NeedLv": 51,
       "PowerupItemIDs": [
         1001,
@@ -88,9 +88,9 @@
     {
       "ID": 6,
       "Power": 318,
-      "HP": 1511.25,
-      "DEF": 29.25,
-      "ATK": 58.5,
+      "HP": 2267.84,
+      "DEF": 58.53,
+      "ATK": 117.05,
       "NeedLv": 61,
       "PowerupItemIDs": [
         1001,
@@ -108,9 +108,9 @@
     {
       "ID": 7,
       "Power": 401,
-      "HP": 1984.5,
-      "DEF": 36.75,
-      "ATK": 73.5,
+      "HP": 2981.0,
+      "DEF": 73.61,
+      "ATK": 147.21,
       "NeedLv": 71,
       "PowerupItemIDs": [
         1001,
@@ -125,9 +125,9 @@
     {
       "ID": 8,
       "Power": 505,
-      "HP": 3557.45,
-      "DEF": 63.15,
-      "ATK": 126.3,
+      "HP": 5333.64,
+      "DEF": 126.24,
+      "ATK": 252.48,
       "NeedLv": 81,
       "PowerupItemIDs": [
         1001,
@@ -142,9 +142,9 @@
     {
       "ID": 9,
       "Power": 636,
-      "HP": 4655.2,
-      "DEF": 79.35,
-      "ATK": 158.7,
+      "HP": 6986.32,
+      "DEF": 158.78,
+      "ATK": 317.56,
       "NeedLv": 91,
       "PowerupItemIDs": [
         1001,
@@ -159,9 +159,9 @@
     {
       "ID": 10,
       "Power": 801,
-      "HP": 6093.9,
-      "DEF": 99.9,
-      "ATK": 199.8,
+      "HP": 9136.28,
+      "DEF": 199.7,
+      "ATK": 399.4,
       "NeedLv": 101,
       "PowerupItemIDs": [
         1001,
@@ -176,9 +176,9 @@
     {
       "ID": 11,
       "Power": 1009,
-      "HP": 10849.0,
-      "DEF": 171.3,
-      "ATK": 342.6,
+      "HP": 16268.99,
+      "DEF": 342.51,
+      "ATK": 685.01,
       "NeedLv": 111,
       "PowerupItemIDs": [
         1001,
@@ -193,9 +193,9 @@
     {
       "ID": 12,
       "Power": 1271,
-      "HP": 14144.6,
-      "DEF": 215.4,
-      "ATK": 430.8,
+      "HP": 21215.67,
+      "DEF": 430.78,
+      "ATK": 861.55,
       "NeedLv": 121,
       "PowerupItemIDs": [
         1001,
@@ -213,9 +213,9 @@
     {
       "ID": 13,
       "Power": 1601,
-      "HP": 18421.2,
-      "DEF": 270.9,
-      "ATK": 541.8,
+      "HP": 27631.8,
+      "DEF": 541.8,
+      "ATK": 1083.6,
       "NeedLv": 131,
       "PowerupItemIDs": [
         1001,
@@ -230,9 +230,9 @@
     {
       "ID": 14,
       "Power": 2017,
-      "HP": 32673.35,
-      "DEF": 464.55,
-      "ATK": 929.1,
+      "HP": 49017.15,
+      "DEF": 929.24,
+      "ATK": 1858.47,
       "NeedLv": 141,
       "PowerupItemIDs": [
         1001,
@@ -247,9 +247,9 @@
     {
       "ID": 15,
       "Power": 2541,
-      "HP": 42466.4,
-      "DEF": 584.4,
-      "ATK": 1168.8,
+      "HP": 63695.51,
+      "DEF": 1168.73,
+      "ATK": 2337.45,
       "NeedLv": 151,
       "PowerupItemIDs": [
         1001,
@@ -264,9 +264,9 @@
     {
       "ID": 16,
       "Power": 3202,
-      "HP": 55125.0,
-      "DEF": 735.0,
-      "ATK": 1470.0,
+      "HP": 82683.84,
+      "DEF": 1469.94,
+      "ATK": 2939.87,
       "NeedLv": 161,
       "PowerupItemIDs": [
         1001,
@@ -281,9 +281,9 @@
     {
       "ID": 17,
       "Power": 4035,
-      "HP": 97486.4,
-      "DEF": 1260.6,
-      "ATK": 2521.2,
+      "HP": 146222.063,
+      "DEF": 2521.07,
+      "ATK": 5042.14,
       "NeedLv": 171,
       "PowerupItemIDs": [
         1001,
@@ -298,9 +298,9 @@
     {
       "ID": 18,
       "Power": 5084,
-      "HP": 126299.547,
-      "DEF": 1585.35,
-      "ATK": 3170.7,
+      "HP": 189456.5,
+      "DEF": 3170.82,
+      "ATK": 6341.64,
       "NeedLv": 181,
       "PowerupItemIDs": [
         1001,
@@ -318,9 +318,9 @@
     {
       "ID": 19,
       "Power": 6406,
-      "HP": 163503.9,
-      "DEF": 1993.95,
-      "ATK": 3987.9,
+      "HP": 245263.844,
+      "DEF": 3988.03,
+      "ATK": 7976.06,
       "NeedLv": 191,
       "PowerupItemIDs": [
         1001,
@@ -335,9 +335,9 @@
     {
       "ID": 20,
       "Power": 8072,
-      "HP": 288407.344,
-      "DEF": 3419.85,
-      "ATK": 6839.7,
+      "HP": 432618.3,
+      "DEF": 6839.82,
+      "ATK": 13679.63,
       "NeedLv": 201,
       "PowerupItemIDs": [
         1001,
@@ -352,9 +352,9 @@
     {
       "ID": 21,
       "Power": 10171,
-      "HP": 372775.0,
-      "DEF": 4301.25,
-      "ATK": 8602.5,
+      "HP": 559170.938,
+      "DEF": 8602.63,
+      "ATK": 17205.26,
       "NeedLv": 211,
       "PowerupItemIDs": [
         1001,
@@ -369,9 +369,9 @@
     {
       "ID": 22,
       "Power": 12815,
-      "HP": 481481.1,
-      "DEF": 5409.9,
-      "ATK": 10819.8,
+      "HP": 722220.3,
+      "DEF": 10819.78,
+      "ATK": 21639.56,
       "NeedLv": 221,
       "PowerupItemIDs": [
         1001,
@@ -386,9 +386,9 @@
     {
       "ID": 23,
       "Power": 16147,
-      "HP": 847427.2,
-      "DEF": 9278.4,
-      "ATK": 18556.8,
+      "HP": 1271143.5,
+      "DEF": 18556.84,
+      "ATK": 37113.68,
       "NeedLv": 231,
       "PowerupItemIDs": [
         1001,
@@ -403,9 +403,9 @@
     {
       "ID": 24,
       "Power": 20345,
-      "HP": 1093061.88,
-      "DEF": 11669.7,
-      "ATK": 23339.4,
+      "HP": 1639598.13,
+      "DEF": 23339.48,
+      "ATK": 46678.95,
       "NeedLv": 241,
       "PowerupItemIDs": [
         1001,
@@ -423,9 +423,9 @@
     {
       "ID": 25,
       "Power": 25635,
-      "HP": 1409025.63,
-      "DEF": 14677.35,
-      "ATK": 29354.7,
+      "HP": 2113541.0,
+      "DEF": 29354.74,
+      "ATK": 58709.47,
       "NeedLv": 251,
       "PowerupItemIDs": [
         1001,
@@ -440,9 +440,9 @@
     {
       "ID": 26,
       "Power": 32300,
-      "HP": 2475345.0,
-      "DEF": 25173.0,
-      "ATK": 50346.0,
+      "HP": 3713007.5,
+      "DEF": 50345.87,
+      "ATK": 100691.727,
       "NeedLv": 261,
       "PowerupItemIDs": [
         1001,
@@ -457,9 +457,9 @@
     {
       "ID": 27,
       "Power": 40698,
-      "HP": 3187187.25,
-      "DEF": 31660.8,
-      "ATK": 63321.6,
+      "HP": 4780769.5,
+      "DEF": 63321.45,
+      "ATK": 126642.9,
       "NeedLv": 271,
       "PowerupItemIDs": [
         1001,
@@ -474,9 +474,9 @@
     {
       "ID": 28,
       "Power": 51279,
-      "HP": 4101527.0,
-      "DEF": 39820.65,
-      "ATK": 79641.3,
+      "HP": 6152284.5,
+      "DEF": 79641.23,
+      "ATK": 159282.453,
       "NeedLv": 281,
       "PowerupItemIDs": [
         1001,
@@ -491,9 +491,9 @@
     {
       "ID": 29,
       "Power": 64612,
-      "HP": 7193819.0,
-      "DEF": 68295.75,
-      "ATK": 136591.5,
+      "HP": 10790726.0,
+      "DEF": 136591.469,
+      "ATK": 273182.938,
       "NeedLv": 291,
       "PowerupItemIDs": [
         1001,
@@ -508,9 +508,9 @@
     {
       "ID": 30,
       "Power": 81411,
-      "HP": 9248298.0,
-      "DEF": 85897.5,
-      "ATK": 171795.0,
+      "HP": 1.387245E+07,
+      "DEF": 171795.047,
+      "ATK": 343590.1,
       "NeedLv": 300,
       "PowerupItemIDs": [
         1001,
@@ -528,9 +528,9 @@
     {
       "ID": 31,
       "Power": 102578,
-      "HP": 11883944.0,
-      "DEF": 108035.852,
-      "ATK": 216071.7,
+      "HP": 17825908.0,
+      "DEF": 216071.609,
+      "ATK": 432143.219,
       "NeedLv": 310,
       "PowerupItemIDs": [
         1001,

Assets/Res/Config/GroupConfig.json

@@ -153,6 +153,15 @@
         5007
       ]
     },
+    {
+      "ID": 1012,
+      "GroupMonsterLevel": [
+        105
+      ],
+      "GroupMonster": [
+        5007
+      ]
+    },
     {
       "ID": 2001,
       "GroupMonsterLevel": [

Assets/Res/Config/HeroModelConfig.json

@@ -66,10 +66,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 220,
-      "hp": 183,
+      "attack": 198,
+      "hp": 165,
       "def": 100,
-      "shield": 183,
+      "shield": 165,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -124,10 +124,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 180,
-      "hp": 224,
+      "attack": 162,
+      "hp": 201,
       "def": 100,
-      "shield": 224,
+      "shield": 201,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -182,10 +182,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 200,
-      "hp": 201,
+      "attack": 180,
+      "hp": 181,
       "def": 100,
-      "shield": 201,
+      "shield": 181,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -240,10 +240,10 @@
       "model": "Guixiu01",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 240,
-      "hp": 168,
+      "attack": 216,
+      "hp": 151,
       "def": 100,
-      "shield": 168,
+      "shield": 151,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -298,10 +298,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 160,
-      "hp": 251,
+      "attack": 144,
+      "hp": 226,
       "def": 100,
-      "shield": 251,
+      "shield": 226,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -356,10 +356,10 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 230,
-      "hp": 175,
+      "attack": 207,
+      "hp": 157,
       "def": 100,
-      "shield": 175,
+      "shield": 157,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -414,10 +414,10 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 250,
-      "hp": 161,
+      "attack": 225,
+      "hp": 145,
       "def": 100,
-      "shield": 161,
+      "shield": 145,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -472,10 +472,10 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 210,
-      "hp": 192,
+      "attack": 189,
+      "hp": 172,
       "def": 100,
-      "shield": 192,
+      "shield": 172,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -530,10 +530,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 286,
-      "hp": 238,
+      "attack": 264,
+      "hp": 219,
       "def": 100,
-      "shield": 238,
+      "shield": 219,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -588,10 +588,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 234,
-      "hp": 291,
+      "attack": 216,
+      "hp": 268,
       "def": 100,
-      "shield": 291,
+      "shield": 268,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -646,10 +646,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 260,
-      "hp": 262,
+      "attack": 240,
+      "hp": 241,
       "def": 100,
-      "shield": 262,
+      "shield": 241,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -704,10 +704,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 312,
-      "hp": 218,
+      "attack": 288,
+      "hp": 201,
       "def": 100,
-      "shield": 218,
+      "shield": 201,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -762,10 +762,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 208,
-      "hp": 327,
+      "attack": 192,
+      "hp": 302,
       "def": 100,
-      "shield": 327,
+      "shield": 302,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -820,10 +820,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 299,
-      "hp": 227,
+      "attack": 276,
+      "hp": 210,
       "def": 100,
-      "shield": 227,
+      "shield": 210,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -878,10 +878,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 325,
-      "hp": 209,
+      "attack": 300,
+      "hp": 193,
       "def": 100,
-      "shield": 209,
+      "shield": 193,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Res/Config/HeroPowerUpConfig.json

@@ -6628,7 +6628,7 @@
       "HPFactor": 22054.01,
       "ATKFactor": 669.5714,
       "DEFFactor": 669.5714,
-      "HudunFactor": 4393.78,
+      "HudunFactor": 4393.775,
       "defK": 418455,
       "ShenshiMax": 1600,
       "AutoXiuwei": 14.84,

Assets/Res/Config/LevelbattleConfig.json

@@ -140,6 +140,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 1012,
+      "Group": [
+        1012
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 2001,
       "Group": [

Assets/Scenes/testCombat.scene

@@ -2203,6 +2203,10 @@ PrefabInstance:
       propertyPath: zhanZhuangTime
       value: 200
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.size
       value: 1
@@ -2245,15 +2249,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 2
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].level
+      value: 125
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].att
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].heroID
+      value: 101
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].level
@@ -2265,7 +2277,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
-      value: 9004
+      value: 5003
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[1].heroID
@@ -2283,6 +2295,14 @@ PrefabInstance:
       propertyPath: myHeroInfo.Array.data[0].skillStart
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].skillLevel
+      value: 30
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].skillStart
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].skillLevel
       value: 0
@@ -2327,25 +2347,41 @@ PrefabInstance:
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.size
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.size
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].magicWeaponId.Array.size
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[0]
-      value: 10003
+      value: 10001
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[1]
-      value: 10005
+      value: 10002
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[2]
-      value: 10004
+      value: 10003
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].magicWeaponId.Array.data[3]
-      value: 10008
+      value: 10004
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.data[0]
+      value: 10001
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.data[1]
+      value: 10002
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: myHeroInfo.Array.data[1].magicWeaponId.Array.data[2]
+      value: 10003
       objectReference: {fileID: 0}
     - target: {fileID: 9214784224709271120, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: m_Name

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -87,6 +87,7 @@ namespace Excel2Json
 
 
 
+
 		/// <summary>
 		///攻击力
 		/// </summary>

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

@@ -76,21 +76,17 @@ namespace GameLogic.Combat.Skill
                 {
                     currCount = 0;
                     List<BuffBasic> buffBasics = CombatHeroEntity.BuffControl.GetBuffBasicForBuffType(2);
-                    int count = (int)effectValue[1];
-                    for (int i = 0; i < count; i++)
+                    float odds = effectValue[1];
+                    float currOdds = CombatCalculateTool.Instance.GetOdd(0, 100);
+                    if (buffBasics.Count > 0 && currOdds <= odds)
                     {
-                        if (buffBasics.Count <= 0)
-                        {
-                            break;
-                        }
-
                         int index = CombatCalculateTool.Instance.GetOdd(0, buffBasics.Count);
                         BuffBasic buffBasic = buffBasics[index];
                         CombatHeroEntity.BuffControl.RemoveBuff(buffBasic);
                         buffBasics.RemoveAt(index);
                     }
 
-                    long maxHp = CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
+                    long maxHp = CombatHeroEntity.CurrCombatHeroInfo.attack.Value;
                     long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(maxHp, effectValue[2]);
                     Recover(CombatHeroEntity, CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true), v,
                         AttType.Skill);

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

@@ -31,8 +31,17 @@ namespace GameLogic.Combat.Skill
             {
                 if (triggerSkillSlotsEventData.triggerType == 2) //触发到木的位置
                 {
-                    long maxHp = CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
-                    long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(maxHp, effectValue[0]);
+                    long maxHp = CombatHeroEntity.CurrCombatHeroInfo.attack.Value;
+                    float addBl = effectValue[0];
+                    if (effectValue.Length > 1)
+                    {
+                        if (CombatHeroEntity.HpBl < effectValue[1])
+                        {
+                            addBl += effectValue[2];
+                        }
+                    }
+
+                    long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(maxHp, addBl);
                     Recover(CombatHeroEntity, CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true), v,
                         AttType.Skill);
                 }

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

@@ -59,10 +59,21 @@ namespace GameLogic.Combat.Skill
             HeroInjuredEventData heroInjuredEventData = ieventData as HeroInjuredEventData;
             b_1011 b1011 = heroInjuredEventData.HarmReturnInfo.triggerData.Source as b_1011;
             b_1012 b1012 = heroInjuredEventData.HarmReturnInfo.triggerData.Source as b_1012;
-            if ((b1011 == null && b1012 == null) || b1011.Source != CombatHeroEntity)
+          
+            if ((b1011 == null && b1012 == null))
             {
                 return;
             }
+            if(b1011!= null &&  b1011.Source != CombatHeroEntity)
+            {
+              return;
+            }
+            if (b1012 != null && b1012.Source != CombatHeroEntity)
+            {
+                return;
+            }
+          
+          
 
             long harm = heroInjuredEventData.HarmReturnInfo.att;
             addHarm += harm;

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

@@ -602,6 +602,11 @@ namespace GameLogic.Combat.Skill
 
         public bool IsPassiveActivateSkill(SkillBasic targetSkillBasic)
         {
+            if (targetSkillBasic == null)
+            {
+                return false;
+            }
+
             if (targetSkillBasic.SelfSkillConfig.SkillType != 1)
             {
                 return false;
@@ -615,7 +620,8 @@ namespace GameLogic.Combat.Skill
             for (int i = 0; i < SelfSkillConfig.PromoteLanPara_1.Length; i++)
             {
                 int configIndex = (int)SelfSkillConfig.PromoteLanPara_1[i];
-                if (targetSkillBasic.index == configIndex + index)
+                int currIndex = (configIndex + index) % 10;
+                if (targetSkillBasic.index == currIndex)
                 {
                     return true;
                 }