From 6afa60788a16ba7e9ee26d9ff6a1e5288b5639f3 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Mon, 10 May 2021 17:02:23 +0800
Subject: [PATCH] 爬塔成就bug

---
 config/develop.lua          | 2 +-
 src/actions/TowerAction.lua | 2 +-
 src/models/RoleTask.lua     | 8 ++++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/develop.lua b/config/develop.lua
index d7aeb74..571256e 100644
--- a/config/develop.lua
+++ b/config/develop.lua
@@ -1,6 +1,6 @@
 include("basic.lua")
 
-logd = 1 -- 是否开启日志
+logd = 0 -- 是否开启日志
 thread = 4
 codeurl = "192.168.0.199:9090"
 servId = 1
diff --git a/src/actions/TowerAction.lua b/src/actions/TowerAction.lua
index b8598ff..31c4586 100644
--- a/src/actions/TowerAction.lua
+++ b/src/actions/TowerAction.lua
@@ -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
 
diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua
index 41e62a9..d2782b8 100644
--- a/src/models/RoleTask.lua
+++ b/src/models/RoleTask.lua
@@ -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
--
libgit2 0.21.2