wasteland / server

Commit f0b814923e1961f7fa6c573279f0a220b482d7b1

Authored by zhouhaihai
1 parent 28b5c033

营地进入 bug

Showing 1 changed file with 3 additions and 1 deletions   Show diff stats
Inline Side-by-side
@@ -143,7 +143,7 @@ function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnt @@ -143,7 +143,7 @@ function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnt
143 end 143 end
144 144
145 -- 中继进入奖励 145 -- 中继进入奖励
146 - if relayData then 146 + if relayData and isEnter then
147 self:awardRelay(relayData, notNotify) 147 self:awardRelay(relayData, notNotify)
148 end 148 end
149 149
@@ -1248,7 +1248,9 @@ end @@ -1248,7 +1248,9 @@ end
1248 local function clickDrop(self, room, block, params) 1248 local function clickDrop(self, room, block, params)
1249 local reward = {} 1249 local reward = {}
1250 if not block.event.item then return end 1250 if not block.event.item then return end
  1251 + if not self.battle or not self.battle.player then return end
1251 self.battle.player:triggerPassive(Passive.CLICK_DROP) 1252 self.battle.player:triggerPassive(Passive.CLICK_DROP)
  1253 +
1252 local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}}) 1254 local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}})
1253 -- local reward = self:award({[5801] = 1}) 1255 -- local reward = self:award({[5801] = 1})
1254 block:clear() 1256 block:clear()