diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json
index 11b095341..1b820c472 100644
--- a/bin/json/game_buriedcondi.json
+++ b/bin/json/game_buriedcondi.json
@@ -764,8 +764,7 @@
     },
     "value": 4,
     "filter": [
-      16003001,
-      24012016
+      16003001
     ],
     "filter2": [
       "0",
@@ -12068,7 +12067,7 @@
       "key": "",
       "text": ""
     },
-    "value": 1,
+    "value": 10,
     "filter": [],
     "filter2": []
   },
@@ -12574,7 +12573,7 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 20,
     "filter": [],
     "filter2": []
   },
@@ -12601,7 +12600,7 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 30,
     "filter": [],
     "filter2": []
   },
@@ -12628,7 +12627,7 @@
       "key": "",
       "text": ""
     },
-    "value": 4,
+    "value": 40,
     "filter": [],
     "filter2": []
   },
@@ -12655,7 +12654,7 @@
       "key": "",
       "text": ""
     },
-    "value": 5,
+    "value": 50,
     "filter": [],
     "filter2": []
   },
@@ -12682,7 +12681,7 @@
       "key": "",
       "text": ""
     },
-    "value": 6,
+    "value": 60,
     "filter": [],
     "filter2": []
   },
@@ -12709,7 +12708,7 @@
       "key": "",
       "text": ""
     },
-    "value": 7,
+    "value": 70,
     "filter": [],
     "filter2": []
   },
@@ -13275,10 +13274,10 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 1,
     "filter": [
-      8,
-      1
+      2,
+      8
     ],
     "filter2": []
   },
@@ -13307,8 +13306,8 @@
     },
     "value": 1,
     "filter": [
-      8,
-      1
+      1,
+      8
     ],
     "filter2": []
   },
@@ -13335,10 +13334,10 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 1,
     "filter": [
-      8,
-      1
+      3,
+      8
     ],
     "filter2": []
   },
@@ -13365,10 +13364,10 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 50,
     "filter": [
-      1,
-      50
+      2,
+      1
     ],
     "filter2": []
   },
@@ -13395,10 +13394,10 @@
       "key": "",
       "text": ""
     },
-    "value": 1,
+    "value": 50,
     "filter": [
       1,
-      50
+      1
     ],
     "filter2": []
   },
@@ -13425,10 +13424,10 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 50,
     "filter": [
-      1,
-      50
+      3,
+      1
     ],
     "filter2": []
   },
@@ -13455,10 +13454,10 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 1,
     "filter": [
-      8,
-      1
+      2,
+      8
     ],
     "filter2": []
   },
@@ -13487,8 +13486,8 @@
     },
     "value": 1,
     "filter": [
-      8,
-      1
+      1,
+      8
     ],
     "filter2": []
   },
@@ -13515,10 +13514,10 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 1,
     "filter": [
-      8,
-      1
+      3,
+      8
     ],
     "filter2": []
   },
@@ -13545,10 +13544,10 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 1,
     "filter": [
-      8,
-      1
+      2,
+      8
     ],
     "filter2": []
   },
@@ -13577,8 +13576,8 @@
     },
     "value": 1,
     "filter": [
-      8,
-      1
+      1,
+      8
     ],
     "filter2": []
   },
@@ -13605,10 +13604,10 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 1,
     "filter": [
-      8,
-      1
+      3,
+      8
     ],
     "filter2": []
   },
@@ -13635,10 +13634,10 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 1,
     "filter": [
-      8,
-      1
+      2,
+      8
     ],
     "filter2": []
   },
@@ -13667,8 +13666,8 @@
     },
     "value": 1,
     "filter": [
-      8,
-      1
+      1,
+      8
     ],
     "filter2": []
   },
@@ -13695,10 +13694,10 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 1,
     "filter": [
-      8,
-      1
+      3,
+      8
     ],
     "filter2": []
   },
@@ -13725,10 +13724,10 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 1,
     "filter": [
-      8,
-      1
+      2,
+      8
     ],
     "filter2": []
   },
@@ -13757,8 +13756,8 @@
     },
     "value": 1,
     "filter": [
-      8,
-      1
+      1,
+      8
     ],
     "filter2": []
   },
@@ -13785,10 +13784,10 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 1,
     "filter": [
-      8,
-      1
+      3,
+      8
     ],
     "filter2": []
   },
@@ -13815,10 +13814,10 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 1,
     "filter": [
-      8,
-      1
+      2,
+      8
     ],
     "filter2": []
   },
@@ -13847,8 +13846,8 @@
     },
     "value": 1,
     "filter": [
-      8,
-      1
+      1,
+      8
     ],
     "filter2": []
   },
@@ -13875,10 +13874,10 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 1,
     "filter": [
-      8,
-      1
+      3,
+      8
     ],
     "filter2": []
   },
@@ -13905,10 +13904,10 @@
       "key": "",
       "text": ""
     },
-    "value": 2,
+    "value": 1,
     "filter": [
-      8,
-      1
+      2,
+      8
     ],
     "filter2": []
   },
@@ -13937,8 +13936,8 @@
     },
     "value": 1,
     "filter": [
-      8,
-      1
+      1,
+      8
     ],
     "filter2": []
   },
@@ -13965,10 +13964,10 @@
       "key": "",
       "text": ""
     },
-    "value": 3,
+    "value": 1,
     "filter": [
-      8,
-      1
+      3,
+      8
     ],
     "filter2": []
   },
@@ -16921,7 +16920,7 @@
       "key": "buried_buried_condi_tasktxt_547",
       "text": "在任意商店购买5次商品"
     },
-    "type": 241,
+    "type": 64,
     "valid": 0,
     "head": {
       "a": "attr",
@@ -17956,6 +17955,7 @@
     },
     "value": 1,
     "filter": [
+      1,
       1
     ],
     "filter2": []
diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json
index fae212a60..72ca56a7d 100644
--- a/bin/json/game_gm.json
+++ b/bin/json/game_gm.json
@@ -828,5 +828,15 @@
     },
     "data": "触发条件",
     "prefix": ""
+  },
+  {
+    "id": 84,
+    "type": 2,
+    "text": {
+      "key": "GM_GM_text_131",
+      "text": "辉月等级"
+    },
+    "data": "3",
+    "prefix": "bingo:moonlv,{0}"
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 2641bbae6..26a02d91f 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -19424,7 +19424,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 9999,
-    "img": "wp_icon_jjcq",
+    "img": "item_23000001",
     "intr": {
       "key": "item_item_intr_23000001",
       "text": "可以用于开服活动中抽奖。"
@@ -19471,7 +19471,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 9999,
-    "img": "wp_icon_jjcq",
+    "img": "item_23000002",
     "intr": {
       "key": "item_item_intr_23000002",
       "text": "可用于拼图游戏中完成拼图游戏。"
@@ -19518,7 +19518,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 9999,
-    "img": "wp_icon_jjcq",
+    "img": "item_23000003",
     "intr": {
       "key": "item_item_intr_23000003",
       "text": "可用于云上行走游戏中。"
@@ -19565,7 +19565,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 9999,
-    "img": "wp_icon_jjcq",
+    "img": "item_23000004",
     "intr": {
       "key": "item_item_intr_23000004",
       "text": "可用于黄金矿工游戏中。"
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index 47738ad72..3afa7d95f 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -6172,7 +6172,7 @@
         "n": 1
       }
     ],
-    "BattleReadyID": 10103004,
+    "BattleReadyID": 10103001,
     "FormatList": [
       1104008
     ],
@@ -21440,7 +21440,7 @@
     "frontstoryid": 303000,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "mainchapter_main_stage_maingroupName_167",
+      "key": "",
       "text": ""
     },
     "maingroupIcon": "",
@@ -30263,8 +30263,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_167",
+      "text": "国王的新装"
     },
     "maingroupIcon": "13004",
     "mainlineName": {
@@ -30392,8 +30392,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_168",
+      "text": "国王的新装"
     },
     "maingroupIcon": "13004",
     "mainlineName": {
@@ -30521,8 +30521,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_169",
+      "text": "国王的新装"
     },
     "maingroupIcon": "13004",
     "mainlineName": {
@@ -30650,8 +30650,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_170",
+      "text": "国王的新装"
     },
     "maingroupIcon": "13004",
     "mainlineName": {
@@ -30779,8 +30779,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_171",
+      "text": "国王的新装"
     },
     "maingroupIcon": "13004",
     "mainlineName": {
@@ -30908,8 +30908,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_172",
+      "text": "国王的新装"
     },
     "maingroupIcon": "13004",
     "mainlineName": {
@@ -31037,8 +31037,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_173",
+      "text": "国王的新装"
     },
     "maingroupIcon": "13004",
     "mainlineName": {
@@ -31166,8 +31166,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_174",
+      "text": "国王的新装"
     },
     "maingroupIcon": "13004",
     "mainlineName": {
@@ -31295,8 +31295,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_175",
+      "text": "魂之挽歌"
     },
     "maingroupIcon": "54016",
     "mainlineName": {
@@ -31424,8 +31424,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_176",
+      "text": "魂之挽歌"
     },
     "maingroupIcon": "54016",
     "mainlineName": {
@@ -31553,8 +31553,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_177",
+      "text": "魂之挽歌"
     },
     "maingroupIcon": "54016",
     "mainlineName": {
@@ -31682,8 +31682,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_178",
+      "text": "魂之挽歌"
     },
     "maingroupIcon": "54016",
     "mainlineName": {
@@ -31811,8 +31811,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_179",
+      "text": "魂之挽歌"
     },
     "maingroupIcon": "54016",
     "mainlineName": {
@@ -31940,8 +31940,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_180",
+      "text": "魂之挽歌"
     },
     "maingroupIcon": "54016",
     "mainlineName": {
@@ -32069,8 +32069,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_181",
+      "text": "魂之挽歌"
     },
     "maingroupIcon": "54016",
     "mainlineName": {
@@ -32198,8 +32198,8 @@
     "frontstoryid": 0,
     "afterstoryid": 0,
     "maingroupName": {
-      "key": "",
-      "text": ""
+      "key": "mainchapter_main_stage_maingroupName_182",
+      "text": "魂之挽歌"
     },
     "maingroupIcon": "54016",
     "mainlineName": {
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index e09c62f65..5db5166a3 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -250036,7 +250036,7 @@
     "Id": 1104008,
     "pos": 1,
     "captainId": 0,
-    "IsBoss": 1,
+    "IsBoss": 0,
     "bossHpCnt": 0,
     "heroid": 55007,
     "star": 3,
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 4c162d1d2..3fa34603b 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -174,7 +174,7 @@
       "text": "每日一练"
     },
     "npcName": [
-      "每日一练"
+      "阿宝"
     ],
     "functionicon": "ty_qp_mryj",
     "jumpId": 10002
@@ -228,7 +228,7 @@
       "text": "打造"
     },
     "npcName": [
-      "打造"
+      "阿宝"
     ],
     "functionicon": "ty_qp_zm",
     "jumpId": 1001
@@ -279,7 +279,7 @@
     "sceneicon": "ty_qp_my01",
     "functionname": {
       "key": "navigation_Sheet1_functionname_17",
-      "text": "纸牌接龙"
+      "text": "纸牌对决"
     },
     "npcName": [
       "功能入口-纸牌接龙"
@@ -315,7 +315,7 @@
     "sceneicon": "ty_qp_my01",
     "functionname": {
       "key": "navigation_Sheet1_functionname_19",
-      "text": "猜颜色"
+      "text": "缤纷乐声"
     },
     "npcName": [
       "功能入口-藏书馆"
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 05c750f3c..1b4f323b0 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -2945,8 +2945,8 @@
     },
     "main": [
       {
-        "key": 1,
-        "param": 40
+        "key": 2,
+        "param": 1103015
       }
     ],
     "wkqbx": 2,
@@ -2973,8 +2973,8 @@
     },
     "main": [
       {
-        "key": 1,
-        "param": 41
+        "key": 2,
+        "param": 1104031
       }
     ],
     "wkqbx": 2,
diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json
index a5711478d..bea071098 100644
--- a/bin/json/game_pagoda.json
+++ b/bin/json/game_pagoda.json
@@ -2363,7 +2363,7 @@
       "key": "pandamas_pagoda_name_display_71",
       "text": "第1层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2394,7 +2394,7 @@
       "key": "pandamas_pagoda_name_display_72",
       "text": "第2层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2425,7 +2425,7 @@
       "key": "pandamas_pagoda_name_display_73",
       "text": "第3层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2456,7 +2456,7 @@
       "key": "pandamas_pagoda_name_display_74",
       "text": "第4层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2498,7 +2498,7 @@
       "key": "pandamas_pagoda_name_display_75",
       "text": "第5层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2529,7 +2529,7 @@
       "key": "pandamas_pagoda_name_display_76",
       "text": "第6层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2560,7 +2560,7 @@
       "key": "pandamas_pagoda_name_display_77",
       "text": "第7层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2591,7 +2591,7 @@
       "key": "pandamas_pagoda_name_display_78",
       "text": "第8层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2622,7 +2622,7 @@
       "key": "pandamas_pagoda_name_display_79",
       "text": "第9层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2665,7 +2665,7 @@
       "key": "pandamas_pagoda_name_display_80",
       "text": "第10层"
     },
-    "model_display": 25001,
+    "model_display": 44002,
     "unlock": 1101007
   },
   {
@@ -2696,7 +2696,7 @@
       "key": "pandamas_pagoda_name_display_81",
       "text": "第1层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2727,7 +2727,7 @@
       "key": "pandamas_pagoda_name_display_82",
       "text": "第2层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2758,7 +2758,7 @@
       "key": "pandamas_pagoda_name_display_83",
       "text": "第3层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2789,7 +2789,7 @@
       "key": "pandamas_pagoda_name_display_84",
       "text": "第4层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2831,7 +2831,7 @@
       "key": "pandamas_pagoda_name_display_85",
       "text": "第5层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2862,7 +2862,7 @@
       "key": "pandamas_pagoda_name_display_86",
       "text": "第6层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2893,7 +2893,7 @@
       "key": "pandamas_pagoda_name_display_87",
       "text": "第7层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2924,7 +2924,7 @@
       "key": "pandamas_pagoda_name_display_88",
       "text": "第8层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2955,7 +2955,7 @@
       "key": "pandamas_pagoda_name_display_89",
       "text": "第9层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -2998,7 +2998,7 @@
       "key": "pandamas_pagoda_name_display_90",
       "text": "第10层"
     },
-    "model_display": 45001,
+    "model_display": 35002,
     "unlock": 1101007
   },
   {
@@ -3029,7 +3029,7 @@
       "key": "pandamas_pagoda_name_display_91",
       "text": "第1层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3060,7 +3060,7 @@
       "key": "pandamas_pagoda_name_display_92",
       "text": "第2层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3091,7 +3091,7 @@
       "key": "pandamas_pagoda_name_display_93",
       "text": "第3层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3122,7 +3122,7 @@
       "key": "pandamas_pagoda_name_display_94",
       "text": "第4层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3164,7 +3164,7 @@
       "key": "pandamas_pagoda_name_display_95",
       "text": "第5层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3195,7 +3195,7 @@
       "key": "pandamas_pagoda_name_display_96",
       "text": "第6层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3226,7 +3226,7 @@
       "key": "pandamas_pagoda_name_display_97",
       "text": "第7层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3257,7 +3257,7 @@
       "key": "pandamas_pagoda_name_display_98",
       "text": "第8层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3288,7 +3288,7 @@
       "key": "pandamas_pagoda_name_display_99",
       "text": "第9层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   },
   {
@@ -3331,7 +3331,7 @@
       "key": "pandamas_pagoda_name_display_100",
       "text": "第10层"
     },
-    "model_display": 45001,
+    "model_display": 45004,
     "unlock": 1101007
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_paygiftpack.json b/bin/json/game_paygiftpack.json
index 7c652fb82..516531f8a 100644
--- a/bin/json/game_paygiftpack.json
+++ b/bin/json/game_paygiftpack.json
@@ -3,11 +3,14 @@
     "id": 20001,
     "type": 1,
     "type2": 101,
+    "rank": 2,
     "day": 1,
     "repeat_num": 1,
     "refreshtime": 1,
     "packagetype": "",
     "buy_num": 1,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20001",
       "text": "每日好礼"
@@ -31,11 +34,14 @@
     "id": 20002,
     "type": 1,
     "type2": 101,
+    "rank": 3,
     "day": 2,
     "repeat_num": 1,
     "refreshtime": 1,
     "packagetype": "",
     "buy_num": 1,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20002",
       "text": "每日好礼"
@@ -59,11 +65,14 @@
     "id": 20003,
     "type": 1,
     "type2": 101,
+    "rank": 4,
     "day": 3,
     "repeat_num": 1,
     "refreshtime": 1,
     "packagetype": "",
     "buy_num": 1,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20003",
       "text": "每日好礼"
@@ -87,11 +96,14 @@
     "id": 20004,
     "type": 1,
     "type2": 101,
+    "rank": 5,
     "day": 4,
     "repeat_num": 1,
     "refreshtime": 1,
     "packagetype": "",
     "buy_num": 1,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20004",
       "text": "每日好礼"
@@ -115,11 +127,14 @@
     "id": 20005,
     "type": 1,
     "type2": 101,
+    "rank": 6,
     "day": 5,
     "repeat_num": 1,
     "refreshtime": 1,
     "packagetype": "",
     "buy_num": 1,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20005",
       "text": "每日好礼"
@@ -143,11 +158,14 @@
     "id": 20006,
     "type": 1,
     "type2": 102,
+    "rank": 1,
     "day": 0,
     "repeat_num": 2,
     "refreshtime": 30,
     "packagetype": "",
     "buy_num": 2,
+    "issp": 1,
+    "isrecommend": 1,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20006",
       "text": "兑换礼包"
@@ -171,11 +189,14 @@
     "id": 20007,
     "type": 1,
     "type2": 103,
+    "rank": 0,
     "day": 0,
     "repeat_num": 3,
     "refreshtime": 30,
     "packagetype": "drawcard_pack1",
     "buy_num": 3,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20007",
       "text": "招募礼包1"
@@ -193,11 +214,14 @@
     "id": 20008,
     "type": 2,
     "type2": 104,
+    "rank": 0,
     "day": 0,
     "repeat_num": 3,
     "refreshtime": 30,
     "packagetype": "drawcard_pack2",
     "buy_num": 3,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20008",
       "text": "限时礼包1"
@@ -215,11 +239,14 @@
     "id": 20009,
     "type": 2,
     "type2": 104,
+    "rank": 0,
     "day": 0,
     "repeat_num": 3,
     "refreshtime": 30,
     "packagetype": "drawcard_pack3",
     "buy_num": 3,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20009",
       "text": "限时礼包2"
@@ -237,11 +264,14 @@
     "id": 20010,
     "type": 2,
     "type2": 104,
+    "rank": 0,
     "day": 0,
     "repeat_num": 3,
     "refreshtime": 30,
     "packagetype": "drawcard_pack4",
     "buy_num": 3,
+    "issp": 0,
+    "isrecommend": 0,
     "packagename": {
       "key": "paypackage_paypackage_packagename_20010",
       "text": "限时礼包3"
diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json
index 9c183faa3..feb267c9d 100644
--- a/bin/json/game_shop.json
+++ b/bin/json/game_shop.json
@@ -403,5 +403,34 @@
       28011,
       28012
     ]
+  },
+  {
+    "shopid": 15,
+    "tab": 15,
+    "shopname": {
+      "key": "shop_shop_shopname_15",
+      "text": "巅峰商店"
+    },
+    "upper_shop": {
+      "key": "shop_shop_upper_shop_15",
+      "text": ""
+    },
+    "opencond": "shop15",
+    "rtype": 2,
+    "rtime": 1,
+    "rnum": 10,
+    "rneed": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 50
+      }
+    ],
+    "shopitem": [
+      30001,
+      30002,
+      30003,
+      30004
+    ]
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json
index 77c07621f..f30d7a7bd 100644
--- a/bin/json/game_shopitem.json
+++ b/bin/json/game_shopitem.json
@@ -28438,5 +28438,437 @@
     "lvmax": 60,
     "mapidmin": 101,
     "mapidmax": 9999
+  },
+  {
+    "key": 807,
+    "id": 30001,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000100",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 808,
+    "id": 30001,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000100",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 809,
+    "id": 30001,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000100",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 810,
+    "id": 30002,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000102",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 811,
+    "id": 30002,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000102",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 812,
+    "id": 30002,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000102",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 813,
+    "id": 30003,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000103",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 814,
+    "id": 30003,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000103",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 815,
+    "id": 30003,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000103",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 816,
+    "id": 30004,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000104",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 817,
+    "id": 30004,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000104",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 818,
+    "id": 30004,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "27000104",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "consumemoney",
+        "n": 100
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 10,
+    "buymaxnum": 10,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
   }
 ]
\ No newline at end of file
diff --git a/sys/configure/structs/Game.PayGiftpackData.go b/sys/configure/structs/Game.PayGiftpackData.go
index d9e3858c5..2e58b5a18 100644
--- a/sys/configure/structs/Game.PayGiftpackData.go
+++ b/sys/configure/structs/Game.PayGiftpackData.go
@@ -14,11 +14,14 @@ type GamePayGiftpackData struct {
     Id int32
     Type int32
     Type2 int32
+    Rank int32
     Day int32
     RepeatNum int32
     Refreshtime int32
     Packagetype string
     BuyNum int32
+    Issp int32
+    Isrecommend int32
     Packagename string
     Costitem []*Gameatn
     Item []*Gameatn
@@ -34,11 +37,14 @@ func (_v *GamePayGiftpackData)Deserialize(_buf map[string]interface{}) (err erro
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type2"].(float64); !_ok_ { err = errors.New("type2 error"); return }; _v.Type2 = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank"].(float64); !_ok_ { err = errors.New("rank error"); return }; _v.Rank = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["day"].(float64); !_ok_ { err = errors.New("day error"); return }; _v.Day = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["repeat_num"].(float64); !_ok_ { err = errors.New("repeat_num error"); return }; _v.RepeatNum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["refreshtime"].(float64); !_ok_ { err = errors.New("refreshtime error"); return }; _v.Refreshtime = int32(_tempNum_) }
     { var _ok_ bool; if _v.Packagetype, _ok_ = _buf["packagetype"].(string); !_ok_ { err = errors.New("packagetype error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buy_num"].(float64); !_ok_ { err = errors.New("buy_num error"); return }; _v.BuyNum = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["issp"].(float64); !_ok_ { err = errors.New("issp error"); return }; _v.Issp = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isrecommend"].(float64); !_ok_ { err = errors.New("isrecommend error"); return }; _v.Isrecommend = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["packagename"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Packagename error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Packagename, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
      {
                 var _arr_ []interface{}