Merge branch 'bugfix' into tr/publish

熊润斐
2 parents 4eba3da0 de1a55b4
Showing 2 changed files with 5 additions and 2 deletions Show diff stats
src/actions/HeroAction.lua
src/csvdata
@@ -724,6 +724,9 @@ function _M.drawHeroRpc(agent, data)
 		subType = 1
 		if btype == 4 and role:getProperty("newerDraw") >= 10 then
 			subType = 2
+			if(role:getProperty("newerDraw") >= 30) then
+				return 30
+			end
 		end
 	end
  
@@ -761,7 +764,7 @@ function _M.drawHeroRpc(agent, data)
 	local drawCount = {1, 10} -- 抽取次数
 	if not drawCount[drawType] then return 3 end
  
-	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype]
+	local draw_floor_back_counts = globalCsv.draw_floor_back_counts[btype] or 10
 	local floorHeroCount = role:getProperty("floorHero")[btype] or 0
  
 	-- 计算抽卡消耗品
-Subproject commit f6a626350c1f4039f0f677a1baf262f3493757d2
+Subproject commit 76400551f6a7539d383e1f52e524b613eba61c90