From e1dbd84e697445ea0c5f73075f56f97e5849ae53 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 08 三月 2019 14:58:15 +0800
Subject: [PATCH] 6328 【后端】优化代码eval - json只适合字符串序列化，并且尽量用于非中文；建议使用cPickle 的dumps 和loads，协议用2，可支持所有类型，缺点为序列化后不可阅读
---
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