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

Assets/Res/Config/EventConfig.json

@@ -1432,7 +1432,7 @@
       "PrizeNums": [
         1,
         1,
-        3060
+        3030
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1463,7 +1463,7 @@
       "PrizeNums": [
         1,
         1,
-        3120
+        3060
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1500,7 +1500,7 @@
       "PrizeNums": [
         1,
         1,
-        3180
+        3090
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1532,7 +1532,7 @@
       "PrizeNums": [
         1,
         1,
-        3240
+        3150
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,

Assets/Res/Config/EventLinkConfig.json

@@ -12649,6 +12649,9 @@
       "DialogueType": 0,
       "EventID": 6014,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         5953
       ],
@@ -13038,6 +13041,9 @@
       "DialogueType": 0,
       "EventID": 6021,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         5981
       ],
@@ -14097,6 +14103,9 @@
       "DialogueType": 0,
       "EventID": 6041,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         6063
       ],
@@ -14408,6 +14417,9 @@
       "DialogueType": 0,
       "EventID": 6045,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         6091
       ],
@@ -14525,6 +14537,9 @@
       "DialogueType": 0,
       "EventID": 6051,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         6102
       ],
@@ -22674,6 +22689,18 @@
       "EventID": 9162,
       "optionType": 0,
       "ResultType": 0
+    },
+    {
+      "ID": 103,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 0,
+      "optionType": 0,
+      "ResultType": 0
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -91,10 +91,10 @@
     {
       "ID": 1002,
       "GroupMonsterLevel": [
-        9
+        6
       ],
       "GroupMonster": [
-        9002
+        7001
       ]
     },
     {
@@ -395,7 +395,7 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        250
+        210
       ],
       "GroupMonster": [
         9005

Assets/Res/Config/HeroModelConfig.json

@@ -586,10 +586,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 116,
-      "hp": 95,
+      "attack": 113,
+      "hp": 94,
       "def": 100,
-      "shield": 95,
+      "shield": 94,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -644,10 +644,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 95,
-      "hp": 117,
+      "attack": 93,
+      "hp": 114,
       "def": 100,
-      "shield": 117,
+      "shield": 114,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -702,10 +702,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 105,
-      "hp": 105,
+      "attack": 103,
+      "hp": 103,
       "def": 100,
-      "shield": 105,
+      "shield": 103,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -760,10 +760,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 126,
-      "hp": 88,
+      "attack": 124,
+      "hp": 86,
       "def": 100,
-      "shield": 88,
+      "shield": 86,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -818,10 +818,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 84,
-      "hp": 131,
+      "attack": 82,
+      "hp": 129,
       "def": 100,
-      "shield": 131,
+      "shield": 129,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -876,10 +876,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 121,
-      "hp": 91,
+      "attack": 118,
+      "hp": 90,
       "def": 100,
-      "shield": 91,
+      "shield": 90,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -934,10 +934,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 110,
-      "hp": 100,
+      "attack": 108,
+      "hp": 98,
       "def": 100,
-      "shield": 100,
+      "shield": 98,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -992,10 +992,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 104,
-      "hp": 138,
+      "attack": 110,
+      "hp": 77,
       "def": 100,
-      "shield": 94,
+      "shield": 110,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1050,10 +1050,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 58,
-      "hp": 115,
+      "attack": 110,
+      "hp": 55,
       "def": 100,
-      "shield": 115,
+      "shield": 110,
       "speed_atk": 2.0,
       "Linggen": [
         100,
@@ -1108,10 +1108,10 @@
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 58,
-      "hp": 104,
-      "def": 200,
-      "shield": 104,
+      "attack": 88,
+      "hp": 138,
+      "def": 100,
+      "shield": 138,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1166,10 +1166,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 81,
-      "hp": 104,
+      "attack": 110,
+      "hp": 110,
       "def": 100,
-      "shield": 104,
+      "shield": 110,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1224,10 +1224,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 104,
-      "hp": 128,
+      "attack": 110,
+      "hp": 110,
       "def": 100,
-      "shield": 128,
+      "shield": 110,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1282,10 +1282,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 104,
-      "hp": 128,
+      "attack": 132,
+      "hp": 92,
       "def": 100,
-      "shield": 128,
+      "shield": 92,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1331,6 +1331,64 @@
         -1
       ],
       "heroStory": 0
+    },
+    {
+      "ID": 7001,
+      "nickName": -1,
+      "name": 18,
+      "headicon": "icon_tx9002",
+      "model": "Boss_fenghuang",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 48,
+      "def": 100,
+      "shield": 95,
+      "speed_atk": 2.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        9011,
+        -1,
+        9013,
+        9014,
+        -1,
+        9012,
+        -1,
+        -1,
+        9015,
+        9015
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": 0
     }
   ]
 }