Merge bugfix to develop

liuzujun
2 parents e0bc1298 8b6745bf
Showing 1 changed file with 23 additions and 4 deletions Show diff stats
src/actions/ActivityAction.lua
@@ -488,8 +488,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
@@ -516,7 +524,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()
@@ -531,7 +539,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"]
@@ -836,6 +844,7 @@ function _M.bossRewardRpc(agent, data)
 	local awardCfg = actCfg[index]
 	if not awardCfg then return 6 end
+	local totalAwardCnt = #actCfg
 	local preList = awardCfg.condition1:toArray(true, "=")
 	local actData = role.activity:getActData("ChallengeLevel") or {}
@@ -863,6 +872,16 @@ function _M.bossRewardRpc(agent, data)
 	if not ok then return 8 end
 	battleInfo["bossR"] = string.setbit(bossRecord, index)
+	local allFinish = true
+	for i = 1, totalAwardCnt do
+		if string.char(string.getbit(battleInfo["bossR"], i)) == "0" then
+			allFinish = false
+			break
+		end
+	end
+	if allFinish then
+		battleInfo["bossR"] = ""
+	end
 	battleInfo["bossP"] = bossPoint - 1
 	actData[id] = battleInfo
 	role.activity:updateActData("ChallengeLevel", actData)