diff --git a/src/GlobalVar.lua b/src/GlobalVar.lua index 4bafebb..d3ab154 100644 --- a/src/GlobalVar.lua +++ b/src/GlobalVar.lua @@ -155,6 +155,23 @@ TimeReset = { DrawType3 = 19, -- 魔法 抽卡加成 } +-- TimeReset 索引数组 +TimeResetArray = { + "CrossDay", --通用跨天 + "CrossWeek", --通用跨周 + "DinerRank", -- 餐厅排行榜 + "PvpRank", -- pvp排行榜 + "PvpHight", --高级竞技场 + "PvpCross", -- 跨服竞技场 + "PvpShop", -- 竞技场商城 + "DailyBattle2", -- 特殊-每日副本(贴纸) + "DailyBattle1", -- 特殊-每日副本(装备) + "DailyBattle3", -- 特殊-每日副本(时钟箱) + "DrawType1", -- 变异 抽卡加成 + "DrawType2", -- 通常 抽卡加成 + "DrawType3", -- 魔法 抽卡加成 +} + GuideStep = { AdvGuide = 41, AdvRelay = 42, diff --git a/src/csvdata b/src/csvdata index 5c618b1..b86293f 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699 +Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736 diff --git a/src/models/Activity.lua b/src/models/Activity.lua index fbf0db8..a2d9691 100644 --- a/src/models/Activity.lua +++ b/src/models/Activity.lua @@ -1001,6 +1001,8 @@ activityFunc[Activity.ActivityType.CommonSignIn] = { if not isCrossDay then activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId) end + local taskStatus = self.owner:getProperty("dTask") + activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0)) end, ["crossDay"] = function(self, actType, notify, actId) local actCfg = csvdb["activity_ctrlCsv"][actId] diff --git a/src/models/RoleTimeReset.lua b/src/models/RoleTimeReset.lua index 7b974c0..2d43816 100644 --- a/src/models/RoleTimeReset.lua +++ b/src/models/RoleTimeReset.lua @@ -84,10 +84,14 @@ function Role:updateTimeReset(now, notify) local resetMode = {} local response = {} - for funcName, resetId in pairs(TimeReset) do - if needResetId[resetId] and ResetFunc[funcName] then - ResetFunc[funcName](self, notify, response, now) - resetMode[funcName] = true + for idx = 1, #TimeResetArray do + local funcName = TimeResetArray[idx] + local resetId = TimeReset[funcName] + if resetId then + if needResetId[resetId] and ResetFunc[funcName] then + ResetFunc[funcName](self, notify, response, now) + resetMode[funcName] = true + end end end -- libgit2 0.21.2