Commit c2c9dc14c15b1aec61f418fed0c2f1ecdf98d98f

Authored by chenyueqi
1 parent a5dc3b0e

回归者领取任务协议号,触发限时礼包

src/GlobalVar.lua
... ... @@ -361,6 +361,7 @@ TriggerEventType = {
361 361 SSRCount = 6,
362 362 AfterTs = 7, -- 某时间以后
363 363 DrawHeroCnt = 8, -- 每日抽卡次数
  364 + Appoint = 0, -- 触发指定id礼包
364 365 }
365 366  
366 367 DrawCardType = {
... ...
src/ProtocolCode.lua
... ... @@ -242,6 +242,7 @@ actionCodes = {
242 242 Activity_newSignRpc = 670,
243 243 Activity_advLevelRpc = 671,
244 244 Activity_buyBattleCommandLvlRpc = 672,
  245 + Activity_returnerTaskRpc = 673,
245 246  
246 247 Radio_startQuestRpc = 700,
247 248 Radio_finishQuestRpc = 701,
... ...
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  
... ...