From 3e80ee5657c7aca3718e07b09e8c21f5247a5969 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Fri, 8 Jan 2021 20:24:11 +0800
Subject: [PATCH] 世界boss行动点bug

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

diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua
index 4b07ec3..52f79dc 100644
--- a/src/actions/ActivityAction.lua
+++ b/src/actions/ActivityAction.lua
@@ -485,8 +485,16 @@ function _M.startBattleRpc(agent, data)
 			local bi = actData[id]
 			if not bi then return 8 end
 			local star = bi["star"] or 0
-			if star < 1 then
-				return 9
+			local maxP = bi["maxP"] or 0
+			-- 世界boss
+			if battleCfg.worldBoss_award ~= 0 then
+				if maxP < 1 then
+					return 9
+				end
+			else
+				if star < 1 then
+					return 9
+				end
 			end
 			num = num * count
 		end
@@ -513,7 +521,7 @@ function _M.startBattleRpc(agent, data)
 			return 7
 		end
 		local bi = actData[id]
-		local star = bi["star"]
+		local star = bi["star"] or 0
 		local award = battleCfg.item_clear:toNumMap()
 		if getStarCount(battleCfg, star) == 3 then
 			local aw = battleCfg.perfect_reward:toNumMap()
@@ -528,7 +536,7 @@ function _M.startBattleRpc(agent, data)
 		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"]
+			bi["bossP"] = (bi["bossP"] or 0) + bi["maxP"] * count
 		end
 
 		bi["sum"] = bi["sum"] + bi["top"]
diff --git a/src/csvdata b/src/csvdata
index 94b161b..c0e012b 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit 94b161b3a3ae6933c8c9a8e3827721411368cad9
+Subproject commit c0e012b7089fda957e48bd3fd9c9a9076d8cd6db
--
libgit2 0.21.2