Commit 44e73cd5ba03021e3d4efa42b948488f65cbc87b
1 parent
8ce440c7
Exists in
master
提交
Showing
1 changed file
with
28 additions
and
0 deletions
Show diff stats
src/HttpServer/jsonconf/jsonconf.go
| @@ -191,6 +191,34 @@ func LoadJsonConf() error { | @@ -191,6 +191,34 @@ func LoadJsonConf() error { | ||
| 191 | return err | 191 | return err |
| 192 | } | 192 | } |
| 193 | 193 | ||
| 194 | + path = "../jsonconf/GunLevelRewardConfig.json" | ||
| 195 | + content, err = file_get_contents(path) | ||
| 196 | + if err != nil { | ||
| 197 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 198 | + return err | ||
| 199 | + } | ||
| 200 | + | ||
| 201 | + err = json.Unmarshal([]byte(content), &g_jsonconf.GunLevelConfig) | ||
| 202 | + if err != nil { | ||
| 203 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 204 | + return err | ||
| 205 | + } | ||
| 206 | + | ||
| 207 | + | ||
| 208 | + | ||
| 209 | + path = "../jsonconf/OnlineRewardConfig.json" | ||
| 210 | + content, err = file_get_contents(path) | ||
| 211 | + if err != nil { | ||
| 212 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 213 | + return err | ||
| 214 | + } | ||
| 215 | + | ||
| 216 | + err = json.Unmarshal([]byte(content), &g_jsonconf.OnlineRewardConfig) | ||
| 217 | + if err != nil { | ||
| 218 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 219 | + return err | ||
| 220 | + } | ||
| 221 | + | ||
| 194 | logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err) | 222 | logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err) |
| 195 | return nil | 223 | return nil |
| 196 | } | 224 | } |