From 34d9f1925b6ca2e3cc41029099c50d7d72790764 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Wed, 30 Dec 2020 16:15:05 +0800
Subject: [PATCH] 世界boss 胜利才扣门票，扫荡根据之前的最大值给行动点

---
 src/actions/ActivityAction.lua | 7 ++++++-
 src/csvdata                    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua
index 893ad32..69903b8 100644
--- a/src/actions/ActivityAction.lua
+++ b/src/actions/ActivityAction.lua
@@ -525,6 +525,10 @@ function _M.startBattleRpc(agent, data)
 		local reward, change  = role:award(award, {log = {desc = "actBattle", int1 = actid, int2 = count or 0}})
 		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
 
+		if battleCfg.worldBoss_award ~= 0 and (bi["maxP"] or 0) > 0 then
+			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"]
+		end
+
 		bi["sum"] = bi["sum"] + bi["top"]
 		actData["ticket"] = ticket - num
 		actData[id] = bi
@@ -656,7 +660,7 @@ function _M.endBattleRpc(agent, data)
 		battleInfo["star"] = curStar
 	end
 
-	if battleCfg.rank ~= 0 then
+	if battleCfg.rank ~= 0 and isWin then
 		-- 消耗门票
 		role.activity:getBattleTicket(actid)
 		local num = battleCfg.type:toArray(true, "=")[3]
@@ -703,6 +707,7 @@ function _M.endBattleRpc(agent, data)
 
 	if battleCfg.worldBoss_award ~= 0 and msg.point then
 		battleInfo["bossP"] = (battleInfo["bossP"] or 0) + msg.point
+		battleInfo["maxP"] = math.max(msg.point, (battleInfo["maxP"] or 0))
 	end
 	actData[id] = battleInfo
 	role.activity:updateActData("ChallengeLevel", actData)
diff --git a/src/csvdata b/src/csvdata
index 6b88613..ccdf6fc 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit 6b8861395586f7ac72eba0deacd3e535333ac86e
+Subproject commit ccdf6fcc82fd0a38d1b00bc199baadfd81ec3ab1
--
libgit2 0.21.2