From 9a040f7b949883be559a68f5909a82ad9d2d7142 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Mon, 15 Aug 2022 18:25:47 +0800
Subject: [PATCH] =?UTF-8?q?json=20=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_global.json    | 29 ++++++++++++++++++++++++++++-
 modules/hero/api_drawCard.go |  3 +++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 00f11b087..26ae44012 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -79,6 +79,31 @@
       "t": "10005",
       "n": 1
     },
+    "base_pool_10cost": {
+      "a": "item",
+      "t": "10001",
+      "n": 10
+    },
+    "camp1_pool_10cost": {
+      "a": "item",
+      "t": "10002",
+      "n": 10
+    },
+    "camp2_pool_10cost": {
+      "a": "item",
+      "t": "10003",
+      "n": 10
+    },
+    "camp3_pool_10cost": {
+      "a": "item",
+      "t": "10004",
+      "n": 10
+    },
+    "camp4_pool_10cost": {
+      "a": "item",
+      "t": "10005",
+      "n": 10
+    },
     "camp1_pool1": "camp1_pool",
     "camp2_pool1": "camp2_pool",
     "camp3_pool1": "camp3_pool",
@@ -109,6 +134,8 @@
     "camp_pool_star3": 9000,
     "camp_pool_star4": 900,
     "camp_pool_star5": 100,
-    "gourmet": 500
+    "gourmet": 500,
+    "smithy_maxplayer": 20,
+    "smithy_maxtime": 36000
   }
 ]
\ No newline at end of file
diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index f3e330076..c98043ed2 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -32,6 +32,9 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
 	)
 	req.DrawCount = 10                              // test
 	cfgDraw = this.module.configure.GetGlobalConf() // 读取抽卡配置文件
+	if cfgDraw == nil {
+		return
+	}
 	code = this.DrawCardCheck(session, req)
 	if code != pb.ErrorCode_Success {
 		return