Commit 434c0d2d4a34b20f123c466430d8a4f877446f28
1 parent
587705ca
Exists in
master
and in
4 other branches
提交每日任务新的类型
Showing
4 changed files
with
24 additions
and
12 deletions
Show diff stats
src/HttpServer/logic/constdef.go
| @@ -2,22 +2,25 @@ package logic | @@ -2,22 +2,25 @@ package logic | ||
| 2 | 2 | ||
| 3 | //任务成就类型枚举 协议上报用 | 3 | //任务成就类型枚举 协议上报用 |
| 4 | const ( | 4 | const ( |
| 5 | - TASKTYPE_PASSLEVEL = 1 //表示通过x关卡 | ||
| 6 | - TASKTYPE_GETREDBAG = 2 //领取x次红包 | ||
| 7 | - TASKTYPE_WATCHADS = 3 //3表示观看x次广告 | ||
| 8 | - TASKTYPE_KILLSTAR = 4 //4表示消除x颗星星 | ||
| 9 | - TASKTYPE_USEITEM = 5 //5表示使用x次道具 | 5 | + TASKTYPE_PASSLEVEL = 1 //表示通过x关卡 |
| 6 | + TASKTYPE_GETREDBAG = 2 //领取x次红包 | ||
| 7 | + TASKTYPE_WATCHADS = 3 //3表示观看x次广告 | ||
| 8 | + TASKTYPE_KILLSTAR = 4 //4表示消除x颗星星 | ||
| 9 | + TASKTYPE_USEITEM = 5 //5表示使用x次道具 | ||
| 10 | + TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏 | ||
| 11 | + | ||
| 10 | ) | 12 | ) |
| 11 | 13 | ||
| 12 | //任务类型 对应表 | 14 | //任务类型 对应表 |
| 13 | const ( | 15 | const ( |
| 14 | - DAILY_TASKTYPE_LOGIN = 1 //1 每日登录 | ||
| 15 | - DAILY_TASKTYPE_GETGUANCNT = 2 //提取存钱罐 | ||
| 16 | - DAILY_TASKTYPE_PASSLEVEL = 3 //近日通过关 | ||
| 17 | - DAILY_TASKTYPE_USEITEM = 4 //使用道具数 | ||
| 18 | - DAILY_TASKTYPE_GETREDBAG = 5 //领取红包次数 | ||
| 19 | - DAILY_TASKTYPE_GETGUANGOLD = 6 //收取金币x枚 | ||
| 20 | - DAILY_TASKTYPE_ONLINEMIN = 7 //在线分钟数 | 16 | + DAILY_TASKTYPE_LOGIN = 1 //1 每日登录 |
| 17 | + DAILY_TASKTYPE_GETGUANCNT = 2 //提取存钱罐 | ||
| 18 | + DAILY_TASKTYPE_PASSLEVEL = 3 //近日通过关 | ||
| 19 | + DAILY_TASKTYPE_USEITEM = 4 //使用道具数 | ||
| 20 | + DAILY_TASKTYPE_GETREDBAG = 5 //领取红包次数 | ||
| 21 | + DAILY_TASKTYPE_GETGUANGOLD = 6 //收取金币x枚 | ||
| 22 | + DAILY_TASKTYPE_ONLINEMIN = 7 //在线分钟数 | ||
| 23 | + DAILY_TASKTYPE_PLAYSMALLGAME = 8 //试玩小游戏15s | ||
| 21 | ) | 24 | ) |
| 22 | 25 | ||
| 23 | //成就类型 对应表 | 26 | //成就类型 对应表 |
src/HttpServer/logic/datadef.go
| @@ -262,6 +262,7 @@ type TaskInfo struct { | @@ -262,6 +262,7 @@ type TaskInfo struct { | ||
| 262 | UseItemCnt int //使用道具次数 | 262 | UseItemCnt int //使用道具次数 |
| 263 | GetRedbagCnt int //领取红包次数 | 263 | GetRedbagCnt int //领取红包次数 |
| 264 | GetGuanGold int //收集金币数 | 264 | GetGuanGold int //收集金币数 |
| 265 | + PlaySmall int //当日是否试玩小游戏15s 次数 | ||
| 265 | } | 266 | } |
| 266 | 267 | ||
| 267 | // | 268 | // |
src/HttpServer/logic/function.go
| @@ -145,6 +145,11 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) { | @@ -145,6 +145,11 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) { | ||
| 145 | if uinfo.Task.OnlineMin >= cfg.Num { | 145 | if uinfo.Task.OnlineMin >= cfg.Num { |
| 146 | list.Taskdata[k].Taskstatus = 2 | 146 | list.Taskdata[k].Taskstatus = 2 |
| 147 | } | 147 | } |
| 148 | + } else if cfg.TaskType == DAILY_TASKTYPE_PLAYSMALLGAME { | ||
| 149 | + list.Taskdata[k].Taskprogress = uinfo.Task.PlaySmall | ||
| 150 | + if uinfo.Task.PlaySmall > 0 { | ||
| 151 | + list.Taskdata[k].Taskstatus = 2 | ||
| 152 | + } | ||
| 148 | } | 153 | } |
| 149 | 154 | ||
| 150 | } | 155 | } |
| @@ -669,6 +674,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | @@ -669,6 +674,7 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { | ||
| 669 | u.Task.OnlineMin = 0 | 674 | u.Task.OnlineMin = 0 |
| 670 | u.Task.PassLevel = 0 | 675 | u.Task.PassLevel = 0 |
| 671 | u.Task.UseItemCnt = 0 | 676 | u.Task.UseItemCnt = 0 |
| 677 | + u.Task.PlaySmall = 0 | ||
| 672 | 678 | ||
| 673 | //任务也需要处理 | 679 | //任务也需要处理 |
| 674 | /*tasklist, err := GetTaskInfo(u.Userid, 1) | 680 | /*tasklist, err := GetTaskInfo(u.Userid, 1) |
src/HttpServer/logic/logic.go
| @@ -592,6 +592,8 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { | @@ -592,6 +592,8 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { | ||
| 592 | case TASKTYPE_USEITEM: | 592 | case TASKTYPE_USEITEM: |
| 593 | uinfo.Task.UseItemCnt += rdata.Value | 593 | uinfo.Task.UseItemCnt += rdata.Value |
| 594 | uinfo.Achieve.SumUseItemCnt += rdata.Value | 594 | uinfo.Achieve.SumUseItemCnt += rdata.Value |
| 595 | + case TASKTYPE_PLAYSMALLGAMES: | ||
| 596 | + uinfo.Task.PlaySmall += 1 | ||
| 595 | } | 597 | } |
| 596 | logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) | 598 | logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) |
| 597 | SaveUserInfo(uinfo, uniqueuuid) | 599 | SaveUserInfo(uinfo, uniqueuuid) |