Commit c2c9dc14c15b1aec61f418fed0c2f1ecdf98d98f
1 parent
a5dc3b0e
回归者领取任务协议号,触发限时礼包
Showing
4 changed files
with
10 additions
and
1 deletions
 
Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/actions/ActivityAction.lua
| ... | ... | @@ -1402,12 +1402,17 @@ function _M.returnerTaskRpc(agent, data) | 
| 1402 | 1402 | status[taskId] = 1 | 
| 1403 | 1403 | returner.status = status | 
| 1404 | 1404 | |
| 1405 | - local reward, change = role:award(dayData.reward, {log = {desc = "returner", int1 = taskData.day, int2 = taskId}}) | |
| 1405 | + local reward, change = role:award(taskData.reward, {log = {desc = "returner", int1 = taskData.day, int2 = taskId}}) | |
| 1406 | 1406 | |
| 1407 | 1407 | if done then | 
| 1408 | 1408 | returner = {} | 
| 1409 | 1409 | end | 
| 1410 | 1410 | |
| 1411 | + local pack = globalCsv.returner_pack:toArray(true,"=") | |
| 1412 | + if pack[1] == taskData.id then | |
| 1413 | + role:checkTaskEnter("Appoint", {id = pack[2]}) | |
| 1414 | + end | |
| 1415 | + | |
| 1411 | 1416 | role:updateProperty({field = "returner", value = returner}) | 
| 1412 | 1417 | SendPacket(actionCodes.Activity_returnerTaskRpc, MsgPack.pack(role:packReward(reward, change))) | 
| 1413 | 1418 | return true | ... | ... | 
src/models/RoleTask.lua
| ... | ... | @@ -109,6 +109,7 @@ local TaskType = { | 
| 109 | 109 | CostDiamond = 909, -- 消耗钻石 | 
| 110 | 110 | WeekTask = 910, -- 完成每周活跃任务 | 
| 111 | 111 | ActBattlePass = 911, -- 活动关卡通关 -- chapterId | 
| 112 | + Appoint = 912, -- 触发限时礼包,指定id | |
| 112 | 113 | |
| 113 | 114 | --功能未实现 todo | 
| 114 | 115 | AdvShop = 1002, -- 冒险商城 | 
| ... | ... | @@ -264,6 +265,7 @@ local StoreListener = { | 
| 264 | 265 | [TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}}, | 
| 265 | 266 | [TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}}, | 
| 266 | 267 | [TaskType.DrawHeroLimitPack] = {{TriggerEventType.DrawHeroCnt, f("count")}}, | 
| 268 | + [TaskType.Appoint] = {{TriggerEventType.Appoint, f("id")}}, | |
| 267 | 269 | } | 
| 268 | 270 | } | 
| 269 | 271 | ... | ... |