Merge branch 'tr/bugfix' into tr/publish/preview

chenyueqi
2 parents 72690e7d ab2928d9
Showing 2 changed files with 9 additions and 18 deletions Show diff stats
src/actions/HangAction.lua
src/models/RolePlugin.lua
@@ -761,27 +761,18 @@ local function workWinReward(role, bonusData, rewardType, count, sweep)
 		end
 	end
  
-	if rewardType == 3 then
-		reward = bonusData.reward:toNumMap()
-		for itemId, c in pairs(reward) do
-			reward[itemId] = 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 = bonusData.reward:toNumMap()
+	for itemId, c in pairs(reward) do
+		reward[itemId] = c * count
 	end
-	if sweep then
-		-- local bnousReward = role:getBnousSweep()
-		-- for key, value in pairs(bnousReward) do
-		-- 	reward[key] = (reward[key] or 0) + value * 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}})
-	-- role:checkTaskEnter("BonusPass", {id = bonusData.id, count = count})
 	return reward, change
 end
  
@@ -1343,7 +1343,7 @@ function RolePlugin.bind(Role)
 				for idx, set in ipairs(csvdb["seaport_purchaseCsv"]) do
 					local done = true
 					for id, data in ipairs(set) do
-						if donate[id] or not result[idx] or not result[idx][id] or result[idx][id] < data.need_num then
+						if donate[idx] or not result[idx] or not result[idx][id] or result[idx][id] < data.need_num then
 							done = false
 							break
 						end