Commit e058aebe575990c54af8092c06e33e6b8d04e767
1 parent
c5d9338f
修改生效位置
Showing
1 changed file
with
4 additions
and
1 deletions
Show diff stats
src/adv/AdvBlock.lua
| @@ -149,6 +149,9 @@ function Block:randomEvent() | @@ -149,6 +149,9 @@ function Block:randomEvent() | ||
| 149 | 149 | ||
| 150 | randomFunc[AdvEventType.Trap] = function() | 150 | randomFunc[AdvEventType.Trap] = function() |
| 151 | local data = csvdb["event_trapCsv"][self.event.id] | 151 | local data = csvdb["event_trapCsv"][self.event.id] |
| 152 | + -- 因为一些神器效果 提前触发被动 | ||
| 153 | + adv.battle.player:triggerPassive(Passive.CLICK_TRAP) | ||
| 154 | + | ||
| 152 | local buffs = data.effect:toArray(true, "=") | 155 | local buffs = data.effect:toArray(true, "=") |
| 153 | for _, buffId in ipairs(buffs) do | 156 | for _, buffId in ipairs(buffs) do |
| 154 | adv.battle.player:addBuff(buffId) | 157 | adv.battle.player:addBuff(buffId) |
| @@ -167,7 +170,7 @@ function Block:randomEvent() | @@ -167,7 +170,7 @@ function Block:randomEvent() | ||
| 167 | self.room.map.adv:mapItemChange(effect[2]) | 170 | self.room.map.adv:mapItemChange(effect[2]) |
| 168 | end | 171 | end |
| 169 | end | 172 | end |
| 170 | - adv.battle.player:triggerPassive(Passive.CLICK_TRAP) | 173 | + |
| 171 | adv:checkAchievement(adv.AchievType.Trap, 1, self.event.id) | 174 | adv:checkAchievement(adv.AchievType.Trap, 1, self.event.id) |
| 172 | adv:backTrap() | 175 | adv:backTrap() |
| 173 | self:clear() | 176 | self:clear() |