From f5a2d72d60cf43cf28a44868d62deeda8d10482f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 28 六月 2019 20:48:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCHP.py | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCHP.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCHP.py
index 49ffca8..b57155c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCHP.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetNPCHP.py
@@ -14,10 +14,10 @@
# 详细描述: 设置屏幕周围NPC血量
#
#---------------------------------------------------------------------
-"""Version = 2015-03-22 23:00"""
+#"""Version = 2015-03-22 23:00"""
#---------------------------------------------------------------------
-
+import IpyGameDataPY
import IPY_GameWorld
import GameWorld
import ChConfig
@@ -75,7 +75,9 @@
return
def __GMSetNPCHP(curPlayer, curNPC, setHP):
- GameObj.SetHP(curNPC, setHP)
+ npcID = curNPC.GetNPCID()
+ isByTime = True if IpyGameDataPY.GetIpyGameDataNotLog("NPCTimeLostHP", npcID) else False
+ GameObj.SetHP(curNPC, setHP, isByTime=isByTime)
curNPC.Notify_HPEx()
GameWorld.DebugAnswer(curPlayer, "SetNPCHP ID=%s(%s),HP=%s" % (curNPC.GetID(), curNPC.GetNPCID(), setHP))
return
--
Gitblit v1.8.0