diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json
index 589c027cf..6c84fbd1f 100644
--- a/bin/json/game_drawcard.json
+++ b/bin/json/game_drawcard.json
@@ -39,238 +39,139 @@
     "key": 5,
     "recruitment_type": 1,
     "card_pool_type": "base_pool2",
-    "star": 3,
-    "race": 4,
-    "id": "44006",
+    "star": 4,
+    "race": 2,
+    "id": "25004",
     "weight": 1000
   },
   {
     "key": 6,
     "recruitment_type": 1,
     "card_pool_type": "base_pool2",
+    "star": 5,
+    "race": 2,
+    "id": "25004",
+    "weight": 1000
+  },
+  {
+    "key": 7,
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool3",
+    "star": 3,
+    "race": 2,
+    "id": "25004",
+    "weight": 1000
+  },
+  {
+    "key": 8,
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool3",
+    "star": 3,
+    "race": 4,
+    "id": "44006",
+    "weight": 1000
+  },
+  {
+    "key": 9,
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 2,
     "id": "35001",
     "weight": 1000
   },
   {
-    "key": 7,
+    "key": 10,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 4,
     "id": "44005",
     "weight": 1000
   },
   {
-    "key": 8,
+    "key": 11,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 1,
     "id": "15004",
     "weight": 1000
   },
   {
-    "key": 9,
+    "key": 12,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 2,
     "id": "24002",
     "weight": 1000
   },
   {
-    "key": 10,
+    "key": 13,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 4,
     "id": "45003",
     "weight": 1000
   },
   {
-    "key": 11,
+    "key": 14,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 2,
     "id": "24004",
     "weight": 1000
   },
   {
-    "key": 12,
+    "key": 15,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 1,
     "id": "14003",
     "weight": 1000
   },
   {
-    "key": 13,
+    "key": 16,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 1,
     "id": "15005",
     "weight": 1000
   },
   {
-    "key": 14,
+    "key": 17,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
+    "card_pool_type": "base_pool3",
     "star": 3,
     "race": 2,
     "id": "24003",
     "weight": 1000
   },
-  {
-    "key": 15,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
-    "star": 4,
-    "race": 3,
-    "id": "34006",
-    "weight": 1000
-  },
-  {
-    "key": 16,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
-    "star": 4,
-    "race": 2,
-    "id": "25001",
-    "weight": 1000
-  },
-  {
-    "key": 17,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool2",
-    "star": 5,
-    "race": 1,
-    "id": "14007",
-    "weight": 1000
-  },
   {
     "key": 18,
     "recruitment_type": 1,
     "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 2,
-    "id": "25004",
+    "star": 4,
+    "race": 3,
+    "id": "34006",
     "weight": 1000
   },
   {
     "key": 19,
     "recruitment_type": 1,
     "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 4,
-    "id": "44006",
-    "weight": 1000
-  },
-  {
-    "key": 20,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 2,
-    "id": "35001",
-    "weight": 1000
-  },
-  {
-    "key": 21,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 4,
-    "id": "44005",
-    "weight": 1000
-  },
-  {
-    "key": 22,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 1,
-    "id": "15004",
-    "weight": 1000
-  },
-  {
-    "key": 23,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 2,
-    "id": "24002",
-    "weight": 1000
-  },
-  {
-    "key": 24,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 4,
-    "id": "45003",
-    "weight": 1000
-  },
-  {
-    "key": 25,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 2,
-    "id": "24004",
-    "weight": 1000
-  },
-  {
-    "key": 26,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 1,
-    "id": "14003",
-    "weight": 1000
-  },
-  {
-    "key": 27,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 1,
-    "id": "15005",
-    "weight": 1000
-  },
-  {
-    "key": 28,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 3,
-    "race": 2,
-    "id": "24003",
-    "weight": 1000
-  },
-  {
-    "key": 29,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
-    "star": 4,
-    "race": 3,
-    "id": "34006",
-    "weight": 1000
-  },
-  {
-    "key": 30,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool3",
     "star": 4,
     "race": 2,
     "id": "25001",
     "weight": 1000
   },
   {
-    "key": 31,
+    "key": 20,
     "recruitment_type": 1,
     "card_pool_type": "base_pool3",
     "star": 5,
@@ -279,7 +180,7 @@
     "weight": 1000
   },
   {
-    "key": 32,
+    "key": 21,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -288,7 +189,7 @@
     "weight": 1000
   },
   {
-    "key": 33,
+    "key": 22,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -297,7 +198,7 @@
     "weight": 1000
   },
   {
-    "key": 34,
+    "key": 23,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -306,7 +207,7 @@
     "weight": 1000
   },
   {
-    "key": 35,
+    "key": 24,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -315,7 +216,7 @@
     "weight": 1000
   },
   {
-    "key": 36,
+    "key": 25,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -324,7 +225,7 @@
     "weight": 1000
   },
   {
-    "key": 37,
+    "key": 26,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -333,7 +234,7 @@
     "weight": 1000
   },
   {
-    "key": 38,
+    "key": 27,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -342,7 +243,7 @@
     "weight": 1000
   },
   {
-    "key": 39,
+    "key": 28,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -351,7 +252,7 @@
     "weight": 1000
   },
   {
-    "key": 40,
+    "key": 29,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -360,7 +261,7 @@
     "weight": 1000
   },
   {
-    "key": 41,
+    "key": 30,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -369,7 +270,7 @@
     "weight": 1000
   },
   {
-    "key": 42,
+    "key": 31,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 3,
@@ -378,7 +279,7 @@
     "weight": 1000
   },
   {
-    "key": 43,
+    "key": 32,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 4,
@@ -387,7 +288,7 @@
     "weight": 1000
   },
   {
-    "key": 44,
+    "key": 33,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 4,
@@ -396,7 +297,7 @@
     "weight": 1000
   },
   {
-    "key": 45,
+    "key": 34,
     "recruitment_type": 1,
     "card_pool_type": "base_pool4",
     "star": 5,
@@ -405,7 +306,7 @@
     "weight": 1000
   },
   {
-    "key": 46,
+    "key": 35,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -414,7 +315,7 @@
     "weight": 1000
   },
   {
-    "key": 47,
+    "key": 36,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -423,7 +324,7 @@
     "weight": 1000
   },
   {
-    "key": 48,
+    "key": 37,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -432,7 +333,7 @@
     "weight": 1000
   },
   {
-    "key": 49,
+    "key": 38,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -441,7 +342,7 @@
     "weight": 1000
   },
   {
-    "key": 50,
+    "key": 39,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -450,7 +351,7 @@
     "weight": 1000
   },
   {
-    "key": 51,
+    "key": 40,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -459,7 +360,7 @@
     "weight": 1000
   },
   {
-    "key": 52,
+    "key": 41,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -468,7 +369,7 @@
     "weight": 1000
   },
   {
-    "key": 53,
+    "key": 42,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -477,7 +378,7 @@
     "weight": 1000
   },
   {
-    "key": 54,
+    "key": 43,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -486,7 +387,7 @@
     "weight": 1000
   },
   {
-    "key": 55,
+    "key": 44,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -495,7 +396,7 @@
     "weight": 1000
   },
   {
-    "key": 56,
+    "key": 45,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -504,7 +405,7 @@
     "weight": 1000
   },
   {
-    "key": 57,
+    "key": 46,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -513,7 +414,7 @@
     "weight": 1000
   },
   {
-    "key": 58,
+    "key": 47,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 5,
@@ -522,7 +423,7 @@
     "weight": 1000
   },
   {
-    "key": 59,
+    "key": 48,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 5,
@@ -531,7 +432,7 @@
     "weight": 1000
   },
   {
-    "key": 60,
+    "key": 49,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 5,
@@ -540,7 +441,7 @@
     "weight": 1000
   },
   {
-    "key": 61,
+    "key": 50,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 5,
@@ -549,7 +450,7 @@
     "weight": 1000
   },
   {
-    "key": 62,
+    "key": 51,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -558,7 +459,7 @@
     "weight": 1000
   },
   {
-    "key": 63,
+    "key": 52,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -567,7 +468,7 @@
     "weight": 1000
   },
   {
-    "key": 64,
+    "key": 53,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -576,7 +477,7 @@
     "weight": 1000
   },
   {
-    "key": 65,
+    "key": 54,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -585,7 +486,7 @@
     "weight": 1000
   },
   {
-    "key": 66,
+    "key": 55,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -594,7 +495,7 @@
     "weight": 1000
   },
   {
-    "key": 67,
+    "key": 56,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -603,7 +504,7 @@
     "weight": 1000
   },
   {
-    "key": 68,
+    "key": 57,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -612,7 +513,7 @@
     "weight": 1000
   },
   {
-    "key": 69,
+    "key": 58,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -621,7 +522,7 @@
     "weight": 1000
   },
   {
-    "key": 70,
+    "key": 59,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -630,7 +531,7 @@
     "weight": 1000
   },
   {
-    "key": 71,
+    "key": 60,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -639,7 +540,7 @@
     "weight": 1000
   },
   {
-    "key": 72,
+    "key": 61,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -648,7 +549,7 @@
     "weight": 1000
   },
   {
-    "key": 73,
+    "key": 62,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -657,7 +558,7 @@
     "weight": 1000
   },
   {
-    "key": 74,
+    "key": 63,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -666,7 +567,7 @@
     "weight": 1000
   },
   {
-    "key": 75,
+    "key": 64,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 5,
@@ -675,7 +576,7 @@
     "weight": 1000
   },
   {
-    "key": 76,
+    "key": 65,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 5,
@@ -684,7 +585,7 @@
     "weight": 1000
   },
   {
-    "key": 77,
+    "key": 66,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 5,
@@ -693,7 +594,7 @@
     "weight": 1000
   },
   {
-    "key": 78,
+    "key": 67,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 5,
@@ -702,7 +603,7 @@
     "weight": 1000
   },
   {
-    "key": 79,
+    "key": 68,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -711,7 +612,7 @@
     "weight": 1000
   },
   {
-    "key": 80,
+    "key": 69,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -720,7 +621,7 @@
     "weight": 1000
   },
   {
-    "key": 81,
+    "key": 70,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -729,7 +630,7 @@
     "weight": 1000
   },
   {
-    "key": 82,
+    "key": 71,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -738,7 +639,7 @@
     "weight": 1000
   },
   {
-    "key": 83,
+    "key": 72,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -747,7 +648,7 @@
     "weight": 1000
   },
   {
-    "key": 84,
+    "key": 73,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -756,7 +657,7 @@
     "weight": 1000
   },
   {
-    "key": 85,
+    "key": 74,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -765,7 +666,7 @@
     "weight": 1000
   },
   {
-    "key": 86,
+    "key": 75,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -774,7 +675,7 @@
     "weight": 1000
   },
   {
-    "key": 87,
+    "key": 76,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -783,7 +684,7 @@
     "weight": 1000
   },
   {
-    "key": 88,
+    "key": 77,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -792,7 +693,7 @@
     "weight": 1000
   },
   {
-    "key": 89,
+    "key": 78,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -801,7 +702,7 @@
     "weight": 1000
   },
   {
-    "key": 90,
+    "key": 79,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -810,7 +711,7 @@
     "weight": 1000
   },
   {
-    "key": 91,
+    "key": 80,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -819,7 +720,7 @@
     "weight": 1000
   },
   {
-    "key": 92,
+    "key": 81,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -828,7 +729,7 @@
     "weight": 1000
   },
   {
-    "key": 93,
+    "key": 82,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -837,7 +738,7 @@
     "weight": 1000
   },
   {
-    "key": 94,
+    "key": 83,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -846,7 +747,7 @@
     "weight": 1000
   },
   {
-    "key": 95,
+    "key": 84,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -855,7 +756,7 @@
     "weight": 1000
   },
   {
-    "key": 96,
+    "key": 85,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -864,7 +765,7 @@
     "weight": 1000
   },
   {
-    "key": 97,
+    "key": 86,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -873,7 +774,7 @@
     "weight": 1000
   },
   {
-    "key": 98,
+    "key": 87,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -882,7 +783,7 @@
     "weight": 1000
   },
   {
-    "key": 99,
+    "key": 88,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -891,7 +792,7 @@
     "weight": 1000
   },
   {
-    "key": 100,
+    "key": 89,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -900,7 +801,7 @@
     "weight": 1000
   },
   {
-    "key": 101,
+    "key": 90,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -909,7 +810,7 @@
     "weight": 1000
   },
   {
-    "key": 102,
+    "key": 91,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -918,7 +819,7 @@
     "weight": 1000
   },
   {
-    "key": 103,
+    "key": 92,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -927,7 +828,7 @@
     "weight": 1000
   },
   {
-    "key": 104,
+    "key": 93,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -936,7 +837,7 @@
     "weight": 1000
   },
   {
-    "key": 105,
+    "key": 94,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -945,7 +846,7 @@
     "weight": 1000
   },
   {
-    "key": 106,
+    "key": 95,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -954,7 +855,7 @@
     "weight": 1000
   },
   {
-    "key": 107,
+    "key": 96,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -963,7 +864,7 @@
     "weight": 1000
   },
   {
-    "key": 108,
+    "key": 97,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -972,7 +873,7 @@
     "weight": 1000
   },
   {
-    "key": 109,
+    "key": 98,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -981,7 +882,7 @@
     "weight": 1000
   },
   {
-    "key": 110,
+    "key": 99,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 5,
@@ -990,7 +891,7 @@
     "weight": 1000
   },
   {
-    "key": 111,
+    "key": 100,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 5,
@@ -999,7 +900,7 @@
     "weight": 1000
   },
   {
-    "key": 112,
+    "key": 101,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 5,
@@ -1008,7 +909,7 @@
     "weight": 1000
   },
   {
-    "key": 113,
+    "key": 102,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 5,
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index ea051e51e..a1b63da5a 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -105,21 +105,21 @@
     "camp4_pool1": "camp4_pool",
     "base_pool1": {
       "s": 0,
-      "e": 1,
+      "e": 0,
       "p": "base_pool1"
     },
     "base_pool2": {
-      "s": 2,
-      "e": 200,
+      "s": 1,
+      "e": 1,
       "p": "base_pool2"
     },
     "base_pool3": {
-      "s": 201,
-      "e": 1000,
+      "s": 2,
+      "e": 200,
       "p": "base_pool3"
     },
     "base_pool4": {
-      "s": 1001,
+      "s": 201,
       "e": 99999999,
       "p": "base_pool4"
     },
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index e26182e41..90856e420 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -5712,7 +5712,7 @@
     "type": 5,
     "ip": 1,
     "sd": 1,
-    "handbook": 1,
+    "handbook": -1,
     "prefab": "53001",
     "rotation": "0|0|0",
     "icon": "53001",
diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json
index 61702b476..81458f9d3 100644
--- a/bin/json/game_mainline.json
+++ b/bin/json/game_mainline.json
@@ -46,7 +46,7 @@
     "FormatList": [
       101011
     ],
-    "captainId": "240044",
+    "captainId": "240023",
     "battlescene": "bg_zhandoulmboss",
     "award": [
       {
diff --git a/bin/json/game_model.json b/bin/json/game_model.json
index 89d7048c0..90ca1220a 100644
--- a/bin/json/game_model.json
+++ b/bin/json/game_model.json
@@ -303,7 +303,7 @@
     "id": "14007",
     "preson": "14007",
     "presonshow": "14007_exhibition",
-    "presonstory": "14007",
+    "presonstory": "14007_story",
     "presondraw": "14007_gachashow",
     "height": 1,
     "weight": 1,
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index f7aaf0248..a838d7ce4 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -20109,9 +20109,9 @@
       -1,
       -1
     ],
-    "lv": 4,
-    "hppro": 2,
-    "atkpro": 0.3,
+    "lv": 1,
+    "hppro": 0.6,
+    "atkpro": 1.2,
     "defpro": 1
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index fca743eb4..ebee0ca6c 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -37,7 +37,7 @@
     "datatype": 2,
     "type": 4,
     "inited": [],
-    "data1": 25004,
+    "data1": 14007,
     "data2": 10,
     "data3": 0,
     "data4": 0,
@@ -204,8 +204,8 @@
       -1,
       -1
     ],
-    "data1": 7,
-    "data2": 5,
+    "data1": 1,
+    "data2": 3,
     "data3": 0,
     "data4": 0,
     "data5": 0
diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json
index 453c5b67f..b62a0ef2f 100644
--- a/bin/json/game_rdtaskside.json
+++ b/bin/json/game_rdtaskside.json
@@ -497,11 +497,6 @@
             "a": "hero",
             "t": "44005",
             "n": 1
-          },
-          {
-            "a": "hero",
-            "t": "25004",
-            "n": 1
           }
         ]
       }
@@ -681,11 +676,6 @@
             "t": "44911",
             "n": 10
           },
-          {
-            "a": "hero",
-            "t": "25004",
-            "n": 1
-          },
           {
             "a": "attr",
             "t": "gold",
@@ -1315,7 +1305,7 @@
     "id": 2029,
     "objType": 1,
     "location": "middle",
-    "point": "model_11",
+    "point": "model_07",
     "storyBegin": 328,
     "Entity": [],
     "EntityChange": [],
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 12e02de6e..22fb80ae4 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -7533,7 +7533,7 @@
     "Where": "",
     "Order": "",
     "Limit": 1,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 2,
     "Type": 1,
     "Argu": [
       1,
@@ -7554,7 +7554,7 @@
     "Where": "",
     "Order": "Type=Rand",
     "Limit": 1,
-    "ExecuteCnt": 1,
+    "ExecuteCnt": 2,
     "Type": 1,
     "Argu": [
       1,
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index cbfa6797c..2482d1223 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -579,7 +579,7 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z010",
     "buffeffect": "",
     "buffpos": "Bip016 HeadNub"
   },
@@ -823,7 +823,7 @@
     "RemoveType": true,
     "OverlayTimes": 1,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z010",
     "buffeffect": "",
     "buffpos": "Bip026 HeadNub"
   },
@@ -851,7 +851,7 @@
     "RemoveType": true,
     "OverlayTimes": 3,
     "SameID": false,
-    "buffIcon": "",
+    "buffIcon": "ty_zd_buff_z010",
     "buffeffect": "",
     "buffpos": "Bip027 HeadNub"
   },
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index 3387014bf..3bbac4220 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -382,7 +382,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimes": 1,
     "Callback": [
-      124002213
+      224002213
     ]
   },
   {
@@ -394,8 +394,8 @@
     "Type": "CallSkillPas",
     "MaxEmitTimes": 1,
     "Callback": [
-      124002111,
-      124002112
+      224002111,
+      224002112
     ]
   },
   {
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index c7f874d73..250051782 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -580,8 +580,15 @@ func (this *ModelHero) CheckPool(drawCount int32, config *cfg.GameGlobalData) (p
 		return config.BasePool2.P
 	} else if config.BasePool3.S <= drawCount && config.BasePool3.E >= drawCount {
 		return config.BasePool3.P
+	} else if config.BasePool4.S <= drawCount && config.BasePool4.E >= drawCount {
+		return config.BasePool4.P
+	} else if config.BasePool5.S <= drawCount && config.BasePool5.E >= drawCount {
+		return config.BasePool5.P
+	} else if config.BasePool6.S <= drawCount && config.BasePool6.E >= drawCount {
+		return config.BasePool6.P
 	}
-	return config.BasePool4.P
+
+	return config.BasePool7.P
 }
 
 // 通数组里的权重随机命中 返回值为数组的下标