Commit 7a4c9ac8b035181d153ff01ea5339d1f67c948ed

Authored by liguanghui
1 parent eb1d28df

bug修复:扫荡会多给一次奖励

Showing 1 changed file with 6 additions and 6 deletions   Show diff stats
src/actions/HangAction.lua
@@ -755,23 +755,23 @@ end @@ -755,23 +755,23 @@ end
755 local function workWinReward(role, bonusData, rewardType, count, sweep) 755 local function workWinReward(role, bonusData, rewardType, count, sweep)
756 count = count or 1 756 count = count or 1
757 local reward, change = {} 757 local reward, change = {}
  758 +
  759 +
  760 + reward = bonusData.reward:toNumMap()
  761 + for itemId, c in pairs(reward) do
  762 + reward[itemId] = c * count
  763 + end
758 if rewardType == 2 or rewardType == 4 then 764 if rewardType == 2 or rewardType == 4 then
759 for k, v in pairs(bonusData.perfect_reward:toNumMap()) do 765 for k, v in pairs(bonusData.perfect_reward:toNumMap()) do
760 reward[k] = (reward[k] or 0) + v 766 reward[k] = (reward[k] or 0) + v
761 end 767 end
762 end 768 end
763 -  
764 - reward = bonusData.reward:toNumMap()  
765 - for itemId, c in pairs(reward) do  
766 - reward[itemId] = (reward[itemId] or 0) + c * count  
767 - end  
768 for i = 1, count do 769 for i = 1, count do
769 local chance = bonusData.chance:randWeight(true) 770 local chance = bonusData.chance:randWeight(true)
770 if chance[1] ~= 0 then 771 if chance[1] ~= 0 then
771 reward[chance[1]] = (reward[chance[1]] or 0) + chance[2] 772 reward[chance[1]] = (reward[chance[1]] or 0) + chance[2]
772 end 773 end
773 end 774 end
774 -  
775 reward, change = role:award(reward, {log = {desc = "workBattle", int1 = bonusData.id}}) 775 reward, change = role:award(reward, {log = {desc = "workBattle", int1 = bonusData.id}})
776 return reward, change 776 return reward, change
777 end 777 end