From e81011e981c149619a76de56ecd268b667e046d9 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 03 六月 2019 10:29:38 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py | 1 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4527.py | 19 +------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4526.py | 15 ++++++++++-----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4528.py | 13 +++++++++----
4 files changed, 20 insertions(+), 28 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
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4527.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4527.py
index baeedc5..de63485 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4527.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4527.py
@@ -3,7 +3,7 @@
#
##@package
#
-# @todo: buff中提高普通攻击的重击概率
+# @todo: 废弃
#
# @author: Alee
# @date 2019-4-25 下午03:52:01
@@ -13,20 +13,3 @@
#
#---------------------------------------------------------------------
-import ChConfig
-import GameWorld
-import SkillCommon
-import BuffSkill
-
-def CheckCanHappen(attacker, defender, passiveEffect, skillID, **skillkwargs):
- useSkill = skillkwargs.get("useSkill", None)
- if not useSkill:
- # 普攻：无技能，技能型普攻
- return True
- if useSkill.GetFuncType() != ChConfig.Def_SkillFuncType_NormalAttack:
- return False
- return True
-
-
-def GetValue(attacker, defender, passiveEffect):
- return passiveEffect.GetEffectValue(0)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4528.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4528.py
index 1f7a3ec..aee2386 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4528.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4528.py
@@ -19,11 +19,16 @@
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):
# 只针对第一目标
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 1f0ee3b..653e637 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.py
@@ -436,7 +436,6 @@
4524:ChConfig.TriggerType_SuperHitSubLayer, # 暴击减层 67
4525:ChConfig.TriggerType_SuperHitSkipCD, # 暴击无冷却 68
4526:ChConfig.TriggerType_AddThumpHitRate, # 增加重击概率
- 4527:ChConfig.TriggerType_AddThumpHitRate, # 增加重击概率
4528:ChConfig.TriggerType_AddThumpHitPer, # 重击时 增加重击百分比 75
4529:ChConfig.TriggerType_Buff_SuckBloodPer, # BUFF类： 百分比吸血, 此处非属性类
4530:ChConfig.TriggerType_Buff_AttackSubLayer, # BUFF类：攻击减buff层，0消失
--
Gitblit v1.8.0