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

Assets/Res/Config/EventConfig.json

@@ -19,7 +19,7 @@
         999001
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         1
       ],
       "RefreshProbability": 10,
@@ -51,7 +51,7 @@
         999002
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         1
       ],
       "RefreshProbability": 10,
@@ -83,7 +83,7 @@
         1001
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -115,7 +115,7 @@
         1005
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -147,7 +147,7 @@
         1006
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -179,7 +179,7 @@
         1002
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         100
       ],
       "RefreshProbability": 30,
@@ -211,7 +211,7 @@
         1004
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         10
       ],
       "RefreshProbability": 20,
@@ -243,7 +243,7 @@
         1501
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         1
       ],
       "RefreshProbability": 60,
@@ -275,7 +275,7 @@
         1601
       ],
       "PrizeNums": [
-        -500,
+        -5000,
         1
       ],
       "RefreshProbability": 40,
@@ -307,7 +307,7 @@
         999001
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         1
       ],
       "RefreshProbability": 15,
@@ -339,7 +339,7 @@
         999002
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         1
       ],
       "RefreshProbability": 15,
@@ -371,7 +371,7 @@
         1001
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -403,7 +403,7 @@
         1005
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -435,7 +435,7 @@
         1006
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         -5000
       ],
       "RefreshProbability": 100,
@@ -467,7 +467,7 @@
         1002
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         100
       ],
       "RefreshProbability": 35,
@@ -499,7 +499,7 @@
         1004
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         10
       ],
       "RefreshProbability": 25,
@@ -531,7 +531,7 @@
         1501
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         1
       ],
       "RefreshProbability": 65,
@@ -563,7 +563,7 @@
         1601
       ],
       "PrizeNums": [
-        -750,
+        -7500,
         1
       ],
       "RefreshProbability": 45,
@@ -595,7 +595,7 @@
         999001
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         1
       ],
       "RefreshProbability": 20,
@@ -627,7 +627,7 @@
         999002
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         1
       ],
       "RefreshProbability": 20,
@@ -659,7 +659,7 @@
         1001
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -691,7 +691,7 @@
         1005
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -723,7 +723,7 @@
         1006
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -755,7 +755,7 @@
         1002
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         100
       ],
       "RefreshProbability": 40,
@@ -787,7 +787,7 @@
         1004
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         10
       ],
       "RefreshProbability": 30,
@@ -819,7 +819,7 @@
         1501
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         1
       ],
       "RefreshProbability": 70,
@@ -851,7 +851,7 @@
         1601
       ],
       "PrizeNums": [
-        -1500,
+        -15000,
         1
       ],
       "RefreshProbability": 50,
@@ -883,7 +883,7 @@
         999001
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         1
       ],
       "RefreshProbability": 25,
@@ -915,7 +915,7 @@
         999002
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         1
       ],
       "RefreshProbability": 25,
@@ -947,7 +947,7 @@
         1001
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -979,7 +979,7 @@
         1005
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1011,7 +1011,7 @@
         1006
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1043,7 +1043,7 @@
         1002
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         100
       ],
       "RefreshProbability": 45,
@@ -1075,7 +1075,7 @@
         1004
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         10
       ],
       "RefreshProbability": 35,
@@ -1107,7 +1107,7 @@
         1501
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         1
       ],
       "RefreshProbability": 75,
@@ -1139,7 +1139,7 @@
         1601
       ],
       "PrizeNums": [
-        -3000,
+        -30000,
         1
       ],
       "RefreshProbability": 55,
@@ -1171,7 +1171,7 @@
         999001
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         1
       ],
       "RefreshProbability": 30,
@@ -1203,7 +1203,7 @@
         999002
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         1
       ],
       "RefreshProbability": 30,
@@ -1235,7 +1235,7 @@
         1001
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1267,7 +1267,7 @@
         1005
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1299,7 +1299,7 @@
         1006
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         -5000
       ],
       "RefreshProbability": 100,
@@ -1331,7 +1331,7 @@
         1002
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         100
       ],
       "RefreshProbability": 50,
@@ -1363,7 +1363,7 @@
         1004
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         10
       ],
       "RefreshProbability": 40,
@@ -1395,7 +1395,7 @@
         1501
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         1
       ],
       "RefreshProbability": 80,
@@ -1427,7 +1427,7 @@
         1601
       ],
       "PrizeNums": [
-        -5000,
+        -50000,
         1
       ],
       "RefreshProbability": 60,

Assets/Res/Config/EventLinkConfig.json

@@ -22637,10 +22637,7 @@
       "DialogueType": 0,
       "EventID": 9162,
       "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        916204
-      ]
+      "ResultType": 0
     },
     {
       "ID": 916204,
@@ -22655,10 +22652,7 @@
       "DialogueType": 0,
       "EventID": 9162,
       "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        916205
-      ]
+      "ResultType": 0
     },
     {
       "ID": 916205,

Assets/Res/Config/GroupConfig.json

@@ -769,7 +769,7 @@
         30
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
@@ -778,7 +778,7 @@
         60
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
@@ -787,7 +787,7 @@
         90
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
@@ -796,7 +796,7 @@
         110
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
@@ -805,7 +805,7 @@
         120
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
@@ -814,7 +814,7 @@
         130
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
@@ -823,7 +823,7 @@
         140
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
@@ -832,7 +832,7 @@
         150
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
@@ -841,7 +841,7 @@
         160
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
@@ -850,7 +850,7 @@
         170
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
@@ -859,7 +859,7 @@
         180
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
@@ -868,7 +868,7 @@
         190
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
@@ -877,7 +877,7 @@
         200
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
@@ -886,7 +886,7 @@
         210
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
@@ -895,7 +895,7 @@
         220
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
@@ -904,7 +904,7 @@
         230
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
@@ -913,7 +913,7 @@
         240
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
@@ -922,7 +922,7 @@
         250
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
@@ -931,7 +931,7 @@
         260
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
@@ -940,7 +940,7 @@
         270
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
@@ -949,7 +949,7 @@
         280
       ],
       "GroupMonster": [
-        9001
+        1005
       ]
     },
     {
@@ -958,7 +958,7 @@
         290
       ],
       "GroupMonster": [
-        9001
+        1006
       ]
     },
     {
@@ -967,7 +967,7 @@
         300
       ],
       "GroupMonster": [
-        9001
+        1007
       ]
     },
     {
@@ -976,7 +976,7 @@
         300
       ],
       "GroupMonster": [
-        9001
+        1008
       ]
     },
     {
@@ -985,13 +985,13 @@
         300
       ],
       "GroupMonster": [
-        9001
+        1001
       ]
     },
     {
       "ID": 5001,
       "GroupMonster": [
-        9001
+        1005
       ],
       "hpQiangDu": [
         60
@@ -1006,7 +1006,7 @@
     {
       "ID": 5002,
       "GroupMonster": [
-        9001
+        1006
       ],
       "hpQiangDu": [
         70
@@ -1021,7 +1021,7 @@
     {
       "ID": 5003,
       "GroupMonster": [
-        9001
+        1007
       ],
       "hpQiangDu": [
         80
@@ -1036,7 +1036,7 @@
     {
       "ID": 5004,
       "GroupMonster": [
-        9001
+        1008
       ],
       "hpQiangDu": [
         90
@@ -1051,7 +1051,7 @@
     {
       "ID": 5005,
       "GroupMonster": [
-        9001
+        1001
       ],
       "hpQiangDu": [
         100
@@ -1066,7 +1066,7 @@
     {
       "ID": 5006,
       "GroupMonster": [
-        9001
+        1005
       ],
       "hpQiangDu": [
         60
@@ -1081,7 +1081,7 @@
     {
       "ID": 5007,
       "GroupMonster": [
-        9001
+        1006
       ],
       "hpQiangDu": [
         70
@@ -1096,7 +1096,7 @@
     {
       "ID": 5008,
       "GroupMonster": [
-        9001
+        1007
       ],
       "hpQiangDu": [
         80
@@ -1111,7 +1111,7 @@
     {
       "ID": 5009,
       "GroupMonster": [
-        9001
+        1008
       ],
       "hpQiangDu": [
         90
@@ -1126,7 +1126,7 @@
     {
       "ID": 5010,
       "GroupMonster": [
-        9001
+        1001
       ],
       "hpQiangDu": [
         100

Assets/Res/Config/ShopItemConfig.json

@@ -234,7 +234,7 @@
       "ID": 11,
       "giftID": "",
       "itemId": [
-        21001
+        1201
       ],
       "itemCount": [
         99
@@ -257,7 +257,7 @@
       "ID": 12,
       "giftID": "",
       "itemId": [
-        21002
+        1202
       ],
       "itemCount": [
         99
@@ -280,7 +280,7 @@
       "ID": 13,
       "giftID": "",
       "itemId": [
-        21003
+        1203
       ],
       "itemCount": [
         99
@@ -303,7 +303,7 @@
       "ID": 14,
       "giftID": "",
       "itemId": [
-        21004
+        1204
       ],
       "itemCount": [
         99
@@ -326,7 +326,7 @@
       "ID": 15,
       "giftID": "",
       "itemId": [
-        21005
+        21001
       ],
       "itemCount": [
         99
@@ -349,7 +349,7 @@
       "ID": 16,
       "giftID": "",
       "itemId": [
-        21006
+        21002
       ],
       "itemCount": [
         99
@@ -372,7 +372,7 @@
       "ID": 17,
       "giftID": "",
       "itemId": [
-        21007
+        21003
       ],
       "itemCount": [
         99
@@ -395,7 +395,7 @@
       "ID": 18,
       "giftID": "",
       "itemId": [
-        21008
+        21004
       ],
       "itemCount": [
         99
@@ -418,7 +418,7 @@
       "ID": 19,
       "giftID": "",
       "itemId": [
-        21009
+        21005
       ],
       "itemCount": [
         99