diff --git a/src/GlobalVar.lua b/src/GlobalVar.lua index 86604bd..0909fdb 100644 --- a/src/GlobalVar.lua +++ b/src/GlobalVar.lua @@ -242,6 +242,7 @@ AdvBackEventType = { BuffEffect = 27, -- buff 效果 PassiveEffect = 28, -- 被动 效果 ChooseDice = 29, -- 选择点随机效果 + NoEffect = 30, -- 没有效果 } AdvScoreType = { diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua index 7d849bd..20bcbdd 100644 --- a/src/adv/Adv.lua +++ b/src/adv/Adv.lua @@ -2031,9 +2031,18 @@ function Adv:doActive(activeId, target) -- 5:放逐目标 doActiveEffect[5] = function(_) for _, target in ipairs(targers) do + local had = false if not target.lock and not target.isDead then - target:kill() - self:backBlockChange(target.roomId, target.blockId) + if target:getMonsterCsv().type == 5 then + -- 假boss 不能用 + had = true + else + target:kill() + self:backBlockChange(target.roomId, target.blockId) + end + end + if had then + self:pushBackEvent(AdvBackEventType.NoEffect) end end return true diff --git a/src/adv/AdvPlayer.lua b/src/adv/AdvPlayer.lua index d08204c..aa2fa8c 100644 --- a/src/adv/AdvPlayer.lua +++ b/src/adv/AdvPlayer.lua @@ -677,6 +677,10 @@ function Enemy:getClassify() return csvdb["event_monsterCsv"][self.monsterId].classify end +function Enemy:getMonsterCsv() + return csvdb["event_monsterCsv"][self.monsterId] +end + -- 0=所有 1=怪物 2=玩家 function Enemy:checkAuraBuff(buffs) local needBuffs = {} -- libgit2 0.21.2