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

Assets/Res/Config/DropConfig.json

@@ -170,6 +170,226 @@
         1204
       ]
     },
+    {
+      "ID": 1205,
+      "dropGroupID": [
+        1205
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1205
+      ]
+    },
+    {
+      "ID": 1206,
+      "dropGroupID": [
+        1206
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1206
+      ]
+    },
+    {
+      "ID": 1207,
+      "dropGroupID": [
+        1207
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1207
+      ]
+    },
+    {
+      "ID": 1208,
+      "dropGroupID": [
+        1208
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1208
+      ]
+    },
+    {
+      "ID": 1209,
+      "dropGroupID": [
+        1209
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1209
+      ]
+    },
+    {
+      "ID": 1210,
+      "dropGroupID": [
+        1210
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1210
+      ]
+    },
+    {
+      "ID": 1211,
+      "dropGroupID": [
+        1211
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1211
+      ]
+    },
+    {
+      "ID": 1212,
+      "dropGroupID": [
+        1212
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1212
+      ]
+    },
+    {
+      "ID": 1213,
+      "dropGroupID": [
+        1213
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1213
+      ]
+    },
+    {
+      "ID": 1214,
+      "dropGroupID": [
+        1214
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1214
+      ]
+    },
+    {
+      "ID": 1215,
+      "dropGroupID": [
+        1215
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1215
+      ]
+    },
+    {
+      "ID": 1216,
+      "dropGroupID": [
+        1216
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1216
+      ]
+    },
+    {
+      "ID": 1217,
+      "dropGroupID": [
+        1217
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1217
+      ]
+    },
+    {
+      "ID": 1218,
+      "dropGroupID": [
+        1218
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1218
+      ]
+    },
+    {
+      "ID": 1219,
+      "dropGroupID": [
+        1219
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1219
+      ]
+    },
+    {
+      "ID": 1220,
+      "dropGroupID": [
+        1220
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1220
+      ]
+    },
+    {
+      "ID": 1221,
+      "dropGroupID": [
+        1221
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1221
+      ]
+    },
+    {
+      "ID": 1222,
+      "dropGroupID": [
+        1222
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1222
+      ]
+    },
+    {
+      "ID": 1223,
+      "dropGroupID": [
+        1223
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1223
+      ]
+    },
+    {
+      "ID": 1224,
+      "dropGroupID": [
+        1224
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1224
+      ]
+    },
+    {
+      "ID": 1225,
+      "dropGroupID": [
+        1225
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1225
+      ]
+    },
+    {
+      "ID": 1226,
+      "dropGroupID": [
+        1226
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1226
+      ]
+    },
     {
       "ID": 1301,
       "dropGroupID": [
@@ -260,6 +480,216 @@
         1309
       ]
     },
+    {
+      "ID": 1310,
+      "dropGroupID": [
+        1310
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1310
+      ]
+    },
+    {
+      "ID": 1311,
+      "dropGroupID": [
+        1311
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1311
+      ]
+    },
+    {
+      "ID": 1312,
+      "dropGroupID": [
+        1312
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1312
+      ]
+    },
+    {
+      "ID": 1313,
+      "dropGroupID": [
+        1313
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1313
+      ]
+    },
+    {
+      "ID": 1314,
+      "dropGroupID": [
+        1314
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1314
+      ]
+    },
+    {
+      "ID": 1315,
+      "dropGroupID": [
+        1315
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1315
+      ]
+    },
+    {
+      "ID": 1316,
+      "dropGroupID": [
+        1316
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1316
+      ]
+    },
+    {
+      "ID": 1317,
+      "dropGroupID": [
+        1317
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1317
+      ]
+    },
+    {
+      "ID": 1318,
+      "dropGroupID": [
+        1318
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1318
+      ]
+    },
+    {
+      "ID": 1319,
+      "dropGroupID": [
+        1319
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1319
+      ]
+    },
+    {
+      "ID": 1320,
+      "dropGroupID": [
+        1320
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1320
+      ]
+    },
+    {
+      "ID": 1321,
+      "dropGroupID": [
+        1321
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1321
+      ]
+    },
+    {
+      "ID": 1322,
+      "dropGroupID": [
+        1322
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1322
+      ]
+    },
+    {
+      "ID": 1323,
+      "dropGroupID": [
+        1323
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1323
+      ]
+    },
+    {
+      "ID": 1324,
+      "dropGroupID": [
+        1324
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1324
+      ]
+    },
+    {
+      "ID": 1325,
+      "dropGroupID": [
+        1325
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1325
+      ]
+    },
+    {
+      "ID": 1326,
+      "dropGroupID": [
+        1326
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1326
+      ]
+    },
+    {
+      "ID": 1327,
+      "dropGroupID": [
+        1327
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1327
+      ]
+    },
+    {
+      "ID": 1328,
+      "dropGroupID": [
+        1328
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1328
+      ]
+    },
+    {
+      "ID": 1329,
+      "dropGroupID": [
+        1329
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1329
+      ]
+    },
+    {
+      "ID": 1330,
+      "dropGroupID": [
+        1330
+      ],
+      "dropType": 3,
+      "showItemId": [
+        1330
+      ]
+    },
     {
       "ID": 1401,
       "dropGroupID": [

Assets/Res/Config/EventConfig.json

@@ -214,6 +214,9 @@
       "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
+      "EventConditionId": [
+        3
+      ],
       "EventName": 4007,
       "Description": 4082
     },
@@ -1577,12 +1580,12 @@
       "PrizeIDs": [
         10001,
         1702,
-        1003
+        1301
       ],
       "PrizeNums": [
         1,
         1,
-        330
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1731,12 +1734,12 @@
       "PrizeIDs": [
         10003,
         1702,
-        1003
+        1302
       ],
       "PrizeNums": [
         1,
         1,
-        360
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1799,12 +1802,12 @@
       "PrizeIDs": [
         1301,
         1702,
-        1003
+        1303
       ],
       "PrizeNums": [
         1,
         1,
-        390
+        1
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,

Assets/Res/Config/EventLinkConfig.json

@@ -23530,7 +23530,10 @@
       "EventID": 9156,
       "step": 10,
       "optionType": 0,
-      "ResultType": 0
+      "ResultType": 1,
+      "ResultOptions": [
+        915611
+      ]
     },
     {
       "ID": 915611,

Assets/Res/Config/ItemConfig.json

@@ -1367,7 +1367,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1401,7 +1401,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1435,7 +1435,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1469,7 +1469,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1503,7 +1503,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1537,7 +1537,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1571,7 +1571,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1605,7 +1605,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1639,7 +1639,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1673,7 +1673,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1707,7 +1707,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1741,7 +1741,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1775,7 +1775,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1809,7 +1809,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1843,7 +1843,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1877,7 +1877,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1911,7 +1911,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1945,7 +1945,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -1979,7 +1979,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2013,7 +2013,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2047,7 +2047,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2081,7 +2081,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2115,7 +2115,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2149,7 +2149,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2183,7 +2183,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2217,7 +2217,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2251,7 +2251,7 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2507,7 +2507,8 @@
       "isSell": false,
       "SkiptoID": [
         8,
-        7
+        7,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2538,7 +2539,8 @@
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        8,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -2570,7 +2572,8 @@
       "isSell": false,
       "SkiptoID": [
         8,
-        9
+        9,
+        14
       ],
       "rewardsNum": 0,
       "isVisible": 1,

Assets/Res/Config/ShopItemConfig.json

@@ -2096,52 +2096,6 @@
     {
       "ID": 801,
       "giftID": "",
-      "itemId": [
-        1201
-      ],
-      "itemCount": [
-        1
-      ],
-      "costItemId": 1004,
-      "price": 6,
-      "oldPrice": 1,
-      "buyCount": 4,
-      "maxBuyCount": -1,
-      "shopItemGroup": 8,
-      "continueTime": -1,
-      "shopName": 0,
-      "shopDesc": 0,
-      "shopShowTemplate": 3,
-      "shopShowTemplateParm": [
-        "icon_Gem_Star_Blue"
-      ]
-    },
-    {
-      "ID": 802,
-      "giftID": "",
-      "itemId": [
-        1202
-      ],
-      "itemCount": [
-        1
-      ],
-      "costItemId": 1004,
-      "price": 30,
-      "oldPrice": 1,
-      "buyCount": 2,
-      "maxBuyCount": -1,
-      "shopItemGroup": 8,
-      "continueTime": -1,
-      "shopName": 0,
-      "shopDesc": 0,
-      "shopShowTemplate": 3,
-      "shopShowTemplateParm": [
-        "icon_Gem_Star_Blue"
-      ]
-    },
-    {
-      "ID": 803,
-      "giftID": "",
       "itemId": [
         1701
       ],
@@ -2163,7 +2117,7 @@
       ]
     },
     {
-      "ID": 804,
+      "ID": 802,
       "giftID": "",
       "itemId": [
         12004
@@ -2186,7 +2140,7 @@
       ]
     },
     {
-      "ID": 805,
+      "ID": 803,
       "giftID": "",
       "itemId": [
         12510
@@ -2209,7 +2163,7 @@
       ]
     },
     {
-      "ID": 806,
+      "ID": 804,
       "giftID": "",
       "itemId": [
         10010

Assets/Res/Config/SkillConfig.json

@@ -433,7 +433,7 @@
         3.0,
         56.0,
         100.0,
-        30.0
+        15.0
       ],
       "intensifierIndex": [
         2
@@ -460,7 +460,7 @@
         3.0,
         64.0,
         100.0,
-        40.0
+        20.0
       ],
       "intensifierIndex": [
         2
@@ -496,7 +496,7 @@
         3.0,
         73.0,
         100.0,
-        50.0
+        25.0
       ],
       "intensifierIndex": [
         2
@@ -532,7 +532,7 @@
         3.0,
         84.0,
         100.0,
-        60.0
+        30.0
       ],
       "intensifierIndex": [
         2
@@ -568,7 +568,7 @@
         3.0,
         77.0,
         100.0,
-        70.0,
+        35.0,
         20.0
       ],
       "intensifierIndex": [
@@ -5976,7 +5976,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         30.0,
@@ -6005,7 +6005,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         40.0,
@@ -6043,7 +6043,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         50.0,
@@ -6081,7 +6081,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         60.0,
@@ -6119,7 +6119,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         70.0,
@@ -6157,7 +6157,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 10,
+      "effectUpK": 20,
       "effectValue": [
         5.0,
         100.0,
@@ -6193,7 +6193,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 1,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         50.0,
         0.0
@@ -6218,7 +6218,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 2,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         60.0,
         20.0,
@@ -6253,7 +6253,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 3,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         70.0,
         20.0,
@@ -6288,7 +6288,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 4,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         80.0,
         30.0,
@@ -6323,7 +6323,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 5,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         90.0,
         30.0,
@@ -6358,7 +6358,7 @@
       "addcd": 0.0,
       "SkillType": 2,
       "level": 6,
-      "effectUpK": 15,
+      "effectUpK": 45,
       "effectValue": [
         100.0,
         30.0,

Assets/Res/Config/TowerInfoConfig.json

@@ -11,7 +11,7 @@
         2001
       ],
       "reward": [
-        1402,
+        1401,
         1001
       ],
       "unlockValue": 0
@@ -27,7 +27,7 @@
         2002
       ],
       "reward": [
-        1702,
+        1701,
         1001
       ],
       "unlockValue": 0
@@ -59,7 +59,7 @@
         2004
       ],
       "reward": [
-        1402,
+        1304,
         1001
       ],
       "unlockValue": 0
@@ -75,7 +75,7 @@
         2005
       ],
       "reward": [
-        1702,
+        1401,
         1001
       ],
       "unlockValue": 0
@@ -91,7 +91,7 @@
         2006
       ],
       "reward": [
-        21012,
+        1701,
         1001
       ],
       "unlockValue": 0
@@ -107,7 +107,7 @@
         2007
       ],
       "reward": [
-        1402,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -123,7 +123,7 @@
         2008
       ],
       "reward": [
-        1702,
+        1305,
         1001
       ],
       "unlockValue": 0
@@ -139,7 +139,7 @@
         2009
       ],
       "reward": [
-        21012,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -155,7 +155,7 @@
         2010
       ],
       "reward": [
-        1402,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -171,7 +171,7 @@
         2011
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -187,7 +187,7 @@
         2012
       ],
       "reward": [
-        21012,
+        1306,
         1001
       ],
       "unlockValue": 0
@@ -251,7 +251,7 @@
         2016
       ],
       "reward": [
-        1402,
+        1307,
         1001
       ],
       "unlockValue": 0
@@ -267,7 +267,7 @@
         2017
       ],
       "reward": [
-        1702,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -283,7 +283,7 @@
         2018
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -299,7 +299,7 @@
         2019
       ],
       "reward": [
-        1402,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -315,7 +315,7 @@
         2020
       ],
       "reward": [
-        1702,
+        1308,
         1001
       ],
       "unlockValue": 0
@@ -331,7 +331,7 @@
         2021
       ],
       "reward": [
-        21012,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -347,7 +347,7 @@
         2022
       ],
       "reward": [
-        1402,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -363,7 +363,7 @@
         2023
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -379,7 +379,7 @@
         2024
       ],
       "reward": [
-        21012,
+        1309,
         1001
       ],
       "unlockValue": 0
@@ -443,7 +443,7 @@
         2028
       ],
       "reward": [
-        1402,
+        1310,
         1001
       ],
       "unlockValue": 0
@@ -459,7 +459,7 @@
         2029
       ],
       "reward": [
-        1702,
+        1402,
         1001
       ],
       "unlockValue": 0
@@ -475,7 +475,7 @@
         2030
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -491,7 +491,7 @@
         2031
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -507,7 +507,7 @@
         2032
       ],
       "reward": [
-        1702,
+        1311,
         1001
       ],
       "unlockValue": 0
@@ -523,7 +523,7 @@
         2033
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -539,7 +539,7 @@
         2034
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -555,7 +555,7 @@
         2035
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -571,7 +571,7 @@
         2036
       ],
       "reward": [
-        21012,
+        1312,
         1001
       ],
       "unlockValue": 0
@@ -635,7 +635,7 @@
         2040
       ],
       "reward": [
-        1403,
+        1313,
         1001
       ],
       "unlockValue": 0
@@ -651,7 +651,7 @@
         2041
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -667,7 +667,7 @@
         2042
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -683,7 +683,7 @@
         2043
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -699,7 +699,7 @@
         2044
       ],
       "reward": [
-        1702,
+        1314,
         1001
       ],
       "unlockValue": 0
@@ -715,7 +715,7 @@
         2045
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -731,7 +731,7 @@
         2046
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -747,7 +747,7 @@
         2047
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -763,7 +763,7 @@
         2048
       ],
       "reward": [
-        21012,
+        1315,
         1001
       ],
       "unlockValue": 0
@@ -827,7 +827,7 @@
         2052
       ],
       "reward": [
-        1403,
+        1316,
         1001
       ],
       "unlockValue": 0
@@ -843,7 +843,7 @@
         2053
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -859,7 +859,7 @@
         2054
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -875,7 +875,7 @@
         2055
       ],
       "reward": [
-        1403,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -891,7 +891,7 @@
         2056
       ],
       "reward": [
-        1702,
+        1317,
         1001
       ],
       "unlockValue": 0
@@ -907,7 +907,7 @@
         2057
       ],
       "reward": [
-        21012,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -923,7 +923,7 @@
         2058
       ],
       "reward": [
-        1403,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -939,7 +939,7 @@
         2059
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -955,7 +955,7 @@
         2060
       ],
       "reward": [
-        21012,
+        1318,
         1001
       ],
       "unlockValue": 0
@@ -971,7 +971,7 @@
         2061
       ],
       "reward": [
-        1404,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -1019,7 +1019,7 @@
         2064
       ],
       "reward": [
-        1404,
+        1319,
         1001
       ],
       "unlockValue": 0
@@ -1035,7 +1035,7 @@
         2065
       ],
       "reward": [
-        1702,
+        1403,
         1001
       ],
       "unlockValue": 0
@@ -1051,7 +1051,7 @@
         2066
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1067,7 +1067,7 @@
         2067
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1083,7 +1083,7 @@
         2068
       ],
       "reward": [
-        1702,
+        1320,
         1001
       ],
       "unlockValue": 0
@@ -1099,7 +1099,7 @@
         2069
       ],
       "reward": [
-        21012,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1115,7 +1115,7 @@
         2070
       ],
       "reward": [
-        1404,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1131,7 +1131,7 @@
         2071
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1147,7 +1147,7 @@
         2072
       ],
       "reward": [
-        21012,
+        1321,
         1001
       ],
       "unlockValue": 0
@@ -1211,7 +1211,7 @@
         2076
       ],
       "reward": [
-        1404,
+        1322,
         1001
       ],
       "unlockValue": 0
@@ -1227,7 +1227,7 @@
         2077
       ],
       "reward": [
-        1702,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1243,7 +1243,7 @@
         2078
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1259,7 +1259,7 @@
         2079
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1275,7 +1275,7 @@
         2080
       ],
       "reward": [
-        1702,
+        1323,
         1001
       ],
       "unlockValue": 0
@@ -1291,7 +1291,7 @@
         2081
       ],
       "reward": [
-        21012,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1307,7 +1307,7 @@
         2082
       ],
       "reward": [
-        1404,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1323,7 +1323,7 @@
         2083
       ],
       "reward": [
-        1702,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1339,7 +1339,7 @@
         2084
       ],
       "reward": [
-        21012,
+        1324,
         1001
       ],
       "unlockValue": 0
@@ -1403,7 +1403,7 @@
         2088
       ],
       "reward": [
-        1404,
+        1325,
         1001
       ],
       "unlockValue": 0
@@ -1419,7 +1419,7 @@
         2089
       ],
       "reward": [
-        1702,
+        1404,
         1001
       ],
       "unlockValue": 0
@@ -1435,7 +1435,7 @@
         2090
       ],
       "reward": [
-        21012,
+        1702,
         1001
       ],
       "unlockValue": 0
@@ -1451,7 +1451,7 @@
         2091
       ],
       "reward": [
-        1404,
+        21012,
         1001
       ],
       "unlockValue": 0
@@ -1467,7 +1467,7 @@
         2092
       ],
       "reward": [
-        1702,
+        1326,
         1001
       ],
       "unlockValue": 0
@@ -1483,7 +1483,7 @@
         2093
       ],
       "reward": [
-        21012,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1499,7 +1499,7 @@
         2094
       ],
       "reward": [
-        1404,
+        1327,
         1001
       ],
       "unlockValue": 0
@@ -1515,7 +1515,7 @@
         2095
       ],
       "reward": [
-        1702,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1531,7 +1531,7 @@
         2096
       ],
       "reward": [
-        21012,
+        1328,
         1001
       ],
       "unlockValue": 0
@@ -1547,7 +1547,7 @@
         2097
       ],
       "reward": [
-        1404,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1563,7 +1563,7 @@
         2098
       ],
       "reward": [
-        1702,
+        1329,
         1001
       ],
       "unlockValue": 0
@@ -1579,7 +1579,7 @@
         2099
       ],
       "reward": [
-        21012,
+        1703,
         1001
       ],
       "unlockValue": 0
@@ -1595,7 +1595,7 @@
         2100
       ],
       "reward": [
-        1404,
+        1330,
         1001
       ],
       "unlockValue": 0