From e04abcb49b81923bcc0f4c6ae527be1cdf5a55b5 Mon Sep 17 00:00:00 2001
From: chenyueqi <chenyueqi@qq.com>
Date: Wed, 17 Mar 2021 14:53:49 +0800
Subject: [PATCH] 电波塔的任务只算主塔的进度

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

diff --git a/src/actions/TowerAction.lua b/src/actions/TowerAction.lua
index ec44ff4..c15608a 100644
--- a/src/actions/TowerAction.lua
+++ b/src/actions/TowerAction.lua
@@ -109,7 +109,9 @@ function _M.endBattleRpc(agent, data)
 
 		curLevel = curLevel + 1
 		reward, change = role:award(curTower.reward, {log = {desc = "towerBattle", int1 = id}})
-		role:checkTaskEnter("TowerPass", {count = 1, type = towerType + 1})
+		if towerType == 0 then
+			role:checkTaskEnter("TowerPass", {count = towerInfo.l})
+		end
 	end
 
 	if towerType == 0 then
diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua
index 889f796..a3e42b6 100644
--- a/src/models/RoleTask.lua
+++ b/src/models/RoleTask.lua
@@ -191,7 +191,7 @@ local AchievListener = {
 		[TaskType.OverOderTask] = {{14}},
 		[TaskType.FoodSellGold] = {{15, f("count")}},
 		[TaskType.DinerPopular] = {{16, f("count")}},
-		[TaskType.TowerPass] = {{17, f("count"), f("type")}},
+		[TaskType.TowerPass] = {{17, f("level")}},
 		[TaskType.OpenBox] = {{18, f("count")}},
 		[TaskType.DinerLevelUp] = {{19, f("level"), f("type")}},
 		[TaskType.DinerTalentUp] = {{20, 1, f("type")}},
@@ -493,6 +493,7 @@ function RoleTask.bind(Role)
 			[6] = true,
 			[7] = true,
 			[16] = true,
+			[17] = true,
 			[19] = true,
 			[22] = true,
 			[23] = true,
--
libgit2 0.21.2