From 6054a82822cbeee91566c75b1b9402539c684849 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 15 八月 2022 17:02:44 +0800
Subject: [PATCH] 5424 【主干】【yn_1.0.1】【bt7】【qkbt52】【x7bt5】跨服战场报错LoadMapOK地图报错（跨服战场防报错）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.py | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.py
index b685cd0..4ee4e9e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.py
@@ -20,7 +20,9 @@
import NPCCommon
import ChConfig
import NPCHurtManager
+import NPCHurtMgr
import PlayerTeam
+import ShareDefine
import GameObj
##查看点选的NPC仇恨列表
@@ -49,17 +51,21 @@
FamilyRobBoss.OnGMPrintFamilyOwnerBossHurt(curPlayer, curNPC)
return
- isPyHurtList = 1
+ isAssistHurt = 0
npcHurtList = NPCHurtManager.GetPlayerHurtList(curNPC)
+ if npcHurtList:
+ isAssistHurt = 1
+ if not npcHurtList:
+ npcHurtList = NPCHurtMgr.GetPlayerHurtList(curNPC)
if not npcHurtList:
npcHurtList = curNPC.GetPlayerHurtList()
- isPyHurtList = 0
+
if isSort:
npcHurtList.Sort() #sort以后伤血列表从大到小排序
- GameWorld.DebugAnswer(curPlayer, "ID=%s,NPCID=%s, 伤血数=%s,排序=%s,PY=%s"
- % (curNPC.GetID(), curNPC.GetNPCID(), npcHurtList.GetHurtCount(), isSort, isPyHurtList))
- if isPyHurtList:
+ GameWorld.DebugAnswer(curPlayer, "ID=%s,NPCID=%s, 伤血数=%s,排序=%s,协=%s"
+ % (curNPC.GetID(), curNPC.GetNPCID(), npcHurtList.GetHurtCount(), isSort, isAssistHurt))
+ if isAssistHurt:
for playerID, assistPlayerIDList in npcHurtList.GetNoAssitPlayerIDDict().items():
GameWorld.DebugAnswer(curPlayer, "玩家:%s, 协助玩家:%s" % (playerID, assistPlayerIDList))
for assistPlayerID, tagPlayerID in npcHurtList.GetAssistPlayerIDDict().items():
@@ -71,6 +77,8 @@
hurtType = hurtObj.GetValueType()
hurtID = hurtObj.GetValueID()
hurtValue = hurtObj.GetHurtValue()
+ if hasattr(hurtObj, "GetHurtValueEx"):
+ hurtValue += hurtObj.GetHurtValueEx() * ShareDefine.Def_PerPointValue
if not hurtID:
GameWorld.DebugAnswer(curPlayer, "%s 不存在！HurtType=%s,ID=%s, V=%s" % (index, hurtType, hurtID, hurtValue))
continue
@@ -79,13 +87,13 @@
hurtPlayer = GameWorld.GetObj(hurtID, IPY_GameWorld.gotPlayer)
if hurtPlayer == None:
GameWorld.DebugAnswer(curPlayer, "%s 玩家ID=%s,不存在, V=%s" % (index, hurtID, hurtValue))
- elif hurtPlayer.GetHP() <= 0 :
+ elif GameObj.GetHP(hurtPlayer) <= 0 :
GameWorld.DebugAnswer(curPlayer, "%s 玩家ID=%s,血量为0, V=%s" % (index, hurtID, hurtValue))
else:
d = GameWorld.GetDist(curNPC.GetPosX(), curNPC.GetPosY(), hurtPlayer.GetPosX(), hurtPlayer.GetPosY())
GameWorld.DebugAnswer(curPlayer, "%s 玩家ID=%s,距离=%s, V=%s" % (index, hurtID, d, hurtValue))
- if isPyHurtList:
+ if isAssistHurt:
playerHurtValue, assistPlayerHurtDict = npcHurtList.GetPlayerHurtDetail(hurtID)
GameWorld.DebugAnswer(curPlayer, " 非协id=%s,v=%s" % (hurtID, playerHurtValue))
for assistPlayerID, assistHurtValue in assistPlayerHurtDict.items():
@@ -99,7 +107,7 @@
else:
GameWorld.DebugAnswer(curPlayer, "%s 队伍ID=%s,人数=%s, V=%s" % (index, hurtID, curTeam.GetMemberCount(), hurtValue))
- if isPyHurtList:
+ if isAssistHurt:
mapTeamPlayerIDList = PlayerTeam.GetMapTeamPlayerIDList(hurtID)
for teamPlayerID in mapTeamPlayerIDList:
if not npcHurtList.IsNoAssistPlayer(teamPlayerID):
--
Gitblit v1.8.0