diff --git a/src/actions/TowerAction.lua b/src/actions/TowerAction.lua index 31c4586..898b137 100644 --- a/src/actions/TowerAction.lua +++ b/src/actions/TowerAction.lua @@ -114,9 +114,9 @@ function _M.endBattleRpc(agent, data) curLevel = curLevel + 1 reward, change = role:award(rewardStr, {log = {desc = "towerBattle", int1 = id}}) - if towerType == 0 then - role:checkTaskEnter("TowerPass", {level = towerInfo.l, type = towerType + 1}) - end + --if towerType == 0 then + role:checkTaskEnter("TowerPass", {level = curLevel % 10000, type = towerType + 1}) + --end end if towerType == 0 then diff --git a/src/csvdata b/src/csvdata index bd13610..9aff702 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit bd13610bc236a8df4eede66365eb499ecd5b3c45 +Subproject commit 9aff702ee3155b22558066e653585574bc730791 diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua index d2782b8..a7a6595 100644 --- a/src/models/RoleTask.lua +++ b/src/models/RoleTask.lua @@ -810,7 +810,7 @@ function RoleTask.bind(Role) calTask[id] = (calTask[id] or 0) + 1 end elseif cfg.type == 13 then -- 挑战电波塔主塔 - if cfg.condition2 == param1 and param2 == 1 then + if cfg.condition2 <= param1 and param2 == 1 then calTask[id] = (calTask[id] or 0) + 1 end end -- libgit2 0.21.2