Commit c2e24956eec0f414c97416e91209d435292379ea
1 parent
82520a23
战令-周任务没有刷新, 日活跃签到初始化时候检测当前活跃度是否达到签到标准
Showing
4 changed files
with
28 additions
and
5 deletions
Show diff stats
src/GlobalVar.lua
| @@ -155,6 +155,23 @@ TimeReset = { | @@ -155,6 +155,23 @@ TimeReset = { | ||
| 155 | DrawType3 = 19, -- 魔法 抽卡加成 | 155 | DrawType3 = 19, -- 魔法 抽卡加成 |
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | +-- TimeReset 索引数组 | ||
| 159 | +TimeResetArray = { | ||
| 160 | + "CrossDay", --通用跨天 | ||
| 161 | + "CrossWeek", --通用跨周 | ||
| 162 | + "DinerRank", -- 餐厅排行榜 | ||
| 163 | + "PvpRank", -- pvp排行榜 | ||
| 164 | + "PvpHight", --高级竞技场 | ||
| 165 | + "PvpCross", -- 跨服竞技场 | ||
| 166 | + "PvpShop", -- 竞技场商城 | ||
| 167 | + "DailyBattle2", -- 特殊-每日副本(贴纸) | ||
| 168 | + "DailyBattle1", -- 特殊-每日副本(装备) | ||
| 169 | + "DailyBattle3", -- 特殊-每日副本(时钟箱) | ||
| 170 | + "DrawType1", -- 变异 抽卡加成 | ||
| 171 | + "DrawType2", -- 通常 抽卡加成 | ||
| 172 | + "DrawType3", -- 魔法 抽卡加成 | ||
| 173 | +} | ||
| 174 | + | ||
| 158 | GuideStep = { | 175 | GuideStep = { |
| 159 | AdvGuide = 41, | 176 | AdvGuide = 41, |
| 160 | AdvRelay = 42, | 177 | AdvRelay = 42, |
src/models/Activity.lua
| @@ -1001,6 +1001,8 @@ activityFunc[Activity.ActivityType.CommonSignIn] = { | @@ -1001,6 +1001,8 @@ activityFunc[Activity.ActivityType.CommonSignIn] = { | ||
| 1001 | if not isCrossDay then | 1001 | if not isCrossDay then |
| 1002 | activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId) | 1002 | activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId) |
| 1003 | end | 1003 | end |
| 1004 | + local taskStatus = self.owner:getProperty("dTask") | ||
| 1005 | + activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0)) | ||
| 1004 | end, | 1006 | end, |
| 1005 | ["crossDay"] = function(self, actType, notify, actId) | 1007 | ["crossDay"] = function(self, actType, notify, actId) |
| 1006 | local actCfg = csvdb["activity_ctrlCsv"][actId] | 1008 | local actCfg = csvdb["activity_ctrlCsv"][actId] |
src/models/RoleTimeReset.lua
| @@ -84,10 +84,14 @@ function Role:updateTimeReset(now, notify) | @@ -84,10 +84,14 @@ function Role:updateTimeReset(now, notify) | ||
| 84 | local resetMode = {} | 84 | local resetMode = {} |
| 85 | 85 | ||
| 86 | local response = {} | 86 | local response = {} |
| 87 | - for funcName, resetId in pairs(TimeReset) do | ||
| 88 | - if needResetId[resetId] and ResetFunc[funcName] then | ||
| 89 | - ResetFunc[funcName](self, notify, response, now) | ||
| 90 | - resetMode[funcName] = true | 87 | + for idx = 1, #TimeResetArray do |
| 88 | + local funcName = TimeResetArray[idx] | ||
| 89 | + local resetId = TimeReset[funcName] | ||
| 90 | + if resetId then | ||
| 91 | + if needResetId[resetId] and ResetFunc[funcName] then | ||
| 92 | + ResetFunc[funcName](self, notify, response, now) | ||
| 93 | + resetMode[funcName] = true | ||
| 94 | + end | ||
| 91 | end | 95 | end |
| 92 | end | 96 | end |
| 93 | 97 |