提交

JisolGameCocos/assets/resources/config/json/tbggift.json

@@ -0,0 +1,47 @@
+[
+  {
+    "id": 180001,
+    "name": "金币礼包",
+    "tig": "金币礼包",
+    "limit": 1,
+    "limitValue": 0,
+    "price": 6,
+    "rewards": [
+      {
+        "type": 1,
+        "id": 90002,
+        "value": 20
+      }
+    ]
+  },
+  {
+    "id": 190001,
+    "name": "限购金币礼包",
+    "tig": "限购金币礼包",
+    "limit": 2,
+    "limitValue": 1,
+    "price": 6,
+    "rewards": [
+      {
+        "type": 1,
+        "id": 90002,
+        "value": 20
+      }
+    ]
+  },
+  {
+    "id": 200001,
+    "name": "每日限购金币礼包",
+    "tig": "每日限购金币礼包",
+    "limit": 3,
+    "limitValue": 1,
+    "price": 6,
+    "rewards": [
+      {
+        "type": 1,
+        "id": 90002,
+        "value": 20
+      }
+    ]
+  }
+]

JisolGameCocos/assets/resources/config/json/tbggift.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "2.0.1",
+  "importer": "json",
+  "imported": true,
+  "uuid": "2e71e57f-4d8e-4235-b108-955a0cfc600b",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/resources/config/json/tbgresource.json

@@ -46,5 +46,13 @@
     "tig": "用于宠物升星",
     "args": "",
     "quality": 1
+  },
+  {
+    "id": 90007,
+    "icon": "90007",
+    "name": "兑换券",
+    "tig": "用于购买礼包",
+    "args": "",
+    "quality": 1
   }
 ]

JisolGameCocos/assets/resources/config/json/tbgshop.json

@@ -0,0 +1,17 @@
+[
+  {
+    "id": 1,
+    "tig": "金币礼包",
+    "giftId": 180001
+  },
+  {
+    "id": 2,
+    "tig": "限购金币礼包",
+    "giftId": 190001
+  },
+  {
+    "id": 3,
+    "tig": "每日限购金币礼包",
+    "giftId": 200001
+  }
+]

JisolGameCocos/assets/resources/config/json/tbgshop.json.meta

@@ -0,0 +1,11 @@
+{
+  "ver": "2.0.1",
+  "importer": "json",
+  "imported": true,
+  "uuid": "6b14eb32-1cee-40b3-849c-8e786ec1aadd",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/resources/config/json/tbgsysdungeon160001.json

@@ -16,6 +16,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -39,6 +40,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -62,6 +64,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -85,6 +88,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -108,6 +112,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -131,6 +136,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -154,6 +160,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -177,6 +184,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -200,6 +208,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -223,6 +232,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -246,6 +256,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -269,6 +280,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -292,6 +304,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -315,6 +328,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -338,6 +352,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -361,6 +376,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -384,6 +400,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -407,6 +424,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -430,6 +448,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -453,6 +472,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -476,6 +496,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -499,6 +520,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -522,6 +544,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -545,6 +568,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -568,6 +592,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -591,6 +616,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -614,6 +640,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -637,6 +664,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -660,6 +688,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -683,6 +712,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -706,6 +736,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -729,6 +760,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -752,6 +784,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -775,6 +808,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -798,6 +832,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -821,6 +856,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -844,6 +880,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -867,6 +904,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -890,6 +928,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -913,6 +952,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -936,6 +976,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -959,6 +1000,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -982,6 +1024,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1005,6 +1048,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1028,6 +1072,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1051,6 +1096,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1074,6 +1120,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1097,6 +1144,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1120,6 +1168,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1143,6 +1192,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1166,6 +1216,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1189,6 +1240,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1212,6 +1264,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1235,6 +1288,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1258,6 +1312,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1281,6 +1336,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1304,6 +1360,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1327,6 +1384,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1350,6 +1408,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1373,6 +1432,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1396,6 +1456,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1419,6 +1480,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1442,6 +1504,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1465,6 +1528,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1488,6 +1552,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1511,6 +1576,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1534,6 +1600,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1557,6 +1624,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1580,6 +1648,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1603,6 +1672,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1626,6 +1696,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1649,6 +1720,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1672,6 +1744,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1695,6 +1768,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1718,6 +1792,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1741,6 +1816,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1764,6 +1840,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1787,6 +1864,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1810,6 +1888,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1833,6 +1912,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1856,6 +1936,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1879,6 +1960,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1902,6 +1984,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1925,6 +2008,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1948,6 +2032,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1971,6 +2056,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1994,6 +2080,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2017,6 +2104,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2040,6 +2128,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2063,6 +2152,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2086,6 +2176,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2109,6 +2200,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2132,6 +2224,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2155,6 +2248,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2178,6 +2272,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2201,6 +2296,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2224,6 +2320,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2247,6 +2344,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2270,6 +2368,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2293,6 +2392,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }

JisolGameCocos/assets/resources/config/json/tbgsysdungeon160002.json

@@ -16,6 +16,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -39,6 +40,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -62,6 +64,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -85,6 +88,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -108,6 +112,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -131,6 +136,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -154,6 +160,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -177,6 +184,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -200,6 +208,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -223,6 +232,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -246,6 +256,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -269,6 +280,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -292,6 +304,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -315,6 +328,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -338,6 +352,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -361,6 +376,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -384,6 +400,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -407,6 +424,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -430,6 +448,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -453,6 +472,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -476,6 +496,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -499,6 +520,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -522,6 +544,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -545,6 +568,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -568,6 +592,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -591,6 +616,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -614,6 +640,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -637,6 +664,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -660,6 +688,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -683,6 +712,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -706,6 +736,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -729,6 +760,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -752,6 +784,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -775,6 +808,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -798,6 +832,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -821,6 +856,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -844,6 +880,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -867,6 +904,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -890,6 +928,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -913,6 +952,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -936,6 +976,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -959,6 +1000,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -982,6 +1024,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1005,6 +1048,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1028,6 +1072,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1051,6 +1096,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1074,6 +1120,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1097,6 +1144,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1120,6 +1168,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1143,6 +1192,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1166,6 +1216,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1189,6 +1240,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1212,6 +1264,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1235,6 +1288,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1258,6 +1312,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1281,6 +1336,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1304,6 +1360,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1327,6 +1384,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1350,6 +1408,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1373,6 +1432,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1396,6 +1456,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1419,6 +1480,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1442,6 +1504,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1465,6 +1528,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1488,6 +1552,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1511,6 +1576,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1534,6 +1600,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1557,6 +1624,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1580,6 +1648,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1603,6 +1672,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1626,6 +1696,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1649,6 +1720,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1672,6 +1744,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1695,6 +1768,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1718,6 +1792,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1741,6 +1816,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1764,6 +1840,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1787,6 +1864,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1810,6 +1888,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1833,6 +1912,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1856,6 +1936,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1879,6 +1960,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1902,6 +1984,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1925,6 +2008,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1948,6 +2032,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1971,6 +2056,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1994,6 +2080,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2017,6 +2104,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2040,6 +2128,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2063,6 +2152,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2086,6 +2176,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2109,6 +2200,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2132,6 +2224,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2155,6 +2248,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2178,6 +2272,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2201,6 +2296,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2224,6 +2320,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2247,6 +2344,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2270,6 +2368,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2293,6 +2392,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }

JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab

@@ -48,7 +48,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": 1080,
       "y": 0,
       "z": 0
     },
@@ -4101,7 +4101,6 @@
       "__id__": 0
     },
     "fileId": "bdtesuqqNGPpKG+sSNpvIP",
-    "instance": null,
     "targetOverrides": [
       {
         "__id__": 227

JisolGameCocos/assets/resources/prefab/ui/常用预制体/奖励.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "d2c57bb7-f408-4861-943c-427c0ba9d7d4",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/resources/prefab/ui/常用预制体/奖励/列表奖励ICON.prefab

@@ -0,0 +1,268 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "列表奖励ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "列表奖励ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_prefab": {
+      "__id__": 3
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 2
+    },
+    "asset": {
+      "__uuid__": "02a7c444-c227-42df-824c-9ab8fdc733bd",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": {
+      "__id__": 4
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "a56u6iGGBAfq1c6X+we3RR",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "奖励ICON"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "02c3tqHwFAbp7zhkA22zq9"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 6
+    },
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    }
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "60HDOce21EU4mT/teH3tKt"
+  },
+  {
+    "__type__": "11083hh8A9NKKIx34Sb7I+G",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "icon": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "98xITtaApCa5SA5rcBNVjt"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": null,
+    "targetOverrides": [
+      {
+        "__id__": 15
+      }
+    ],
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 2
+      }
+    ]
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": {
+      "__id__": 12
+    },
+    "sourceInfo": null,
+    "propertyPath": [
+      "icon"
+    ],
+    "target": {
+      "__id__": 2
+    },
+    "targetInfo": {
+      "__id__": 16
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "f41dkcJe1C2o7zoUiZe10Y"
+    ]
+  }
+]

JisolGameCocos/assets/resources/prefab/ui/常用预制体/奖励/列表奖励ICON.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "6e8bc3fd-d622-4f2e-9ad8-35af8d6396ea",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "列表奖励ICON"
+  }
+}

JisolGameCocos/assets/resources/prefab/ui/常用预制体/奖励/奖励ICON.prefab

@@ -0,0 +1,739 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "奖励ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "persistent": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "奖励ICON",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 32
+      }
+    ],
+    "_prefab": {
+      "__id__": 34
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "背景",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 4
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "5dXmPodeBIzK9ZudCJ0lyM"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 6
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": {
+      "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941",
+      "__expectedType__": "cc.SpriteFrame"
+    },
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "20sb9VIT5KFIQeKj9xXgfd"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "5fFj0bKJZKHaJ1M3mytw3C",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "资源遮罩",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      },
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Sprite",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 8
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 11
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 70,
+      "height": 70
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "25alLvKOtKF50Ax8vwjjXJ"
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 9
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 13
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_spriteFrame": null,
+    "_type": 0,
+    "_fillType": 0,
+    "_sizeMode": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_useGrayscale": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "70nwIs5DNEdZlxo43eL/ak"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "0bJ3xFlaZFqIQTEe6gKXth",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 16
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "91h3J1Qo9NKp8P7pZ/ijRa"
+  },
+  {
+    "__type__": "cc.Mask",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 18
+    },
+    "_type": 0,
+    "_inverted": false,
+    "_segments": 64,
+    "_alphaThreshold": 0.1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "bay7jjytVJP6Fzx/k5RFdU"
+  },
+  {
+    "__type__": "cc.Graphics",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 20
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_lineWidth": 1,
+    "_strokeColor": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_lineJoin": 2,
+    "_lineCap": 0,
+    "_fillColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 0
+    },
+    "_miterLimit": 10,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4fJHZYu41AYIvcwxfCrJ6o"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "fc1fm88XdG0IiJpjOWJQQH",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "数量",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 23
+      },
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 29
+    },
+    "_lpos": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -33.647,
+      "z": 0
+    },
+    "_lrot": {
+      "__type__": "cc.Quat",
+      "x": 0,
+      "y": 0,
+      "z": 0,
+      "w": 1
+    },
+    "_lscale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_mobility": 0,
+    "_layer": 33554432,
+    "_euler": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 24
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 4,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "4c5h6T0flJt5JRab2+oYMO"
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 26
+    },
+    "_customMaterial": null,
+    "_srcBlendFactor": 2,
+    "_dstBlendFactor": 4,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_string": "",
+    "_horizontalAlign": 1,
+    "_verticalAlign": 1,
+    "_actualFontSize": 20,
+    "_fontSize": 20,
+    "_fontFamily": "Arial",
+    "_lineHeight": 40,
+    "_overflow": 0,
+    "_enableWrapText": true,
+    "_font": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_isItalic": false,
+    "_isBold": true,
+    "_isUnderline": false,
+    "_underlineHeight": 2,
+    "_cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "62+4SzXqFA8qi5LTvf4hNx"
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 22
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 28
+    },
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "76GD7mt+pBzIkY1rSwIkaJ"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "21MjGY6ndKiZ3M6O5l/pbL",
+    "instance": null,
+    "targetOverrides": null,
+    "nestedPrefabInstanceRoots": null
+  },
+  {
+    "__type__": "cc.UITransform",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 31
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "60HDOce21EU4mT/teH3tKt"
+  },
+  {
+    "__type__": "8ac904m4gdGUINAT3gK89wJ",
+    "_name": "",
+    "_objFlags": 0,
+    "__editorExtras__": {},
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "__prefab": {
+      "__id__": 33
+    },
+    "quality": {
+      "__id__": 5
+    },
+    "icon": {
+      "__id__": 12
+    },
+    "num": {
+      "__id__": 25
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.CompPrefabInfo",
+    "fileId": "f41dkcJe1C2o7zoUiZe10Y"
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": null,
+    "targetOverrides": null
+  }
+]

JisolGameCocos/assets/resources/prefab/ui/常用预制体/奖励/奖励ICON.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "02a7c444-c227-42df-824c-9ab8fdc733bd",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "奖励ICON"
+  }
+}

JisolGameCocos/assets/resources/prefab/ui/常用预制体/奖励/领取奖励页面.prefab.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.49",
+  "importer": "prefab",
+  "imported": true,
+  "uuid": "697ef794-5726-4fb6-b59d-f47cadacc1c2",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {
+    "syncNodeName": "领取奖励页面"
+  }
+}

JisolGameCocos/assets/resources/prefab/ui/常用预制体/资源/资源ICON.prefab

@@ -326,8 +326,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
+      "width": 70,
-      "height": 100
+      "height": 70
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",

JisolGameCocos/assets/script/App.ts

@@ -28,12 +28,12 @@ import AppAction from "./AppAction";
 import { Asset } from "cc";
 import { Component } from "cc";
 
-let APIPath = `http://localhost:8080`
+// let APIPath = `http://localhost:8080`
-let WsPath = `ws://localhost:8080/websocket`
+// let WsPath = `ws://localhost:8080/websocket`
 // let APIPath = `http://192.168.1.23:8080`
 // let WsPath = `ws://192.168.1.23:8080/websocket`
-// let APIPath = `http://192.168.0.118:8080`
+let APIPath = `http://192.168.0.118:8080`
-// let WsPath = `ws://192.168.0.118:8080/websocket`
+let WsPath = `ws://192.168.0.118:8080/websocket`
 // let APIPath = `https://api.pet.jisol.cn`
 // let WsPath = `wss://api.pet.jisol.cn/websocket`
 

JisolGameCocos/assets/script/config/data/schema.ts

@@ -8,6 +8,38 @@
 //------------------------------------------------------------------------------
 
 
+export namespace TbGEnum { 
+/**
+ * 奖励类型
+ */
+export enum TReward {
+    /**
+     * 资源类型
+     */
+    Resource = 1,
+}
+
+} 
+export namespace TbGEnum { 
+/**
+ * 礼包限购类型
+ */
+export enum TGiftLimit {
+    /**
+     * 无限购
+     */
+    Unlimited = 1,
+    /**
+     * 限制次数
+     */
+    Limit = 2,
+    /**
+     * 每天限制
+     */
+    DayLimit = 3,
+}
+
+} 
 
 
 
@@ -1028,7 +1060,7 @@ export class TDungeon {
         if (_json_.attributes === undefined) { throw new Error() }
         { this.attributes = []; for(let _ele of _json_.attributes) { let _e; _e = new TbGEntity.TAttributeValue(_ele); this.attributes.push(_e);}}
         if (_json_.rewards === undefined) { throw new Error() }
-        { this.rewards = []; for(let _ele of _json_.rewards) { let _e; _e = new TbGEntity.TResource(_ele); this.rewards.push(_e);}}
+        { this.rewards = []; for(let _ele of _json_.rewards) { let _e; _e = new TbGEntity.TReward(_ele); this.rewards.push(_e);}}
     }
 
     /**
@@ -1046,7 +1078,43 @@ export class TDungeon {
     /**
      * 关卡奖励
      */
-    readonly rewards: TbGEntity.TResource[]
+    readonly rewards: TbGEntity.TReward[]
+
+    resolve(tables:Tables)
+    {
+    }
+}
+
+}
+
+
+export namespace TbGEntity {
+/**
+ * 奖励信息
+ */
+export class TReward {
+
+    constructor(_json_: any) {
+        if (_json_.type === undefined) { throw new Error() }
+        this.type = _json_.type
+        if (_json_.id === undefined) { throw new Error() }
+        this.id = _json_.id
+        if (_json_.value === undefined) { throw new Error() }
+        this.value = _json_.value
+    }
+
+    /**
+     * 奖励类型
+     */
+    readonly type: TbGEnum.TReward
+    /**
+     * 奖励Id
+     */
+    readonly id: number
+    /**
+     * 奖励数量
+     */
+    readonly value: number
 
     resolve(tables:Tables)
     {
@@ -1083,6 +1151,96 @@ export class TbGSysDungeon160002 {
 }
 
 
+export namespace TB {
+export class TbGGift {
+
+    constructor(_json_: any) {
+        if (_json_.id === undefined) { throw new Error() }
+        this.id = _json_.id
+        if (_json_.name === undefined) { throw new Error() }
+        this.name = _json_.name
+        if (_json_.tig === undefined) { throw new Error() }
+        this.tig = _json_.tig
+        if (_json_.limit === undefined) { throw new Error() }
+        this.limit = _json_.limit
+        if (_json_.limitValue === undefined) { throw new Error() }
+        this.limitValue = _json_.limitValue
+        if (_json_.price === undefined) { throw new Error() }
+        this.price = _json_.price
+        if (_json_.rewards === undefined) { throw new Error() }
+        { this.rewards = []; for(let _ele of _json_.rewards) { let _e; _e = new TbGEntity.TReward(_ele); this.rewards.push(_e);}}
+    }
+
+    /**
+     * 礼包唯一Id
+     */
+    readonly id: number
+    /**
+     * 礼包名称
+     */
+    readonly name: string
+    /**
+     * 描述
+     */
+    readonly tig: string
+    /**
+     * 礼包购买限制
+     */
+    readonly limit: TbGEnum.TGiftLimit
+    /**
+     * 限购数量
+     */
+    readonly limitValue: number
+    /**
+     * 价格
+     */
+    readonly price: number
+    /**
+     * 奖励
+     */
+    readonly rewards: TbGEntity.TReward[]
+
+    resolve(tables:Tables)
+    {
+    }
+}
+
+}
+
+
+export namespace TB {
+export class TbGShop {
+
+    constructor(_json_: any) {
+        if (_json_.id === undefined) { throw new Error() }
+        this.id = _json_.id
+        if (_json_.tig === undefined) { throw new Error() }
+        this.tig = _json_.tig
+        if (_json_.giftId === undefined) { throw new Error() }
+        this.giftId = _json_.giftId
+    }
+
+    /**
+     * id
+     */
+    readonly id: number
+    /**
+     * 备注
+     */
+    readonly tig: string
+    /**
+     * 礼包Id
+     */
+    readonly giftId: number
+
+    resolve(tables:Tables)
+    {
+    }
+}
+
+}
+
+
 
 
 export class TbGGlobal{
@@ -1821,6 +1979,70 @@ export class TbGSysDungeon160002{
 
 
 
+export class TbGGift{
+    private _dataMap: Map<number, TB.TbGGift>
+    private _dataList: TB.TbGGift[]
+    constructor(_json_: any) {
+        this._dataMap = new Map<number, TB.TbGGift>()
+        this._dataList = []
+        for(var _json2_ of _json_) {
+            let _v: TB.TbGGift
+            _v = new TB.TbGGift(_json2_)
+            this._dataList.push(_v)
+            this._dataMap.set(_v.id, _v)
+        }
+    }
+
+    getDataMap(): Map<number, TB.TbGGift> { return this._dataMap; }
+    getDataList(): TB.TbGGift[] { return this._dataList; }
+
+    get(key: number): TB.TbGGift | undefined { return this._dataMap.get(key); }
+
+    resolve(tables:Tables)
+    {
+        for(let  data of this._dataList)
+        {
+            data.resolve(tables)
+        }
+    }
+
+}
+
+
+
+
+export class TbGShop{
+    private _dataMap: Map<number, TB.TbGShop>
+    private _dataList: TB.TbGShop[]
+    constructor(_json_: any) {
+        this._dataMap = new Map<number, TB.TbGShop>()
+        this._dataList = []
+        for(var _json2_ of _json_) {
+            let _v: TB.TbGShop
+            _v = new TB.TbGShop(_json2_)
+            this._dataList.push(_v)
+            this._dataMap.set(_v.id, _v)
+        }
+    }
+
+    getDataMap(): Map<number, TB.TbGShop> { return this._dataMap; }
+    getDataList(): TB.TbGShop[] { return this._dataList; }
+
+    get(key: number): TB.TbGShop | undefined { return this._dataMap.get(key); }
+
+    resolve(tables:Tables)
+    {
+        for(let  data of this._dataList)
+        {
+            data.resolve(tables)
+        }
+    }
+
+}
+
+
+
+
 type JsonLoader = (file: string) => any
 
 export class Tables {
@@ -1870,6 +2092,10 @@ export class Tables {
     get TbGSysDungeon160001(): TbGSysDungeon160001  { return this._TbGSysDungeon160001;}
     private _TbGSysDungeon160002: TbGSysDungeon160002
     get TbGSysDungeon160002(): TbGSysDungeon160002  { return this._TbGSysDungeon160002;}
+    private _TbGGift: TbGGift
+    get TbGGift(): TbGGift  { return this._TbGGift;}
+    private _TbGShop: TbGShop
+    get TbGShop(): TbGShop  { return this._TbGShop;}
 
     constructor(loader: JsonLoader) {
         this._TbGGlobal = new TbGGlobal(loader('tbgglobal'))
@@ -1895,6 +2121,8 @@ export class Tables {
         this._TbGSysDungeon = new TbGSysDungeon(loader('tbgsysdungeon'))
         this._TbGSysDungeon160001 = new TbGSysDungeon160001(loader('tbgsysdungeon160001'))
         this._TbGSysDungeon160002 = new TbGSysDungeon160002(loader('tbgsysdungeon160002'))
+        this._TbGGift = new TbGGift(loader('tbggift'))
+        this._TbGShop = new TbGShop(loader('tbgshop'))
 
         this._TbGGlobal.resolve(this)
         this._TbGRole.resolve(this)
@@ -1919,5 +2147,7 @@ export class Tables {
         this._TbGSysDungeon.resolve(this)
         this._TbGSysDungeon160001.resolve(this)
         this._TbGSysDungeon160002.resolve(this)
+        this._TbGGift.resolve(this)
+        this._TbGShop.resolve(this)
     }
 }

JisolGameCocos/assets/script/consts/API.ts

@@ -15,6 +15,11 @@ export const RData = (data:any,isTips:boolean = false) => {
                 PlayerPetData.getIns().onUpdateOV(res.operation,res.pet);       //刷新宠物
             })
         }
+        //如果有 rewards 字段 表示要弹出获得资源
+        if(data.data['rewards']){
+            //弹出获得资源
+            app.layer.Open(GUI.RewardClaimView,data.data['rewards'])
+        }
         //弹出提示
         if(isTips){
             app.layer.Open(GUI.Tips,{text:data.data.msg});

JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts

@@ -111,6 +111,7 @@ export default class GOnHookManager extends Singleton{
 
     //获取下一只野怪
     getNextCreeps(){
+        if(this.getKillSreepsIds().length > 50) return;
         if(!this.sreeps) return;
         let creeps = this.sreeps.get(this.sreeps.keys().next()?.value);
         this.sreeps.delete(creeps.key);

JisolGameCocos/assets/script/ui/Consts/Reward.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "92c659b6-f0f2-42ba-a6c1-eb30b3dee78b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/script/ui/Consts/Reward/RewardClaimView.ts

@@ -0,0 +1,28 @@
+import { _decorator, Component, Node } from 'cc';
+import { JNGLayerBase } from '../../../components/JNComponent';
+import { TbGEntity } from '../../../config/data/schema';
+import JNScrollView from '../../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView';
+const { ccclass, property } = _decorator;
+
+@ccclass('RewardClaimView')
+export class RewardClaimView extends JNGLayerBase {
+
+    //奖励页面
+    @property(JNScrollView)
+    views:JNScrollView;
+
+    data:TbGEntity.TReward[] = [];
+
+    onJNLoad(data?: TbGEntity.TReward[]): void {
+        super.onJNLoad(data);
+        this.data = data;
+        this.onUpdateView();
+    }
+
+    onUpdateView(){
+        this.views.refreshData(this.data);
+    }
+
+}
+
+

JisolGameCocos/assets/script/ui/Consts/Reward/RewardClaimView.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "e4a39951-dd79-4562-be9b-8325a60d612b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/script/ui/Consts/Reward/RewardIcon.ts

@@ -0,0 +1,53 @@
+import { Label } from 'cc';
+import { Sprite } from 'cc';
+import { _decorator, Component, Node } from 'cc';
+import { TbGEntity, TbGEnum } from '../../../config/data/schema';
+import { TD } from '../../../App';
+import TbResource, { IconTypeEnum } from '../../../tools/TbResource';
+const { ccclass, property } = _decorator;
+
+@ccclass('RewardIcon')
+export class RewardIcon extends Component {
+
+    //资源品质
+    @property(Sprite)
+    quality:Sprite;
+
+    //资源图标
+    @property(Sprite)
+    icon:Sprite;
+
+    //资源数量
+    @property(Label)
+    num:Label;
+
+    info:TbGEntity.TReward;
+
+    //设置icon
+    set(info:TbGEntity.TReward){
+
+        this.info = info;
+        if(info.type == TbGEnum.TReward.Resource)
+            this.onUpdateResource();
+
+    }
+
+    //刷新资源
+    onUpdateResource(){
+
+        let config = TD.TbGResource.get(this.info.id);
+
+        //设置ICON
+        TbResource.loadSpriteIcon(IconTypeEnum.资源,config.icon,this.icon,this);
+        //设置品质
+        TbResource.loadSpriteIcon(IconTypeEnum.品质,config.quality,this.quality,this);
+
+        this.num.string = ``;
+        if(this.info.value > 1){
+            //显示数量
+            this.num.string = `${this.info.value}`;
+        }
+
+    }
+
+}

JisolGameCocos/assets/script/ui/Consts/Reward/RewardIcon.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "8ac90e26-e207-4650-8340-4f780af3dc09",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/script/ui/Consts/Reward/RewardIconScroll.ts

@@ -0,0 +1,20 @@
+import { _decorator, Component, Node } from 'cc';
+import JNScrollViewItem from '../../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollViewItem';
+import { TbGEntity } from '../../../config/data/schema';
+import { RewardIcon } from './RewardIcon';
+const { ccclass, property } = _decorator;
+
+@ccclass('RewardIconScroll')
+export class RewardIconScroll extends JNScrollViewItem<TbGEntity.TReward> {
+
+    @property(RewardIcon)
+    icon:RewardIcon;
+
+    onInit(data:TbGEntity.TReward){
+
+        this.icon.set(data);
+
+    }
+}
+
+

JisolGameCocos/assets/script/ui/Consts/Reward/RewardIconScroll.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "4.0.23",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "11083861-f00f-4d28-a231-df849bec8f86",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

JisolGameCocos/assets/script/ui/Tactical/IntoBattleView.ts

@@ -57,6 +57,7 @@ export class IntoBattleView extends JNLayerBase {
     }
     
     onJNClose(): void {
+        super.onJNClose();
         //取消监听
         app.event.off(PlayerPetEvent.UPDATE_INFO,this.onPetMinus,this);    //减少宠物
     }

JisolGameCocos/assets/script/ui/UIConfig.ts

@@ -9,11 +9,12 @@ export enum GLayer{
 
 export enum GUI{
     /** 系统UI */
-    Login = "Login",                //登录页面
+    Login = "Login",                        //登录页面
-    Loading = "Loading",            //加载页面
+    Loading = "Loading",                    //加载页面
-    Tips = "Tips",                  //提示
+    Tips = "Tips",                          //提示
-    SelectionBox = "SelectionBox",  //选择提示页面 (用于玩家确定该操作)
+    SelectionBox = "SelectionBox",          //选择提示页面 (用于玩家确定该操作)
-    Debugger = "Debugger",          //Debugger
+    Debugger = "Debugger",                  //Debugger
+    RewardClaimView = "RewardClaimView",    //奖励领取通用界面
 
     /** 新手引导 */
     NoviceNamingView = "NoviceNamingView", //新手引导页面 - 取名
@@ -90,6 +91,11 @@ const UISystemConfig:{ [key: string]: JNLayerInfo; } = {
             backInfo:{key:"position",start:v3(0,0,0),end:v3(-720,0,0)}
         },
     },
+    [GUI.RewardClaimView]:{
+        layer:GLayer.View, 
+        uri: "prefab/ui/常用预制体/奖励/领取奖励页面",
+        anims:BackOutScale
+    },
 }
 
 //主页UI

JisolGameServer/Main/src/main/java/cfg/TB/TbGGift.java

@@ -0,0 +1,79 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg.TB;
+
+import luban.*;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+
+public final class TbGGift extends AbstractBean {
+    public TbGGift(JsonObject _buf) { 
+        id = _buf.get("id").getAsInt();
+        name = _buf.get("name").getAsString();
+        tig = _buf.get("tig").getAsString();
+        limit = _buf.get("limit").getAsInt();
+        limitValue = _buf.get("limitValue").getAsInt();
+        price = _buf.get("price").getAsInt();
+        { com.google.gson.JsonArray _json0_ = _buf.get("rewards").getAsJsonArray(); int __n0 = _json0_.size(); rewards = new cfg.TbGEntity.TReward[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { cfg.TbGEntity.TReward __v0;  __v0 = cfg.TbGEntity.TReward.deserialize(__e0.getAsJsonObject());  rewards[__index0++] = __v0; }   }
+    }
+
+    public static TbGGift deserialize(JsonObject _buf) {
+            return new cfg.TB.TbGGift(_buf);
+    }
+
+    /**
+     * 礼包唯一Id
+     */
+    public final int id;
+    /**
+     * 礼包名称
+     */
+    public final String name;
+    /**
+     * 描述
+     */
+    public final String tig;
+    /**
+     * 礼包购买限制
+     */
+    public final int limit;
+    /**
+     * 限购数量
+     */
+    public final int limitValue;
+    /**
+     * 价格
+     */
+    public final int price;
+    /**
+     * 奖励
+     */
+    public final cfg.TbGEntity.TReward[] rewards;
+
+    public static final int __ID__ = 319065289;
+    
+    @Override
+    public int getTypeId() { return __ID__; }
+
+    @Override
+    public String toString() {
+        return "{ "
+        + "(format_field_name __code_style field.name):" + id + ","
+        + "(format_field_name __code_style field.name):" + name + ","
+        + "(format_field_name __code_style field.name):" + tig + ","
+        + "(format_field_name __code_style field.name):" + limit + ","
+        + "(format_field_name __code_style field.name):" + limitValue + ","
+        + "(format_field_name __code_style field.name):" + price + ","
+        + "(format_field_name __code_style field.name):" + rewards + ","
+        + "}";
+    }
+}
+

JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java

@@ -0,0 +1,55 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg.TB;
+
+import luban.*;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+
+public final class TbGShop extends AbstractBean {
+    public TbGShop(JsonObject _buf) { 
+        id = _buf.get("id").getAsInt();
+        tig = _buf.get("tig").getAsString();
+        giftId = _buf.get("giftId").getAsInt();
+    }
+
+    public static TbGShop deserialize(JsonObject _buf) {
+            return new cfg.TB.TbGShop(_buf);
+    }
+
+    /**
+     * id
+     */
+    public final int id;
+    /**
+     * 备注
+     */
+    public final String tig;
+    /**
+     * 礼包Id
+     */
+    public final int giftId;
+
+    public static final int __ID__ = 319422095;
+    
+    @Override
+    public int getTypeId() { return __ID__; }
+
+    @Override
+    public String toString() {
+        return "{ "
+        + "(format_field_name __code_style field.name):" + id + ","
+        + "(format_field_name __code_style field.name):" + tig + ","
+        + "(format_field_name __code_style field.name):" + giftId + ","
+        + "}";
+    }
+}
+

JisolGameServer/Main/src/main/java/cfg/Tables.java

@@ -65,6 +65,10 @@ public final class Tables
     public cfg.TbGSysDungeon160001 getTbGSysDungeon160001() { return _tbgsysdungeon160001; }
     private final cfg.TbGSysDungeon160002 _tbgsysdungeon160002;
     public cfg.TbGSysDungeon160002 getTbGSysDungeon160002() { return _tbgsysdungeon160002; }
+    private final cfg.TbGGift _tbggift;
+    public cfg.TbGGift getTbGGift() { return _tbggift; }
+    private final cfg.TbGShop _tbgshop;
+    public cfg.TbGShop getTbGShop() { return _tbgshop; }
 
     public Tables(IJsonLoader loader) throws java.io.IOException {
         _tbgglobal = new cfg.TbGGlobal(loader.load("tbgglobal")); 
@@ -90,6 +94,8 @@ public final class Tables
         _tbgsysdungeon = new cfg.TbGSysDungeon(loader.load("tbgsysdungeon")); 
         _tbgsysdungeon160001 = new cfg.TbGSysDungeon160001(loader.load("tbgsysdungeon160001")); 
         _tbgsysdungeon160002 = new cfg.TbGSysDungeon160002(loader.load("tbgsysdungeon160002")); 
+        _tbggift = new cfg.TbGGift(loader.load("tbggift")); 
+        _tbgshop = new cfg.TbGShop(loader.load("tbgshop")); 
     }
 }
 

JisolGameServer/Main/src/main/java/cfg/TbGEntity/TDungeon.java

@@ -22,7 +22,7 @@ public final class TDungeon extends AbstractBean {
         level = _buf.get("level").getAsInt();
         boss = _buf.get("boss").getAsInt();
         { com.google.gson.JsonArray _json0_ = _buf.get("attributes").getAsJsonArray(); int __n0 = _json0_.size(); attributes = new cfg.TbGEntity.TAttributeValue[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { cfg.TbGEntity.TAttributeValue __v0;  __v0 = cfg.TbGEntity.TAttributeValue.deserialize(__e0.getAsJsonObject());  attributes[__index0++] = __v0; }   }
-        { com.google.gson.JsonArray _json0_ = _buf.get("rewards").getAsJsonArray(); int __n0 = _json0_.size(); rewards = new cfg.TbGEntity.TResource[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { cfg.TbGEntity.TResource __v0;  __v0 = cfg.TbGEntity.TResource.deserialize(__e0.getAsJsonObject());  rewards[__index0++] = __v0; }   }
+        { com.google.gson.JsonArray _json0_ = _buf.get("rewards").getAsJsonArray(); int __n0 = _json0_.size(); rewards = new cfg.TbGEntity.TReward[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { cfg.TbGEntity.TReward __v0;  __v0 = cfg.TbGEntity.TReward.deserialize(__e0.getAsJsonObject());  rewards[__index0++] = __v0; }   }
     }
 
     public static TDungeon deserialize(JsonObject _buf) {
@@ -44,7 +44,7 @@ public final class TDungeon extends AbstractBean {
     /**
      * 关卡奖励
      */
-    public final cfg.TbGEntity.TResource[] rewards;
+    public final cfg.TbGEntity.TReward[] rewards;
 
     public static final int __ID__ = -191293256;
     

JisolGameServer/Main/src/main/java/cfg/TbGEntity/TReward.java

@@ -0,0 +1,58 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg.TbGEntity;
+
+import luban.*;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
+
+/**
+ * 奖励信息
+ */
+public final class TReward extends AbstractBean {
+    public TReward(JsonObject _buf) { 
+        type = _buf.get("type").getAsInt();
+        id = _buf.get("id").getAsInt();
+        value = _buf.get("value").getAsInt();
+    }
+
+    public static TReward deserialize(JsonObject _buf) {
+            return new cfg.TbGEntity.TReward(_buf);
+    }
+
+    /**
+     * 奖励类型
+     */
+    public final int type;
+    /**
+     * 奖励Id
+     */
+    public final int id;
+    /**
+     * 奖励数量
+     */
+    public final int value;
+
+    public static final int __ID__ = 103029105;
+    
+    @Override
+    public int getTypeId() { return __ID__; }
+
+    @Override
+    public String toString() {
+        return "{ "
+        + "(format_field_name __code_style field.name):" + type + ","
+        + "(format_field_name __code_style field.name):" + id + ","
+        + "(format_field_name __code_style field.name):" + value + ","
+        + "}";
+    }
+}
+

JisolGameServer/Main/src/main/java/cfg/TbGEnum/TGiftLimit.java

@@ -0,0 +1,29 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg.TbGEnum;
+
+/**
+ * 礼包限购类型
+ */
+public final class TGiftLimit {
+    /**
+     * 无限购
+     */
+    public static final int Unlimited = 1;
+    /**
+     * 限制次数
+     */
+    public static final int Limit = 2;
+    /**
+     * 每天限制
+     */
+    public static final int DayLimit = 3;
+}
+

JisolGameServer/Main/src/main/java/cfg/TbGEnum/TReward.java

@@ -0,0 +1,21 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg.TbGEnum;
+
+/**
+ * 奖励类型
+ */
+public final class TReward {
+    /**
+     * 资源类型
+     */
+    public static final int Resource = 1;
+}
+

JisolGameServer/Main/src/main/java/cfg/TbGGift.java

@@ -0,0 +1,37 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg;
+
+import luban.*;
+import com.google.gson.JsonElement;
+
+
+public final class TbGGift {
+    private final java.util.HashMap<Integer, cfg.TB.TbGGift> _dataMap;
+    private final java.util.ArrayList<cfg.TB.TbGGift> _dataList;
+    
+    public TbGGift(JsonElement _buf) {
+        _dataMap = new java.util.HashMap<Integer, cfg.TB.TbGGift>();
+        _dataList = new java.util.ArrayList<cfg.TB.TbGGift>();
+        
+        for (com.google.gson.JsonElement _e_ : _buf.getAsJsonArray()) {
+            cfg.TB.TbGGift _v;
+            _v = cfg.TB.TbGGift.deserialize(_e_.getAsJsonObject());
+            _dataList.add(_v);
+            _dataMap.put(_v.id, _v);
+        }
+    }
+
+    public java.util.HashMap<Integer, cfg.TB.TbGGift> getDataMap() { return _dataMap; }
+    public java.util.ArrayList<cfg.TB.TbGGift> getDataList() { return _dataList; }
+
+    public cfg.TB.TbGGift get(int key) { return _dataMap.get(key); }
+
+}

JisolGameServer/Main/src/main/java/cfg/TbGShop.java

@@ -0,0 +1,37 @@
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+package cfg;
+
+import luban.*;
+import com.google.gson.JsonElement;
+
+
+public final class TbGShop {
+    private final java.util.HashMap<Integer, cfg.TB.TbGShop> _dataMap;
+    private final java.util.ArrayList<cfg.TB.TbGShop> _dataList;
+    
+    public TbGShop(JsonElement _buf) {
+        _dataMap = new java.util.HashMap<Integer, cfg.TB.TbGShop>();
+        _dataList = new java.util.ArrayList<cfg.TB.TbGShop>();
+        
+        for (com.google.gson.JsonElement _e_ : _buf.getAsJsonArray()) {
+            cfg.TB.TbGShop _v;
+            _v = cfg.TB.TbGShop.deserialize(_e_.getAsJsonObject());
+            _dataList.add(_v);
+            _dataMap.put(_v.id, _v);
+        }
+    }
+
+    public java.util.HashMap<Integer, cfg.TB.TbGShop> getDataMap() { return _dataMap; }
+    public java.util.ArrayList<cfg.TB.TbGShop> getDataList() { return _dataList; }
+
+    public cfg.TB.TbGShop get(int key) { return _dataMap.get(key); }
+
+}

JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GDungeonController.java

@@ -11,6 +11,7 @@ import cn.jisol.game.service.DungeonService;
 import cn.jisol.game.service.ResourceService;
 import cn.jisol.game.table.TableUtil;
 import cn.jisol.game.vo.news.NewsResource;
+import cn.jisol.game.vo.news.NewsReward;
 import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
 import cn.jisol.ngame.util.NewsContext;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -81,17 +82,17 @@ public class GDungeonController {
     @ApiOperation(value = "消耗钥匙挑战普通副本")
     @PostMapping("/challenge/dungeon/{dungeonId}/{dungeonItemId}")
     @Transactional
-    public NewsResource<Map<Integer,Dungeon>> challengeDungeon(@CurrentPlayer Player player, @PathVariable Integer dungeonId, @PathVariable Integer dungeonItemId){
+    public NewsReward<Map<Integer,Dungeon>> challengeDungeon(@CurrentPlayer Player player, @PathVariable Integer dungeonId, @PathVariable Integer dungeonItemId){
 
         TbGSysDungeon tbGSysDungeon = TD.DATA.getTbGSysDungeon().get(dungeonId);
-        if(Objects.isNull(tbGSysDungeon)) return NewsResource.onFail("不存在该副本");
+        if(Objects.isNull(tbGSysDungeon)) return NewsReward.onFail("不存在该副本");
-        if(!tbGSysDungeon.type.equals(ModeDungeonType.GDungeonMode)) return NewsResource.onFail("错误副本");
+        if(!tbGSysDungeon.type.equals(ModeDungeonType.GDungeonMode)) return NewsReward.onFail("错误副本");
 
         //获取副本信息
         Map<Integer, Dungeon> infos = this.getInfos(player).data;
 
         //禁止越级挑战
-        if(infos.get(dungeonId).getDungeonCfgItemId() < dungeonItemId) return NewsResource.onFail("请不要越级挑战哦");
+        if(infos.get(dungeonId).getDungeonCfgItemId() < dungeonItemId) return NewsReward.onFail("请不要越级挑战哦");
 
         //获取副本
         TableUtil.TableData tableData = Objects.requireNonNull(TableUtil.getTableData(tbGSysDungeon.tigs));
@@ -117,7 +118,7 @@ public class GDungeonController {
         }
 
         //发放奖励
-        return NewsResource.onSuccess("挑战成功",infos,ovs);
+        return NewsReward.onSuccess("挑战成功",infos,ovs,Arrays.asList(dungeon.rewards));
 
     }
 

JisolGameServer/Main/src/main/java/cn/jisol/game/service/ResourceService.java

@@ -1,6 +1,7 @@
 package cn.jisol.game.service;
 
 import cfg.TbGEntity.TResource;
+import cfg.TbGEntity.TReward;
 import cn.jisol.game.entity.table.Player;
 import cn.jisol.game.entity.table.Resource;
 import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
@@ -28,6 +29,6 @@ public interface ResourceService extends IService<Resource> {
     public long timeSpeedUp(int type);
 
     //发放奖励
-    public List<ResourceUpdateOV> rewards(Long playerId,TResource[] rewards);
+    public List<ResourceUpdateOV> rewards(Long playerId, TReward[] rewards);
 
 }

JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.jisol.game.service.impl;
 
 import cfg.TbGEntity.TResource;
+import cfg.TbGEntity.TReward;
 import cn.jisol.game.controller.exception.GeneralException;
 import cn.jisol.game.controller.exception.ResourceInitException;
 import cn.jisol.game.controller.exception.ResourceNotException;
@@ -133,8 +134,13 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
     }
 
     @Override
-    public List<ResourceUpdateOV> rewards(Long playerId, TResource[] rewards) {
+    public List<ResourceUpdateOV> rewards(Long playerId, TReward[] rewards) {
-        return Arrays.stream(rewards).map(reward -> ResourceUpdateOV.onUpdate(this.addResourceValue(playerId, reward.id, (long) reward.value))).collect(Collectors.toList());
+        return Arrays.stream(rewards).map(reward -> {
+            if(reward.type == cfg.TbGEnum.TReward.Resource){
+                return ResourceUpdateOV.onUpdate(this.addResourceValue(playerId, reward.id, (long) reward.value));
+            }
+            return null;
+        }).collect(Collectors.toList());
     }
 
 

JisolGameServer/Main/src/main/java/cn/jisol/game/vo/news/NewsReward.java

@@ -0,0 +1,52 @@
+package cn.jisol.game.vo.news;
+
+import cfg.TbGEntity.TResource;
+import cfg.TbGEntity.TReward;
+import cn.jisol.game.entity.table.Resource;
+import cn.jisol.game.vo.news.ov.ResourceUpdateOV;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.experimental.SuperBuilder;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+//返回带资源领取的消息
+@SuperBuilder
+@ApiResponses({
+    @ApiResponse(code = 200,message = "成功"),
+    @ApiResponse(code = 500,message = "失败"),
+})
+public class NewsReward<T> extends NewsResource<T>{
+
+    public List<TReward> rewards = new ArrayList<>();
+
+    public static <T> NewsReward<T> onSuccess(String msg){
+        return onMessage(msg,null,NEWS_STATE_SUCCESS,new ArrayList<>(),new ArrayList<>());
+    }
+    public static <T> NewsReward<T> onSuccess(String msg,T data){
+        return onMessage(msg,data,NEWS_STATE_SUCCESS,new ArrayList<>(),new ArrayList<>());
+    }
+    public static <T> NewsReward<T> onSuccess(String msg,T data,ResourceUpdateOV... resource){
+        return onMessage(msg,data,NEWS_STATE_SUCCESS, Arrays.asList(resource),new ArrayList<>());
+    }
+    public static <T> NewsReward<T> onSuccess(String msg,T data,List<ResourceUpdateOV> resource){
+        return onMessage(msg,data,NEWS_STATE_SUCCESS, resource,new ArrayList<>());
+    }
+    public static <T> NewsReward<T> onSuccess(String msg,T data,List<ResourceUpdateOV> resource, List<TReward> rewards){
+        return onMessage(msg,data,NEWS_STATE_SUCCESS, resource,rewards);
+    }
+
+    public static <T> NewsReward<T> onFail(String msg){
+        return onMessage(msg,null,NEWS_STATE_FAIL,new ArrayList<>(),new ArrayList<>());
+    }
+    public static <T> NewsReward<T> onFail(String msg, T data){
+        return onMessage(msg,data,NEWS_STATE_FAIL,new ArrayList<>(),new ArrayList<>());
+    }
+
+    public static <T> NewsReward<T> onMessage(String msg, T data, Integer state, List<ResourceUpdateOV> resource, List<TReward> rewards){
+        return (NewsReward<T>) NewsReward.builder().state(state).msg(msg).data(data).resources(resource).rewards(rewards).build();
+    }
+
+}

JisolGameServer/Main/src/main/resources/json/tbggift.json

@@ -0,0 +1,47 @@
+[
+  {
+    "id": 180001,
+    "name": "金币礼包",
+    "tig": "金币礼包",
+    "limit": 1,
+    "limitValue": 0,
+    "price": 6,
+    "rewards": [
+      {
+        "type": 1,
+        "id": 90002,
+        "value": 20
+      }
+    ]
+  },
+  {
+    "id": 190001,
+    "name": "限购金币礼包",
+    "tig": "限购金币礼包",
+    "limit": 2,
+    "limitValue": 1,
+    "price": 6,
+    "rewards": [
+      {
+        "type": 1,
+        "id": 90002,
+        "value": 20
+      }
+    ]
+  },
+  {
+    "id": 200001,
+    "name": "每日限购金币礼包",
+    "tig": "每日限购金币礼包",
+    "limit": 3,
+    "limitValue": 1,
+    "price": 6,
+    "rewards": [
+      {
+        "type": 1,
+        "id": 90002,
+        "value": 20
+      }
+    ]
+  }
+]

JisolGameServer/Main/src/main/resources/json/tbgresource.json

@@ -46,5 +46,13 @@
     "tig": "用于宠物升星",
     "args": "",
     "quality": 1
+  },
+  {
+    "id": 90007,
+    "icon": "90007",
+    "name": "兑换券",
+    "tig": "用于购买礼包",
+    "args": "",
+    "quality": 1
   }
 ]

JisolGameServer/Main/src/main/resources/json/tbgshop.json

@@ -0,0 +1,17 @@
+[
+  {
+    "id": 1,
+    "tig": "金币礼包",
+    "giftId": 180001
+  },
+  {
+    "id": 2,
+    "tig": "限购金币礼包",
+    "giftId": 190001
+  },
+  {
+    "id": 3,
+    "tig": "每日限购金币礼包",
+    "giftId": 200001
+  }
+]

JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160001.json

@@ -16,6 +16,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -39,6 +40,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -62,6 +64,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -85,6 +88,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -108,6 +112,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -131,6 +136,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -154,6 +160,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -177,6 +184,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -200,6 +208,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -223,6 +232,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -246,6 +256,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -269,6 +280,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -292,6 +304,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -315,6 +328,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -338,6 +352,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -361,6 +376,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -384,6 +400,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -407,6 +424,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -430,6 +448,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -453,6 +472,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -476,6 +496,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -499,6 +520,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -522,6 +544,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -545,6 +568,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -568,6 +592,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -591,6 +616,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -614,6 +640,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -637,6 +664,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -660,6 +688,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -683,6 +712,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -706,6 +736,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -729,6 +760,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -752,6 +784,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -775,6 +808,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -798,6 +832,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -821,6 +856,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -844,6 +880,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -867,6 +904,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -890,6 +928,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -913,6 +952,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -936,6 +976,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -959,6 +1000,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -982,6 +1024,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1005,6 +1048,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1028,6 +1072,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1051,6 +1096,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1074,6 +1120,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1097,6 +1144,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1120,6 +1168,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1143,6 +1192,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1166,6 +1216,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1189,6 +1240,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1212,6 +1264,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1235,6 +1288,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1258,6 +1312,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1281,6 +1336,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1304,6 +1360,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1327,6 +1384,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1350,6 +1408,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1373,6 +1432,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1396,6 +1456,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1419,6 +1480,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1442,6 +1504,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1465,6 +1528,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1488,6 +1552,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1511,6 +1576,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1534,6 +1600,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1557,6 +1624,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1580,6 +1648,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1603,6 +1672,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1626,6 +1696,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1649,6 +1720,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1672,6 +1744,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1695,6 +1768,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1718,6 +1792,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1741,6 +1816,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1764,6 +1840,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1787,6 +1864,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1810,6 +1888,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1833,6 +1912,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1856,6 +1936,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1879,6 +1960,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1902,6 +1984,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1925,6 +2008,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1948,6 +2032,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1971,6 +2056,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -1994,6 +2080,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2017,6 +2104,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2040,6 +2128,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2063,6 +2152,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2086,6 +2176,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2109,6 +2200,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2132,6 +2224,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2155,6 +2248,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2178,6 +2272,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2201,6 +2296,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2224,6 +2320,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2247,6 +2344,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2270,6 +2368,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }
@@ -2293,6 +2392,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90001,
           "value": 4000
         }

JisolGameServer/Main/src/main/resources/json/tbgsysdungeon160002.json

@@ -16,6 +16,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -39,6 +40,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -62,6 +64,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -85,6 +88,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -108,6 +112,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -131,6 +136,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -154,6 +160,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -177,6 +184,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -200,6 +208,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -223,6 +232,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -246,6 +256,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -269,6 +280,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -292,6 +304,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -315,6 +328,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -338,6 +352,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -361,6 +376,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -384,6 +400,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -407,6 +424,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -430,6 +448,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -453,6 +472,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -476,6 +496,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -499,6 +520,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -522,6 +544,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -545,6 +568,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -568,6 +592,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -591,6 +616,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -614,6 +640,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -637,6 +664,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -660,6 +688,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -683,6 +712,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -706,6 +736,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -729,6 +760,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -752,6 +784,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -775,6 +808,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -798,6 +832,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -821,6 +856,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -844,6 +880,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -867,6 +904,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -890,6 +928,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -913,6 +952,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -936,6 +976,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -959,6 +1000,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -982,6 +1024,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1005,6 +1048,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1028,6 +1072,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1051,6 +1096,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1074,6 +1120,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1097,6 +1144,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1120,6 +1168,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1143,6 +1192,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1166,6 +1216,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1189,6 +1240,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1212,6 +1264,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1235,6 +1288,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1258,6 +1312,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1281,6 +1336,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1304,6 +1360,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1327,6 +1384,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1350,6 +1408,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1373,6 +1432,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1396,6 +1456,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1419,6 +1480,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1442,6 +1504,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1465,6 +1528,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1488,6 +1552,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1511,6 +1576,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1534,6 +1600,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1557,6 +1624,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1580,6 +1648,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1603,6 +1672,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1626,6 +1696,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1649,6 +1720,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1672,6 +1744,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1695,6 +1768,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1718,6 +1792,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1741,6 +1816,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1764,6 +1840,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1787,6 +1864,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1810,6 +1888,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1833,6 +1912,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1856,6 +1936,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1879,6 +1960,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1902,6 +1984,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1925,6 +2008,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1948,6 +2032,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1971,6 +2056,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -1994,6 +2080,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2017,6 +2104,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2040,6 +2128,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2063,6 +2152,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2086,6 +2176,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2109,6 +2200,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2132,6 +2224,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2155,6 +2248,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2178,6 +2272,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2201,6 +2296,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2224,6 +2320,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2247,6 +2344,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2270,6 +2368,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }
@@ -2293,6 +2392,7 @@
       ],
       "rewards": [
         {
+          "type": 1,
           "id": 90002,
           "value": 20
         }