From 7577e420ae88bc68662eb7eee72153d260a07f4f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 17 五月 2019 09:48:14 +0800
Subject: [PATCH] 6805 【后端】【2.0】副本前端化（有地图ID时才进行自定义场景通用判断）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.py | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..f0e8fc5 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
@@ -1,7 +1,7 @@
#!/usr/bin/python
# -*- coding: GBK -*-
#
-# @todo: 进入濒死状态 血量为1, 不触发技能
+# @todo: 进入濒死状态 血量为1
#
# @author: Alee
# @date 2017-12-9 下午09:41:44
@@ -22,17 +22,23 @@
# 当前已经被处理为死亡，那么就不触发
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)
-
- return False
+
+ # False 可用于多次触发不死的作用
+ return True if passiveEffect.GetEffectValue(1) else False
def GetSkillData(passiveEffect):
- return
+ skillID = passiveEffect.GetEffectValue(1)
+
+ return GameWorld.GetGameData().GetSkillBySkillID(skillID)
def AfterUsePassiveSkill(attacker, defender, passiveEffect, tick):
return
--
Gitblit v1.8.0