Commit 7569d408258ef02265a5192433e71299578d5e6c
1 parent
11935c04
Exists in
master
提交
Showing
5 changed files
with
64 additions
and
333 deletions
Show diff stats
src/HttpServer/jsonconf/DailyTask.json
| 1 | 1 | [ |
| 2 | 2 | { |
| 3 | 3 | "id": 1, |
| 4 | - "task": "领取%d%个红包", | |
| 5 | - "num": 2, | |
| 6 | - "reward": [8,1], | |
| 7 | - "type": 5 | |
| 4 | + "type": 1, | |
| 5 | + "parameter": 5, | |
| 6 | + "desc": "在线%d分钟", | |
| 7 | + "reward": "[1,500]" | |
| 8 | 8 | }, |
| 9 | 9 | { |
| 10 | 10 | "id": 2, |
| 11 | - "task": "领取%d%个红包", | |
| 12 | - "num": 5, | |
| 13 | - "reward": [8,1], | |
| 14 | - "type": 5 | |
| 11 | + "type": 1, | |
| 12 | + "parameter": 10, | |
| 13 | + "desc": "在线%d分钟", | |
| 14 | + "reward": "[1,1000]" | |
| 15 | 15 | }, |
| 16 | 16 | { |
| 17 | 17 | "id": 3, |
| 18 | - "task": "领取%d%个红包", | |
| 19 | - "num": 7, | |
| 20 | - "reward": [8,1], | |
| 21 | - "type": 5 | |
| 18 | + "type": 1, | |
| 19 | + "parameter": 30, | |
| 20 | + "desc": "在线%d分钟", | |
| 21 | + "reward": "[1,2000]" | |
| 22 | 22 | }, |
| 23 | 23 | { |
| 24 | 24 | "id": 4, |
| 25 | - "task": "领取%d%个红包", | |
| 26 | - "num": 10, | |
| 27 | - "reward": [8,1], | |
| 28 | - "type": 5 | |
| 25 | + "type": 1, | |
| 26 | + "parameter": 60, | |
| 27 | + "desc": "在线%d分钟", | |
| 28 | + "reward": "[1,5000]" | |
| 29 | 29 | }, |
| 30 | 30 | { |
| 31 | 31 | "id": 5, |
| 32 | - "task": "领取%d%个红包", | |
| 33 | - "num": 15, | |
| 34 | - "reward": [8,1], | |
| 35 | - "type": 5 | |
| 32 | + "type": 2, | |
| 33 | + "parameter": 512, | |
| 34 | + "desc": "合成%d分的球", | |
| 35 | + "reward": "[1,500]" | |
| 36 | 36 | }, |
| 37 | 37 | { |
| 38 | 38 | "id": 6, |
| 39 | - "task": "领取%d%个红包", | |
| 40 | - "num": 20, | |
| 41 | - "reward": [8,1], | |
| 42 | - "type": 5 | |
| 39 | + "type": 2, | |
| 40 | + "parameter": 1024, | |
| 41 | + "desc": "合成%d分的球", | |
| 42 | + "reward": "[1,1000]" | |
| 43 | 43 | }, |
| 44 | 44 | { |
| 45 | 45 | "id": 7, |
| 46 | - "task": "领取%d%个红包", | |
| 47 | - "num": 25, | |
| 48 | - "reward": [8,1], | |
| 49 | - "type": 5 | |
| 46 | + "type": 2, | |
| 47 | + "parameter": 2048, | |
| 48 | + "desc": "合成%d分的球", | |
| 49 | + "reward": "[1,2000]" | |
| 50 | 50 | }, |
| 51 | 51 | { |
| 52 | 52 | "id": 8, |
| 53 | - "task": "领取%d%个红包", | |
| 54 | - "num": 30, | |
| 55 | - "reward": [8,1], | |
| 56 | - "type": 5 | |
| 53 | + "type": 2, | |
| 54 | + "parameter": 4096, | |
| 55 | + "desc": "合成%d分的球", | |
| 56 | + "reward": "[1,5000]" | |
| 57 | 57 | }, |
| 58 | 58 | { |
| 59 | 59 | "id": 9, |
| 60 | - "task": "领取%d%个红包", | |
| 61 | - "num": 35, | |
| 62 | - "reward": [8,1], | |
| 63 | - "type": 5 | |
| 60 | + "type": 3, | |
| 61 | + "parameter": 5, | |
| 62 | + "desc": "观看广告%d次", | |
| 63 | + "reward": "[1,1000]" | |
| 64 | 64 | }, |
| 65 | 65 | { |
| 66 | 66 | "id": 10, |
| 67 | - "task": "领取%d%个红包", | |
| 68 | - "num": 40, | |
| 69 | - "reward": [8,1], | |
| 70 | - "type": 5 | |
| 71 | - }, | |
| 72 | - { | |
| 73 | - "id": 11, | |
| 74 | - "task": "领取%d%个红包", | |
| 75 | - "num": 45, | |
| 76 | - "reward": [8,1], | |
| 77 | - "type": 5 | |
| 78 | - }, | |
| 79 | - { | |
| 80 | - "id": 12, | |
| 81 | - "task": "领取%d%个红包", | |
| 82 | - "num": 50, | |
| 83 | - "reward": [8,1], | |
| 84 | - "type": 5 | |
| 85 | - }, | |
| 86 | - { | |
| 87 | - "id": 13, | |
| 88 | - "task": "今日通过%d%关", | |
| 89 | - "num": 2, | |
| 90 | - "reward": [8,1], | |
| 91 | - "type": 3 | |
| 92 | - }, | |
| 93 | - { | |
| 94 | - "id": 14, | |
| 95 | - "task": "今日通过%d%关", | |
| 96 | - "num": 4, | |
| 97 | - "reward": [8,1], | |
| 98 | - "type": 3 | |
| 99 | - }, | |
| 100 | - { | |
| 101 | - "id": 15, | |
| 102 | - "task": "今日通过%d%关", | |
| 103 | - "num": 6, | |
| 104 | - "reward": [8,1], | |
| 105 | - "type": 3 | |
| 106 | - }, | |
| 107 | - { | |
| 108 | - "id": 16, | |
| 109 | - "task": "今日通过%d%关", | |
| 110 | - "num": 8, | |
| 111 | - "reward": [8,1], | |
| 112 | - "type": 3 | |
| 113 | - }, | |
| 114 | - { | |
| 115 | - "id": 17, | |
| 116 | - "task": "今日通过%d%关", | |
| 117 | - "num": 10, | |
| 118 | - "reward": [8,1], | |
| 119 | - "type": 3 | |
| 120 | - }, | |
| 121 | - { | |
| 122 | - "id": 18, | |
| 123 | - "task": "今日通过%d%关", | |
| 124 | - "num": 15, | |
| 125 | - "reward": [8,1], | |
| 126 | - "type": 3 | |
| 127 | - }, | |
| 128 | - { | |
| 129 | - "id": 19, | |
| 130 | - "task": "今日通过%d%关", | |
| 131 | - "num": 20, | |
| 132 | - "reward": [8,1], | |
| 133 | - "type": 3 | |
| 134 | - }, | |
| 135 | - { | |
| 136 | - "id": 20, | |
| 137 | - "task": "今日通过%d%关", | |
| 138 | - "num": 25, | |
| 139 | - "reward": [8,1], | |
| 140 | - "type": 3 | |
| 141 | - }, | |
| 142 | - { | |
| 143 | - "id": 21, | |
| 144 | - "task": "今日通过%d%关", | |
| 145 | - "num": 30, | |
| 146 | - "reward": [8,1], | |
| 147 | - "type": 3 | |
| 148 | - }, | |
| 149 | - { | |
| 150 | - "id": 22, | |
| 151 | - "task": "今日通过%d%关", | |
| 152 | - "num": 40, | |
| 153 | - "reward": [8,1], | |
| 154 | - "type": 3 | |
| 155 | - }, | |
| 156 | - { | |
| 157 | - "id": 23, | |
| 158 | - "task": "今日通过%d%关", | |
| 159 | - "num": 50, | |
| 160 | - "reward": [8,1], | |
| 161 | - "type": 3 | |
| 162 | - }, | |
| 163 | - { | |
| 164 | - "id": 24, | |
| 165 | - "task": "使用%d%次道具", | |
| 166 | - "num": 2, | |
| 167 | - "reward": [8,1], | |
| 168 | - "type": 4 | |
| 169 | - }, | |
| 170 | - { | |
| 171 | - "id": 25, | |
| 172 | - "task": "使用%d%次道具", | |
| 173 | - "num": 4, | |
| 174 | - "reward": [8,1], | |
| 175 | - "type": 4 | |
| 176 | - }, | |
| 177 | - { | |
| 178 | - "id": 26, | |
| 179 | - "task": "使用%d%次道具", | |
| 180 | - "num": 6, | |
| 181 | - "reward": [8,1], | |
| 182 | - "type": 4 | |
| 183 | - }, | |
| 184 | - { | |
| 185 | - "id": 27, | |
| 186 | - "task": "使用%d%次道具", | |
| 187 | - "num": 8, | |
| 188 | - "reward": [8,1], | |
| 189 | - "type": 4 | |
| 190 | - }, | |
| 191 | - { | |
| 192 | - "id": 28, | |
| 193 | - "task": "使用%d%次道具", | |
| 194 | - "num": 10, | |
| 195 | - "reward": [8,1], | |
| 196 | - "type": 4 | |
| 197 | - }, | |
| 198 | - { | |
| 199 | - "id": 29, | |
| 200 | - "task": "使用%d%次道具", | |
| 201 | - "num": 15, | |
| 202 | - "reward": [8,1], | |
| 203 | - "type": 4 | |
| 204 | - }, | |
| 205 | - { | |
| 206 | - "id": 30, | |
| 207 | - "task": "使用%d%次道具", | |
| 208 | - "num": 20, | |
| 209 | - "reward": [8,1], | |
| 210 | - "type": 4 | |
| 211 | - }, | |
| 212 | - { | |
| 213 | - "id": 31, | |
| 214 | - "task": "使用%d%次道具", | |
| 215 | - "num": 25, | |
| 216 | - "reward": [8,1], | |
| 217 | - "type": 4 | |
| 218 | - }, | |
| 219 | - { | |
| 220 | - "id": 32, | |
| 221 | - "task": "使用%d%次道具", | |
| 222 | - "num": 30, | |
| 223 | - "reward": [8,1], | |
| 224 | - "type": 4 | |
| 225 | - }, | |
| 226 | - { | |
| 227 | - "id": 33, | |
| 228 | - "task": "使用%d%次道具", | |
| 229 | - "num": 40, | |
| 230 | - "reward": [8,1], | |
| 231 | - "type": 4 | |
| 232 | - }, | |
| 233 | - { | |
| 234 | - "id": 34, | |
| 235 | - "task": "使用%d%次道具", | |
| 236 | - "num": 50, | |
| 237 | - "reward": [8,1], | |
| 238 | - "type": 4 | |
| 239 | - }, | |
| 240 | - { | |
| 241 | - "id": 35, | |
| 242 | - "task": "累计在线%d%分钟", | |
| 243 | - "num": 5, | |
| 244 | - "reward": [8,1], | |
| 245 | - "type": 7 | |
| 246 | - }, | |
| 247 | - { | |
| 248 | - "id": 36, | |
| 249 | - "task": "累计在线%d%分钟", | |
| 250 | - "num": 10, | |
| 251 | - "reward": [8,1], | |
| 252 | - "type": 7 | |
| 253 | - }, | |
| 254 | - { | |
| 255 | - "id": 37, | |
| 256 | - "task": "累计在线%d%分钟", | |
| 257 | - "num": 15, | |
| 258 | - "reward": [8,1], | |
| 259 | - "type": 7 | |
| 260 | - }, | |
| 261 | - { | |
| 262 | - "id": 38, | |
| 263 | - "task": "累计在线%d%分钟", | |
| 264 | - "num": 20, | |
| 265 | - "reward": [8,1], | |
| 266 | - "type": 7 | |
| 267 | - }, | |
| 268 | - { | |
| 269 | - "id": 39, | |
| 270 | - "task": "累计在线%d%分钟", | |
| 271 | - "num": 25, | |
| 272 | - "reward": [8,1], | |
| 273 | - "type": 7 | |
| 274 | - }, | |
| 275 | - { | |
| 276 | - "id": 40, | |
| 277 | - "task": "累计在线%d%分钟", | |
| 278 | - "num": 30, | |
| 279 | - "reward": [8,1], | |
| 280 | - "type": 7 | |
| 281 | - }, | |
| 282 | - { | |
| 283 | - "id": 41, | |
| 284 | - "task": "累计在线%d%分钟", | |
| 285 | - "num": 35, | |
| 286 | - "reward": [8,1], | |
| 287 | - "type": 7 | |
| 288 | - }, | |
| 289 | - { | |
| 290 | - "id": 42, | |
| 291 | - "task": "累计在线%d%分钟", | |
| 292 | - "num": 40, | |
| 293 | - "reward": [8,1], | |
| 294 | - "type": 7 | |
| 295 | - }, | |
| 296 | - { | |
| 297 | - "id": 43, | |
| 298 | - "task": "累计在线%d%分钟", | |
| 299 | - "num": 45, | |
| 300 | - "reward": [8,1], | |
| 301 | - "type": 7 | |
| 302 | - }, | |
| 303 | - { | |
| 304 | - "id": 44, | |
| 305 | - "task": "累计在线%d%分钟", | |
| 306 | - "num": 50, | |
| 307 | - "reward": [8,1], | |
| 308 | - "type": 7 | |
| 309 | - }, | |
| 310 | - { | |
| 311 | - "id": 45, | |
| 312 | - "task": "累计在线%d%分钟", | |
| 313 | - "num": 55, | |
| 314 | - "reward": [8,1], | |
| 315 | - "type": 7 | |
| 316 | - }, | |
| 317 | - { | |
| 318 | - "id": 46, | |
| 319 | - "task": "累计在线%d%分钟", | |
| 320 | - "num": 60, | |
| 321 | - "reward": [8,1], | |
| 322 | - "type": 7 | |
| 323 | - }, | |
| 324 | - { | |
| 325 | - "id": 47, | |
| 326 | - "task": "累计在线%d%分钟", | |
| 327 | - "num": 70, | |
| 328 | - "reward": [8,1], | |
| 329 | - "type": 7 | |
| 330 | - }, | |
| 331 | - { | |
| 332 | - "id": 48, | |
| 333 | - "task": "累计在线%d%分钟", | |
| 334 | - "num": 80, | |
| 335 | - "reward": [8,1], | |
| 336 | - "type": 7 | |
| 337 | - }, | |
| 338 | - { | |
| 339 | - "id": 49, | |
| 340 | - "task": "累计在线%d%分钟", | |
| 341 | - "num": 90, | |
| 342 | - "reward": [8,1], | |
| 343 | - "type": 7 | |
| 344 | - }, | |
| 345 | - { | |
| 346 | - "id": 50, | |
| 347 | - "task": "每日登录", | |
| 348 | - "num": 1, | |
| 349 | - "reward": [8,1], | |
| 350 | - "type": 1 | |
| 67 | + "type": 3, | |
| 68 | + "parameter": 10, | |
| 69 | + "desc": "观看广告%d次", | |
| 70 | + "reward": "[1,5000]" | |
| 351 | 71 | } |
| 352 | 72 | ] |
| 353 | 73 | \ No newline at end of file | ... | ... |
src/HttpServer/logic/constdef.go
| ... | ... | @@ -2,7 +2,7 @@ package logic |
| 2 | 2 | |
| 3 | 3 | //任务成就类型枚举 协议上报用 |
| 4 | 4 | const ( |
| 5 | - TASKTYPE_PASSLEVEL = 1 //表示通过x关卡 | |
| 5 | + TASKTYPE_HENUM = 1 //合道多少分 | |
| 6 | 6 | TASKTYPE_GETREDBAG = 3 //3表示观看x次广告 |
| 7 | 7 | TASKTYPE_WATCHADS = 2 //领取x次红包 |
| 8 | 8 | TASKTYPE_KILLSTAR = 4 //4表示消除x颗星星 |
| ... | ... | @@ -10,17 +10,18 @@ const ( |
| 10 | 10 | TASKTYPE_PLAYSMALLGAMES = 6 //6表示试玩15s小游戏 |
| 11 | 11 | TASKTYPE_SHAKETIME = 7 //摇一摇次数 |
| 12 | 12 | |
| 13 | + | |
| 13 | 14 | ) |
| 14 | 15 | |
| 15 | 16 | //任务类型 对应表 |
| 16 | 17 | const ( |
| 17 | - DAILY_TASKTYPE_LOGIN = 1 //1 每日登录 | |
| 18 | - DAILY_TASKTYPE_GETGUANCNT = 2 //提取存钱罐 | |
| 19 | - DAILY_TASKTYPE_PASSLEVEL = 3 //近日通过关 | |
| 18 | + DAILY_TASKTYPE_LOGIN = 7 //1 每日登录 | |
| 19 | + DAILY_TASKTYPE_GETGUANCNT = 2 //合成多少分的球 | |
| 20 | + DAILY_TASKTYPE_PASSLEVEL = 3 //观看广告 | |
| 20 | 21 | DAILY_TASKTYPE_USEITEM = 4 //使用道具数 |
| 21 | 22 | DAILY_TASKTYPE_GETREDBAG = 5 //领取红包次数 |
| 22 | 23 | DAILY_TASKTYPE_GETGUANGOLD = 6 //收取金币x枚 |
| 23 | - DAILY_TASKTYPE_ONLINEMIN = 7 //在线分钟数 | |
| 24 | + DAILY_TASKTYPE_ONLINEMIN = 1 //在线分钟数 | |
| 24 | 25 | DAILY_TASKTYPE_PLAYSMALLGAME = 8 //试玩小游戏15s |
| 25 | 26 | ) |
| 26 | 27 | |
| ... | ... | @@ -36,13 +37,13 @@ const ( |
| 36 | 37 | |
| 37 | 38 | //奖励类型枚举 |
| 38 | 39 | const ( |
| 39 | - REWARDTYPE_STAR = 1 //星星 | |
| 40 | + REWARDTYPE_STAR = 7 //星星 | |
| 40 | 41 | REWARDTYPE_CHUI = 2 |
| 41 | 42 | REWARDTYPE_SHUA = 3 |
| 42 | 43 | REWARDTYPE_SWAP = 4 |
| 43 | 44 | REWARDTYPE_ELIMITE = 5 |
| 44 | 45 | REWARDTYPE_EXP = 6 |
| 45 | - REWARDTYPE_GOLD = 7 | |
| 46 | + REWARDTYPE_GOLD = 1 | |
| 46 | 47 | REWARDTYPE_REDPACKAGE = 8 //新版红包 |
| 47 | 48 | ) |
| 48 | 49 | ... | ... |
src/HttpServer/logic/datadef.go
| ... | ... | @@ -328,6 +328,7 @@ type UsersignReq struct { |
| 328 | 328 | |
| 329 | 329 | type UsersignData struct { |
| 330 | 330 | Goldnum int `json:"goldnum"` |
| 331 | + Addgold int `json:"addgold"` | |
| 331 | 332 | } |
| 332 | 333 | type UsersignResp struct { |
| 333 | 334 | Code int `json:"code"` |
| ... | ... | @@ -369,6 +370,8 @@ type TaskInfo struct { |
| 369 | 370 | GetRedbagCnt int //领取红包次数 |
| 370 | 371 | GetGuanGold int //收集金币数 |
| 371 | 372 | PlaySmall int //当日是否试玩小游戏15s 次数 |
| 373 | + CaiNum int //合道的球的分数 | |
| 374 | + Watchads int //管看广告次数 | |
| 372 | 375 | } |
| 373 | 376 | |
| 374 | 377 | type UploadhigestscoreReq struct { | ... | ... |
src/HttpServer/logic/function.go
| ... | ... | @@ -118,14 +118,14 @@ func (uinfo *UserData) CalcTaskList(list *TaskList, uniqueid string) *TaskList { |
| 118 | 118 | list.Taskdata[k].Taskstatus = 2 |
| 119 | 119 | } |
| 120 | 120 | } else if cfg.TaskType == DAILY_TASKTYPE_GETGUANCNT { |
| 121 | - list.Taskdata[k].Taskprogress = uinfo.GetFromGuanCnt | |
| 121 | + list.Taskdata[k].Taskprogress = uinfo.Task.CaiNum | |
| 122 | 122 | //当日提取存钱罐次数 |
| 123 | - if uinfo.GetFromGuanCnt >= cfg.Num { | |
| 123 | + if uinfo.Task.CaiNum >= cfg.Num { | |
| 124 | 124 | list.Taskdata[k].Taskstatus = 2 |
| 125 | 125 | } |
| 126 | 126 | } else if cfg.TaskType == DAILY_TASKTYPE_PASSLEVEL { |
| 127 | - list.Taskdata[k].Taskprogress = uinfo.Task.PassLevel | |
| 128 | - if uinfo.Task.PassLevel >= cfg.Num { | |
| 127 | + list.Taskdata[k].Taskprogress = uinfo.Task.Watchads | |
| 128 | + if uinfo.Task.Watchads >= cfg.Num { | |
| 129 | 129 | list.Taskdata[k].Taskstatus = 2 |
| 130 | 130 | } |
| 131 | 131 | } else if cfg.TaskType == DAILY_TASKTYPE_USEITEM { |
| ... | ... | @@ -904,6 +904,8 @@ func (u *UserData) HandlePassDay(uuid int, channel string) { |
| 904 | 904 | u.Task.PassLevel = 0 |
| 905 | 905 | u.Task.UseItemCnt = 0 |
| 906 | 906 | u.Task.PlaySmall = 0 |
| 907 | + u.Task.CaiNum = 0 | |
| 908 | + u.Task.Watchads = 0 | |
| 907 | 909 | u.ShakeTime = SHAKELIMIT |
| 908 | 910 | u.FetchRdBagNum = 0 |
| 909 | 911 | ... | ... |
src/HttpServer/logic/logic.go
| ... | ... | @@ -877,6 +877,7 @@ func HandlerUsersign(w http.ResponseWriter, data string, uuid int) { |
| 877 | 877 | //uinfo.RealGold += cfg.Num |
| 878 | 878 | |
| 879 | 879 | resp.Data.Goldnum = uinfo.RealGold |
| 880 | + resp.Data.Addgold = cfg.Num | |
| 880 | 881 | |
| 881 | 882 | //保存数据 |
| 882 | 883 | err = SaveUserInfo(uinfo, uniqueuuid) |
| ... | ... | @@ -1042,8 +1043,6 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { |
| 1042 | 1043 | } |
| 1043 | 1044 | |
| 1044 | 1045 | switch rdata.Tasktype { |
| 1045 | - case TASKTYPE_PASSLEVEL: | |
| 1046 | - uinfo.Task.PassLevel += rdata.Value | |
| 1047 | 1046 | case TASKTYPE_GETREDBAG: |
| 1048 | 1047 | uinfo.Task.GetRedbagCnt += rdata.Value |
| 1049 | 1048 | if uinfo.LeftFreeRB > 0 { |
| ... | ... | @@ -1054,6 +1053,7 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { |
| 1054 | 1053 | } |
| 1055 | 1054 | case TASKTYPE_WATCHADS: |
| 1056 | 1055 | uinfo.Achieve.WatchAdsCnt += rdata.Value |
| 1056 | + uinfo.Task.Watchads += rdata.Value | |
| 1057 | 1057 | /*case TASKTYPE_GETREDBAG: |
| 1058 | 1058 | uinfo.Task.GetRedbagCnt += rdata.Value |
| 1059 | 1059 | case TASKTYPE_WATCHADS: |
| ... | ... | @@ -1076,6 +1076,11 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) { |
| 1076 | 1076 | if uinfo.ShakeTime < 0 { |
| 1077 | 1077 | uinfo.ShakeTime = 0 |
| 1078 | 1078 | } |
| 1079 | + case TASKTYPE_HENUM: | |
| 1080 | + if uinfo.Task.CaiNum < rdata.Value{ | |
| 1081 | + uinfo.Task.CaiNum = rdata.Value | |
| 1082 | + } | |
| 1083 | + | |
| 1079 | 1084 | } |
| 1080 | 1085 | logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata) |
| 1081 | 1086 | SaveUserInfo(uinfo, uniqueuuid) | ... | ... |