diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json
index 714e8f71e..de42a0111 100644
--- a/bin/json/game_drawcard.json
+++ b/bin/json/game_drawcard.json
@@ -5,7 +5,7 @@
     "card_pool_type": "base_pool1",
     "star": 3,
     "race": 1,
-    "id": "14007",
+    "id": "13003",
     "weight": 1000
   },
   {
@@ -32,7 +32,7 @@
     "card_pool_type": "base_pool2",
     "star": 3,
     "race": 2,
-    "id": "25004",
+    "id": "13003",
     "weight": 1000
   },
   {
@@ -59,7 +59,7 @@
     "card_pool_type": "base_pool3",
     "star": 3,
     "race": 3,
-    "id": "34006",
+    "id": "13003",
     "weight": 1000
   },
   {
@@ -86,7 +86,7 @@
     "card_pool_type": "base_pool4",
     "star": 3,
     "race": 2,
-    "id": "24004",
+    "id": "13003",
     "weight": 1000
   },
   {
@@ -112,80 +112,80 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 3,
-    "race": 4,
-    "id": "44006",
+    "race": 1,
+    "id": "13003",
     "weight": 1000
   },
   {
     "key": 14,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 3,
-    "race": 2,
-    "id": "35001",
+    "star": 4,
+    "race": 4,
+    "id": "44006",
     "weight": 1000
   },
   {
     "key": 15,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 3,
-    "race": 4,
-    "id": "44005",
+    "star": 5,
+    "race": 2,
+    "id": "35001",
     "weight": 1000
   },
   {
     "key": 16,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 3,
-    "race": 1,
-    "id": "15004",
+    "star": 4,
+    "race": 4,
+    "id": "44005",
     "weight": 1000
   },
   {
     "key": 17,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 3,
-    "race": 2,
-    "id": "24002",
+    "star": 5,
+    "race": 1,
+    "id": "15004",
     "weight": 1000
   },
   {
     "key": 18,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 3,
-    "race": 4,
-    "id": "45003",
+    "star": 4,
+    "race": 2,
+    "id": "24002",
     "weight": 1000
   },
   {
     "key": 19,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 3,
-    "race": 1,
-    "id": "14003",
+    "star": 4,
+    "race": 4,
+    "id": "45003",
     "weight": 1000
   },
   {
     "key": 20,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 3,
+    "star": 4,
     "race": 1,
-    "id": "15005",
+    "id": "14003",
     "weight": 1000
   },
   {
     "key": 21,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 3,
-    "race": 2,
-    "id": "24003",
+    "star": 5,
+    "race": 1,
+    "id": "15005",
     "weight": 1000
   },
   {
@@ -193,8 +193,8 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 4,
-    "race": 4,
-    "id": "44006",
+    "race": 2,
+    "id": "24003",
     "weight": 1000
   },
   {
@@ -202,12 +202,21 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 4,
+    "race": 4,
+    "id": "44006",
+    "weight": 1000
+  },
+  {
+    "key": 24,
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool5",
+    "star": 5,
     "race": 2,
     "id": "35001",
     "weight": 1000
   },
   {
-    "key": 24,
+    "key": 25,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 4,
@@ -216,16 +225,16 @@
     "weight": 1000
   },
   {
-    "key": 25,
+    "key": 26,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 4,
+    "star": 5,
     "race": 1,
     "id": "15004",
     "weight": 1000
   },
   {
-    "key": 26,
+    "key": 27,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 4,
@@ -234,7 +243,7 @@
     "weight": 1000
   },
   {
-    "key": 27,
+    "key": 28,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 4,
@@ -242,49 +251,40 @@
     "id": "45003",
     "weight": 1000
   },
-  {
-    "key": 28,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool5",
-    "star": 4,
-    "race": 1,
-    "id": "14003",
-    "weight": 1000
-  },
   {
     "key": 29,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 4,
     "race": 1,
-    "id": "15005",
+    "id": "14003",
     "weight": 1000
   },
   {
     "key": 30,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
+    "star": 5,
+    "race": 1,
+    "id": "15005",
+    "weight": 1000
+  },
+  {
+    "key": 31,
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool5",
     "star": 4,
     "race": 2,
     "id": "24003",
     "weight": 1000
   },
-  {
-    "key": 31,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool5",
-    "star": 5,
-    "race": 4,
-    "id": "44006",
-    "weight": 1000
-  },
   {
     "key": 32,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 5,
-    "race": 2,
-    "id": "35001",
+    "star": 4,
+    "race": 4,
+    "id": "44006",
     "weight": 1000
   },
   {
@@ -292,17 +292,17 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 5,
-    "race": 4,
-    "id": "44005",
+    "race": 2,
+    "id": "35001",
     "weight": 1000
   },
   {
     "key": 34,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 5,
-    "race": 1,
-    "id": "15004",
+    "star": 4,
+    "race": 4,
+    "id": "44005",
     "weight": 1000
   },
   {
@@ -310,35 +310,35 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 5,
-    "race": 2,
-    "id": "24002",
+    "race": 1,
+    "id": "15004",
     "weight": 1000
   },
   {
     "key": 36,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 5,
-    "race": 4,
-    "id": "45003",
+    "star": 4,
+    "race": 2,
+    "id": "24002",
     "weight": 1000
   },
   {
     "key": 37,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 5,
-    "race": 1,
-    "id": "14003",
+    "star": 4,
+    "race": 4,
+    "id": "45003",
     "weight": 1000
   },
   {
     "key": 38,
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
-    "star": 5,
+    "star": 4,
     "race": 1,
-    "id": "15005",
+    "id": "14003",
     "weight": 1000
   },
   {
@@ -346,17 +346,17 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool5",
     "star": 5,
-    "race": 2,
-    "id": "24003",
+    "race": 1,
+    "id": "15005",
     "weight": 1000
   },
   {
     "key": 40,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool6",
-    "star": 3,
-    "race": 4,
-    "id": "44006",
+    "card_pool_type": "base_pool5",
+    "star": 4,
+    "race": 2,
+    "id": "24003",
     "weight": 1000
   },
   {
@@ -364,80 +364,80 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
     "star": 3,
-    "race": 2,
-    "id": "35001",
+    "race": 1,
+    "id": "13003",
     "weight": 1000
   },
   {
     "key": 42,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 3,
+    "star": 4,
     "race": 4,
-    "id": "44005",
+    "id": "44006",
     "weight": 1000
   },
   {
     "key": 43,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 3,
-    "race": 1,
-    "id": "15004",
+    "star": 5,
+    "race": 2,
+    "id": "35001",
     "weight": 1000
   },
   {
     "key": 44,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 3,
-    "race": 2,
-    "id": "24002",
+    "star": 4,
+    "race": 4,
+    "id": "44005",
     "weight": 1000
   },
   {
     "key": 45,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 3,
-    "race": 4,
-    "id": "45003",
+    "star": 5,
+    "race": 1,
+    "id": "15004",
     "weight": 1000
   },
   {
     "key": 46,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 3,
-    "race": 1,
-    "id": "14003",
+    "star": 4,
+    "race": 2,
+    "id": "24002",
     "weight": 1000
   },
   {
     "key": 47,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 3,
-    "race": 1,
-    "id": "15005",
+    "star": 4,
+    "race": 4,
+    "id": "45003",
     "weight": 1000
   },
   {
     "key": 48,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 3,
-    "race": 2,
-    "id": "24003",
+    "star": 4,
+    "race": 1,
+    "id": "14003",
     "weight": 1000
   },
   {
     "key": 49,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 4,
-    "race": 2,
-    "id": "24004",
+    "star": 5,
+    "race": 1,
+    "id": "15005",
     "weight": 1000
   },
   {
@@ -446,7 +446,7 @@
     "card_pool_type": "base_pool6",
     "star": 4,
     "race": 2,
-    "id": "25004",
+    "id": "24003",
     "weight": 1000
   },
   {
@@ -454,44 +454,44 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
     "star": 4,
-    "race": 3,
-    "id": "34006",
+    "race": 2,
+    "id": "24004",
     "weight": 1000
   },
   {
     "key": 52,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 4,
+    "star": 5,
     "race": 2,
-    "id": "25001",
+    "id": "25004",
     "weight": 1000
   },
   {
     "key": 53,
     "recruitment_type": 1,
     "card_pool_type": "base_pool6",
-    "star": 5,
-    "race": 1,
-    "id": "14007",
+    "star": 4,
+    "race": 3,
+    "id": "34006",
     "weight": 1000
   },
   {
     "key": 54,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool7",
-    "star": 3,
-    "race": 4,
-    "id": "44006",
+    "card_pool_type": "base_pool6",
+    "star": 5,
+    "race": 2,
+    "id": "25001",
     "weight": 1000
   },
   {
     "key": 55,
     "recruitment_type": 1,
-    "card_pool_type": "base_pool7",
-    "star": 3,
-    "race": 2,
-    "id": "35001",
+    "card_pool_type": "base_pool6",
+    "star": 4,
+    "race": 1,
+    "id": "14007",
     "weight": 1000
   },
   {
@@ -499,62 +499,62 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 3,
-    "race": 4,
-    "id": "44005",
+    "race": 1,
+    "id": "13003",
     "weight": 1000
   },
   {
     "key": 57,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
-    "star": 3,
-    "race": 1,
-    "id": "15004",
+    "star": 4,
+    "race": 4,
+    "id": "44006",
     "weight": 1000
   },
   {
     "key": 58,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
-    "star": 3,
+    "star": 5,
     "race": 2,
-    "id": "24002",
+    "id": "35001",
     "weight": 1000
   },
   {
     "key": 59,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
-    "star": 3,
+    "star": 4,
     "race": 4,
-    "id": "45003",
+    "id": "44005",
     "weight": 1000
   },
   {
     "key": 60,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
-    "star": 3,
+    "star": 5,
     "race": 1,
-    "id": "14003",
+    "id": "15004",
     "weight": 1000
   },
   {
     "key": 61,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
-    "star": 3,
-    "race": 1,
-    "id": "15005",
+    "star": 4,
+    "race": 2,
+    "id": "24002",
     "weight": 1000
   },
   {
     "key": 62,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
-    "star": 3,
-    "race": 2,
-    "id": "24003",
+    "star": 4,
+    "race": 4,
+    "id": "45003",
     "weight": 1000
   },
   {
@@ -562,17 +562,17 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
-    "race": 2,
-    "id": "24004",
+    "race": 1,
+    "id": "14003",
     "weight": 1000
   },
   {
     "key": 64,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
-    "star": 4,
-    "race": 2,
-    "id": "25004",
+    "star": 5,
+    "race": 1,
+    "id": "15005",
     "weight": 1000
   },
   {
@@ -580,8 +580,8 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
-    "race": 3,
-    "id": "34006",
+    "race": 2,
+    "id": "24003",
     "weight": 1000
   },
   {
@@ -590,7 +590,7 @@
     "card_pool_type": "base_pool7",
     "star": 4,
     "race": 2,
-    "id": "25001",
+    "id": "24004",
     "weight": 1000
   },
   {
@@ -598,35 +598,35 @@
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 5,
-    "race": 1,
-    "id": "14007",
+    "race": 2,
+    "id": "25004",
     "weight": 1000
   },
   {
     "key": 68,
-    "recruitment_type": 2,
-    "card_pool_type": "camp1_pool",
-    "star": 3,
-    "race": 1,
-    "id": "13001",
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool7",
+    "star": 4,
+    "race": 3,
+    "id": "34006",
     "weight": 1000
   },
   {
     "key": 69,
-    "recruitment_type": 2,
-    "card_pool_type": "camp1_pool",
-    "star": 3,
-    "race": 1,
-    "id": "13002",
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool7",
+    "star": 5,
+    "race": 2,
+    "id": "25001",
     "weight": 1000
   },
   {
     "key": 70,
-    "recruitment_type": 2,
-    "card_pool_type": "camp1_pool",
-    "star": 3,
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool7",
+    "star": 4,
     "race": 1,
-    "id": "13003",
+    "id": "14007",
     "weight": 1000
   },
   {
@@ -635,7 +635,7 @@
     "card_pool_type": "camp1_pool",
     "star": 3,
     "race": 1,
-    "id": "13004",
+    "id": "13001",
     "weight": 1000
   },
   {
@@ -644,34 +644,34 @@
     "card_pool_type": "camp1_pool",
     "star": 3,
     "race": 1,
-    "id": "13005",
+    "id": "13002",
     "weight": 1000
   },
   {
     "key": 73,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
-    "star": 4,
+    "star": 3,
     "race": 1,
-    "id": "14001",
+    "id": "13003",
     "weight": 1000
   },
   {
     "key": 74,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
-    "star": 4,
+    "star": 3,
     "race": 1,
-    "id": "14002",
+    "id": "13004",
     "weight": 1000
   },
   {
     "key": 75,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
-    "star": 4,
+    "star": 3,
     "race": 1,
-    "id": "14003",
+    "id": "13005",
     "weight": 1000
   },
   {
@@ -680,7 +680,7 @@
     "card_pool_type": "camp1_pool",
     "star": 4,
     "race": 1,
-    "id": "14004",
+    "id": "14001",
     "weight": 1000
   },
   {
@@ -689,7 +689,7 @@
     "card_pool_type": "camp1_pool",
     "star": 4,
     "race": 1,
-    "id": "14005",
+    "id": "14002",
     "weight": 1000
   },
   {
@@ -698,7 +698,7 @@
     "card_pool_type": "camp1_pool",
     "star": 4,
     "race": 1,
-    "id": "14006",
+    "id": "14003",
     "weight": 1000
   },
   {
@@ -707,34 +707,34 @@
     "card_pool_type": "camp1_pool",
     "star": 4,
     "race": 1,
-    "id": "14007",
+    "id": "14004",
     "weight": 1000
   },
   {
     "key": 80,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
-    "star": 5,
+    "star": 4,
     "race": 1,
-    "id": "15001",
+    "id": "14005",
     "weight": 1000
   },
   {
     "key": 81,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
-    "star": 5,
+    "star": 4,
     "race": 1,
-    "id": "15002",
+    "id": "14006",
     "weight": 1000
   },
   {
     "key": 82,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
-    "star": 5,
+    "star": 4,
     "race": 1,
-    "id": "15003",
+    "id": "14007",
     "weight": 1000
   },
   {
@@ -743,34 +743,34 @@
     "card_pool_type": "camp1_pool",
     "star": 5,
     "race": 1,
-    "id": "15004",
+    "id": "15001",
     "weight": 1000
   },
   {
     "key": 84,
     "recruitment_type": 2,
-    "card_pool_type": "camp2_pool",
-    "star": 3,
-    "race": 2,
-    "id": "23001",
+    "card_pool_type": "camp1_pool",
+    "star": 5,
+    "race": 1,
+    "id": "15002",
     "weight": 1000
   },
   {
     "key": 85,
     "recruitment_type": 2,
-    "card_pool_type": "camp2_pool",
-    "star": 3,
-    "race": 2,
-    "id": "23002",
+    "card_pool_type": "camp1_pool",
+    "star": 5,
+    "race": 1,
+    "id": "15003",
     "weight": 1000
   },
   {
     "key": 86,
     "recruitment_type": 2,
-    "card_pool_type": "camp2_pool",
-    "star": 3,
-    "race": 2,
-    "id": "23003",
+    "card_pool_type": "camp1_pool",
+    "star": 5,
+    "race": 1,
+    "id": "15004",
     "weight": 1000
   },
   {
@@ -779,34 +779,34 @@
     "card_pool_type": "camp2_pool",
     "star": 3,
     "race": 2,
-    "id": "23004",
+    "id": "23001",
     "weight": 1000
   },
   {
     "key": 88,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
-    "star": 4,
+    "star": 3,
     "race": 2,
-    "id": "24001",
+    "id": "23002",
     "weight": 1000
   },
   {
     "key": 89,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
-    "star": 4,
+    "star": 3,
     "race": 2,
-    "id": "24002",
+    "id": "23003",
     "weight": 1000
   },
   {
     "key": 90,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
-    "star": 4,
+    "star": 3,
     "race": 2,
-    "id": "24003",
+    "id": "23004",
     "weight": 1000
   },
   {
@@ -815,7 +815,7 @@
     "card_pool_type": "camp2_pool",
     "star": 4,
     "race": 2,
-    "id": "24004",
+    "id": "24001",
     "weight": 1000
   },
   {
@@ -824,7 +824,7 @@
     "card_pool_type": "camp2_pool",
     "star": 4,
     "race": 2,
-    "id": "24005",
+    "id": "24002",
     "weight": 1000
   },
   {
@@ -833,7 +833,7 @@
     "card_pool_type": "camp2_pool",
     "star": 4,
     "race": 2,
-    "id": "24006",
+    "id": "24003",
     "weight": 1000
   },
   {
@@ -842,7 +842,7 @@
     "card_pool_type": "camp2_pool",
     "star": 4,
     "race": 2,
-    "id": "24007",
+    "id": "24004",
     "weight": 1000
   },
   {
@@ -851,7 +851,7 @@
     "card_pool_type": "camp2_pool",
     "star": 4,
     "race": 2,
-    "id": "24008",
+    "id": "24005",
     "weight": 1000
   },
   {
@@ -860,34 +860,34 @@
     "card_pool_type": "camp2_pool",
     "star": 4,
     "race": 2,
-    "id": "24009",
+    "id": "24006",
     "weight": 1000
   },
   {
     "key": 97,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
-    "star": 5,
+    "star": 4,
     "race": 2,
-    "id": "25001",
+    "id": "24007",
     "weight": 1000
   },
   {
     "key": 98,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
-    "star": 5,
+    "star": 4,
     "race": 2,
-    "id": "25002",
+    "id": "24008",
     "weight": 1000
   },
   {
     "key": 99,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
-    "star": 5,
+    "star": 4,
     "race": 2,
-    "id": "25003",
+    "id": "24009",
     "weight": 1000
   },
   {
@@ -896,34 +896,34 @@
     "card_pool_type": "camp2_pool",
     "star": 5,
     "race": 2,
-    "id": "25004",
+    "id": "25001",
     "weight": 1000
   },
   {
     "key": 101,
     "recruitment_type": 2,
-    "card_pool_type": "camp3_pool",
-    "star": 3,
-    "race": 3,
-    "id": "33001",
+    "card_pool_type": "camp2_pool",
+    "star": 5,
+    "race": 2,
+    "id": "25002",
     "weight": 1000
   },
   {
     "key": 102,
     "recruitment_type": 2,
-    "card_pool_type": "camp3_pool",
-    "star": 3,
-    "race": 3,
-    "id": "33002",
+    "card_pool_type": "camp2_pool",
+    "star": 5,
+    "race": 2,
+    "id": "25003",
     "weight": 1000
   },
   {
     "key": 103,
     "recruitment_type": 2,
-    "card_pool_type": "camp3_pool",
-    "star": 3,
-    "race": 3,
-    "id": "33003",
+    "card_pool_type": "camp2_pool",
+    "star": 5,
+    "race": 2,
+    "id": "25004",
     "weight": 1000
   },
   {
@@ -932,7 +932,7 @@
     "card_pool_type": "camp3_pool",
     "star": 3,
     "race": 3,
-    "id": "33004",
+    "id": "33001",
     "weight": 1000
   },
   {
@@ -941,7 +941,7 @@
     "card_pool_type": "camp3_pool",
     "star": 3,
     "race": 3,
-    "id": "33005",
+    "id": "33002",
     "weight": 1000
   },
   {
@@ -950,34 +950,34 @@
     "card_pool_type": "camp3_pool",
     "star": 3,
     "race": 3,
-    "id": "33006",
+    "id": "33003",
     "weight": 1000
   },
   {
     "key": 107,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
-    "star": 4,
+    "star": 3,
     "race": 3,
-    "id": "34001",
+    "id": "33004",
     "weight": 1000
   },
   {
     "key": 108,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
-    "star": 4,
+    "star": 3,
     "race": 3,
-    "id": "34002",
+    "id": "33005",
     "weight": 1000
   },
   {
     "key": 109,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
-    "star": 4,
+    "star": 3,
     "race": 3,
-    "id": "34003",
+    "id": "33006",
     "weight": 1000
   },
   {
@@ -986,7 +986,7 @@
     "card_pool_type": "camp3_pool",
     "star": 4,
     "race": 3,
-    "id": "34004",
+    "id": "34001",
     "weight": 1000
   },
   {
@@ -995,7 +995,7 @@
     "card_pool_type": "camp3_pool",
     "star": 4,
     "race": 3,
-    "id": "34005",
+    "id": "34002",
     "weight": 1000
   },
   {
@@ -1004,7 +1004,7 @@
     "card_pool_type": "camp3_pool",
     "star": 4,
     "race": 3,
-    "id": "34006",
+    "id": "34003",
     "weight": 1000
   },
   {
@@ -1013,7 +1013,7 @@
     "card_pool_type": "camp3_pool",
     "star": 4,
     "race": 3,
-    "id": "34007",
+    "id": "34004",
     "weight": 1000
   },
   {
@@ -1022,34 +1022,34 @@
     "card_pool_type": "camp3_pool",
     "star": 4,
     "race": 3,
-    "id": "34008",
+    "id": "34005",
     "weight": 1000
   },
   {
     "key": 115,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
-    "star": 5,
+    "star": 4,
     "race": 3,
-    "id": "35002",
+    "id": "34006",
     "weight": 1000
   },
   {
     "key": 116,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
-    "star": 5,
+    "star": 4,
     "race": 3,
-    "id": "35003",
+    "id": "34007",
     "weight": 1000
   },
   {
     "key": 117,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
-    "star": 5,
+    "star": 4,
     "race": 3,
-    "id": "35004",
+    "id": "34008",
     "weight": 1000
   },
   {
@@ -1058,7 +1058,7 @@
     "card_pool_type": "camp3_pool",
     "star": 5,
     "race": 3,
-    "id": "35005",
+    "id": "35002",
     "weight": 1000
   },
   {
@@ -1067,34 +1067,34 @@
     "card_pool_type": "camp3_pool",
     "star": 5,
     "race": 3,
-    "id": "35006",
+    "id": "35003",
     "weight": 1000
   },
   {
     "key": 120,
     "recruitment_type": 2,
-    "card_pool_type": "camp4_pool",
-    "star": 3,
-    "race": 4,
-    "id": "43001",
+    "card_pool_type": "camp3_pool",
+    "star": 5,
+    "race": 3,
+    "id": "35004",
     "weight": 1000
   },
   {
     "key": 121,
     "recruitment_type": 2,
-    "card_pool_type": "camp4_pool",
-    "star": 3,
-    "race": 4,
-    "id": "43002",
+    "card_pool_type": "camp3_pool",
+    "star": 5,
+    "race": 3,
+    "id": "35005",
     "weight": 1000
   },
   {
     "key": 122,
     "recruitment_type": 2,
-    "card_pool_type": "camp4_pool",
-    "star": 3,
-    "race": 4,
-    "id": "43003",
+    "card_pool_type": "camp3_pool",
+    "star": 5,
+    "race": 3,
+    "id": "35006",
     "weight": 1000
   },
   {
@@ -1103,7 +1103,7 @@
     "card_pool_type": "camp4_pool",
     "star": 3,
     "race": 4,
-    "id": "43004",
+    "id": "43001",
     "weight": 1000
   },
   {
@@ -1112,7 +1112,7 @@
     "card_pool_type": "camp4_pool",
     "star": 3,
     "race": 4,
-    "id": "43005",
+    "id": "43002",
     "weight": 1000
   },
   {
@@ -1121,7 +1121,7 @@
     "card_pool_type": "camp4_pool",
     "star": 3,
     "race": 4,
-    "id": "43006",
+    "id": "43003",
     "weight": 1000
   },
   {
@@ -1130,34 +1130,34 @@
     "card_pool_type": "camp4_pool",
     "star": 3,
     "race": 4,
-    "id": "43007",
+    "id": "43004",
     "weight": 1000
   },
   {
     "key": 127,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
-    "star": 4,
+    "star": 3,
     "race": 4,
-    "id": "44001",
+    "id": "43005",
     "weight": 1000
   },
   {
     "key": 128,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
-    "star": 4,
+    "star": 3,
     "race": 4,
-    "id": "44002",
+    "id": "43006",
     "weight": 1000
   },
   {
     "key": 129,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
-    "star": 4,
+    "star": 3,
     "race": 4,
-    "id": "44003",
+    "id": "43007",
     "weight": 1000
   },
   {
@@ -1166,7 +1166,7 @@
     "card_pool_type": "camp4_pool",
     "star": 4,
     "race": 4,
-    "id": "44004",
+    "id": "44001",
     "weight": 1000
   },
   {
@@ -1175,41 +1175,68 @@
     "card_pool_type": "camp4_pool",
     "star": 4,
     "race": 4,
-    "id": "44006",
+    "id": "44002",
     "weight": 1000
   },
   {
     "key": 132,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
-    "star": 5,
+    "star": 4,
     "race": 4,
-    "id": "45001",
+    "id": "44003",
     "weight": 1000
   },
   {
     "key": 133,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
-    "star": 5,
+    "star": 4,
     "race": 4,
-    "id": "45002",
+    "id": "44004",
     "weight": 1000
   },
   {
     "key": 134,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
-    "star": 5,
+    "star": 4,
     "race": 4,
-    "id": "45003",
+    "id": "44006",
     "weight": 1000
   },
   {
     "key": 135,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
-    "star": 5,
+    "star": 4,
+    "race": 4,
+    "id": "45001",
+    "weight": 1000
+  },
+  {
+    "key": 136,
+    "recruitment_type": 2,
+    "card_pool_type": "camp4_pool",
+    "star": 4,
+    "race": 4,
+    "id": "45002",
+    "weight": 1000
+  },
+  {
+    "key": 137,
+    "recruitment_type": 2,
+    "card_pool_type": "camp4_pool",
+    "star": 4,
+    "race": 4,
+    "id": "45003",
+    "weight": 1000
+  },
+  {
+    "key": 138,
+    "recruitment_type": 2,
+    "card_pool_type": "camp4_pool",
+    "star": 4,
     "race": 4,
     "id": "45004",
     "weight": 1000
diff --git a/modules/gourmet/api_createorder.go b/modules/gourmet/api_createorder.go
index 127d6b791..c12bd0247 100644
--- a/modules/gourmet/api_createorder.go
+++ b/modules/gourmet/api_createorder.go
@@ -22,7 +22,7 @@ func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.Gourmet
 ///美食城创建订单
 func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreateOrderReq) (code pb.ErrorCode, data proto.Message) {
 	var (
-		res      []*cfg.Gameatn
+		res      []*cfg.Gameatn // 订单消耗
 		costTime int32
 		szTime   map[int32]int32 // 记录每个类型的订单耗时 key 是技能组type value 订单耗时
 	)
@@ -38,21 +38,19 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat
 	}
 	// 记录每个食材耗时
 	for k, v := range _gourmet.Skill {
-		var _time int32
-		// 计算出需要的时间
 		_skillCfg := this.module.configure.GetGourmetConfigData(k, v)
-		_time += _skillCfg.Needtime
-		// 高效制作技能
-		for k, v := range _gourmet.SpecialSkill {
-			specalSkill := this.module.configure.GetGourmetConfigData(k, v)
-			_time += specalSkill.Needtime
-		}
-		szTime[k] = _time
+		szTime[k] = _skillCfg.Needtime
+	}
+	// 高效制作技能
+	for k, v := range _gourmet.SpecialSkill {
+		specalSkill := this.module.configure.GetGourmetConfigData(k, v)
+		szTime[k] = specalSkill.Needtime
 	}
 	if !utils.IsToday(_gourmet.Ctime) { // 跨天了
 		_gourmet.Ctime = configure.Now().Unix()
 		_gourmet.OrderCostTime = 0
 	}
+	// 计算消耗
 	for _, order := range req.Order {
 		if order.FoodCount == 0 {
 			continue
@@ -60,6 +58,10 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat
 		if v, ok := szTime[order.FoodType]; ok {
 			costTime += v * order.FoodCount
 		}
+		if v, ok := _gourmet.Skill[order.FoodType]; ok {
+			conf := this.module.configure.GetGourmetConfigData(order.FoodType, v)
+			res = append(res, conf.DeliciousConsume...)
+		}
 	}
 
 	// 校验时间
@@ -97,17 +99,12 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat
 		}
 		if v1, ok := szTime[v.FoodType]; ok {
 			v.CookTime = v1 * v.FoodCount
-			costTime += v.CookTime
 		}
 	}
 	if _gourmet.CookingFood != nil && _gourmet.CookingFood.ETime == 0 {
 		_gourmet.CookingFood = nil
 	}
 	if _gourmet.CookingFood == nil {
-		if _gourmet.Ctime == 0 {
-			_gourmet.Ctime = configure.Now().Unix()
-		}
-
 		for _, v := range _gourmet.Foods {
 			if v.FoodCount > 0 {
 				v.FoodCount--
@@ -121,6 +118,9 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat
 				if v.FoodCount == 0 {
 					v.CookTime = 0
 				}
+				if _gourmet.Ctime == 0 {
+					_gourmet.Ctime = configure.Now().Unix()
+				}
 				break
 			}
 		}
@@ -130,10 +130,6 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.GourmetCreat
 		return
 	}
 
-	if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { // 真正消耗
-		return
-	}
-
 	// 校验通过 写数据
 	mapData := make(map[string]interface{}, 0)
 	mapData["foods"] = _gourmet.Foods