From 5affad5d239f5fed725f5992ebab08c6da59c090 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 12 二月 2019 11:58:17 +0800
Subject: [PATCH] 5819 【后端】【1.6】运营活动支持对应不同的职业和世界等级

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
index bdde78b..22c8681 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py
@@ -220,7 +220,7 @@
 def PlayerLoginMergeServerSkillLogic(curPlayer, tick):
     playerID = curPlayer.GetPlayerID()
 
-    if not GameWorld.IsMergeServer():
+    if not GameWorld.IsCrossServer():
         GameWorld.DebugLog("非跨服服务器上线不清除buff...", playerID)
         return
     
@@ -1232,6 +1232,9 @@
     
     notifyLostValue = lostValue
     curObjHP_BeforeAttack = GameObj.GetHP(curObj)
+    if curObjHP_BeforeAttack == 0:
+        # 没有血量不能再触发
+        return
     
     if reduceHP :
         lostValue = AttackCommon.CalcAtkProDef(buffOwner, curObj, lostValue, curSkill, tick)

--
Gitblit v1.8.0