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

Assets/Res/Config/EventConfig.json

@@ -3539,7 +3539,7 @@
       ],
       "EventValue": [
         6001,
-        11
+        6
       ],
       "EventName": 4153,
       "Description": 4154
@@ -3578,7 +3578,7 @@
       "PrizeNums": [
         1,
         1,
-        600
+        550
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -3591,7 +3591,7 @@
       ],
       "EventValue": [
         6002,
-        16
+        11
       ],
       "EventName": 4155,
       "Description": 4156
@@ -3637,7 +3637,7 @@
       ],
       "EventValue": [
         6003,
-        21
+        16
       ],
       "EventName": 4157,
       "Description": 4158
@@ -3667,7 +3667,7 @@
       "PrizeNums": [
         1,
         2,
-        650
+        600
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -3680,7 +3680,7 @@
       ],
       "EventValue": [
         6004,
-        26
+        21
       ],
       "EventName": 4159,
       "Description": 4160
@@ -3726,7 +3726,7 @@
       ],
       "EventValue": [
         6005,
-        31
+        26
       ],
       "EventName": 4161,
       "Description": 4162
@@ -3757,7 +3757,7 @@
       "PrizeNums": [
         1,
         1,
-        600
+        550
       ],
       "RefreshProbability": 40,
       "RefreshCount": 1,
@@ -3815,7 +3815,7 @@
       ],
       "EventValue": [
         6011,
-        21
+        16
       ],
       "EventName": 4166,
       "Description": 4172
@@ -3849,7 +3849,7 @@
       "PrizeNums": [
         1,
         1,
-        650
+        600
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -3862,7 +3862,7 @@
       ],
       "EventValue": [
         6012,
-        26
+        21
       ],
       "EventName": 4167,
       "Description": 4173
@@ -3909,7 +3909,7 @@
       ],
       "EventValue": [
         6013,
-        31
+        26
       ],
       "EventName": 4168,
       "Description": 4174
@@ -3944,7 +3944,7 @@
       "PrizeNums": [
         1,
         2,
-        700
+        650
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -3957,7 +3957,7 @@
       ],
       "EventValue": [
         6014,
-        36
+        31
       ],
       "EventName": 4169,
       "Description": 4175
@@ -3999,7 +3999,7 @@
       ],
       "EventValue": [
         6015,
-        41
+        36
       ],
       "EventName": 4170,
       "Description": 4176
@@ -4027,7 +4027,7 @@
       "PrizeNums": [
         1,
         1,
-        650
+        600
       ],
       "RefreshProbability": 35,
       "RefreshCount": 1,
@@ -4068,7 +4068,7 @@
       "PrizeNums": [
         1,
         1,
-        700
+        600
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -4081,7 +4081,7 @@
       ],
       "EventValue": [
         6021,
-        36
+        24
       ],
       "EventName": 4180,
       "Description": 4186
@@ -4108,7 +4108,7 @@
       "PrizeNums": [
         1,
         1,
-        700
+        650
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4121,7 +4121,7 @@
       ],
       "EventValue": [
         6022,
-        41
+        27
       ],
       "EventName": 4181,
       "Description": 4187
@@ -4149,7 +4149,7 @@
       "PrizeNums": [
         1,
         2,
-        750
+        650
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4162,7 +4162,7 @@
       ],
       "EventValue": [
         6023,
-        46
+        30
       ],
       "EventName": 4182,
       "Description": 4188
@@ -4190,7 +4190,7 @@
       "PrizeNums": [
         1,
         2,
-        750
+        650
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4203,7 +4203,7 @@
       ],
       "EventValue": [
         6024,
-        51
+        35
       ],
       "EventName": 4183,
       "Description": 4189
@@ -4234,7 +4234,7 @@
       "PrizeNums": [
         1,
         1,
-        800
+        700
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -4247,7 +4247,7 @@
       ],
       "EventValue": [
         6025,
-        56
+        40
       ],
       "EventName": 4184,
       "Description": 4190
@@ -4979,8 +4979,8 @@
         1003
       ],
       "PrizeNums": [
-        2650,
-        550
+        2500,
+        500
       ],
       "RefreshProbability": 35,
       "RefreshCount": 1,
@@ -4991,7 +4991,7 @@
         3
       ],
       "EventValue": [
-        6
+        1
       ],
       "EventName": 4244,
       "Description": 4326
@@ -5019,7 +5019,7 @@
         1003
       ],
       "PrizeNums": [
-        2750,
+        2700,
         550
       ],
       "RefreshProbability": 35,
@@ -5033,7 +5033,7 @@
       ],
       "EventValue": [
         9111,
-        11
+        8
       ],
       "EventName": 4245,
       "Description": 4327
@@ -5061,8 +5061,8 @@
       ],
       "PrizeNums": [
         1,
-        2900,
-        600
+        2800,
+        550
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -5075,7 +5075,7 @@
       ],
       "EventValue": [
         9112,
-        16
+        13
       ],
       "EventName": 4246,
       "Description": 4328
@@ -5104,8 +5104,8 @@
         1003
       ],
       "PrizeNums": [
-        3150,
-        650
+        2950,
+        600
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -5118,7 +5118,7 @@
       ],
       "EventValue": [
         9113,
-        26
+        18
       ],
       "EventName": 4247,
       "Description": 4329
@@ -5143,8 +5143,8 @@
       ],
       "PrizeNums": [
         3,
-        3400,
-        700
+        3050,
+        600
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -5157,7 +5157,7 @@
       ],
       "EventValue": [
         9114,
-        36
+        23
       ],
       "EventName": 4248,
       "Description": 4330
@@ -5200,8 +5200,8 @@
       ],
       "PrizeNums": [
         1,
-        3650,
-        750
+        3200,
+        650
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -5247,7 +5247,7 @@
         1003
       ],
       "PrizeNums": [
-        2750,
+        2850,
         550
       ],
       "RefreshProbability": 40,
@@ -5259,7 +5259,7 @@
         3
       ],
       "EventValue": [
-        11
+        15
       ],
       "EventName": 4250,
       "Description": 4332
@@ -5302,7 +5302,7 @@
       ],
       "EventValue": [
         9117,
-        21
+        20
       ],
       "EventName": 4251,
       "Description": 4333
@@ -5336,8 +5336,8 @@
         1003
       ],
       "PrizeNums": [
-        3500,
-        700
+        3100,
+        600
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -5350,7 +5350,7 @@
       ],
       "EventValue": [
         9118,
-        41
+        25
       ],
       "EventName": 4252,
       "Description": 4334
@@ -5381,8 +5381,8 @@
       ],
       "PrizeNums": [
         1,
-        2900,
-        600
+        3250,
+        650
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -5395,7 +5395,7 @@
       ],
       "EventValue": [
         9119,
-        16
+        30
       ],
       "EventName": 4253,
       "Description": 4335
@@ -5422,8 +5422,8 @@
         1003
       ],
       "PrizeNums": [
-        3400,
-        700
+        3350,
+        650
       ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
@@ -5436,7 +5436,7 @@
       ],
       "EventValue": [
         9120,
-        36
+        35
       ],
       "EventName": 4254,
       "Description": 4336
@@ -5474,8 +5474,8 @@
       ],
       "PrizeNums": [
         1,
-        3900,
-        800
+        3500,
+        700
       ],
       "RefreshProbability": 15,
       "RefreshCount": 1,
@@ -5488,7 +5488,7 @@
       ],
       "EventValue": [
         9121,
-        56
+        40
       ],
       "EventName": 4255,
       "Description": 4337
@@ -5576,7 +5576,7 @@
         1003
       ],
       "PrizeNums": [
-        3250,
+        3150,
         650
       ],
       "RefreshProbability": 35,
@@ -5590,7 +5590,7 @@
       ],
       "EventValue": [
         9123,
-        31
+        26
       ],
       "EventName": 4257,
       "Description": 4339
@@ -5616,8 +5616,8 @@
       ],
       "PrizeNums": [
         1,
-        3500,
-        700
+        3250,
+        650
       ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
@@ -5630,7 +5630,7 @@
       ],
       "EventValue": [
         9124,
-        41
+        31
       ],
       "EventName": 4258,
       "Description": 4340
@@ -5657,8 +5657,8 @@
       ],
       "PrizeNums": [
         1,
-        4000,
-        800
+        3400,
+        700
       ],
       "RefreshProbability": 25,
       "RefreshCount": 1,
@@ -5671,7 +5671,7 @@
       ],
       "EventValue": [
         9125,
-        61
+        36
       ],
       "EventName": 4259,
       "Description": 4341

Assets/Res/Config/GroupConfig.json

@@ -262,7 +262,7 @@
     {
       "ID": 3001,
       "GroupMonsterLevel": [
-        16
+        11
       ],
       "GroupMonster": [
         7007
@@ -271,7 +271,7 @@
     {
       "ID": 3002,
       "GroupMonsterLevel": [
-        26
+        21
       ],
       "GroupMonster": [
         7001
@@ -280,7 +280,7 @@
     {
       "ID": 3003,
       "GroupMonsterLevel": [
-        16
+        11
       ],
       "GroupMonster": [
         7007
@@ -289,7 +289,7 @@
     {
       "ID": 3004,
       "GroupMonsterLevel": [
-        21
+        16
       ],
       "GroupMonster": [
         7007
@@ -298,7 +298,7 @@
     {
       "ID": 3005,
       "GroupMonsterLevel": [
-        21
+        16
       ],
       "GroupMonster": [
         5003
@@ -307,7 +307,7 @@
     {
       "ID": 3006,
       "GroupMonsterLevel": [
-        26
+        21
       ],
       "GroupMonster": [
         5003
@@ -316,7 +316,7 @@
     {
       "ID": 3007,
       "GroupMonsterLevel": [
-        36
+        31
       ],
       "GroupMonster": [
         5003
@@ -325,7 +325,7 @@
     {
       "ID": 3008,
       "GroupMonsterLevel": [
-        36
+        31
       ],
       "GroupMonster": [
         7001
@@ -397,7 +397,7 @@
     {
       "ID": 3016,
       "GroupMonsterLevel": [
-        0
+        46
       ],
       "GroupMonster": [
         9001
@@ -415,7 +415,7 @@
     {
       "ID": 4001,
       "GroupMonsterLevel": [
-        11
+        8
       ],
       "GroupMonster": [
         5002
@@ -424,7 +424,7 @@
     {
       "ID": 4002,
       "GroupMonsterLevel": [
-        36
+        23
       ],
       "GroupMonster": [
         5007
@@ -433,7 +433,7 @@
     {
       "ID": 4003,
       "GroupMonsterLevel": [
-        21
+        20
       ],
       "GroupMonster": [
         5001
@@ -442,7 +442,7 @@
     {
       "ID": 4004,
       "GroupMonsterLevel": [
-        41
+        25
       ],
       "GroupMonster": [
         5001
@@ -451,7 +451,7 @@
     {
       "ID": 4005,
       "GroupMonsterLevel": [
-        41
+        25
       ],
       "GroupMonster": [
         5003
@@ -460,7 +460,7 @@
     {
       "ID": 4006,
       "GroupMonsterLevel": [
-        16
+        30
       ],
       "GroupMonster": [
         5002
@@ -469,7 +469,7 @@
     {
       "ID": 4007,
       "GroupMonsterLevel": [
-        36
+        35
       ],
       "GroupMonster": [
         5005
@@ -478,7 +478,7 @@
     {
       "ID": 4008,
       "GroupMonsterLevel": [
-        56
+        40
       ],
       "GroupMonster": [
         5001
@@ -487,7 +487,7 @@
     {
       "ID": 4009,
       "GroupMonsterLevel": [
-        31
+        26
       ],
       "GroupMonster": [
         5002
@@ -496,7 +496,7 @@
     {
       "ID": 4010,
       "GroupMonsterLevel": [
-        41
+        31
       ],
       "GroupMonster": [
         5004
@@ -639,9 +639,6 @@
     },
     {
       "ID": 4026,
-      "GroupMonsterLevel": [
-        1
-      ],
       "GroupMonster": [
         1008
       ]