Commit 47c6253a8abc04f34446a6060dc1c2aca4557a0e
1 parent
d778335c
bugfix
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
src/adv/Adv.lua
| @@ -971,7 +971,7 @@ function Adv:award(gift, params, backRewardParams) | @@ -971,7 +971,7 @@ function Adv:award(gift, params, backRewardParams) | ||
| 971 | 971 | ||
| 972 | local autoUse = {} | 972 | local autoUse = {} |
| 973 | for itemId, count in pairs(tgift) do | 973 | for itemId, count in pairs(tgift) do |
| 974 | - if count > 0 then | 974 | + if count > 0 and self.battle.player then |
| 975 | local buffAdd = self.battle.player:getRewardChange(itemId) | 975 | local buffAdd = self.battle.player:getRewardChange(itemId) |
| 976 | count = math.floor(math.max(0, (count + buffAdd[0]) * (1 + buffAdd[1]))) --附加 buff 的影响 | 976 | count = math.floor(math.max(0, (count + buffAdd[0]) * (1 + buffAdd[1]))) --附加 buff 的影响 |
| 977 | self:checkTask(Adv.TaskType.Item, count, itemId) | 977 | self:checkTask(Adv.TaskType.Item, count, itemId) |
src/adv/AdvBlock.lua
| @@ -60,9 +60,9 @@ function Block:updateEvent(event, isInit) | @@ -60,9 +60,9 @@ function Block:updateEvent(event, isInit) | ||
| 60 | end | 60 | end |
| 61 | self:randomEvent() | 61 | self:randomEvent() |
| 62 | end | 62 | end |
| 63 | - self:quickDrop() | ||
| 64 | 63 | ||
| 65 | if not isInit and self.isOpen then | 64 | if not isInit and self.isOpen then |
| 65 | + self:quickDrop() | ||
| 66 | local newet = self:getEventType() | 66 | local newet = self:getEventType() |
| 67 | if oldet ~= newet then | 67 | if oldet ~= newet then |
| 68 | local em = {} | 68 | local em = {} |