Commit f773a6772d09750818370c78aae766ca554d1220
1 parent
ff7cd89e
假的boss 没有效果
Showing
3 changed files
with
16 additions
and
2 deletions
Show diff stats
src/GlobalVar.lua
@@ -242,6 +242,7 @@ AdvBackEventType = { | @@ -242,6 +242,7 @@ AdvBackEventType = { | ||
242 | BuffEffect = 27, -- buff 效果 | 242 | BuffEffect = 27, -- buff 效果 |
243 | PassiveEffect = 28, -- 被动 效果 | 243 | PassiveEffect = 28, -- 被动 效果 |
244 | ChooseDice = 29, -- 选择点随机效果 | 244 | ChooseDice = 29, -- 选择点随机效果 |
245 | + NoEffect = 30, -- 没有效果 | ||
245 | } | 246 | } |
246 | 247 | ||
247 | AdvScoreType = { | 248 | AdvScoreType = { |
src/adv/Adv.lua
@@ -2031,9 +2031,18 @@ function Adv:doActive(activeId, target) | @@ -2031,9 +2031,18 @@ function Adv:doActive(activeId, target) | ||
2031 | -- 5:放逐目标 | 2031 | -- 5:放逐目标 |
2032 | doActiveEffect[5] = function(_) | 2032 | doActiveEffect[5] = function(_) |
2033 | for _, target in ipairs(targers) do | 2033 | for _, target in ipairs(targers) do |
2034 | + local had = false | ||
2034 | if not target.lock and not target.isDead then | 2035 | if not target.lock and not target.isDead then |
2035 | - target:kill() | ||
2036 | - self:backBlockChange(target.roomId, target.blockId) | 2036 | + if target:getMonsterCsv().type == 5 then |
2037 | + -- 假boss 不能用 | ||
2038 | + had = true | ||
2039 | + else | ||
2040 | + target:kill() | ||
2041 | + self:backBlockChange(target.roomId, target.blockId) | ||
2042 | + end | ||
2043 | + end | ||
2044 | + if had then | ||
2045 | + self:pushBackEvent(AdvBackEventType.NoEffect) | ||
2037 | end | 2046 | end |
2038 | end | 2047 | end |
2039 | return true | 2048 | return true |
src/adv/AdvPlayer.lua
@@ -677,6 +677,10 @@ function Enemy:getClassify() | @@ -677,6 +677,10 @@ function Enemy:getClassify() | ||
677 | return csvdb["event_monsterCsv"][self.monsterId].classify | 677 | return csvdb["event_monsterCsv"][self.monsterId].classify |
678 | end | 678 | end |
679 | 679 | ||
680 | +function Enemy:getMonsterCsv() | ||
681 | + return csvdb["event_monsterCsv"][self.monsterId] | ||
682 | +end | ||
683 | + | ||
680 | -- 0=所有 1=怪物 2=玩家 | 684 | -- 0=所有 1=怪物 2=玩家 |
681 | function Enemy:checkAuraBuff(buffs) | 685 | function Enemy:checkAuraBuff(buffs) |
682 | local needBuffs = {} | 686 | local needBuffs = {} |