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/NPC/NPCCommon.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
index 1efe1c7..070232a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -60,6 +60,7 @@
import PlayerState
import PyGameData
import PlayerTeam
+import NPCHurtMgr
import PlayerVip
import GameObj
import ChNPC
@@ -2296,6 +2297,7 @@
# 清除自定义伤血列表
#BossHurtMng.ClearHurtValueList(curNPC)
NPCHurtManager.DeletePlayerHurtList(curNPC)
+ NPCHurtMgr.DeletePlayerHurtList(curNPC)
if curNPC.GetType() == ChConfig.ntRobot:
lineID = GameWorld.GetGameWorld().GetLineID()
lineRobotJobDict = PyGameData.g_fbRobotJobDict.get(lineID, {})
@@ -3258,6 +3260,7 @@
self.ClearAllBuff(isClearAuraBuff)
curNPC = self.__Instance
NPCHurtManager.ClearPlayerHurtList(curNPC)
+ NPCHurtMgr.ClearPlayerHurtList(curNPC)
return True
#---------------------------------------------------------------------
@@ -5182,11 +5185,13 @@
GameWorld.Log("Boss死亡: lineID=%s,objID=%s,npcID=%s,dropOwnerType=%s"
% (GameWorld.GetGameWorld().GetLineID(), curNPC.GetID(), curNPC.GetNPCID(), dropOwnerType))
#if dropOwnerType == ChConfig.DropOwnerType_MaxHurt:
- if NPCHurtManager.GetPlayerHurtList(curNPC):
- maxHurtInfo = NPCHurtManager.RefreshHurtList(curNPC, tick, refreshInterval, isDead)
- if maxHurtInfo:
- tagObj, ownerType, ownerID = maxHurtInfo
-
+ maxHurtInfo = NPCHurtManager.RefreshHurtList(curNPC, tick, refreshInterval, isDead)
+ if not maxHurtInfo:
+ maxHurtInfo = NPCHurtMgr.RefreshHurtList(curNPC, tick, refreshInterval, isDead)
+
+ if maxHurtInfo:
+ tagObj, ownerType, ownerID = maxHurtInfo
+
elif dropOwnerType == ChConfig.DropOwnerType_Family:
ownerInfo = FamilyRobBoss.RefreshFamilyOwnerNPCHurt(self, curNPC, tick, refreshInterval)
if ownerInfo:
--
Gitblit v1.8.0