Merge branch 'tr/develop' into tr/bugfix

* tr/develop: bug修复：扫荡会多给一次奖励

Merge branch 'tr/develop' into tr/bugfix
* tr/develop: bug修复：扫荡会多给一次奖励
zhouhaihai
2 parents c6a4c456 7a4c9ac8
Showing 1 changed file with 6 additions and 6 deletions Show diff stats
src/actions/HangAction.lua
@@ -755,23 +755,23 @@ end
 local function workWinReward(role, bonusData, rewardType, count, sweep)
 	count = count or 1
 	local reward, change = {}
+	
+
+	reward = bonusData.reward:toNumMap()
+	for itemId, c in pairs(reward) do
+		reward[itemId] = c * count
+	end
 	if rewardType == 2 or rewardType == 4 then
 		for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
 			reward[k] = (reward[k] or 0) + v
 		end
 	end
-
-	reward = bonusData.reward:toNumMap()
-	for itemId, c in pairs(reward) do
-		reward[itemId] = (reward[itemId] or 0) + c * count
-	end
 	for i = 1, count do
 		local chance = bonusData.chance:randWeight(true)
 		if chance[1] ~= 0 then
 			reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
 		end
 	end
-
 	reward, change = role:award(reward, {log = {desc = "workBattle", int1 = bonusData.id}})
 	return reward, change
 end