Merge branch 'develop' into qa

zhouhaihai
2 parents e5378b4c 3df938f9
Showing 4 changed files with 26 additions and 10 deletions Show diff stats
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/adv/AdvBuff.lua
@@ -356,7 +356,9 @@ function _M.adv(role, pms)
  
 	local advData = csvdb["adv_chapterCsv"][chapterId]
 	if not advData then return end
-	layer = math.min(layer, advData.limitlevel)
+	if math.floor(chapterId / 100) ~= 2 then
+		layer = math.min(layer, advData.limitlevel)
+	end
 	local advPass = role:getProperty("advPass")
 	local addPre 
 	addPre = function(chapterId)
@@ -384,13 +386,15 @@ function _M.advt(role, pms)
 	local layer = tonum(pms.pm2)
 	local advData = csvdb["adv_chapterCsv"][chapterId]
 	if not advData then return "不存在的章节" end
-	layer = math.min(layer, advData.limitlevel)
-	local advData = role:getAdvData()
  
+	local advData = role:getAdvData()
 	if not advData.chapterId then
 		return "先随便开启一关"
 	end
-
+	if not advData:isEndless() then
+		layer = math.min(layer, advData.limitlevel)
+	end
+	
 	_M.adv(role, {pm1 = chapterId, pm2 = layer - 1})
  
  
@@ -202,6 +202,13 @@ function _M.endBattleRpc(agent, data)
 	return true
 end
  
+local function checkLeader(heros, leader)
+	if not leader then return end
+	for slot, heroId in pairs(heros) do
+		if heroId == leader then return true end
+	end
+end
+
 function _M.roleFormatRpc(agent , data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
@@ -219,6 +226,7 @@ function _M.roleFormatRpc(agent , data)
 		if level <= 0 then return end
 		supports[slot] = support
 	end
+	if not checkLeader(hangTeam.heros, hangTeam.leader) then return end
  
 	table.clear(hangTeam)
 	hangTeam.heros = {}
@@ -377,7 +385,8 @@ function _M.bonusFormatRpc(agent , data)
 		if level <= 0 then return end
 		supports[slot] = support
 	end
-
+	if not checkLeader(msg.heros, msg.leader) then return end
+	
 	table.clear(bTeam)
 	bTeam.heros = {}
 	for slot, heroId in pairs(msg.heros) do
@@ -815,7 +815,7 @@ function _M.drawHeroRpc(agent, data)
 			end
 			if not fillPoolFunc[rateTypes[rateType]] then return 4 end
 			if isFloorBack then
-				fillPoolFunc[rateTypes[rateType]](4) -- 保底
+				fillPoolFunc[rateTypes[rateType]](3) -- 保底 sr 【郑斌】明确
 			else
 				fillPoolFunc[rateTypes[rateType]]()
 			end
@@ -825,9 +825,12 @@ function _M.drawHeroRpc(agent, data)
 		local temp = resultPool[idx]
 		local itemData = csvdb["itemCsv"][temp[1]]
  
-		if itemData.type == ItemType.Hero and itemData.quality == 4 then
-			ssrCount = ssrCount + 1
-			floorHeroCount = 0
+		if itemData.type == ItemType.Hero then
+			if itemData.quality == 4 then
+				ssrCount = ssrCount + 1
+			elseif itemData.quality == 3 then
+				floorHeroCount = 0
+			end
 		end
  
 		if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
@@ -237,7 +237,7 @@ local BuffFactory = {
 		_Buff._init = function(self)
 			for _, buff in ipairs(self.owner.buffs) do -- 挂上就清除一下子
 				if not buff.isDel and self:canEffect(buff.id) and not self.isDel then
-					if not buff.isDel and not self.isDel then
+					while not buff.isDel and not self.isDel do
 						self:effect()
 						buff:uncover()
 					end