抽奖

zhouhaihai
1 parent 216fb30d
Showing 1 changed file with 18 additions and 18 deletions Show diff stats
src/actions/HeroAction.lua
@@ -726,7 +726,6 @@ function _M.drawHeroRpc(agent, data)
 	for _, rateType in ipairs(rateTypes) do
 		table.insert(typePool, {buildTypeData[rateType]})
 	end
-	local rateType = math.randWeight(typePool, 1)
 	local resultPool = {}
@@ -771,23 +770,24 @@ function _M.drawHeroRpc(agent, data)
 	for i = 1, drawCount[drawType] do
 		resultPool = {}
-		if not fillPoolFunc[rateTypes[rateType]] then return 4 end
-		fillPoolFunc[rateTypes[rateType]]()
-		
-		if next(resultPool) then
-			local idx = math.randWeight(resultPool, 3)
-			local temp = resultPool[idx]
-			local itemData = csvdb["itemCsv"][temp[1]]
-			if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
-				local fragId = itemData.id - ItemStartId.Hero
-				local heroData = csvdb["unitCsv"][fragId]
-				local count = globalCsv.draw_unit_tofragment[heroData.rare] * temp[2]
-				role:award({[fragId] = count})
-				table.insert(reward, {id = fragId, count = count, from = temp[1], fcount = temp[2]})
-			else
-				role:award({[temp[1]] = temp[2]})
-				table.insert(reward, {id = temp[1], count = temp[2]})
-			end
+		while not next(resultPool) do
+			local rateType = math.randWeight(typePool, 1)
+			if not fillPoolFunc[rateTypes[rateType]] then return 4 end
+			fillPoolFunc[rateTypes[rateType]]()
+		end
+
+		local idx = math.randWeight(resultPool, 3)
+		local temp = resultPool[idx]
+		local itemData = csvdb["itemCsv"][temp[1]]
+		if itemData.type == ItemType.Hero and role:isHaveHero(itemData.id - ItemStartId.Hero) then
+			local fragId = itemData.id - ItemStartId.Hero
+			local heroData = csvdb["unitCsv"][fragId]
+			local count = globalCsv.draw_unit_tofragment[heroData.rare] * temp[2]
+			role:award({[fragId] = count})
+			table.insert(reward, {id = fragId, count = count, from = temp[1], fcount = temp[2]})
+		else
+			role:award({[temp[1]] = temp[2]})
+			table.insert(reward, {id = temp[1], count = temp[2]})
 		end
 	end