From 44e73cd5ba03021e3d4efa42b948488f65cbc87b Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Thu, 6 Aug 2020 17:08:07 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/jsonconf/jsonconf.go | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/HttpServer/jsonconf/jsonconf.go b/src/HttpServer/jsonconf/jsonconf.go
index af0a950..26e5bb9 100644
--- a/src/HttpServer/jsonconf/jsonconf.go
+++ b/src/HttpServer/jsonconf/jsonconf.go
@@ -191,6 +191,34 @@ func LoadJsonConf() error {
 		return err
 	}
 
+	path = "../jsonconf/GunLevelRewardConfig.json"
+	content, err = file_get_contents(path)
+	if err != nil {
+		logger.Info("loadJsonConf failed1,err=%v", err)
+		return err
+	}
+
+	err = json.Unmarshal([]byte(content), &g_jsonconf.GunLevelConfig)
+	if err != nil {
+		logger.Info("loadJsonConf failed1,err=%v", err)
+		return err
+	}
+
+
+
+	path = "../jsonconf/OnlineRewardConfig.json"
+	content, err = file_get_contents(path)
+	if err != nil {
+		logger.Info("loadJsonConf failed1,err=%v", err)
+		return err
+	}
+
+	err = json.Unmarshal([]byte(content), &g_jsonconf.OnlineRewardConfig)
+	if err != nil {
+		logger.Info("loadJsonConf failed1,err=%v", err)
+		return err
+	}
+
 	logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err)
 	return nil
 }
--
libgit2 0.21.0