爬塔成就bug

liuzujun
1 parent 78139af8
Showing 3 changed files with 8 additions and 4 deletions Show diff stats
config/develop.lua
src/actions/TowerAction.lua
src/models/RoleTask.lua
 include("basic.lua")
-logd = 1 -- 是否开启日志
+logd = 0 -- 是否开启日志
 thread = 4
 codeurl = "192.168.0.199:9090"
 servId = 1
@@ -115,7 +115,7 @@ 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})
+			role:checkTaskEnter("TowerPass", {level = towerInfo.l, type = towerType + 1})
 		end
 	end
@@ -194,7 +194,7 @@ local AchievListener = {
 		[TaskType.OverOderTask] = {{14}},
 		[TaskType.FoodSellGold] = {{15, f("count")}},
 		[TaskType.DinerPopular] = {{16, f("count")}},
-		[TaskType.TowerPass] = {{17, f("level")}},
+		[TaskType.TowerPass] = {{17, f("level"), f("type")}},
 		[TaskType.OpenBox] = {{18, f("count")}},
 		[TaskType.DinerLevelUp] = {{19, f("level"), f("type")}},
 		[TaskType.DinerTalentUp] = {{20, 1, f("type")}},
@@ -289,7 +289,7 @@ local CalendaTaskListener = {
 		[TaskType.PvpWin]= {{10, 2, f("score")}},
 		[TaskType.DinerPopular]= {{11, 2, f("count")}},
 		[TaskType.RoleLevelUp]= {{12, 2, f("level")}},
-		[TaskType.TowerPass]= {{13, 2, f("level")}},
+		[TaskType.TowerPass]= {{13, 3, f("level"), f("type")}},
 		[TaskType.HeroTalent]= {{14, 1}},
 		[TaskType.HangPass]= {{15, 3}},
 		[TaskType.HeroStarCollect]= {{16, 3}},
@@ -809,6 +809,10 @@ function RoleTask.bind(Role)
 								if cfg.condition2 == param1 then
 									calTask[id] = (calTask[id] or 0) + 1
 								end
+							elseif cfg.type == 13 then	-- 挑战电波塔主塔
+								if cfg.condition2 == param1 and param2 == 1 then
+									calTask[id] = (calTask[id] or 0) + 1
+								end
 							end
 						end
 					end