Commit 1ed0082a96ed3465cea30ec511194e411557a0c7
1 parent
7bd1fed9
Exists in
master
and in
4 other branches
提交加载配置文件
Showing
2 changed files
with
105 additions
and
1 deletions
Show diff stats
src/HttpServer/jsonconf/jsonconf.go
| @@ -19,8 +19,44 @@ type AchieveDesc struct { | @@ -19,8 +19,44 @@ type AchieveDesc struct { | ||
| 19 | 19 | ||
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | +type LevelDesc struct { | ||
| 23 | + Id int `json:"id"` | ||
| 24 | + Level int `json:"level"` | ||
| 25 | + Exp int `json:"exp"` | ||
| 26 | + Cash int `json:"cash"` | ||
| 27 | + Extracash int `json:"extracash"` | ||
| 28 | +} | ||
| 29 | + | ||
| 30 | +type MoneyBoxLevelDesc struct { | ||
| 31 | + Id int `json:"id"` | ||
| 32 | + Level int `json:"level"` | ||
| 33 | + Min int `json:"min"` | ||
| 34 | + Max int `json:"max"` | ||
| 35 | +} | ||
| 36 | + | ||
| 37 | +type MoneyBoxTimesDesc struct { | ||
| 38 | + Id int `json:"id"` | ||
| 39 | + Times int `json:"times"` | ||
| 40 | + Login int `json:"login"` | ||
| 41 | + Score int `json:"score"` | ||
| 42 | +} | ||
| 43 | + | ||
| 44 | +type WithDrawDesc struct { | ||
| 45 | + Id int `json:"id"` | ||
| 46 | + Money int `json:"money"` | ||
| 47 | + Coin int `json:"coin"` | ||
| 48 | + Task int `json:"task"` | ||
| 49 | + Level int `json:"level"` | ||
| 50 | + Isnew int `json:"new"` | ||
| 51 | +} | ||
| 52 | + | ||
| 22 | type GameConfig struct { | 53 | type GameConfig struct { |
| 23 | AchieventConfig []AchieveDesc | 54 | AchieventConfig []AchieveDesc |
| 55 | + TaskConfig []AchieveDesc | ||
| 56 | + LevelConfig []LevelDesc | ||
| 57 | + MoneyBoxConfig []MoneyBoxLevelDesc | ||
| 58 | + MoneyBoxTimeConfig []MoneyBoxTimesDesc | ||
| 59 | + WithDrawConfig []WithDrawDesc | ||
| 24 | } | 60 | } |
| 25 | 61 | ||
| 26 | func GetJsonConf() *GameConfig { | 62 | func GetJsonConf() *GameConfig { |
| @@ -52,6 +88,74 @@ func LoadJsonConf() error { | @@ -52,6 +88,74 @@ func LoadJsonConf() error { | ||
| 52 | return err | 88 | return err |
| 53 | } | 89 | } |
| 54 | 90 | ||
| 91 | + path = "../jsonconf/DailyTask.json" | ||
| 92 | + content, err = file_get_contents(path) | ||
| 93 | + if err != nil { | ||
| 94 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 95 | + return err | ||
| 96 | + } | ||
| 97 | + | ||
| 98 | + err = json.Unmarshal([]byte(content), &g_jsonconf.TaskConfig) | ||
| 99 | + if err != nil { | ||
| 100 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 101 | + return err | ||
| 102 | + } | ||
| 103 | + | ||
| 104 | + path = "../jsonconf/LevelConfig.json" | ||
| 105 | + content, err = file_get_contents(path) | ||
| 106 | + if err != nil { | ||
| 107 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 108 | + return err | ||
| 109 | + } | ||
| 110 | + | ||
| 111 | + err = json.Unmarshal([]byte(content), &g_jsonconf.LevelConfig) | ||
| 112 | + if err != nil { | ||
| 113 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 114 | + return err | ||
| 115 | + } | ||
| 116 | + | ||
| 117 | + path = "../jsonconf/MoneyboxLevel.json" | ||
| 118 | + content, err = file_get_contents(path) | ||
| 119 | + if err != nil { | ||
| 120 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 121 | + return err | ||
| 122 | + } | ||
| 123 | + | ||
| 124 | + err = json.Unmarshal([]byte(content), &g_jsonconf.MoneyBoxConfig) | ||
| 125 | + if err != nil { | ||
| 126 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 127 | + return err | ||
| 128 | + } | ||
| 129 | + | ||
| 130 | + | ||
| 131 | + path = "../jsonconf/MoneyboxTimes.json" | ||
| 132 | + content, err = file_get_contents(path) | ||
| 133 | + if err != nil { | ||
| 134 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 135 | + return err | ||
| 136 | + } | ||
| 137 | + | ||
| 138 | + err = json.Unmarshal([]byte(content), &g_jsonconf.MoneyBoxTimeConfig) | ||
| 139 | + if err != nil { | ||
| 140 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 141 | + return err | ||
| 142 | + } | ||
| 143 | + | ||
| 144 | + | ||
| 145 | + path = "../jsonconf/WithdrawConfig.json" | ||
| 146 | + content, err = file_get_contents(path) | ||
| 147 | + if err != nil { | ||
| 148 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 149 | + return err | ||
| 150 | + } | ||
| 151 | + | ||
| 152 | + err = json.Unmarshal([]byte(content), &g_jsonconf.WithDrawConfig) | ||
| 153 | + if err != nil { | ||
| 154 | + logger.Info("loadJsonConf failed1,err=%v", err) | ||
| 155 | + return err | ||
| 156 | + } | ||
| 157 | + | ||
| 158 | + | ||
| 55 | logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err) | 159 | logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err) |
| 56 | return err | 160 | return err |
| 57 | } | 161 | } |
| 58 | \ No newline at end of file | 162 | \ No newline at end of file |
src/HttpServer/main/main.go
| @@ -68,7 +68,7 @@ func main() { | @@ -68,7 +68,7 @@ func main() { | ||
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | //測試 | 70 | //測試 |
| 71 | - logic.Test() | 71 | + //logic.Test() |
| 72 | go logic.StartHttpServe() | 72 | go logic.StartHttpServe() |
| 73 | go logic.StartHttpTicker() | 73 | go logic.StartHttpTicker() |
| 74 | time.Sleep(time.Duration(2) * time.Second) | 74 | time.Sleep(time.Duration(2) * time.Second) |