diff --git a/src/models/Activity.lua b/src/models/Activity.lua index fdff431..7d024dc 100644 --- a/src/models/Activity.lua +++ b/src/models/Activity.lua @@ -455,7 +455,7 @@ activityFunc[Activity.ActivityType.PayBack] = { -- 英雄帖 activityFunc[Activity.ActivityType.CalendaTask] = { ["init"] = function(self, actType, isCrossDay, notify) - local calTask = self.owner:getProperty("CalTask") + local calTask = self.owner:getProperty("calTask") calTask = {} local role = self.owner local buildL = role.dinerData:getProperty("buildL") @@ -481,7 +481,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = { end, ["close"] = function(self, actType, notify) - self.owner:updateProperty({field="CalTask", value={}}) + self.owner:updateProperty({field="calTask", value={}}) end, } @@ -874,7 +874,7 @@ activityFunc[Activity.ActivityType.CommonSignIn] = { ["crossDay"] = function(self, actType, notify, actId) local actCfg = csvdb["activity_ctrlCsv"][actId] if not actCfg then return end - local conArr = actCfg.condition2:toArray("true", "=") + local conArr = actCfg.condition2:toArray(true, "=") -- 0 登录即可, 1 达到指定活跃度 if conArr[1] ~= 0 then return diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua index c0e2313..3ffef92 100644 --- a/src/models/RoleTask.lua +++ b/src/models/RoleTask.lua @@ -706,7 +706,7 @@ function RoleTask.bind(Role) calTask[id] = count elseif cfg.type == 20 then -- 开启x品质时钟箱子 if cfg.condition2 <= (param2 or 0) then - calTask[id] = (calTask[id] or 0) + param2 + calTask[id] = (calTask[id] or 0) + param1 end elseif cfg.type == 15 then -- 通关关卡 if (calTask[id] or 0) == 0 then -- libgit2 0.21.2