From 10668d5c705391df124a600de234008e91c6d9ea Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 05 十一月 2018 19:49:23 +0800
Subject: [PATCH] 4574 【后端】【1.2】开服前14天活动定制优化（如果开服前14天的活动配置开始时间在14天之内而结束时间超过第14天，那么该活动不开启）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.py | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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..a4d4399 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
@@ -18,7 +18,16 @@
def CheckCanHappen(attacker, defender, effect, curSkill):
+
result = GameWorld.CanHappen(effect.GetEffectValue(0))
if result:
GameObj.SetHP(attacker, 1) # 为了避免生命为0时，屏蔽过多逻辑
- return result
+ return True
+
+ if effect.GetEffectValue(1):
+ #不死血量1，但不触发技能
+ if GameWorld.CanHappen(effect.GetEffectValue(1)):
+ GameObj.SetHP(attacker, 1)
+ return False
+
+ return False
--
Gitblit v1.8.0