被动取消

zhouhaihai · xiongrenfei · xiongrenfei
1 parent c23734ee
Showing 2 changed files with 7 additions and 3 deletions Show diff stats
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
@@ -304,7 +304,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()