From e5f79d7b7aa03bee0bc0c4ac22e5f102aa69a513 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 22 六月 2019 11:48:06 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 神火定身
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py | 4 ++--
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
index a5b2f84..d33cea8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.py
@@ -413,7 +413,7 @@
# 此处不能传技能curSkill 屏蔽被动触发被动限制
# 暂且特殊处理控制类buff才触发
if SkillCommon.GetBuffType(curSkill) == IPY_GameWorld.bfActionBuff:
- PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(curObj, buffOwner, curSkill, ChConfig.TriggerType_AddBuffOver)
+ PassiveBuffEffMng.GetValueByPassiveBuffTriggerType(curObj, buffOwner, curSkill, ChConfig.TriggerType_AddBuffOver, False)
#是否是持续性技能
isLstSkill = curSkill.GetSkillType() in ChConfig.Def_LstBuff_List
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
index e4a9888..d0ce334 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -1534,13 +1534,13 @@
# buff 影响的(攻击)行为值
# 返回数值
-def GetValueByPassiveBuffTriggerType(attacker, defender, useSkill, triggerType):
+def GetValueByPassiveBuffTriggerType(attacker, defender, useSkill, triggerType, isStopPassiveSkill=True):
attacker = FindRealAttacker(attacker)
if not attacker:
return 0
stopPassiveSkill = False # 被动技能不能再触发被动技能，但可以触发天赋技能
- if useSkill and SkillCommon.isPassiveSkill(useSkill):
+ if useSkill and SkillCommon.isPassiveSkill(useSkill) and isStopPassiveSkill:
#GameWorld.DebugLog("被动技能不能再次触发被动技能")
#return 0
if not PassPassiveLimit(useSkill):
--
Gitblit v1.8.0