From 126e0aa3e1a2604609ec4d65c45f20fc1758d066 Mon Sep 17 00:00:00 2001 From: 陆恒 Date: Tue, 16 Jun 2020 10:54:49 +0800 Subject: [PATCH] 提交代码 --- src/HttpServer/jsonconf/BoxConfig.json | 30 ++++++++++++++++++++++++++++++ src/HttpServer/jsonconf/GiftConfig.json | 30 ++++++++++++++++++++++++++++++ src/HttpServer/jsonconf/RmbConfig.json | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/HttpServer/jsonconf/jsonconf.go | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/HttpServer/logic/datadef.go | 2 ++ src/HttpServer/logic/function.go | 9 +++++++-- 6 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 src/HttpServer/jsonconf/BoxConfig.json create mode 100644 src/HttpServer/jsonconf/GiftConfig.json create mode 100644 src/HttpServer/jsonconf/RmbConfig.json diff --git a/src/HttpServer/jsonconf/BoxConfig.json b/src/HttpServer/jsonconf/BoxConfig.json new file mode 100644 index 0000000..e83b62b --- /dev/null +++ b/src/HttpServer/jsonconf/BoxConfig.json @@ -0,0 +1,30 @@ +[ + { + "id": 1, + "type": 1, + "time": 5, + "rate": 30, + "rmb_num": "金币奖励" + }, + { + "id": 2, + "type": 1, + "time": 10, + "rate": 20, + "rmb_num": "金币奖励" + }, + { + "id": 3, + "type": 2, + "time": 0.2, + "rate": 20, + "rmb_num": "红包" + }, + { + "id": 4, + "type": 2, + "time": 0.3, + "rate": 30, + "rmb_num": "红包" + } +] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/GiftConfig.json b/src/HttpServer/jsonconf/GiftConfig.json new file mode 100644 index 0000000..04f954f --- /dev/null +++ b/src/HttpServer/jsonconf/GiftConfig.json @@ -0,0 +1,30 @@ +[ + { + "id": 1, + "type": 1, + "time": 10, + "rate": 30, + "rmb_num": "金币奖励" + }, + { + "id": 2, + "type": 1, + "time": 20, + "rate": 20, + "rmb_num": "金币奖励" + }, + { + "id": 3, + "type": 2, + "time": 0.2, + "rate": 20, + "rmb_num": "红包" + }, + { + "id": 4, + "type": 2, + "time": 0.3, + "rate": 30, + "rmb_num": "红包" + } +] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/RmbConfig.json b/src/HttpServer/jsonconf/RmbConfig.json new file mode 100644 index 0000000..cdb3de1 --- /dev/null +++ b/src/HttpServer/jsonconf/RmbConfig.json @@ -0,0 +1,51 @@ +[ + { + "id": 1, + "rmb_num": 0.5, + "time": 1, + "login_day": 2, + "cat_level": 5 + }, + { + "id": 2, + "rmb_num": 1, + "time": 1, + "login_day": 5, + "cat_level": 10 + }, + { + "id": 3, + "rmb_num": 1.5, + "time": 1, + "login_day": 7, + "cat_level": 15 + }, + { + "id": 4, + "rmb_num": 3, + "time": 1, + "login_day": 10, + "cat_level": 20 + }, + { + "id": 5, + "rmb_num": 5, + "time": 1, + "login_day": 15, + "cat_level": 25 + }, + { + "id": 6, + "rmb_num": 30, + "time": 1, + "login_day": 20, + "cat_level": 35 + }, + { + "id": 7, + "rmb_num": 100, + "time": 999, + "login_day": 1, + "cat_level": 1 + } +] \ No newline at end of file diff --git a/src/HttpServer/jsonconf/jsonconf.go b/src/HttpServer/jsonconf/jsonconf.go index 5993afd..3522e3f 100644 --- a/src/HttpServer/jsonconf/jsonconf.go +++ b/src/HttpServer/jsonconf/jsonconf.go @@ -50,11 +50,30 @@ type TurnTableDesc struct { Idx int `json:"idx"` } +type BoxConfigDesc struct { + Id int `json:"id"` + Ttype int `json:"type"` + Time float32 `json:"time"` + Rate int `json:"rate"` + Rmb_num string `json:"rmb_num"` +} + +type RMBConfigDesc struct { + Id int `json:"id"` + Time int `json:"time"` + Rmb_num float32 `json:"rmb_num"` + Login_day int `json:"login_day"` + Cat_level string `json:"cat_level"` +} + type GameConfig struct { CardConfig []CardDesc CatConfig []CatDesc RedCatConfig []RedCatDesc TurnTableConfig []TurnTableDesc + BoxConfig []BoxConfigDesc + GiftConfig []BoxConfigDesc + RMBConfig []RMBConfigDesc } func GetJsonConf() *GameConfig { @@ -177,6 +196,45 @@ func LoadJsonConf() error { return err } + path = "../jsonconf/RmbConfig.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.RMBConfig) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + path = "../jsonconf/BoxConfig.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.BoxConfig) + if err != nil { + logger.Info("loadJsonConf failed1,err=%v", err) + return err + } + + path = "../jsonconf/GiftConfig.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.GiftConfig) + 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 } diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index d86bdf3..12dc1e1 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -723,6 +723,8 @@ type AchieveMentData struct { type UserData struct { UserId int //玩家id RegTime int //注册时间 + ContinueLoginDay int //连续登陆天数 + SumLoginDay int //累计登录天数 Gold int64 //金币 GoldSum int64 //玩家累计金币 Love int64 //爱心值 diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index f6b24c9..328cb58 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -316,6 +316,8 @@ func (u *UserData) HandlePassDay() { if int64(u.LastLoginTime)-time.Now().Unix() > 86400 { //已经过了很多天了 + u.ContinueLoginDay = 1 + u.SumLoginDay++ isdiffday = true } else { //t同一天 不做处理 @@ -324,9 +326,10 @@ func (u *UserData) HandlePassDay() { //不是同一天了 isdiffday = true if nowtimestamp.Unix() != lasttimestamp.Unix()+86400 { - + u.ContinueLoginDay = 1 + u.SumLoginDay++ } else { - + u.ContinueLoginDay++ } logger.Info("HandlePassDay now=%v,last=%v", nowtimestamp.Unix(), lasttimestamp.Unix()) } @@ -398,6 +401,8 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int) { udata.DratMult = 1 udata.DrawTableCount = 1 udata.FlopCardCnt = 1 + udata.ContinueLoginDay = 1 + udata.SumLoginDay = 1 //test udata.FlopCardLefCnt = 100 udata.NickName = "著名的沙雕玩家" -- libgit2 0.21.0