From 1a3ffe8f1c45c946d9a7286217107bf3e42d86d6 Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期一, 12 十一月 2018 21:39:28 +0800 Subject: [PATCH] 2683 子 天赋技能和新增双职业各两个技能 / 【后端】天赋技能 --- 天赋技能减CD,buff减层关联技能可触发 --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py index 16ce277..1913474 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py @@ -99,6 +99,13 @@ coolDownTime = curSkill.GetCoolDownTime() remainTime = coolDownTime if isPassiveSkill(curSkill): + if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_GiftSkill: + # 天赋有减CD效果 + reduceSkillCDPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, None, curSkill, ChConfig.TriggerType_GiftReduceCD) + # 减CD比率 + if reduceSkillCDPer > 0: + remainTime = int(remainTime * max(0, ShareDefine.Def_MaxRateValue - reduceSkillCDPer) / ShareDefine.Def_MaxRateValue) + # 被动技能的处理和主动技能区分 curSkill.SetRemainTime(remainTime) return @@ -108,7 +115,6 @@ # remainTime = skillData.GetCoolDownTime() reduceSkillCDPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, None, curSkill, ChConfig.TriggerType_ReduceCD) - # 减CD比率 if reduceSkillCDPer > 0: remainTime = int(remainTime * max(0, ShareDefine.Def_MaxRateValue - reduceSkillCDPer) / ShareDefine.Def_MaxRateValue) -- Gitblit v1.8.0