Commit e0ad10e9c845b3f58866e184dcdcbc66b080de3e

Authored by 测试
1 parent 44d8a134

英雄帖任务简单类型测试

src/actions/AdvAction.lua
@@ -380,6 +380,8 @@ function _M.endHangRpc(agent, data) @@ -380,6 +380,8 @@ function _M.endHangRpc(agent, data)
380 380
381 role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0}) 381 role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0})
382 382
  383 + role:checkTaskEnter("AdvHang", {})
  384 +
383 SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull})) 385 SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull}))
384 return true 386 return true
385 end 387 end
1 -Subproject commit 76bf12dfa6afe523ec30d1da6467cb8cbd30790f 1 +Subproject commit 136449ab16898403b00003f7161c2ac278274891
src/models/Role.lua
@@ -167,6 +167,8 @@ Role.schema = { @@ -167,6 +167,8 @@ Role.schema = {
167 167
168 downCvR = {"number", 0}, -- 下载cv扩展包奖励 168 downCvR = {"number", 0}, -- 下载cv扩展包奖励
169 feedback = {"table", {}}, -- 反馈相关信息 {flag = false, count = 0} flag是否评论过,count 提示次数 169 feedback = {"table", {}}, -- 反馈相关信息 {flag = false, count = 0} flag是否评论过,count 提示次数
  170 +
  171 + calTask = {"table", {}}, -- 英雄令活动 日历任务活动
170 } 172 }
171 173
172 174
@@ -388,6 +390,7 @@ function Role:data() @@ -388,6 +390,7 @@ function Role:data()
388 downCvR = self:getProperty("downCvR"), -- 下载cv扩展包奖励 390 downCvR = self:getProperty("downCvR"), -- 下载cv扩展包奖励
389 feedback = self:getProperty("feedback"), 391 feedback = self:getProperty("feedback"),
390 ctime = self:getProperty("ctime"), 392 ctime = self:getProperty("ctime"),
  393 + calTask = self:getProperty("calTask"),
391 } 394 }
392 end 395 end
393 396
src/models/RoleTask.lua
@@ -270,6 +270,7 @@ local TaskListeners = { @@ -270,6 +270,7 @@ local TaskListeners = {
270 SudokuListener, 270 SudokuListener,
271 ActivityListener, 271 ActivityListener,
272 StoreListener, 272 StoreListener,
  273 + CalendaTaskListener,
273 } 274 }
274 275
275 local RoleTask = {} 276 local RoleTask = {}
@@ -585,6 +586,7 @@ function RoleTask.bind(Role) @@ -585,6 +586,7 @@ function RoleTask.bind(Role)
585 end 586 end
586 587
587 function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2) 588 function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2)
  589 + print("check calenda taskl", mainType, subType, param1, param2)
588 local open, actId = self.activity:isOpen("CalendaTask") 590 local open, actId = self.activity:isOpen("CalendaTask")
589 local actData = csvdb["activity_ctrlCsv"][actId] 591 local actData = csvdb["activity_ctrlCsv"][actId]
590 if not actData then return end 592 if not actData then return end
@@ -599,6 +601,7 @@ function RoleTask.bind(Role) @@ -599,6 +601,7 @@ function RoleTask.bind(Role)
599 if k == cid then 601 if k == cid then
600 for id, cfg in pairs(taskList) do 602 for id, cfg in pairs(taskList) do
601 if cfg.type == mainType then 603 if cfg.type == mainType then
  604 + dump(cfg)
602 if subType == 1 then -- 增加数值 605 if subType == 1 then -- 增加数值
603 calTask[id] = (calTask[id] or 0) + param1 606 calTask[id] = (calTask[id] or 0) + param1
604 elseif subType == 2 then -- 直接赋值 607 elseif subType == 2 then -- 直接赋值
@@ -609,6 +612,8 @@ function RoleTask.bind(Role) @@ -609,6 +612,8 @@ function RoleTask.bind(Role)
609 end 612 end
610 end 613 end
611 end 614 end
  615 + self:updateProperty({field = "calTask", value = calTask, notNotify = notNotify})
  616 + dump(calTask)
612 end 617 end
613 618
614 end 619 end