From 189296ec109a4bb64a54d9b9a8b9ca4b26a4e18c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 23 十一月 2018 11:55:53 +0800
Subject: [PATCH] 2423 [主干]古神切图掉线没成功退出(退出副本再重置门票扣除记录)

---
 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