From 06245e45bd46525692a57053a7df0b921700a780 Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Fri, 19 Jun 2020 20:14:04 +0800
Subject: [PATCH] bug 被动技

---
 src/adv/AdvPassive.lua | 3 ++-
 src/adv/AdvPlayer.lua  | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/adv/AdvPassive.lua b/src/adv/AdvPassive.lua
index 1fe4ebb..12e5839 100644
--- a/src/adv/AdvPassive.lua
+++ b/src/adv/AdvPassive.lua
@@ -300,7 +300,8 @@ function Passive:canEffect(effType, effValue)
 		return
 	end
 	--禁用被动技
-	if self.owner:getDisablePassiveCount() == 0 or self.owner:getPassiveIdx(self) <= self.owner:getDisablePassiveCount() then
+	local count, bc = self.owner:getDisablePassiveCount()
+	if bc > 0 and (count == 0 or self.owner:getPassiveIdx(self) <= count) then
 		return
 	end
 	return true
diff --git a/src/adv/AdvPlayer.lua b/src/adv/AdvPlayer.lua
index 1361df1..d926812 100644
--- a/src/adv/AdvPlayer.lua
+++ b/src/adv/AdvPlayer.lua
@@ -114,13 +114,14 @@ function BaseObject:getPassiveIdx(passive)
 end
 
 function BaseObject:getDisablePassiveCount()
-	local count = 0
+	local count, bc = 0, 0
 	for _, buff in ipairs(self.buffs) do
 		if not buff.isDel and buff:getType() == Buff.DISABLE_BUFF then
 			count = count + buff:effect()
+			bc = bc + 1
 		end
 	end
-	return count
+	return count, bc
 end
 
 function BaseObject:addBuff(buffId, releaser)
--
libgit2 0.21.2