From 75876cb3bf40c5cb7025ee3f85c7e0f6b77b8098 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Mon, 1 Feb 2021 14:21:46 +0800
Subject: [PATCH] 代理拾荒出勤人数计数错误， 代理拾荒没有统计进拾荒体力消耗

---
 src/actions/AdvAction.lua |  2 ++
 src/csvdata               |  2 +-
 src/models/Activity.lua   | 12 +++++++-----
 src/models/RoleTask.lua   |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/actions/AdvAction.lua b/src/actions/AdvAction.lua
index 6cf02cd..cf65bd1 100644
--- a/src/actions/AdvAction.lua
+++ b/src/actions/AdvAction.lua
@@ -291,6 +291,8 @@ function _M.startHangRpc(agent, data)
 
 	if not role:checkAdvCount(adv_idle_energy) then return 7 end -- 是否有体力
 
+	role:checkTaskEnter("AdvCostPower", {count = adv_idle_energy})
+
 	if not checkFormat(role, format, role:getAdvData():isRunning()) then return 8 end --编队是否正确
 
 	local player = {}
diff --git a/src/csvdata b/src/csvdata
index 887956f..5c618b1 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit 887956fe254c1ca6e855ec71179e203f9eeb8986
+Subproject commit 5c618b16315e74aaa111b3e84dbc4da3f7b3d699
diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index b030c1c..7d28714 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -1044,12 +1044,14 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 		if not actCfg then return end
 		if actCfg.condition1 == "" then return end
 		local arr = actCfg.condition2:toArray(true, "=")
-		local itemId, limit = arr[1], arr[2]
-		if itemId == id and count > 0 then
-			if (actData["week"] or 0) >= limit then
-				return
+		local itemIdWeek, itemIdNormal, limit = arr[1], arr[2], arr[3]
+		if (itemIdWeek == id or itemIdNormal == id) and count > 0 then
+			if itemIdWeek == id then
+				if (actData["week"] or 0) >= limit then
+					return
+				end
+				actData["week"] = (actData["week"] or 0) + count
 			end
-			actData["week"] = (actData["week"] or 0) + count
 			local total = actData["sum"] + count
 			local curLvl = actData["lvl"] or 0
 			if actCfg.condition == 1 then		-- 代表sum需要转换为等级
diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua
index 812517d..6c1bc73 100644
--- a/src/models/RoleTask.lua
+++ b/src/models/RoleTask.lua
@@ -285,7 +285,7 @@ local CalendaTaskListener = {
 		[TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}},
 		[TaskType.RadioTaskStart] = {{21, 1}, {22, 3, f("heroCnt")}},
 		[TaskType.BonusQuick] = {{23, 1, f("count")}},
-		[TaskType.AdvHangHeroCnt] = {{24, 3, f("HeroCnt")}},
+		[TaskType.AdvHangHeroCnt] = {{24, 3, f("count")}},
 		[TaskType.AdvKillBoss] = {{25, 1}},
 		[TaskType.AdvMineKill] = {{26, 1}},
 		[TaskType.PvpBattle] = {{27, 1}},
--
libgit2 0.21.2