From 80e8600a91252c32c4db9061c96311ea5f9e02f4 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 30 一月 2019 17:44:18 +0800
Subject: [PATCH] 2945 【1.5.200】1血不死的技能效果会被非斩杀技能杀死

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.py
index 9ecff4e..ca05704 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.py
@@ -22,9 +22,12 @@
         # 当前已经被处理为死亡,那么就不触发
         return False
     
-    if attacker.GetDictByKey("zhansha") and passiveEffect.GetEffectValue(0):
-        # 斩杀不触发的标志
-        return False
+    zhanshaState = attacker.GetDictByKey(ChConfig.Def_PlayerKey_Zhansha)
+    
+    if zhanshaState:
+        # 按位判断,1为斩杀情况下,此技能不可被触发,2为终极斩杀不触发,3为任何斩杀都不触发
+        if (passiveEffect.GetEffectValue(2) & pow(2, zhanshaState-1)) != 0:
+            return False
     
     attacker.SetHP(1)
 

--
Gitblit v1.8.0