From ccde2a158d4081738aa3d1c131b92627fac2673b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 21 六月 2019 10:53:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.py | 7 ++++++-
1 files changed, 6 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 cce4ae6..c2f464a 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
@@ -1272,7 +1272,12 @@
if curObj.GetGameNPCObjType() == IPY_GameWorld.gnotPet:
PetControl.SetPetHP(curObj, remainHP)
else:
- GameObj.SetHP(curObj, remainHP)
+ timeLostHPIpyData = IpyGameDataPY.GetIpyGameDataNotLog("NPCTimeLostHP", curObj.GetNPCID())
+ if timeLostHPIpyData:
+ AttackCommon.UpdateTimeMonsterHP(curObj, timeLostHPIpyData, tick)
+ else:
+ GameObj.SetHP(curObj, remainHP)
+
if not view : # 已广播的不重复
curObj.Notify_HPEx()
--
Gitblit v1.8.0