From 9c7acc7f02e130a8b742ec21579fdf5e6640d3cc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 16 十一月 2018 15:18:59 +0800
Subject: [PATCH] 2683 支持召唤兽-灵类型可继承主人为NPC的完整属性
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.py | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.py
index a4d4399..36f7e3f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.py
@@ -14,20 +14,25 @@
import ChConfig
import GameWorld
import GameObj
-import PlayerControl
-
+import SkillCommon
def CheckCanHappen(attacker, defender, effect, curSkill):
result = GameWorld.CanHappen(effect.GetEffectValue(0))
if result:
GameObj.SetHP(attacker, 1) # 为了避免生命为0时，屏蔽过多逻辑
+ # 提前触发CD， 不然外层无法触发技能的话就不进入CD， 如和平模式
+ if curSkill.GetCoolDownTime():
+ SkillCommon.SetSkillRemainTime(curSkill, 0, GameWorld.GetGameWorld().GetTick(), attacker)
return True
if effect.GetEffectValue(1):
#不死血量1，但不触发技能
if GameWorld.CanHappen(effect.GetEffectValue(1)):
GameObj.SetHP(attacker, 1)
+ # 提前触发CD， 不然外层无法触发技能的话就不进入CD， 如和平模式
+ if curSkill.GetCoolDownTime():
+ SkillCommon.SetSkillRemainTime(curSkill, 0, GameWorld.GetGameWorld().GetTick(), attacker)
return False
return False
--
Gitblit v1.8.0