营地进入 bug

zhouhaihai
1 parent 28b5c033
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
src/adv/Adv.lua
@@ -143,7 +143,7 @@ function Adv:initByChapter(chapterId, level, isToNext, notNotify, isRelay, isEnt
 	end
  
 	-- 中继进入奖励
-	if relayData then
+	if relayData and isEnter then
 		self:awardRelay(relayData, notNotify)
 	end
  
@@ -1248,7 +1248,9 @@ end
 local function clickDrop(self, room, block, params)
 	local reward = {}
 	if not block.event.item then return end
+	if not self.battle or not self.battle.player then return end
 	self.battle.player:triggerPassive(Passive.CLICK_DROP)
+
 	local reward = self:award({[block.event.item[1]] = block.event.item[2]}, {log = {desc = "clickDrop"}})
 	-- local reward = self:award({[5801] = 1})
 	block:clear()