From 4f48659ed51c0e087e55da91ec76cbcdd7a87486 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 15 十一月 2018 17:40:58 +0800
Subject: [PATCH] 4788 【后端】【1.3】洗炼必增由消耗仙玉改为消耗道具

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.py |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 67de7f5..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,11 +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时,屏蔽过多逻辑
-    return result
+        # 提前触发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