diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua index 5475fcb..b426cda 100644 --- a/src/adv/Adv.lua +++ b/src/adv/Adv.lua @@ -161,7 +161,7 @@ function Adv:initByChapter(params) -- 中继进入奖励 if isEnter then - relayData = relayData or self:isHaveRelay(level, chapterId, force) + relayData = relayData or self:isHaveRelay(level, chapterId, true) if relayData then self:awardRelay(relayData, notNotify) end @@ -243,7 +243,6 @@ end function Adv:awardRelay(relayData, notNotify) local gift = {} - if relayData.artifact > 0 then local pool = {} for id, temp in pairs(csvdb["adv_artifactCsv"]) do @@ -2076,13 +2075,8 @@ function Adv:doActive(activeId, target) end -- 7=道具燃烧效果 - doActiveEffect[7] = function(_) - for _ , target in ipairs(targers) do - if target:getEventType() == AdvEventType.Drop then - target:updateEvent(nil) - self:backBlockChange(target.room.roomId, target.blockId) - end - end + doActiveEffect[7] = function(_, ctype) + self:blockDropChange(ctype, targers) return true end @@ -2312,7 +2306,7 @@ function Adv:enemyDead(enemy, escape) end end -- 这些奖励可能会有被动加成 - self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops}) + self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops, trigger = enemy}) -- 自身带的掉落是不会被改变的 也不会被加成 if block.event.item and block.event.item[1] ~= 0 then -- libgit2 0.21.2