diff --git a/src/models/Diner.lua b/src/models/Diner.lua index 54133b3..539d2fb 100644 --- a/src/models/Diner.lua +++ b/src/models/Diner.lua @@ -193,10 +193,6 @@ function Diner:calSellReward(sell, delta, dishData, isExpedite) local addReward = {} for key, value in pairs(dishData.item_normal:toNumMap()) do addReward[key] = (addReward[key] or 0) + value * delta - if key == ItemId.Gold then - local goldPriceAdd = self.owner:getBnousDiner(4,value) - addReward[key] = addReward[key] + goldPriceAdd * delta - end end popular = dishData.famous_normal * delta @@ -234,10 +230,16 @@ function Diner:calSellReward(sell, delta, dishData, isExpedite) end upValue[-1] = (upValue[-1] or 0) + collectAdd + -- 电波塔加成 + local goldCount = self.owner:getBnousDiner(4,addReward[ItemId.Gold]) + for id, count in pairs(addReward) do addReward[id] = math.floor(count * (1 + (upValue[id] or 0) / 100)) reward = reward:incrv(id, addReward[id]) end + + addReward[ItemId.Gold] = (addReward[ItemId.Gold] or 0) + goldCount + popular = math.floor(popular * (1 + (upValue[-1] or 0) / 100)) return reward, popular -- libgit2 0.21.2