Merge branch 'tr/bugfix' into tr/publish/release

* tr/bugfix: 铭文升级超过上限bug 世界boss行动点奖励领完后重置世界boss行动点bug 拾荒失败也要触发成就引导 # Conflicts: # src/csvdata

Merge branch 'tr/bugfix' into tr/publish/release
* tr/bugfix: 铭文升级超过上限bug 世界boss行动点奖励领完后重置世界boss行动点bug 拾荒失败也要触发成就引导 # Conflicts: # src/csvdata
zhouhaihai
2 parents ff08d2c3 1627de1c
Showing 3 changed files with 29 additions and 10 deletions Show diff stats
src/actions/ActivityAction.lua
src/actions/CarAction.lua
src/adv/Adv.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"]
@@ -833,6 +841,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 {}
@@ -860,6 +869,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)
@@ -129,8 +129,8 @@ function _M.runeUpRpc( agent, data )
 	local runeData = runeSet[id]
 	if not runeData then return 5 end
-	local maxLv = #csvdb["rune_buildCsv"]
-	if level >= maxLv then return 6 end
+	--local maxLv = #csvdb["rune_buildCsv"]
+	if level >= runeData.lvLimit then return 6 end
 	local lvData = csvdb["rune_buildCsv"][level]
 	local cost = lvData.cost:toNumMap()
 	if not role:checkItemEnough(cost) then
@@ -829,10 +829,10 @@ function Adv:over(success, rewardRatio, overType)
 				red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
 			end)
 		end
-		-- 通关的时候要把引导步骤设定到成就引导
-		if not self.owner:checkOverGuide(57) then
-			self.owner:saveGuide(57,1,true)
-		end
+	end
+	-- 通关的时候要把引导步骤设定到成就引导
+	if not self.owner:checkOverGuide(57) then
+		self.owner:saveGuide(57,1,true)
 	end
 	self:clearAdvUnlockCache()