From 810c6151eec81ba65a0ff55691e42a27fd4841ca Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Wed, 26 Feb 2020 21:00:40 +0800
Subject: [PATCH] 增加buff 效果31 地图被动刷新不出来怪物

---
 src/adv/AdvBuff.lua    | 8 ++++++++
 src/adv/AdvPassive.lua | 8 ++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/adv/AdvBuff.lua b/src/adv/AdvBuff.lua
index 291c160..fcdde4e 100644
--- a/src/adv/AdvBuff.lua
+++ b/src/adv/AdvBuff.lua
@@ -30,6 +30,7 @@ Buff.CHANGE_DROP_TO_CLICK = 27 --掉落转换为click
 Buff.SP_MAX_CHANGE = 28 -- 魔法上限
 Buff.ITEM_GET_UP = 29 -- 获得道具数量增加
 Buff.Buff_EFFECT_CHANGE = 30 -- 改变 buff 效果
+Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物
 
 --角色一些属性的变化
 local function commonAttr(_Buff, attrName)
@@ -360,6 +361,13 @@ local BuffFactory = {
 			self:_init()
 		end
 	end,
+
+	[Buff.Buff_NO_PASSIVE_MONSTER] = function(_Buff)
+		_Buff._effectValue = function(self)
+			return self.buffData.effectValue1
+		end
+	end,
+
 }
 
 -- 同样的返回  effectValue1, effectValue2 * self.layer 类型的buff
diff --git a/src/adv/AdvPassive.lua b/src/adv/AdvPassive.lua
index 1140ebc..e579a3b 100644
--- a/src/adv/AdvPassive.lua
+++ b/src/adv/AdvPassive.lua
@@ -412,6 +412,14 @@ end
 
 --5=召唤怪物
 function Passive:effect5(monsterId)
+	for _, buff in ipairs(self.owner.battle.player.buffs) do
+		if not buff.isDel and buff:getType() == buff.Buff_NO_PASSIVE_MONSTER then
+			local effect = buff:effect()
+			if effect == 0 or effect == monsterId then
+				return
+			end
+		end
+	end
 	self.owner.battle.adv:getCurMap():addNewMonsterRand(monsterId)
 end
 
--
libgit2 0.21.2