From 6253040e3470059c4ef906da2d7122fc48e681e5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 三月 2020 17:39:08 +0800
Subject: [PATCH] 8401 【后端】BOSS复活修改（全服奖励邮件、排名奖励邮件发放） 新增发送全服邮件；新增伤血列表邮件发放奖励模块管理；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.py | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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..9d8bb48 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,6 +20,7 @@
import NPCCommon
import ChConfig
import NPCHurtManager
+import NPCHurtMgr
import PlayerTeam
import GameObj
@@ -49,17 +50,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():
@@ -85,7 +90,7 @@
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 +104,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