Commit 580f0906c4407d05b228033ca9d4339f165d0185
Merge branch 'tr/bugfix' into tr/bugfix-qa
Showing
1 changed file
with
10 additions
and
0 deletions
Show diff stats
src/adv/AdvPassive.lua
| @@ -565,6 +565,16 @@ end | @@ -565,6 +565,16 @@ end | ||
| 565 | 565 | ||
| 566 | -- 在指定地点召唤event项目 | 566 | -- 在指定地点召唤event项目 |
| 567 | function Passive:effect12(eventType, triggerPms, eventId, count, stage) | 567 | function Passive:effect12(eventType, triggerPms, eventId, count, stage) |
| 568 | + if eventType == AdvEventType.Monster then | ||
| 569 | + for _, buff in ipairs(self.owner.battle.player.buffs) do | ||
| 570 | + if not buff.isDel and buff:getType() == buff.Buff_NO_PASSIVE_MONSTER then | ||
| 571 | + local effect = buff:effect() | ||
| 572 | + if effect == 0 or effect == eventId then | ||
| 573 | + return | ||
| 574 | + end | ||
| 575 | + end | ||
| 576 | + end | ||
| 577 | + end | ||
| 568 | local change = self.owner.battle.adv:getCurMap():layEventToStage(eventType, eventId, count, stage) | 578 | local change = self.owner.battle.adv:getCurMap():layEventToStage(eventType, eventId, count, stage) |
| 569 | for _, one in ipairs(change) do | 579 | for _, one in ipairs(change) do |
| 570 | self.owner.battle.adv:backBlockChange(one[1].roomId, one[2].blockId) | 580 | self.owner.battle.adv:backBlockChange(one[1].roomId, one[2].blockId) |