From e058aebe575990c54af8092c06e33e6b8d04e767 Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Fri, 6 Mar 2020 19:35:47 +0800
Subject: [PATCH] 修改生效位置

---
 src/adv/AdvBlock.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/adv/AdvBlock.lua b/src/adv/AdvBlock.lua
index ffb797f..0cc0a35 100644
--- a/src/adv/AdvBlock.lua
+++ b/src/adv/AdvBlock.lua
@@ -149,6 +149,9 @@ function Block:randomEvent()
 
 	randomFunc[AdvEventType.Trap] = function()
 		local data = csvdb["event_trapCsv"][self.event.id]
+		-- 因为一些神器效果 提前触发被动
+		adv.battle.player:triggerPassive(Passive.CLICK_TRAP)
+
 		local buffs = data.effect:toArray(true, "=")
 		for _, buffId in ipairs(buffs) do
 			adv.battle.player:addBuff(buffId)
@@ -167,7 +170,7 @@ function Block:randomEvent()
 				self.room.map.adv:mapItemChange(effect[2])
 			end
 		end
-		adv.battle.player:triggerPassive(Passive.CLICK_TRAP)
+
 		adv:checkAchievement(adv.AchievType.Trap, 1, self.event.id)
 		adv:backTrap()
 		self:clear()
--
libgit2 0.21.2