diff --git a/src/HttpServer/jsonconf/jsonconf.go b/src/HttpServer/jsonconf/jsonconf.go index d50d320..5d0e379 100644 --- a/src/HttpServer/jsonconf/jsonconf.go +++ b/src/HttpServer/jsonconf/jsonconf.go @@ -19,8 +19,44 @@ type AchieveDesc struct { } +type LevelDesc struct { + Id int `json:"id"` + Level int `json:"level"` + Exp int `json:"exp"` + Cash int `json:"cash"` + Extracash int `json:"extracash"` +} + +type MoneyBoxLevelDesc struct { + Id int `json:"id"` + Level int `json:"level"` + Min int `json:"min"` + Max int `json:"max"` +} + +type MoneyBoxTimesDesc struct { + Id int `json:"id"` + Times int `json:"times"` + Login int `json:"login"` + Score int `json:"score"` +} + +type WithDrawDesc struct { + Id int `json:"id"` + Money int `json:"money"` + Coin int `json:"coin"` + Task int `json:"task"` + Level int `json:"level"` + Isnew int `json:"new"` +} + type GameConfig struct { AchieventConfig []AchieveDesc + TaskConfig []AchieveDesc + LevelConfig []LevelDesc + MoneyBoxConfig []MoneyBoxLevelDesc + MoneyBoxTimeConfig []MoneyBoxTimesDesc + WithDrawConfig []WithDrawDesc } func GetJsonConf() *GameConfig { @@ -52,6 +88,74 @@ func LoadJsonConf() error { return err } + path = "../jsonconf/DailyTask.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.TaskConfig) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + path = "../jsonconf/LevelConfig.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.LevelConfig) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + path = "../jsonconf/MoneyboxLevel.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.MoneyBoxConfig) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + + path = "../jsonconf/MoneyboxTimes.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.MoneyBoxTimeConfig) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + + path = "../jsonconf/WithdrawConfig.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.WithDrawConfig) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + logger.Info("loadJsonConf success pconf=%v,err=%v", *g_jsonconf, err) return err } \ No newline at end of file diff --git a/src/HttpServer/main/main.go b/src/HttpServer/main/main.go index 22b49fb..4db76cc 100644 --- a/src/HttpServer/main/main.go +++ b/src/HttpServer/main/main.go @@ -68,7 +68,7 @@ func main() { } //測試 - logic.Test() + //logic.Test() go logic.StartHttpServe() go logic.StartHttpTicker() time.Sleep(time.Duration(2) * time.Second) -- libgit2 0.21.0