diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json
index fab3d46e8..1c36a00d9 100644
--- a/bin/json/game_drawcard.json
+++ b/bin/json/game_drawcard.json
@@ -246,22 +246,13 @@
     "key": 28,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
-    "star": 4,
-    "race": 4,
-    "id": "44005",
-    "weight": 1000
-  },
-  {
-    "key": 29,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool7",
     "star": 5,
     "race": 3,
     "id": "35002",
     "weight": 1000
   },
   {
-    "key": 30,
+    "key": 29,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 5,
@@ -270,7 +261,7 @@
     "weight": 1000
   },
   {
-    "key": 31,
+    "key": 30,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
@@ -279,7 +270,7 @@
     "weight": 1000
   },
   {
-    "key": 32,
+    "key": 31,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
@@ -288,7 +279,7 @@
     "weight": 1000
   },
   {
-    "key": 33,
+    "key": 32,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 5,
@@ -297,7 +288,7 @@
     "weight": 1000
   },
   {
-    "key": 34,
+    "key": 33,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
@@ -306,7 +297,7 @@
     "weight": 1000
   },
   {
-    "key": 35,
+    "key": 34,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 3,
@@ -315,7 +306,7 @@
     "weight": 1000
   },
   {
-    "key": 36,
+    "key": 35,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
@@ -324,16 +315,7 @@
     "weight": 1000
   },
   {
-    "key": 37,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool7",
-    "star": 4,
-    "race": 3,
-    "id": "34007",
-    "weight": 1000
-  },
-  {
-    "key": 38,
+    "key": 36,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 5,
@@ -342,7 +324,7 @@
     "weight": 1000
   },
   {
-    "key": 39,
+    "key": 37,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
@@ -351,7 +333,7 @@
     "weight": 1000
   },
   {
-    "key": 40,
+    "key": 38,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 5,
@@ -360,7 +342,7 @@
     "weight": 1000
   },
   {
-    "key": 41,
+    "key": 39,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 5,
@@ -368,35 +350,35 @@
     "id": "35005",
     "weight": 1000
   },
+  {
+    "key": 40,
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool7",
+    "star": 4,
+    "race": 1,
+    "id": "14005",
+    "weight": 1000
+  },
+  {
+    "key": 41,
+    "recruitment_type": 1,
+    "card_pool_type": "base_pool7",
+    "star": 4,
+    "race": 2,
+    "id": "24004",
+    "weight": 1000
+  },
   {
     "key": 42,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
     "race": 1,
-    "id": "14005",
-    "weight": 1000
-  },
-  {
-    "key": 43,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool7",
-    "star": 4,
-    "race": 2,
-    "id": "24004",
-    "weight": 1000
-  },
-  {
-    "key": 44,
-    "recruitment_type": 1,
-    "card_pool_type": "base_pool7",
-    "star": 4,
-    "race": 1,
     "id": "14007",
     "weight": 1000
   },
   {
-    "key": 45,
+    "key": 43,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 5,
@@ -405,7 +387,7 @@
     "weight": 1000
   },
   {
-    "key": 46,
+    "key": 44,
     "recruitment_type": 1,
     "card_pool_type": "base_pool7",
     "star": 4,
@@ -414,7 +396,7 @@
     "weight": 1000
   },
   {
-    "key": 47,
+    "key": 45,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -423,7 +405,7 @@
     "weight": 1000
   },
   {
-    "key": 48,
+    "key": 46,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -432,7 +414,7 @@
     "weight": 1000
   },
   {
-    "key": 49,
+    "key": 47,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -441,7 +423,7 @@
     "weight": 1000
   },
   {
-    "key": 50,
+    "key": 48,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -450,7 +432,7 @@
     "weight": 1000
   },
   {
-    "key": 51,
+    "key": 49,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 3,
@@ -459,7 +441,7 @@
     "weight": 1000
   },
   {
-    "key": 52,
+    "key": 50,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -468,7 +450,7 @@
     "weight": 1000
   },
   {
-    "key": 53,
+    "key": 51,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -477,7 +459,7 @@
     "weight": 1000
   },
   {
-    "key": 54,
+    "key": 52,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -486,7 +468,7 @@
     "weight": 1000
   },
   {
-    "key": 55,
+    "key": 53,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -495,7 +477,7 @@
     "weight": 1000
   },
   {
-    "key": 56,
+    "key": 54,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -504,7 +486,7 @@
     "weight": 1000
   },
   {
-    "key": 57,
+    "key": 55,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -513,7 +495,7 @@
     "weight": 1000
   },
   {
-    "key": 58,
+    "key": 56,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 4,
@@ -522,7 +504,7 @@
     "weight": 1000
   },
   {
-    "key": 59,
+    "key": 57,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 5,
@@ -531,7 +513,7 @@
     "weight": 1000
   },
   {
-    "key": 60,
+    "key": 58,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 5,
@@ -540,7 +522,7 @@
     "weight": 1000
   },
   {
-    "key": 61,
+    "key": 59,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 5,
@@ -549,7 +531,7 @@
     "weight": 1000
   },
   {
-    "key": 62,
+    "key": 60,
     "recruitment_type": 2,
     "card_pool_type": "camp1_pool",
     "star": 5,
@@ -558,7 +540,7 @@
     "weight": 1000
   },
   {
-    "key": 63,
+    "key": 61,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -567,7 +549,7 @@
     "weight": 1000
   },
   {
-    "key": 64,
+    "key": 62,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -576,7 +558,7 @@
     "weight": 1000
   },
   {
-    "key": 65,
+    "key": 63,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -585,7 +567,7 @@
     "weight": 1000
   },
   {
-    "key": 66,
+    "key": 64,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -594,7 +576,7 @@
     "weight": 1000
   },
   {
-    "key": 67,
+    "key": 65,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -603,7 +585,7 @@
     "weight": 1000
   },
   {
-    "key": 68,
+    "key": 66,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 3,
@@ -612,7 +594,7 @@
     "weight": 1000
   },
   {
-    "key": 69,
+    "key": 67,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -621,7 +603,7 @@
     "weight": 1000
   },
   {
-    "key": 70,
+    "key": 68,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -630,7 +612,7 @@
     "weight": 1000
   },
   {
-    "key": 71,
+    "key": 69,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -639,7 +621,7 @@
     "weight": 1000
   },
   {
-    "key": 72,
+    "key": 70,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -648,7 +630,7 @@
     "weight": 1000
   },
   {
-    "key": 73,
+    "key": 71,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -657,7 +639,7 @@
     "weight": 1000
   },
   {
-    "key": 74,
+    "key": 72,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -666,7 +648,7 @@
     "weight": 1000
   },
   {
-    "key": 75,
+    "key": 73,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 4,
@@ -675,7 +657,7 @@
     "weight": 1000
   },
   {
-    "key": 76,
+    "key": 74,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 5,
@@ -684,7 +666,7 @@
     "weight": 1000
   },
   {
-    "key": 77,
+    "key": 75,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 5,
@@ -693,7 +675,7 @@
     "weight": 1000
   },
   {
-    "key": 78,
+    "key": 76,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 5,
@@ -702,7 +684,7 @@
     "weight": 1000
   },
   {
-    "key": 79,
+    "key": 77,
     "recruitment_type": 2,
     "card_pool_type": "camp2_pool",
     "star": 5,
@@ -711,7 +693,7 @@
     "weight": 1000
   },
   {
-    "key": 80,
+    "key": 78,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -720,7 +702,7 @@
     "weight": 1000
   },
   {
-    "key": 81,
+    "key": 79,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -729,7 +711,7 @@
     "weight": 1000
   },
   {
-    "key": 82,
+    "key": 80,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -738,7 +720,7 @@
     "weight": 1000
   },
   {
-    "key": 83,
+    "key": 81,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -747,7 +729,7 @@
     "weight": 1000
   },
   {
-    "key": 84,
+    "key": 82,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -756,7 +738,7 @@
     "weight": 1000
   },
   {
-    "key": 85,
+    "key": 83,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 3,
@@ -765,7 +747,7 @@
     "weight": 1000
   },
   {
-    "key": 86,
+    "key": 84,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -774,7 +756,7 @@
     "weight": 1000
   },
   {
-    "key": 87,
+    "key": 85,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -783,7 +765,7 @@
     "weight": 1000
   },
   {
-    "key": 88,
+    "key": 86,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -792,7 +774,7 @@
     "weight": 1000
   },
   {
-    "key": 89,
+    "key": 87,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -801,7 +783,7 @@
     "weight": 1000
   },
   {
-    "key": 90,
+    "key": 88,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -810,7 +792,7 @@
     "weight": 1000
   },
   {
-    "key": 91,
+    "key": 89,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -819,7 +801,7 @@
     "weight": 1000
   },
   {
-    "key": 92,
+    "key": 90,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -828,7 +810,7 @@
     "weight": 1000
   },
   {
-    "key": 93,
+    "key": 91,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 4,
@@ -837,7 +819,7 @@
     "weight": 1000
   },
   {
-    "key": 94,
+    "key": 92,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -846,7 +828,7 @@
     "weight": 1000
   },
   {
-    "key": 95,
+    "key": 93,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -855,7 +837,7 @@
     "weight": 1000
   },
   {
-    "key": 96,
+    "key": 94,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -864,7 +846,7 @@
     "weight": 1000
   },
   {
-    "key": 97,
+    "key": 95,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -873,7 +855,7 @@
     "weight": 1000
   },
   {
-    "key": 98,
+    "key": 96,
     "recruitment_type": 2,
     "card_pool_type": "camp3_pool",
     "star": 5,
@@ -882,7 +864,7 @@
     "weight": 1000
   },
   {
-    "key": 99,
+    "key": 97,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -891,7 +873,7 @@
     "weight": 1000
   },
   {
-    "key": 100,
+    "key": 98,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -900,7 +882,7 @@
     "weight": 1000
   },
   {
-    "key": 101,
+    "key": 99,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -909,7 +891,7 @@
     "weight": 1000
   },
   {
-    "key": 102,
+    "key": 100,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -918,7 +900,7 @@
     "weight": 1000
   },
   {
-    "key": 103,
+    "key": 101,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -927,7 +909,7 @@
     "weight": 1000
   },
   {
-    "key": 104,
+    "key": 102,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -936,7 +918,7 @@
     "weight": 1000
   },
   {
-    "key": 105,
+    "key": 103,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 3,
@@ -945,7 +927,7 @@
     "weight": 1000
   },
   {
-    "key": 106,
+    "key": 104,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -954,7 +936,7 @@
     "weight": 1000
   },
   {
-    "key": 107,
+    "key": 105,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -963,7 +945,7 @@
     "weight": 1000
   },
   {
-    "key": 108,
+    "key": 106,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -972,7 +954,7 @@
     "weight": 1000
   },
   {
-    "key": 109,
+    "key": 107,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -981,7 +963,7 @@
     "weight": 1000
   },
   {
-    "key": 110,
+    "key": 108,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -990,7 +972,7 @@
     "weight": 1000
   },
   {
-    "key": 111,
+    "key": 109,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -999,7 +981,7 @@
     "weight": 1000
   },
   {
-    "key": 112,
+    "key": 110,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -1008,7 +990,7 @@
     "weight": 1000
   },
   {
-    "key": 113,
+    "key": 111,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
@@ -1017,7 +999,7 @@
     "weight": 1000
   },
   {
-    "key": 114,
+    "key": 112,
     "recruitment_type": 2,
     "card_pool_type": "camp4_pool",
     "star": 4,
diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json
index ffa43d849..1e3c7781d 100644
--- a/bin/json/game_initial.json
+++ b/bin/json/game_initial.json
@@ -254,7 +254,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "34007",
+        "t": "45003",
         "n": 1
       }
     ]
@@ -264,7 +264,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "45003",
+        "t": "14007",
         "n": 1
       }
     ]
@@ -274,7 +274,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "14007",
+        "t": "34002",
         "n": 1
       }
     ]
@@ -284,7 +284,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "34002",
+        "t": "24002",
         "n": 1
       }
     ]
@@ -294,7 +294,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "24002",
+        "t": "35001",
         "n": 1
       }
     ]
@@ -304,7 +304,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "35001",
+        "t": "15004",
         "n": 1
       }
     ]
@@ -314,7 +314,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "15004",
+        "t": "35002",
         "n": 1
       }
     ]
@@ -324,7 +324,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "44005",
+        "t": "44006",
         "n": 1
       }
     ]
@@ -334,7 +334,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "35002",
+        "t": "13003",
         "n": 1
       }
     ]
@@ -344,7 +344,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "44006",
+        "t": "35003",
         "n": 1
       }
     ]
@@ -354,7 +354,7 @@
     "var": [
       {
         "a": "hero",
-        "t": "13003",
+        "t": "35005",
         "n": 1
       }
     ]
@@ -364,33 +364,13 @@
     "var": [
       {
         "a": "hero",
-        "t": "35003",
+        "t": "14005",
         "n": 1
       }
     ]
   },
   {
     "index": "192",
-    "var": [
-      {
-        "a": "hero",
-        "t": "35005",
-        "n": 1
-      }
-    ]
-  },
-  {
-    "index": "193",
-    "var": [
-      {
-        "a": "hero",
-        "t": "14005",
-        "n": 1
-      }
-    ]
-  },
-  {
-    "index": "194",
     "var": [
       {
         "a": "hero",
diff --git a/modules/gateway/agent.go b/modules/gateway/agent.go
index 7ca867f8f..430b8c0d1 100644
--- a/modules/gateway/agent.go
+++ b/modules/gateway/agent.go
@@ -79,6 +79,7 @@ locp:
 			go this.Close()
 			break locp
 		} else {
+			this.wsConn.SetReadDeadline(time.Now().Add(time.Second * 60))
 			// this.gateway.Debugf("----------1 agent:%s uId:%s  MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType)
 			if msg.MainType == string(comm.ModuleGate) { //心跳消息 无需校验秘钥
 				data, _ := anypb.New(&pb.GatewayHeartbeatResp{
@@ -89,7 +90,6 @@ locp:
 					SubType:  "heartbeat",
 					Data:     data,
 				})
-				this.wsConn.SetReadDeadline(time.Now().Add(time.Second * 30))
 				continue
 			}
 			var code pb.ErrorCode
diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go
index 84cc627e1..252595936 100644
--- a/modules/shop/api_buy.go
+++ b/modules/shop/api_buy.go
@@ -80,6 +80,14 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
 		filed = "allianceShop"
 		record = shopData.AllianceShop
 		break
+	case pb.ShopType_HeroShop:
+		filed = "heroShop"
+		record = shopData.HeroShop
+		break
+	case pb.ShopType_SmithyShop:
+		filed = "smithyShop"
+		record = shopData.SmithyShop
+		break
 	default:
 		code = pb.ErrorCode_ReqParameterError
 		return