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

Assets/Res/Config/EventConfig.json

@@ -121,7 +121,7 @@
       ],
       "PrizeNums": [
         -6000,
-        -10000,
+        -2500,
         -2000
       ],
       "RefreshProbability": 300,
@@ -154,7 +154,7 @@
       ],
       "PrizeNums": [
         -6000,
-        -10000,
+        -2500,
         -2000
       ],
       "RefreshProbability": 300,
@@ -418,7 +418,7 @@
       ],
       "PrizeNums": [
         -9000,
-        -15000,
+        -3500,
         -3000
       ],
       "RefreshProbability": 300,
@@ -451,7 +451,7 @@
       ],
       "PrizeNums": [
         -9000,
-        -15000,
+        -3500,
         -3000
       ],
       "RefreshProbability": 300,
@@ -715,7 +715,7 @@
       ],
       "PrizeNums": [
         -12000,
-        -20000,
+        -4500,
         -4000
       ],
       "RefreshProbability": 300,
@@ -748,7 +748,7 @@
       ],
       "PrizeNums": [
         -12000,
-        -20000,
+        -4500,
         -4000
       ],
       "RefreshProbability": 300,
@@ -1012,7 +1012,7 @@
       ],
       "PrizeNums": [
         -20000,
-        -25000,
+        -6000,
         -5000
       ],
       "RefreshProbability": 300,
@@ -1045,7 +1045,7 @@
       ],
       "PrizeNums": [
         -20000,
-        -25000,
+        -6000,
         -5000
       ],
       "RefreshProbability": 300,
@@ -1309,7 +1309,7 @@
       ],
       "PrizeNums": [
         -30000,
-        -30000,
+        -7500,
         -6000
       ],
       "RefreshProbability": 300,
@@ -1342,7 +1342,7 @@
       ],
       "PrizeNums": [
         -30000,
-        -30000,
+        -7500,
         -6000
       ],
       "RefreshProbability": 300,
@@ -6175,17 +6175,17 @@
       "Description": 4352
     },
     {
-      "ID": 9138,
+      "ID": 9139,
       "EventLinksId": [
-        913801,
-        913802,
-        913803,
-        913804,
-        913805,
-        913806,
-        913807,
-        913808,
-        913809,
+        913901,
+        913902,
+        913903,
+        913904,
+        913905,
+        913906,
+        913907,
+        913908,
+        913909,
         102,
         103
       ],
@@ -6195,43 +6195,35 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
-        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        1,
         4650,
         950
       ],
-      "RefreshProbability": 15,
+      "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 6,
+      "SmallPlacesId": 7,
       "XiantuID": 10,
       "EventConditionId": [
         10,
         3
       ],
       "EventValue": [
-        9140,
+        9137,
         86
       ],
-      "EventName": 4271,
-      "Description": 4353
+      "EventName": 4272,
+      "Description": 4354
     },
     {
-      "ID": 9139,
+      "ID": 9140,
       "EventLinksId": [
-        913901,
-        913902,
-        913903,
-        913904,
-        913905,
-        913906,
-        913907,
-        913908,
-        913909,
+        914001,
+        914002,
+        914003,
         102,
         103
       ],
@@ -6241,14 +6233,16 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        22008,
         1001,
         1003
       ],
       "PrizeNums": [
-        4400,
-        900
+        1,
+        4750,
+        950
       ],
-      "RefreshProbability": 30,
+      "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 2,
       "SmallPlacesId": 7,
@@ -6258,18 +6252,24 @@
         3
       ],
       "EventValue": [
-        9137,
-        71
+        9139,
+        91
       ],
-      "EventName": 4272,
-      "Description": 4354
+      "EventName": 4273,
+      "Description": 4355
     },
     {
-      "ID": 9140,
+      "ID": 9138,
       "EventLinksId": [
-        914001,
-        914002,
-        914003,
+        913801,
+        913802,
+        913803,
+        913804,
+        913805,
+        913806,
+        913807,
+        913808,
+        913809,
         102,
         103
       ],
@@ -6285,24 +6285,24 @@
       ],
       "PrizeNums": [
         1,
-        4650,
+        4750,
         950
       ],
-      "RefreshProbability": 20,
+      "RefreshProbability": 15,
       "RefreshCount": 1,
       "placeID": 2,
-      "SmallPlacesId": 7,
+      "SmallPlacesId": 6,
       "XiantuID": 10,
       "EventConditionId": [
         10,
         3
       ],
       "EventValue": [
-        9139,
-        86
+        9140,
+        91
       ],
-      "EventName": 4273,
-      "Description": 4355
+      "EventName": 4271,
+      "Description": 4353
     },
     {
       "ID": 9141,
@@ -6721,7 +6721,7 @@
       ],
       "PrizeNums": [
         1,
-        -10000,
+        -2500,
         -6000
       ],
       "RefreshProbability": 100,
@@ -6943,7 +6943,7 @@
       ],
       "PrizeNums": [
         1,
-        -15000,
+        -3500,
         -9000
       ],
       "RefreshProbability": 100,
@@ -6985,7 +6985,7 @@
       ],
       "PrizeNums": [
         1,
-        -20000,
+        -4500,
         -12000
       ],
       "RefreshProbability": 100,
@@ -7018,7 +7018,7 @@
       ],
       "PrizeNums": [
         1,
-        -25000,
+        -6000,
         -20000
       ],
       "RefreshProbability": 100,
@@ -7051,7 +7051,7 @@
       ],
       "PrizeNums": [
         1,
-        -10000,
+        -2500,
         -6000
       ],
       "RefreshProbability": 100,
@@ -7084,7 +7084,7 @@
       ],
       "PrizeNums": [
         1,
-        -15000,
+        -3500,
         -9000
       ],
       "RefreshProbability": 100,
@@ -7118,7 +7118,7 @@
       ],
       "PrizeNums": [
         1,
-        -20000,
+        -4500,
         -12000
       ],
       "RefreshProbability": 100,
@@ -7152,7 +7152,7 @@
       ],
       "PrizeNums": [
         1,
-        -25000,
+        -6000,
         -20000
       ],
       "RefreshProbability": 100,

Assets/Res/Config/LanguageChineseConfig.json

@@ -38394,19 +38394,19 @@
     },
     {
       "ID": 10339,
-      "txt": "×3"
+      "txt": "×6"
     },
     {
       "ID": 10340,
-      "txt": "×18"
+      "txt": "×30"
     },
     {
       "ID": 10341,
-      "txt": "×68"
+      "txt": "×98"
     },
     {
       "ID": 10342,
-      "txt": "×128"
+      "txt": "×168"
     },
     {
       "ID": 10343,
@@ -40246,11 +40246,11 @@
     },
     {
       "ID": 10802,
-      "txt": " "
+      "txt": ""
     },
     {
       "ID": 10803,
-      "txt": " "
+      "txt": ""
     }
   ]
 }

Assets/Res/Config/OpenBoxProgressReward.json

@@ -6,11 +6,11 @@
       "TotalScore": 20,
       "PrizeID": [
         23101,
-        1701
+        1004
       ],
       "PrizeCount": [
         6,
-        1
+        600
       ]
     },
     {
@@ -19,11 +19,11 @@
       "TotalScore": 35,
       "PrizeID": [
         23001,
-        1701
+        1004
       ],
       "PrizeCount": [
         1,
-        1
+        400
       ]
     },
     {
@@ -32,11 +32,11 @@
       "TotalScore": 50,
       "PrizeID": [
         23101,
-        1701
+        1004
       ],
       "PrizeCount": [
         3,
-        1
+        200
       ]
     },
     {
@@ -45,11 +45,11 @@
       "TotalScore": 65,
       "PrizeID": [
         23101,
-        1701
+        1004
       ],
       "PrizeCount": [
         1,
-        2
+        100
       ]
     },
     {
@@ -58,11 +58,11 @@
       "TotalScore": 80,
       "PrizeID": [
         23102,
-        1701
+        1004
       ],
       "PrizeCount": [
         1,
-        2
+        200
       ]
     },
     {
@@ -71,11 +71,11 @@
       "TotalScore": 100,
       "PrizeID": [
         23102,
-        1701
+        1004
       ],
       "PrizeCount": [
         3,
-        2
+        300
       ]
     },
     {
@@ -84,11 +84,11 @@
       "TotalScore": 120,
       "PrizeID": [
         23102,
-        1701
+        1004
       ],
       "PrizeCount": [
         6,
-        3
+        400
       ]
     },
     {
@@ -97,11 +97,11 @@
       "TotalScore": 150,
       "PrizeID": [
         23001,
-        1701
+        1004
       ],
       "PrizeCount": [
         1,
-        3
+        600
       ]
     }
   ]