From 98628e52c80ea22ed6c0ea5a2890d88bd5c14ffc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 17 六月 2019 14:54:09 +0800
Subject: [PATCH] 7193 【2.0】仙盟联赛修改（无人参赛时所有成员获得拍品收益，不含中途转盟过来的；修复仙盟拍品无人收益时报错bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4526.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4526.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4526.py
index 5f9aff7..8ff8f17 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4526.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4526.py
@@ -19,12 +19,17 @@
def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
useSkill = skillkwargs.get("useSkill", None)
+ skillLimist = passiveEffect.GetEffectValue(2)
# 主动型技能才有效
- if passiveEffect.GetEffectValue(2) and useSkill:
- if useSkill.GetFuncType() not in [ChConfig.Def_SkillFuncType_FbSkill,
- ChConfig.Def_SkillFuncType_NormalAttack]:
- return False
-
+ if skillLimist and useSkill:
+ if skillLimist == 1:
+ if useSkill.GetFuncType() not in [ChConfig.Def_SkillFuncType_FbSkill,
+ ChConfig.Def_SkillFuncType_NormalAttack]:
+ return False
+ elif skillLimist == 2:
+ if useSkill.GetFuncType() != ChConfig.Def_SkillFuncType_NormalAttack:
+ return False
+
if passiveEffect.GetEffectValue(1):
if AttackCommon.GetFirstDefenderID(attacker) != defender.GetID():
return False
--
Gitblit v1.8.0