diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua index 6c220e7..d195fac 100644 --- a/src/actions/AdvAction.lua +++ b/src/actions/AdvAction.lua @@ -380,6 +380,8 @@ function _M.endHangRpc(agent, data) role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = cancel and 1 or 0}) + role:checkTaskEnter("AdvHang", {}) + SendPacket(actionCodes.Adv_endHangRpc, MsgPack.pack({reward = reward, change = change, isFull = isFull})) return true end diff --git a/src/csvdata b/src/csvdata index 76bf12d..136449a 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 76bf12dfa6afe523ec30d1da6467cb8cbd30790f +Subproject commit 136449ab16898403b00003f7161c2ac278274891 diff --git a/src/models/Role.lua b/src/models/Role.lua index 5b6061b..776a7f8 100644 --- a/src/models/Role.lua +++ b/src/models/Role.lua @@ -167,6 +167,8 @@ Role.schema = { downCvR = {"number", 0}, -- 下载cv扩展包奖励 feedback = {"table", {}}, -- 反馈相关信息 {flag = false, count = 0} flag是否评论过,count 提示次数 + + calTask = {"table", {}}, -- 英雄令活动 日历任务活动 } @@ -388,6 +390,7 @@ function Role:data() downCvR = self:getProperty("downCvR"), -- 下载cv扩展包奖励 feedback = self:getProperty("feedback"), ctime = self:getProperty("ctime"), + calTask = self:getProperty("calTask"), } end diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua index 42d5b8a..915cdea 100644 --- a/src/models/RoleTask.lua +++ b/src/models/RoleTask.lua @@ -270,6 +270,7 @@ local TaskListeners = { SudokuListener, ActivityListener, StoreListener, + CalendaTaskListener, } local RoleTask = {} @@ -585,6 +586,7 @@ function RoleTask.bind(Role) end function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2) + print("check calenda taskl", mainType, subType, param1, param2) local open, actId = self.activity:isOpen("CalendaTask") local actData = csvdb["activity_ctrlCsv"][actId] if not actData then return end @@ -599,6 +601,7 @@ function RoleTask.bind(Role) if k == cid then for id, cfg in pairs(taskList) do if cfg.type == mainType then + dump(cfg) if subType == 1 then -- 增加数值 calTask[id] = (calTask[id] or 0) + param1 elseif subType == 2 then -- 直接赋值 @@ -609,6 +612,8 @@ function RoleTask.bind(Role) end end end + self:updateProperty({field = "calTask", value = calTask, notNotify = notNotify}) + dump(calTask) end end -- libgit2 0.21.2