From e3b29f2f7d478781c4496c30dc0d1a1a2ca1e443 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Tue, 2 Feb 2021 11:57:10 +0800
Subject: [PATCH] 战令-一次性领取超出周上限的战令经验应该只领取到达周上限的那一部分

---
 src/models/Activity.lua | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index 7d28714..2007956 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -1050,7 +1050,9 @@ activityFunc[Activity.ActivityType.BattleCommand] = {
 				if (actData["week"] or 0) >= limit then
 					return
 				end
-				actData["week"] = (actData["week"] or 0) + count
+				local old = actData["week"] or 0
+				actData["week"] = math.min(old + count, limit)
+				count = actData["week"] - old
 			end
 			local total = actData["sum"] + count
 			local curLvl = actData["lvl"] or 0
--
libgit2 0.21.2