Commit a5a2c706b35d361b94cf25b5ee2f26c929323efa
Merge branch 'tr/bugfix-qa' of 120.26.43.151:wasteland/server into tr/bugfix-qa
Showing
1 changed file
with
4 additions
and
6 deletions
Show diff stats
src/adv/Adv.lua
| ... | ... | @@ -812,14 +812,12 @@ function Adv:over(success, rewardRatio, overType) |
| 812 | 812 | local potionBag = self.owner:getProperty("potionBag") |
| 813 | 813 | for itemId, count in pairs(self.owner:getProperty("advItems"):toNumMap()) do |
| 814 | 814 | local itemCsv = csvdb["itemCsv"][itemId] |
| 815 | - if not itemCsv then | |
| 815 | + if advPotionCsv[itemId] then | |
| 816 | + potionBag[itemId] = (potionBag[itemId] or 0) + count | |
| 817 | + elseif not itemCsv then | |
| 816 | 818 | print("ERROR: no itemId in ItemCsv : ", itemId) |
| 817 | 819 | elseif itemCsv.type ~= ItemType.AdvItem then |
| 818 | - if advPotionCsv[itemId] then | |
| 819 | - potionBag[itemId] = (potionBag[itemId] or 0) + count | |
| 820 | - else | |
| 821 | - reward[itemId] = math.ceil(count * rewardRatio / 100) | |
| 822 | - end | |
| 820 | + reward[itemId] = math.ceil(count * rewardRatio / 100) | |
| 823 | 821 | end |
| 824 | 822 | end |
| 825 | 823 | reward = self.owner:award(reward, {log = {desc = "advOver", int1 = self.chapterId}}) | ... | ... |