Commit 6e41111558ef10a5c71c7ce4522e3856420eea3b
1 parent
de111972
开启x品质时钟箱任务计数错误bug
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
src/models/Activity.lua
| @@ -455,7 +455,7 @@ activityFunc[Activity.ActivityType.PayBack] = { | @@ -455,7 +455,7 @@ activityFunc[Activity.ActivityType.PayBack] = { | ||
| 455 | -- 英雄帖 | 455 | -- 英雄帖 |
| 456 | activityFunc[Activity.ActivityType.CalendaTask] = { | 456 | activityFunc[Activity.ActivityType.CalendaTask] = { |
| 457 | ["init"] = function(self, actType, isCrossDay, notify) | 457 | ["init"] = function(self, actType, isCrossDay, notify) |
| 458 | - local calTask = self.owner:getProperty("CalTask") | 458 | + local calTask = self.owner:getProperty("calTask") |
| 459 | calTask = {} | 459 | calTask = {} |
| 460 | local role = self.owner | 460 | local role = self.owner |
| 461 | local buildL = role.dinerData:getProperty("buildL") | 461 | local buildL = role.dinerData:getProperty("buildL") |
| @@ -481,7 +481,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = { | @@ -481,7 +481,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = { | ||
| 481 | 481 | ||
| 482 | end, | 482 | end, |
| 483 | ["close"] = function(self, actType, notify) | 483 | ["close"] = function(self, actType, notify) |
| 484 | - self.owner:updateProperty({field="CalTask", value={}}) | 484 | + self.owner:updateProperty({field="calTask", value={}}) |
| 485 | end, | 485 | end, |
| 486 | } | 486 | } |
| 487 | 487 | ||
| @@ -874,7 +874,7 @@ activityFunc[Activity.ActivityType.CommonSignIn] = { | @@ -874,7 +874,7 @@ activityFunc[Activity.ActivityType.CommonSignIn] = { | ||
| 874 | ["crossDay"] = function(self, actType, notify, actId) | 874 | ["crossDay"] = function(self, actType, notify, actId) |
| 875 | local actCfg = csvdb["activity_ctrlCsv"][actId] | 875 | local actCfg = csvdb["activity_ctrlCsv"][actId] |
| 876 | if not actCfg then return end | 876 | if not actCfg then return end |
| 877 | - local conArr = actCfg.condition2:toArray("true", "=") | 877 | + local conArr = actCfg.condition2:toArray(true, "=") |
| 878 | -- 0 登录即可, 1 达到指定活跃度 | 878 | -- 0 登录即可, 1 达到指定活跃度 |
| 879 | if conArr[1] ~= 0 then | 879 | if conArr[1] ~= 0 then |
| 880 | return | 880 | return |
src/models/RoleTask.lua
| @@ -706,7 +706,7 @@ function RoleTask.bind(Role) | @@ -706,7 +706,7 @@ function RoleTask.bind(Role) | ||
| 706 | calTask[id] = count | 706 | calTask[id] = count |
| 707 | elseif cfg.type == 20 then -- 开启x品质时钟箱子 | 707 | elseif cfg.type == 20 then -- 开启x品质时钟箱子 |
| 708 | if cfg.condition2 <= (param2 or 0) then | 708 | if cfg.condition2 <= (param2 or 0) then |
| 709 | - calTask[id] = (calTask[id] or 0) + param2 | 709 | + calTask[id] = (calTask[id] or 0) + param1 |
| 710 | end | 710 | end |
| 711 | elseif cfg.type == 15 then -- 通关关卡 | 711 | elseif cfg.type == 15 then -- 通关关卡 |
| 712 | if (calTask[id] or 0) == 0 then | 712 | if (calTask[id] or 0) == 0 then |