diff --git a/src/HttpServer/jsonconf/jsonconf.go b/src/HttpServer/jsonconf/jsonconf.go index eb77a37..f978b70 100644 --- a/src/HttpServer/jsonconf/jsonconf.go +++ b/src/HttpServer/jsonconf/jsonconf.go @@ -12,62 +12,78 @@ var ( ) type AchieveDesc struct { - Id int `json:"id"` - Task string `json:"task"` - Num int `json:"num"` - Reward []int `json:"reward"` - TaskType int `json:"type"` + Id int `json:"id"` + Task string `json:"task"` + Num int `json:"num"` + Reward []int `json:"reward"` + TaskType int `json:"type"` } type LevelDesc struct { - Id int `json:"id"` - Level int `json:"level"` - Exp int `json:"exp"` - Cash int `json:"cash"` - Extracash int `json:"extracash"` + 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"` + 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"` + Id int `json:"id"` + Times int `json:"times"` + Login int `json:"login"` + Score int `json:"score"` } type WithDrawDesc struct { - Id int `json:"id"` - Money float32 `json:"money"` - Coin int `json:"coin"` - Task int `json:"task"` - Level int `json:"level"` - Isnew int `json:"new"` + Id int `json:"id"` + Money float32 `json:"money"` + Coin int `json:"coin"` + Task int `json:"task"` + Level int `json:"level"` + Isnew int `json:"new"` +} + +type SignRewardDetail struct { + Id int `json:"id"` + Num int `json:"num"` +} + +type SignReward struct { + Reward1 []SignRewardDetail + Reward2 []SignRewardDetail +} + +type SignConfigDesc struct { + Rule int `json:"rule"` + Round int `json:"round"` + Reward SignReward `json:"reward"` } type GameConfig struct { - AchieventConfig []AchieveDesc - TaskConfig []AchieveDesc - LevelConfig []LevelDesc - MoneyBoxConfig []MoneyBoxLevelDesc + AchieventConfig []AchieveDesc + TaskConfig []AchieveDesc + LevelConfig []LevelDesc + MoneyBoxConfig []MoneyBoxLevelDesc MoneyBoxTimeConfig []MoneyBoxTimesDesc - WithDrawConfig []WithDrawDesc + WithDrawConfig []WithDrawDesc + SignConfig SignConfigDesc } func GetJsonConf() *GameConfig { return g_jsonconf } - func GetMoneyBoxCfg(lv int) *MoneyBoxLevelDesc { rt := new(MoneyBoxLevelDesc) rt = nil - for _,val := range g_jsonconf.MoneyBoxConfig { + for _, val := range g_jsonconf.MoneyBoxConfig { if val.Level == lv { rt = &val break @@ -98,7 +114,7 @@ func LoadJsonConf() error { err = json.Unmarshal([]byte(content), &g_jsonconf.AchieventConfig) if err != nil { logger.Info("loadJsonConf failed1,err=%v", err) - return err + return err } path = "../jsonconf/DailyTask.json" @@ -111,7 +127,7 @@ func LoadJsonConf() error { err = json.Unmarshal([]byte(content), &g_jsonconf.TaskConfig) if err != nil { logger.Info("loadJsonConf failed1,err=%v", err) - return err + return err } path = "../jsonconf/LevelConfig.json" @@ -124,7 +140,7 @@ func LoadJsonConf() error { err = json.Unmarshal([]byte(content), &g_jsonconf.LevelConfig) if err != nil { logger.Info("loadJsonConf failed1,err=%v", err) - return err + return err } path = "../jsonconf/MoneyboxLevel.json" @@ -137,10 +153,9 @@ func LoadJsonConf() error { err = json.Unmarshal([]byte(content), &g_jsonconf.MoneyBoxConfig) if err != nil { logger.Info("loadJsonConf failed1,err=%v", err) - return err + return err } - path = "../jsonconf/MoneyboxTimes.json" content, err = file_get_contents(path) if err != nil { @@ -151,10 +166,9 @@ func LoadJsonConf() error { err = json.Unmarshal([]byte(content), &g_jsonconf.MoneyBoxTimeConfig) if err != nil { logger.Info("loadJsonConf failed1,err=%v", err) - return err + return err } - path = "../jsonconf/WithdrawConfig.json" content, err = file_get_contents(path) if err != nil { @@ -165,10 +179,22 @@ func LoadJsonConf() error { err = json.Unmarshal([]byte(content), &g_jsonconf.WithDrawConfig) if err != nil { logger.Info("loadJsonConf failed1,err=%v", err) - return err + return err } + path = "../jsonconf/SignConfig.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.SignConfig) + 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 + return err +} -- libgit2 0.21.0