Merge branch 'develop' of 120.26.43.151:wasteland/server into develop

测试 · xiongrenfei · xiongrenfei · xiongrenfei · xiongrenfei
2 parents 4bd3095f 95065b5b
Showing 2 changed files with 11 additions and 3 deletions Show diff stats
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
@@ -119,6 +119,7 @@ Passive.AFTER_ROUND = 27 --经过 x回合时
 Passive.GET_BUFF = 28 --获得指定buff
 Passive.OPEN_BLOCK = 29 --翻开格子
 Passive.OPEN_MONSTER = 30 --翻开怪物
+Passive.PLAYER_BUFF = 31 --玩家获得buff
 -- 不同的开启条件
@@ -180,6 +181,7 @@ PassiveCondFactory[Passive.GET_BUFF] = function(_Passive)
 		end
 	end
 end
+PassiveCondFactory[Passive.PLAYER_BUFF] = PassiveCondFactory[Passive.GET_BUFF]
 PassiveCondFactory[Passive.BORN_ONCE] = function(_Passive)
@@ -304,7 +306,8 @@ function Passive:canEffect(effType, effValue)
 	end
 	--禁用被动技
 	local count = self.owner:getDisablePassiveCount()
-	if count and (count == 0 or self.owner:getPassiveIdx(self) <= count) then
+	local idx = self.owner:getPassiveIdx(self)
+	if count and idx and (count == 0 or idx <= count) then
 		return
 	end
 	return true
@@ -115,10 +115,13 @@ end
 function BaseObject:getPassiveIdx(passive)
 	for idx, passive_ in ipairs(self.passives) do
 		if passive_ == passive then
-			return idx
+			if passive.passiveData.dispel ~= 1 then
+				return idx
+			end
+			return
 		end
 	end
-	return 999
+	return
 end
 function BaseObject:getDisablePassiveCount()
@@ -667,6 +670,7 @@ function Player:effectBattleBuff()
 	for _, buff in ipairs(self.buffs) do
 		if not buff:isHide() and (buff:getType() == Buff.BATTLE_BUFF or buff:getType() == Buff.BATTLE_PASSIVE) then
 			buff:effect()
+			buff:uncover()
 		end
 	end
 end
@@ -692,6 +696,7 @@ function Player:addBuff(buffId, releaser)
 		self.battle.player:attrChangeCondBuffCheck(2, buffId)
 		self.battle.adv:checkAchievement(self.battle.adv.AchievType.GetBuff, 1, buffId)
 		self.battle.adv:pushBackEvent(AdvBackEventType.Buff, {buffId = buffId})
+		self.battle:triggerPassive(Passive.PLAYER_BUFF, {buffId = buffId})
 	end
 	return status
 end