Commit 336d29949636c5a841537f423ad803288ba34764
1 parent
a332f230
Exists in
master
提交
Showing
3 changed files
with
8 additions
and
1 deletions
Show diff stats
src/HttpServer/logic/datadef.go
| @@ -24,6 +24,7 @@ type UserLoginData struct { | @@ -24,6 +24,7 @@ type UserLoginData struct { | ||
| 24 | Sumloginday int `json:"sumloginday"` | 24 | Sumloginday int `json:"sumloginday"` |
| 25 | Shakeleftcnt int `json:"shakeleftcnt"` | 25 | Shakeleftcnt int `json:"shakeleftcnt"` |
| 26 | IsNew int `json:"isnew"` | 26 | IsNew int `json:"isnew"` |
| 27 | + Issignshow int `json:"issignshow"` | ||
| 27 | } | 28 | } |
| 28 | 29 | ||
| 29 | type UserLoginResp struct { | 30 | type UserLoginResp struct { |
| @@ -487,6 +488,7 @@ type UserData struct { | @@ -487,6 +488,7 @@ type UserData struct { | ||
| 487 | Nickname string //昵称 | 488 | Nickname string //昵称 |
| 488 | HeadUrl string //头像 | 489 | HeadUrl string //头像 |
| 489 | FetchRdBagNum int //当天已领的红包 | 490 | FetchRdBagNum int //当天已领的红包 |
| 491 | + SignShow int //是否弹出签到 | ||
| 490 | WithDraw WithDrawInfo //提现记录信息 | 492 | WithDraw WithDrawInfo //提现记录信息 |
| 491 | //SpecialWithDraw WithDrawInfo //活跃提现记录信息 | 493 | //SpecialWithDraw WithDrawInfo //活跃提现记录信息 |
| 492 | Task TaskInfo //玩家任务完成相关信息 | 494 | Task TaskInfo //玩家任务完成相关信息 |
src/HttpServer/logic/function.go
| @@ -108,7 +108,7 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | @@ -108,7 +108,7 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { | ||
| 108 | continue | 108 | continue |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | - logger.Info("CalcTaskList task=%+v",cfg) | 111 | + //logger.Info("CalcTaskList task=%+v",cfg) |
| 112 | 112 | ||
| 113 | if cfg.TaskType == DAILY_TASKTYPE_LOGIN { | 113 | if cfg.TaskType == DAILY_TASKTYPE_LOGIN { |
| 114 | nowloginday := time.Now().Day() | 114 | nowloginday := time.Now().Day() |
| @@ -674,6 +674,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | @@ -674,6 +674,7 @@ func InitUserInfo(data *UserLoginReq, resp *UserLoginResp, uuid int, uniqueuid s | ||
| 674 | initdata.FetchRdBagNum = 0 | 674 | initdata.FetchRdBagNum = 0 |
| 675 | initdata.Nickname = data.Nickname | 675 | initdata.Nickname = data.Nickname |
| 676 | initdata.HeadUrl = data.Headurl | 676 | initdata.HeadUrl = data.Headurl |
| 677 | + resp.Data.Issignshow = initdata.SignShow | ||
| 677 | 678 | ||
| 678 | for _, val := range jsonconf.GetJsonConf().WithDrawConfig { | 679 | for _, val := range jsonconf.GetJsonConf().WithDrawConfig { |
| 679 | var tmp WithDrawDesc | 680 | var tmp WithDrawDesc |
| @@ -910,6 +911,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | @@ -910,6 +911,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | ||
| 910 | u.Task.Watchads = 0 | 911 | u.Task.Watchads = 0 |
| 911 | u.ShakeTime = SHAKELIMIT | 912 | u.ShakeTime = SHAKELIMIT |
| 912 | u.FetchRdBagNum = 0 | 913 | u.FetchRdBagNum = 0 |
| 914 | + u.SignShow = 1 | ||
| 913 | 915 | ||
| 914 | //任务也需要处理 | 916 | //任务也需要处理 |
| 915 | /*tasklist, err := GetTaskInfo(u.Userid, 1) | 917 | /*tasklist, err := GetTaskInfo(u.Userid, 1) |
| @@ -1007,6 +1009,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | @@ -1007,6 +1009,7 @@ func GetUserData(uuid int, uniqueuid string, req *UserLoginReq, resp *UserLoginR | ||
| 1007 | resp.Data.Sumloginday = data.SumLoginDay | 1009 | resp.Data.Sumloginday = data.SumLoginDay |
| 1008 | resp.Data.Shakeleftcnt = data.ShakeTime | 1010 | resp.Data.Shakeleftcnt = data.ShakeTime |
| 1009 | resp.Data.IsNew = data.IsNew | 1011 | resp.Data.IsNew = data.IsNew |
| 1012 | + resp.Data.Issignshow = data.SignShow | ||
| 1010 | return nil | 1013 | return nil |
| 1011 | } | 1014 | } |
| 1012 | 1015 |
src/HttpServer/logic/logic.go
| @@ -872,6 +872,8 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | @@ -872,6 +872,8 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { | ||
| 872 | break | 872 | break |
| 873 | } | 873 | } |
| 874 | 874 | ||
| 875 | + | ||
| 876 | + uinfo.SignShow = 0 | ||
| 875 | uinfo.IsSignToday = 1 | 877 | uinfo.IsSignToday = 1 |
| 876 | uinfo.RealGold = goldnum | 878 | uinfo.RealGold = goldnum |
| 877 | //uinfo.RealGold += cfg.Num | 879 | //uinfo.RealGold += cfg.Num |