diff --git a/bin/json/game_cardpool.json b/bin/json/game_cardpool.json
index 598fe56d4..ba0e8c0e9 100644
--- a/bin/json/game_cardpool.json
+++ b/bin/json/game_cardpool.json
@@ -56,1331 +56,1301 @@
   {
     "key": 10,
     "card_pool_type": "pro_pool20003",
-    "id": "23011",
+    "id": "33001",
     "weight": 1
   },
   {
     "key": 11,
     "card_pool_type": "pro_pool20003",
-    "id": "33001",
+    "id": "33002",
     "weight": 1
   },
   {
     "key": 12,
     "card_pool_type": "pro_pool20003",
-    "id": "33002",
+    "id": "33003",
     "weight": 1
   },
   {
     "key": 13,
     "card_pool_type": "pro_pool20003",
-    "id": "33003",
+    "id": "33005",
     "weight": 1
   },
   {
     "key": 14,
     "card_pool_type": "pro_pool20003",
-    "id": "33005",
+    "id": "43001",
     "weight": 1
   },
   {
     "key": 15,
     "card_pool_type": "pro_pool20003",
-    "id": "43001",
+    "id": "43003",
     "weight": 1
   },
   {
     "key": 16,
     "card_pool_type": "pro_pool20003",
-    "id": "43003",
+    "id": "43004",
     "weight": 1
   },
   {
     "key": 17,
     "card_pool_type": "pro_pool20003",
-    "id": "43004",
+    "id": "43006",
     "weight": 1
   },
   {
     "key": 18,
-    "card_pool_type": "pro_pool20003",
-    "id": "43006",
+    "card_pool_type": "pro_pool20004",
+    "id": "14001",
     "weight": 1
   },
   {
     "key": 19,
     "card_pool_type": "pro_pool20004",
-    "id": "14001",
+    "id": "14002",
     "weight": 1
   },
   {
     "key": 20,
     "card_pool_type": "pro_pool20004",
-    "id": "14002",
+    "id": "14005",
     "weight": 1
   },
   {
     "key": 21,
     "card_pool_type": "pro_pool20004",
-    "id": "14005",
+    "id": "14007",
     "weight": 1
   },
   {
     "key": 22,
     "card_pool_type": "pro_pool20004",
-    "id": "14007",
+    "id": "24001",
     "weight": 1
   },
   {
     "key": 23,
     "card_pool_type": "pro_pool20004",
-    "id": "24001",
+    "id": "24002",
     "weight": 1
   },
   {
     "key": 24,
     "card_pool_type": "pro_pool20004",
-    "id": "24002",
+    "id": "24004",
     "weight": 1
   },
   {
     "key": 25,
     "card_pool_type": "pro_pool20004",
-    "id": "24004",
+    "id": "24005",
     "weight": 1
   },
   {
     "key": 26,
     "card_pool_type": "pro_pool20004",
-    "id": "24005",
+    "id": "24008",
     "weight": 1
   },
   {
     "key": 27,
     "card_pool_type": "pro_pool20004",
-    "id": "24008",
+    "id": "24009",
     "weight": 1
   },
   {
     "key": 28,
     "card_pool_type": "pro_pool20004",
-    "id": "24009",
+    "id": "25001",
     "weight": 1
   },
   {
     "key": 29,
     "card_pool_type": "pro_pool20004",
-    "id": "25001",
+    "id": "34002",
     "weight": 1
   },
   {
     "key": 30,
     "card_pool_type": "pro_pool20004",
-    "id": "34002",
+    "id": "34004",
     "weight": 1
   },
   {
     "key": 31,
     "card_pool_type": "pro_pool20004",
-    "id": "34004",
+    "id": "34005",
     "weight": 1
   },
   {
     "key": 32,
     "card_pool_type": "pro_pool20004",
-    "id": "34005",
+    "id": "34008",
     "weight": 1
   },
   {
     "key": 33,
     "card_pool_type": "pro_pool20004",
-    "id": "34008",
+    "id": "13004",
     "weight": 1
   },
   {
     "key": 34,
     "card_pool_type": "pro_pool20004",
-    "id": "13004",
+    "id": "35006",
     "weight": 1
   },
   {
     "key": 35,
     "card_pool_type": "pro_pool20004",
-    "id": "35006",
+    "id": "44001",
     "weight": 1
   },
   {
     "key": 36,
     "card_pool_type": "pro_pool20004",
-    "id": "44001",
+    "id": "44003",
     "weight": 1
   },
   {
     "key": 37,
     "card_pool_type": "pro_pool20004",
-    "id": "44003",
+    "id": "44004",
     "weight": 1
   },
   {
     "key": 38,
     "card_pool_type": "pro_pool20004",
-    "id": "44004",
+    "id": "44006",
     "weight": 1
   },
   {
     "key": 39,
     "card_pool_type": "pro_pool20004",
-    "id": "44006",
+    "id": "43002",
     "weight": 1
   },
   {
     "key": 40,
     "card_pool_type": "pro_pool20004",
-    "id": "43002",
+    "id": "43007",
     "weight": 1
   },
   {
     "key": 41,
-    "card_pool_type": "pro_pool20004",
-    "id": "43007",
+    "card_pool_type": "pro_pool20005",
+    "id": "15002",
     "weight": 1
   },
   {
     "key": 42,
     "card_pool_type": "pro_pool20005",
-    "id": "15002",
+    "id": "15003",
     "weight": 1
   },
   {
     "key": 43,
     "card_pool_type": "pro_pool20005",
-    "id": "15003",
+    "id": "15004",
     "weight": 1
   },
   {
     "key": 44,
     "card_pool_type": "pro_pool20005",
-    "id": "15004",
+    "id": "15005",
     "weight": 1
   },
   {
     "key": 45,
     "card_pool_type": "pro_pool20005",
-    "id": "15005",
+    "id": "25002",
     "weight": 1
   },
   {
     "key": 46,
     "card_pool_type": "pro_pool20005",
-    "id": "25002",
+    "id": "35005",
     "weight": 1
   },
   {
     "key": 47,
     "card_pool_type": "pro_pool20005",
-    "id": "35005",
+    "id": "35001",
     "weight": 1
   },
   {
     "key": 48,
     "card_pool_type": "pro_pool20005",
-    "id": "35001",
+    "id": "35002",
     "weight": 1
   },
   {
     "key": 49,
     "card_pool_type": "pro_pool20005",
-    "id": "35002",
+    "id": "44005",
     "weight": 1
   },
   {
     "key": 50,
     "card_pool_type": "pro_pool20005",
-    "id": "44005",
+    "id": "44002",
     "weight": 1
   },
   {
     "key": 51,
-    "card_pool_type": "pro_pool20005",
-    "id": "44002",
+    "card_pool_type": "base_pool10003",
+    "id": "13001",
     "weight": 1
   },
   {
     "key": 52,
     "card_pool_type": "base_pool10003",
-    "id": "13001",
+    "id": "13002",
     "weight": 1
   },
   {
     "key": 53,
     "card_pool_type": "base_pool10003",
-    "id": "13002",
+    "id": "13003",
     "weight": 1
   },
   {
     "key": 54,
     "card_pool_type": "base_pool10003",
-    "id": "13003",
+    "id": "13005",
     "weight": 1
   },
   {
     "key": 55,
     "card_pool_type": "base_pool10003",
-    "id": "13005",
+    "id": "23003",
     "weight": 1
   },
   {
     "key": 56,
     "card_pool_type": "base_pool10003",
-    "id": "23003",
+    "id": "23004",
     "weight": 1
   },
   {
     "key": 57,
     "card_pool_type": "base_pool10003",
-    "id": "23004",
+    "id": "33001",
     "weight": 1
   },
   {
     "key": 58,
     "card_pool_type": "base_pool10003",
-    "id": "23011",
+    "id": "33002",
     "weight": 1
   },
   {
     "key": 59,
     "card_pool_type": "base_pool10003",
-    "id": "33001",
+    "id": "33003",
     "weight": 1
   },
   {
     "key": 60,
     "card_pool_type": "base_pool10003",
-    "id": "33002",
+    "id": "33005",
     "weight": 1
   },
   {
     "key": 61,
     "card_pool_type": "base_pool10003",
-    "id": "33003",
+    "id": "43001",
     "weight": 1
   },
   {
     "key": 62,
     "card_pool_type": "base_pool10003",
-    "id": "33005",
+    "id": "43003",
     "weight": 1
   },
   {
     "key": 63,
     "card_pool_type": "base_pool10003",
-    "id": "43001",
+    "id": "43004",
     "weight": 1
   },
   {
     "key": 64,
     "card_pool_type": "base_pool10003",
-    "id": "43003",
+    "id": "43006",
     "weight": 1
   },
   {
     "key": 65,
-    "card_pool_type": "base_pool10003",
-    "id": "43004",
+    "card_pool_type": "base_pool10004",
+    "id": "14001",
     "weight": 1
   },
   {
     "key": 66,
-    "card_pool_type": "base_pool10003",
-    "id": "43006",
+    "card_pool_type": "base_pool10004",
+    "id": "14002",
     "weight": 1
   },
   {
     "key": 67,
     "card_pool_type": "base_pool10004",
-    "id": "14001",
+    "id": "14005",
     "weight": 1
   },
   {
     "key": 68,
     "card_pool_type": "base_pool10004",
-    "id": "14002",
+    "id": "14007",
     "weight": 1
   },
   {
     "key": 69,
     "card_pool_type": "base_pool10004",
-    "id": "14005",
+    "id": "24001",
     "weight": 1
   },
   {
     "key": 70,
     "card_pool_type": "base_pool10004",
-    "id": "14007",
+    "id": "24002",
     "weight": 1
   },
   {
     "key": 71,
     "card_pool_type": "base_pool10004",
-    "id": "24001",
+    "id": "24004",
     "weight": 1
   },
   {
     "key": 72,
     "card_pool_type": "base_pool10004",
-    "id": "24002",
+    "id": "24005",
     "weight": 1
   },
   {
     "key": 73,
     "card_pool_type": "base_pool10004",
-    "id": "24004",
+    "id": "24008",
     "weight": 1
   },
   {
     "key": 74,
     "card_pool_type": "base_pool10004",
-    "id": "24005",
+    "id": "24009",
     "weight": 1
   },
   {
     "key": 75,
     "card_pool_type": "base_pool10004",
-    "id": "24008",
+    "id": "25001",
     "weight": 1
   },
   {
     "key": 76,
     "card_pool_type": "base_pool10004",
-    "id": "24009",
+    "id": "34002",
     "weight": 1
   },
   {
     "key": 77,
     "card_pool_type": "base_pool10004",
-    "id": "25001",
+    "id": "34004",
     "weight": 1
   },
   {
     "key": 78,
     "card_pool_type": "base_pool10004",
-    "id": "34002",
+    "id": "34005",
     "weight": 1
   },
   {
     "key": 79,
     "card_pool_type": "base_pool10004",
-    "id": "34004",
+    "id": "34008",
     "weight": 1
   },
   {
     "key": 80,
     "card_pool_type": "base_pool10004",
-    "id": "34005",
+    "id": "13004",
     "weight": 1
   },
   {
     "key": 81,
     "card_pool_type": "base_pool10004",
-    "id": "34008",
+    "id": "35006",
     "weight": 1
   },
   {
     "key": 82,
     "card_pool_type": "base_pool10004",
-    "id": "13004",
+    "id": "44001",
     "weight": 1
   },
   {
     "key": 83,
     "card_pool_type": "base_pool10004",
-    "id": "35006",
+    "id": "44003",
     "weight": 1
   },
   {
     "key": 84,
     "card_pool_type": "base_pool10004",
-    "id": "44001",
+    "id": "44004",
     "weight": 1
   },
   {
     "key": 85,
     "card_pool_type": "base_pool10004",
-    "id": "44003",
+    "id": "44006",
     "weight": 1
   },
   {
     "key": 86,
     "card_pool_type": "base_pool10004",
-    "id": "44004",
+    "id": "43002",
     "weight": 1
   },
   {
     "key": 87,
     "card_pool_type": "base_pool10004",
-    "id": "44006",
+    "id": "43007",
     "weight": 1
   },
   {
     "key": 88,
-    "card_pool_type": "base_pool10004",
-    "id": "43002",
+    "card_pool_type": "base_pool10005",
+    "id": "15002",
     "weight": 1
   },
   {
     "key": 89,
-    "card_pool_type": "base_pool10004",
-    "id": "43007",
+    "card_pool_type": "base_pool10005",
+    "id": "15003",
     "weight": 1
   },
   {
     "key": 90,
     "card_pool_type": "base_pool10005",
-    "id": "15002",
+    "id": "15004",
     "weight": 1
   },
   {
     "key": 91,
     "card_pool_type": "base_pool10005",
-    "id": "15003",
+    "id": "15005",
     "weight": 1
   },
   {
     "key": 92,
     "card_pool_type": "base_pool10005",
-    "id": "15004",
+    "id": "25002",
     "weight": 1
   },
   {
     "key": 93,
     "card_pool_type": "base_pool10005",
-    "id": "15005",
+    "id": "35005",
     "weight": 1
   },
   {
     "key": 94,
     "card_pool_type": "base_pool10005",
-    "id": "25002",
+    "id": "35001",
     "weight": 1
   },
   {
     "key": 95,
     "card_pool_type": "base_pool10005",
-    "id": "35005",
+    "id": "35002",
     "weight": 1
   },
   {
     "key": 96,
     "card_pool_type": "base_pool10005",
-    "id": "35001",
+    "id": "44005",
     "weight": 1
   },
   {
     "key": 97,
     "card_pool_type": "base_pool10005",
-    "id": "35002",
+    "id": "44002",
     "weight": 1
   },
   {
     "key": 98,
-    "card_pool_type": "base_pool10005",
-    "id": "44005",
+    "card_pool_type": "base_pool20003",
+    "id": "13001",
     "weight": 1
   },
   {
     "key": 99,
-    "card_pool_type": "base_pool10005",
-    "id": "44002",
+    "card_pool_type": "base_pool20003",
+    "id": "13002",
     "weight": 1
   },
   {
     "key": 100,
     "card_pool_type": "base_pool20003",
-    "id": "13001",
+    "id": "13003",
     "weight": 1
   },
   {
     "key": 101,
     "card_pool_type": "base_pool20003",
-    "id": "13002",
+    "id": "13005",
     "weight": 1
   },
   {
     "key": 102,
     "card_pool_type": "base_pool20003",
-    "id": "13003",
+    "id": "23003",
     "weight": 1
   },
   {
     "key": 103,
     "card_pool_type": "base_pool20003",
-    "id": "13005",
+    "id": "23004",
     "weight": 1
   },
   {
     "key": 104,
     "card_pool_type": "base_pool20003",
-    "id": "23003",
+    "id": "33001",
     "weight": 1
   },
   {
     "key": 105,
     "card_pool_type": "base_pool20003",
-    "id": "23004",
+    "id": "33002",
     "weight": 1
   },
   {
     "key": 106,
     "card_pool_type": "base_pool20003",
-    "id": "23011",
+    "id": "33003",
     "weight": 1
   },
   {
     "key": 107,
     "card_pool_type": "base_pool20003",
-    "id": "33001",
+    "id": "33005",
     "weight": 1
   },
   {
     "key": 108,
     "card_pool_type": "base_pool20003",
-    "id": "33002",
+    "id": "43001",
     "weight": 1
   },
   {
     "key": 109,
     "card_pool_type": "base_pool20003",
-    "id": "33003",
+    "id": "43003",
     "weight": 1
   },
   {
     "key": 110,
     "card_pool_type": "base_pool20003",
-    "id": "33005",
+    "id": "43004",
     "weight": 1
   },
   {
     "key": 111,
     "card_pool_type": "base_pool20003",
-    "id": "43001",
+    "id": "43006",
     "weight": 1
   },
   {
     "key": 112,
-    "card_pool_type": "base_pool20003",
-    "id": "43003",
+    "card_pool_type": "base_pool20004",
+    "id": "14001",
     "weight": 1
   },
   {
     "key": 113,
-    "card_pool_type": "base_pool20003",
-    "id": "43004",
+    "card_pool_type": "base_pool20004",
+    "id": "14002",
     "weight": 1
   },
   {
     "key": 114,
-    "card_pool_type": "base_pool20003",
-    "id": "43006",
+    "card_pool_type": "base_pool20004",
+    "id": "14005",
     "weight": 1
   },
   {
     "key": 115,
     "card_pool_type": "base_pool20004",
-    "id": "14001",
+    "id": "14007",
     "weight": 1
   },
   {
     "key": 116,
     "card_pool_type": "base_pool20004",
-    "id": "14002",
+    "id": "24001",
     "weight": 1
   },
   {
     "key": 117,
     "card_pool_type": "base_pool20004",
-    "id": "14005",
+    "id": "24002",
     "weight": 1
   },
   {
     "key": 118,
     "card_pool_type": "base_pool20004",
-    "id": "14007",
+    "id": "24004",
     "weight": 1
   },
   {
     "key": 119,
     "card_pool_type": "base_pool20004",
-    "id": "24001",
+    "id": "24005",
     "weight": 1
   },
   {
     "key": 120,
     "card_pool_type": "base_pool20004",
-    "id": "24002",
+    "id": "24008",
     "weight": 1
   },
   {
     "key": 121,
     "card_pool_type": "base_pool20004",
-    "id": "24004",
+    "id": "24009",
     "weight": 1
   },
   {
     "key": 122,
     "card_pool_type": "base_pool20004",
-    "id": "24005",
+    "id": "25001",
     "weight": 1
   },
   {
     "key": 123,
     "card_pool_type": "base_pool20004",
-    "id": "24008",
+    "id": "34002",
     "weight": 1
   },
   {
     "key": 124,
     "card_pool_type": "base_pool20004",
-    "id": "24009",
+    "id": "34004",
     "weight": 1
   },
   {
     "key": 125,
     "card_pool_type": "base_pool20004",
-    "id": "25001",
+    "id": "34005",
     "weight": 1
   },
   {
     "key": 126,
     "card_pool_type": "base_pool20004",
-    "id": "34002",
+    "id": "34008",
     "weight": 1
   },
   {
     "key": 127,
     "card_pool_type": "base_pool20004",
-    "id": "34004",
+    "id": "13004",
     "weight": 1
   },
   {
     "key": 128,
     "card_pool_type": "base_pool20004",
-    "id": "34005",
+    "id": "35006",
     "weight": 1
   },
   {
     "key": 129,
     "card_pool_type": "base_pool20004",
-    "id": "34008",
+    "id": "44001",
     "weight": 1
   },
   {
     "key": 130,
     "card_pool_type": "base_pool20004",
-    "id": "13004",
+    "id": "44003",
     "weight": 1
   },
   {
     "key": 131,
     "card_pool_type": "base_pool20004",
-    "id": "35006",
+    "id": "44004",
     "weight": 1
   },
   {
     "key": 132,
     "card_pool_type": "base_pool20004",
-    "id": "44001",
+    "id": "44006",
     "weight": 1
   },
   {
     "key": 133,
     "card_pool_type": "base_pool20004",
-    "id": "44003",
+    "id": "43002",
     "weight": 1
   },
   {
     "key": 134,
     "card_pool_type": "base_pool20004",
-    "id": "44004",
+    "id": "43007",
     "weight": 1
   },
   {
     "key": 135,
-    "card_pool_type": "base_pool20004",
-    "id": "44006",
+    "card_pool_type": "base_pool20005",
+    "id": "15002",
     "weight": 1
   },
   {
     "key": 136,
-    "card_pool_type": "base_pool20004",
-    "id": "43002",
+    "card_pool_type": "base_pool20005",
+    "id": "15003",
     "weight": 1
   },
   {
     "key": 137,
-    "card_pool_type": "base_pool20004",
-    "id": "43007",
+    "card_pool_type": "base_pool20005",
+    "id": "15004",
     "weight": 1
   },
   {
     "key": 138,
     "card_pool_type": "base_pool20005",
-    "id": "15002",
+    "id": "15005",
     "weight": 1
   },
   {
     "key": 139,
     "card_pool_type": "base_pool20005",
-    "id": "15003",
+    "id": "25002",
     "weight": 1
   },
   {
     "key": 140,
     "card_pool_type": "base_pool20005",
-    "id": "15004",
+    "id": "35005",
     "weight": 1
   },
   {
     "key": 141,
     "card_pool_type": "base_pool20005",
-    "id": "15005",
+    "id": "35001",
     "weight": 1
   },
   {
     "key": 142,
     "card_pool_type": "base_pool20005",
-    "id": "25002",
+    "id": "35002",
     "weight": 1
   },
   {
     "key": 143,
     "card_pool_type": "base_pool20005",
-    "id": "35005",
+    "id": "44005",
     "weight": 1
   },
   {
     "key": 144,
     "card_pool_type": "base_pool20005",
-    "id": "35001",
+    "id": "44002",
     "weight": 1
   },
   {
     "key": 145,
-    "card_pool_type": "base_pool20005",
-    "id": "35002",
+    "card_pool_type": "base_pool30003",
+    "id": "13001",
     "weight": 1
   },
   {
     "key": 146,
-    "card_pool_type": "base_pool20005",
-    "id": "44005",
+    "card_pool_type": "base_pool30003",
+    "id": "13002",
     "weight": 1
   },
   {
     "key": 147,
-    "card_pool_type": "base_pool20005",
-    "id": "44002",
+    "card_pool_type": "base_pool30003",
+    "id": "13003",
     "weight": 1
   },
   {
     "key": 148,
     "card_pool_type": "base_pool30003",
-    "id": "13001",
+    "id": "13005",
     "weight": 1
   },
   {
     "key": 149,
-    "card_pool_type": "base_pool30003",
-    "id": "13002",
+    "card_pool_type": "base_pool30004",
+    "id": "14001",
     "weight": 1
   },
   {
     "key": 150,
-    "card_pool_type": "base_pool30003",
-    "id": "13003",
+    "card_pool_type": "base_pool30004",
+    "id": "14002",
     "weight": 1
   },
   {
     "key": 151,
-    "card_pool_type": "base_pool30003",
-    "id": "13005",
+    "card_pool_type": "base_pool30004",
+    "id": "14005",
     "weight": 1
   },
   {
     "key": 152,
     "card_pool_type": "base_pool30004",
-    "id": "14001",
+    "id": "14007",
     "weight": 1
   },
   {
     "key": 153,
-    "card_pool_type": "base_pool30004",
-    "id": "14002",
+    "card_pool_type": "base_pool30005",
+    "id": "15002",
     "weight": 1
   },
   {
     "key": 154,
-    "card_pool_type": "base_pool30004",
-    "id": "14005",
+    "card_pool_type": "base_pool30005",
+    "id": "15003",
     "weight": 1
   },
   {
     "key": 155,
-    "card_pool_type": "base_pool30004",
-    "id": "14007",
+    "card_pool_type": "base_pool30005",
+    "id": "15004",
     "weight": 1
   },
   {
     "key": 156,
     "card_pool_type": "base_pool30005",
-    "id": "15002",
-    "weight": 1
-  },
-  {
-    "key": 157,
-    "card_pool_type": "base_pool30005",
-    "id": "15003",
-    "weight": 1
-  },
-  {
-    "key": 158,
-    "card_pool_type": "base_pool30005",
-    "id": "15004",
-    "weight": 1
-  },
-  {
-    "key": 159,
-    "card_pool_type": "base_pool30005",
     "id": "15005",
     "weight": 1
   },
   {
-    "key": 160,
+    "key": 157,
     "card_pool_type": "base_pool40003",
     "id": "23003",
     "weight": 1
   },
   {
-    "key": 161,
+    "key": 158,
     "card_pool_type": "base_pool40003",
     "id": "23004",
     "weight": 1
   },
+  {
+    "key": 159,
+    "card_pool_type": "base_pool40004",
+    "id": "24001",
+    "weight": 1
+  },
+  {
+    "key": 160,
+    "card_pool_type": "base_pool40004",
+    "id": "24002",
+    "weight": 1
+  },
+  {
+    "key": 161,
+    "card_pool_type": "base_pool40004",
+    "id": "24004",
+    "weight": 1
+  },
   {
     "key": 162,
-    "card_pool_type": "base_pool40003",
-    "id": "23011",
+    "card_pool_type": "base_pool40004",
+    "id": "24005",
     "weight": 1
   },
   {
     "key": 163,
     "card_pool_type": "base_pool40004",
-    "id": "24001",
+    "id": "24008",
     "weight": 1
   },
   {
     "key": 164,
     "card_pool_type": "base_pool40004",
-    "id": "24002",
+    "id": "24009",
     "weight": 1
   },
   {
     "key": 165,
     "card_pool_type": "base_pool40004",
-    "id": "24004",
-    "weight": 1
-  },
-  {
-    "key": 166,
-    "card_pool_type": "base_pool40004",
-    "id": "24005",
-    "weight": 1
-  },
-  {
-    "key": 167,
-    "card_pool_type": "base_pool40004",
-    "id": "24008",
-    "weight": 1
-  },
-  {
-    "key": 168,
-    "card_pool_type": "base_pool40004",
-    "id": "24009",
-    "weight": 1
-  },
-  {
-    "key": 169,
-    "card_pool_type": "base_pool40004",
     "id": "25001",
     "weight": 1
   },
   {
-    "key": 170,
+    "key": 166,
     "card_pool_type": "base_pool40005",
     "id": "25002",
     "weight": 1
   },
   {
-    "key": 171,
+    "key": 167,
     "card_pool_type": "base_pool50003",
     "id": "33001",
     "weight": 1
   },
   {
-    "key": 172,
+    "key": 168,
     "card_pool_type": "base_pool50003",
     "id": "33002",
     "weight": 1
   },
   {
-    "key": 173,
+    "key": 169,
     "card_pool_type": "base_pool50003",
     "id": "33003",
     "weight": 1
   },
   {
-    "key": 174,
+    "key": 170,
     "card_pool_type": "base_pool50003",
     "id": "33005",
     "weight": 1
   },
+  {
+    "key": 171,
+    "card_pool_type": "base_pool50004",
+    "id": "34002",
+    "weight": 1
+  },
+  {
+    "key": 172,
+    "card_pool_type": "base_pool50004",
+    "id": "34004",
+    "weight": 1
+  },
+  {
+    "key": 173,
+    "card_pool_type": "base_pool50004",
+    "id": "34005",
+    "weight": 1
+  },
+  {
+    "key": 174,
+    "card_pool_type": "base_pool50004",
+    "id": "34008",
+    "weight": 1
+  },
   {
     "key": 175,
     "card_pool_type": "base_pool50004",
-    "id": "34002",
+    "id": "13004",
     "weight": 1
   },
   {
     "key": 176,
     "card_pool_type": "base_pool50004",
-    "id": "34004",
-    "weight": 1
-  },
-  {
-    "key": 177,
-    "card_pool_type": "base_pool50004",
-    "id": "34005",
-    "weight": 1
-  },
-  {
-    "key": 178,
-    "card_pool_type": "base_pool50004",
-    "id": "34008",
-    "weight": 1
-  },
-  {
-    "key": 179,
-    "card_pool_type": "base_pool50004",
-    "id": "13004",
-    "weight": 1
-  },
-  {
-    "key": 180,
-    "card_pool_type": "base_pool50004",
     "id": "35006",
     "weight": 1
   },
   {
-    "key": 181,
+    "key": 177,
     "card_pool_type": "base_pool50005",
     "id": "35001",
     "weight": 1
   },
   {
-    "key": 182,
+    "key": 178,
     "card_pool_type": "base_pool50005",
     "id": "35002",
     "weight": 1
   },
   {
-    "key": 183,
+    "key": 179,
     "card_pool_type": "base_pool50005",
     "id": "35005",
     "weight": 1
   },
   {
-    "key": 184,
+    "key": 180,
     "card_pool_type": "base_pool70003",
     "id": "13001",
     "weight": 1
   },
   {
-    "key": 185,
+    "key": 181,
     "card_pool_type": "base_pool70003",
     "id": "13002",
     "weight": 1
   },
   {
-    "key": 186,
+    "key": 182,
     "card_pool_type": "base_pool70003",
     "id": "13003",
     "weight": 1
   },
   {
-    "key": 187,
+    "key": 183,
     "card_pool_type": "base_pool70003",
     "id": "13005",
     "weight": 1
   },
   {
-    "key": 188,
+    "key": 184,
     "card_pool_type": "base_pool70003",
     "id": "23003",
     "weight": 1
   },
   {
-    "key": 189,
+    "key": 185,
     "card_pool_type": "base_pool70003",
     "id": "23004",
     "weight": 1
   },
   {
-    "key": 190,
-    "card_pool_type": "base_pool70003",
-    "id": "23011",
-    "weight": 1
-  },
-  {
-    "key": 191,
+    "key": 186,
     "card_pool_type": "base_pool70003",
     "id": "33001",
     "weight": 1
   },
   {
-    "key": 192,
+    "key": 187,
     "card_pool_type": "base_pool70003",
     "id": "33002",
     "weight": 1
   },
   {
-    "key": 193,
+    "key": 188,
     "card_pool_type": "base_pool70003",
     "id": "33003",
     "weight": 1
   },
   {
-    "key": 194,
+    "key": 189,
     "card_pool_type": "base_pool70003",
     "id": "33005",
     "weight": 1
   },
   {
-    "key": 195,
+    "key": 190,
     "card_pool_type": "base_pool70003",
     "id": "43001",
     "weight": 1
   },
   {
-    "key": 196,
+    "key": 191,
     "card_pool_type": "base_pool70003",
     "id": "43003",
     "weight": 1
   },
   {
-    "key": 197,
+    "key": 192,
     "card_pool_type": "base_pool70003",
     "id": "43004",
     "weight": 1
   },
   {
-    "key": 198,
+    "key": 193,
     "card_pool_type": "base_pool70003",
     "id": "43006",
     "weight": 1
   },
   {
-    "key": 199,
+    "key": 194,
     "card_pool_type": "base_pool70004",
     "id": "14001",
     "weight": 1
   },
   {
-    "key": 200,
+    "key": 195,
     "card_pool_type": "base_pool70004",
     "id": "14002",
     "weight": 1
   },
   {
-    "key": 201,
+    "key": 196,
     "card_pool_type": "base_pool70004",
     "id": "14005",
     "weight": 1
   },
   {
-    "key": 202,
+    "key": 197,
     "card_pool_type": "base_pool70004",
     "id": "14007",
     "weight": 1
   },
   {
-    "key": 203,
+    "key": 198,
     "card_pool_type": "base_pool70004",
     "id": "24001",
     "weight": 1
   },
   {
-    "key": 204,
+    "key": 199,
     "card_pool_type": "base_pool70004",
     "id": "24002",
     "weight": 1
   },
   {
-    "key": 205,
+    "key": 200,
     "card_pool_type": "base_pool70004",
     "id": "24004",
     "weight": 1
   },
   {
-    "key": 206,
+    "key": 201,
     "card_pool_type": "base_pool70004",
     "id": "24005",
     "weight": 1
   },
   {
-    "key": 207,
+    "key": 202,
     "card_pool_type": "base_pool70004",
     "id": "24008",
     "weight": 1
   },
   {
-    "key": 208,
+    "key": 203,
     "card_pool_type": "base_pool70004",
     "id": "24009",
     "weight": 1
   },
   {
-    "key": 209,
+    "key": 204,
     "card_pool_type": "base_pool70004",
     "id": "25001",
     "weight": 1
   },
   {
-    "key": 210,
+    "key": 205,
     "card_pool_type": "base_pool70004",
     "id": "34002",
     "weight": 1
   },
   {
-    "key": 211,
+    "key": 206,
     "card_pool_type": "base_pool70004",
     "id": "34004",
     "weight": 1
   },
   {
-    "key": 212,
+    "key": 207,
     "card_pool_type": "base_pool70004",
     "id": "34005",
     "weight": 1
   },
   {
-    "key": 213,
+    "key": 208,
     "card_pool_type": "base_pool70004",
     "id": "34008",
     "weight": 1
   },
   {
-    "key": 214,
+    "key": 209,
     "card_pool_type": "base_pool70004",
     "id": "13004",
     "weight": 1
   },
   {
-    "key": 215,
+    "key": 210,
     "card_pool_type": "base_pool70004",
     "id": "35006",
     "weight": 1
   },
   {
-    "key": 216,
+    "key": 211,
     "card_pool_type": "base_pool70004",
     "id": "44001",
     "weight": 1
   },
   {
-    "key": 217,
+    "key": 212,
     "card_pool_type": "base_pool70004",
     "id": "44003",
     "weight": 1
   },
   {
-    "key": 218,
+    "key": 213,
     "card_pool_type": "base_pool70004",
     "id": "44004",
     "weight": 1
   },
   {
-    "key": 219,
+    "key": 214,
     "card_pool_type": "base_pool70004",
     "id": "44006",
     "weight": 1
   },
   {
-    "key": 220,
+    "key": 215,
     "card_pool_type": "base_pool70004",
     "id": "43002",
     "weight": 1
   },
   {
-    "key": 221,
+    "key": 216,
     "card_pool_type": "base_pool70004",
     "id": "43007",
     "weight": 1
   },
   {
-    "key": 222,
+    "key": 217,
     "card_pool_type": "base_pool70005",
     "id": "15002",
     "weight": 1
   },
   {
-    "key": 223,
+    "key": 218,
     "card_pool_type": "base_pool70005",
     "id": "15003",
     "weight": 1
   },
   {
-    "key": 224,
+    "key": 219,
     "card_pool_type": "base_pool70005",
     "id": "15004",
     "weight": 1
   },
   {
-    "key": 225,
+    "key": 220,
     "card_pool_type": "base_pool70005",
     "id": "15005",
     "weight": 1
   },
   {
-    "key": 226,
+    "key": 221,
     "card_pool_type": "base_pool70005",
     "id": "25002",
     "weight": 1
   },
   {
-    "key": 227,
+    "key": 222,
     "card_pool_type": "base_pool70005",
     "id": "35005",
     "weight": 1
   },
   {
-    "key": 228,
+    "key": 223,
     "card_pool_type": "base_pool70005",
     "id": "35001",
     "weight": 1
   },
   {
-    "key": 229,
+    "key": 224,
     "card_pool_type": "base_pool70005",
     "id": "35002",
     "weight": 1
   },
   {
-    "key": 230,
+    "key": 225,
     "card_pool_type": "base_pool70005",
     "id": "44005",
     "weight": 1
   },
   {
-    "key": 231,
+    "key": 226,
     "card_pool_type": "base_pool70005",
     "id": "44002",
     "weight": 1
diff --git a/bin/json/game_drawreplace.json b/bin/json/game_drawreplace.json
index 8a6af0c6d..77a9af167 100644
--- a/bin/json/game_drawreplace.json
+++ b/bin/json/game_drawreplace.json
@@ -3,7 +3,7 @@
     "id": 1,
     "pool": 1,
     "hero_initial": "14003",
-    "hero_replace": "14003",
+    "hero_replace": "15005",
     "replace_cd": 0,
     "replace_num": 0,
     "buy_cos": {
diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json
index 8507cf70b..896c5c1e5 100644
--- a/bin/json/game_gamesummary.json
+++ b/bin/json/game_gamesummary.json
@@ -6,7 +6,7 @@
       "text": "驯龙养成"
     },
     "tabId": 11001,
-    "type": 0,
+    "type": 1,
     "jumpId": 10045,
     "icon": "ty_icon_xlyc",
     "mapPos": {
@@ -39,7 +39,7 @@
       "text": "捕羊大赛"
     },
     "tabId": 11001,
-    "type": 1,
+    "type": 0,
     "jumpId": 10042,
     "icon": "ty_qp_by",
     "mapPos": {
diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json
index 8547d6b27..363d04554 100644
--- a/bin/json/game_gamesummarytab.json
+++ b/bin/json/game_gamesummarytab.json
@@ -9,9 +9,9 @@
     "icon": "hkz_wftj_mj",
     "mapPos": {
       "x": 0,
-      "y": 618
+      "y": 759
     },
-    "scale": 1,
+    "scale": 1.5,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_1",
       "text": "起初，没有人在意这次冒险，对于反派来说，这不过是又一次嘲讽失败者的机会。"
@@ -26,10 +26,10 @@
     },
     "icon": "hkz_wftj_sl02",
     "mapPos": {
-      "x": -369,
-      "y": 1664
+      "x": -635,
+      "y": 2256
     },
-    "scale": 1,
+    "scale": 1.5,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_2",
       "text": "探险！这是永远不会停歇的主题！开始你的[color=#ffcc00]冒险之旅[/color]吧！"
@@ -44,10 +44,10 @@
     },
     "icon": "hkz_wftj_zxgk",
     "mapPos": {
-      "x": -1827,
-      "y": 1878
+      "x": -2057,
+      "y": 2204
     },
-    "scale": 1,
+    "scale": 1.5,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_3",
       "text": "坏蛋联盟打算设计一场大骗局，让世人都以为他们是真的洗心革面、改邪归正…"
@@ -62,10 +62,10 @@
     },
     "icon": "hkz_wftj_jjc",
     "mapPos": {
-      "x": -1027,
-      "y": 1878
+      "x": -2749,
+      "y": 1679
     },
-    "scale": 1,
+    "scale": 1.5,
     "usetext": {
       "key": "gamesummary_fathernode_usetext_4",
       "text": "很久很久以前，在遥远的大沼泽里住着一个叫史瑞克的绿色怪物…"
diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json
index a14b898e5..7bb9aeba2 100644
--- a/bin/json/game_guide.json
+++ b/bin/json/game_guide.json
@@ -356,7 +356,7 @@
       "x": 0,
       "y": 0
     },
-    "fingerTime": 0.5,
+    "fingerTime": 1,
     "objSize": {
       "x": 0,
       "y": 0
@@ -2584,7 +2584,7 @@
     "startPar": "",
     "parameter": "",
     "interface": "",
-    "condition": "worldtask_20150",
+    "condition": "",
     "followtj": "",
     "followguide": 1001302,
     "finger": [
@@ -3261,7 +3261,7 @@
     "startPar": "",
     "parameter": "",
     "interface": "",
-    "condition": "FinishLevel_1101037",
+    "condition": "",
     "followtj": "",
     "followguide": 1001802,
     "finger": [
diff --git a/bin/json/game_guildtask.json b/bin/json/game_guildtask.json
index 7614d01fb..08619d257 100644
--- a/bin/json/game_guildtask.json
+++ b/bin/json/game_guildtask.json
@@ -2,7 +2,7 @@
   {
     "type_id": 50000001,
     "id_list": 1,
-    "jump_interface": 10020,
+    "jump_interface": 10004,
     "task_display": {
       "key": "guild_guild_task_task_display_1",
       "text": "使用好友助战守护者1次"
diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json
index 437dad7ee..35f31642b 100644
--- a/bin/json/game_huntingopentime.json
+++ b/bin/json/game_huntingopentime.json
@@ -5,7 +5,7 @@
       1,
       3,
       5,
-      7
+      0
     ],
     "name": {
       "key": "hunting_opentime_name_1",
@@ -29,7 +29,7 @@
       1,
       3,
       5,
-      7
+      0
     ],
     "name": {
       "key": "hunting_opentime_name_2",
@@ -53,7 +53,7 @@
       2,
       4,
       6,
-      7
+      0
     ],
     "name": {
       "key": "hunting_opentime_name_3",
@@ -77,7 +77,7 @@
       2,
       4,
       6,
-      7
+      0
     ],
     "name": {
       "key": "hunting_opentime_name_4",
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index b17852502..2641bbae6 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -5227,7 +5227,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_14002",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12014002",
       "text": "大龙守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5325,7 +5325,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_14004",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12014004",
       "text": "克莱尔·努涅斯守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5423,7 +5423,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_14006",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12014006",
       "text": "布兰奇守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5521,7 +5521,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_15001",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12015001",
       "text": "吉姆·莱克守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5766,7 +5766,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_23001",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12023001",
       "text": "斯梅克船长守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5815,7 +5815,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_23002",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12023002",
       "text": "警卫队长守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -5864,7 +5864,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_23003",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12023003",
       "text": "黛塔黛恩守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6060,7 +6060,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_24003",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12024003",
       "text": "睡神沙人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6207,7 +6207,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_24006",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12024006",
       "text": "凯尔守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6256,7 +6256,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_24007",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12024007",
       "text": "小钱守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6452,7 +6452,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_25002",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12025002",
       "text": "沃尔夫先生守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6501,7 +6501,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_25003",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12025003",
       "text": "羊仙姑守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6550,7 +6550,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_25004",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12025004",
       "text": "波比守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6599,7 +6599,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_33001",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12033001",
       "text": "巫嘎守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6746,7 +6746,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_33004",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12033004",
       "text": "普鲁格兰杰守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6795,7 +6795,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_33005",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12033005",
       "text": "鼻涕粗守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6844,7 +6844,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_33006",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12033006",
       "text": "珍妮丝·邓普顿守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6893,7 +6893,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_34001",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12034001",
       "text": "贫嘴驴守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -6991,7 +6991,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_34003",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12034003",
       "text": "圣诞老人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7040,7 +7040,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_34004",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12034004",
       "text": "瓜哥守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7138,7 +7138,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_34006",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12034006",
       "text": "冰霜杰克守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7187,7 +7187,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_34007",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12034007",
       "text": "菲奥娜守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7383,7 +7383,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_35003",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12035003",
       "text": "漆黑守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7432,7 +7432,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_35004",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12035004",
       "text": "黛安·福克斯顿守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7726,7 +7726,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_43004",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12043004",
       "text": "姜饼人守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7775,7 +7775,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_43005",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12043005",
       "text": "瓦希尔指挥官守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7873,7 +7873,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_43007",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12043007",
       "text": "戈伯守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -7922,7 +7922,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_44001",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12044001",
       "text": "美肚鲨守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -8020,7 +8020,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_44003",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12044003",
       "text": "匹诺曹守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -8216,7 +8216,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_45001",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12045001",
       "text": "乌龟大师守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -8265,7 +8265,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_45002",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12045002",
       "text": "梅林守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
@@ -8363,7 +8363,7 @@
     ],
     "use_skip": 166,
     "upper_limit": 0,
-    "img": "xxtx_js_45004",
+    "img": "xxtx_js_25001",
     "intr": {
       "key": "item_item_intr_12045004",
       "text": "穿靴子的猫守护之心，可在觉醒界面用于相应守护者的觉醒等级提升。"
diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json
index f1ddaf0c6..c0cb74d9c 100644
--- a/bin/json/game_lottery.json
+++ b/bin/json/game_lottery.json
@@ -90490,8 +90490,8 @@
     "groupnum": 1,
     "itemid": {
       "a": "item",
-      "t": "16001002",
-      "n": 1
+      "t": "16001001",
+      "n": 4
     },
     "itemdes": "",
     "itemwt": 1000,
@@ -90539,7 +90539,7 @@
     "itemid": {
       "a": "item",
       "t": "16001002",
-      "n": 1
+      "n": 4
     },
     "itemdes": "",
     "itemwt": 1000,
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index bf503de04..18a89b1da 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -26974,7 +26974,7 @@
     "destroy": 1,
     "progress": 1,
     "timelineplayer": 0,
-    "stroyshow": 0,
+    "stroyshow": 1,
     "frontstoryid": 203370,
     "afterstoryid": 203371,
     "maingroupName": {
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 62a5a9c7e..4c162d1d2 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -268,5 +268,113 @@
     ],
     "functionicon": "ty_qp_sj",
     "jumpId": 1003
+  },
+  {
+    "Id": 17,
+    "scene": "GameMain",
+    "scenename": {
+      "key": "navigation_Sheet1_scenename_17",
+      "text": "中轴城"
+    },
+    "sceneicon": "ty_qp_my01",
+    "functionname": {
+      "key": "navigation_Sheet1_functionname_17",
+      "text": "纸牌接龙"
+    },
+    "npcName": [
+      "功能入口-纸牌接龙"
+    ],
+    "functionicon": "icon_zm",
+    "jumpId": 10074
+  },
+  {
+    "Id": 18,
+    "scene": "GameMain",
+    "scenename": {
+      "key": "navigation_Sheet1_scenename_18",
+      "text": "中轴城"
+    },
+    "sceneicon": "ty_qp_my01",
+    "functionname": {
+      "key": "navigation_Sheet1_functionname_18",
+      "text": "捉虫"
+    },
+    "npcName": [
+      "功能入口-捉虫"
+    ],
+    "functionicon": "ty_icon_zcz",
+    "jumpId": 10075
+  },
+  {
+    "Id": 19,
+    "scene": "GameMain",
+    "scenename": {
+      "key": "navigation_Sheet1_scenename_19",
+      "text": "中轴城"
+    },
+    "sceneicon": "ty_qp_my01",
+    "functionname": {
+      "key": "navigation_Sheet1_functionname_19",
+      "text": "猜颜色"
+    },
+    "npcName": [
+      "功能入口-藏书馆"
+    ],
+    "functionicon": "icon_zm",
+    "jumpId": 10077
+  },
+  {
+    "Id": 20,
+    "scene": "GameMain",
+    "scenename": {
+      "key": "navigation_Sheet1_scenename_20",
+      "text": "中轴城"
+    },
+    "sceneicon": "ty_qp_my01",
+    "functionname": {
+      "key": "navigation_Sheet1_functionname_20",
+      "text": "捕羊大赛"
+    },
+    "npcName": [
+      "功能入口-维京远征"
+    ],
+    "functionicon": "ty_qp_by",
+    "jumpId": 10078
+  },
+  {
+    "Id": 21,
+    "scene": "GameMain",
+    "scenename": {
+      "key": "navigation_Sheet1_scenename_21",
+      "text": "中轴城"
+    },
+    "sceneicon": "ty_qp_my01",
+    "functionname": {
+      "key": "navigation_Sheet1_functionname_21",
+      "text": "石阵秘境"
+    },
+    "npcName": [
+      "功能入口-石阵秘境"
+    ],
+    "functionicon": "ty_icon_szmj",
+    "jumpId": 10079
+  },
+  {
+    "Id": 22,
+    "scene": "GameMain",
+    "scenename": {
+      "key": "navigation_Sheet1_scenename_22",
+      "text": "中轴城"
+    },
+    "sceneicon": "ty_qp_my01",
+    "functionname": {
+      "key": "navigation_Sheet1_functionname_22",
+      "text": "猴拳猴语"
+    },
+    "npcName": [
+      "功能入口-猴拳猴语"
+    ],
+    "functionicon": "icon_zm",
+    "jumpId": 10076
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 24279dfd9..19bed25e7 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -2728,7 +2728,7 @@
     ],
     "deliver_npc": 0,
     "taskend_removeitem": [],
-    "auto_accept": 1,
+    "auto_accept": 0,
     "tasktips": 0,
     "deliver_task": 0,
     "deliver_task_npc": 0,