From f38f1d13f83bd005eab8a101173c916d03163dc7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 09 一月 2020 17:20:27 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统（修复封魔坛协助进错线路bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAssist.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtManager.py | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtManager.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtManager.py
index 9482636..c18d57c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtManager.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCHurtManager.py
@@ -924,11 +924,19 @@
defendHurtList.Clear()
return
+def GetBossLineID(npcID):
+ sealDemonIpyData = IpyGameDataPY.GetIpyGameDataNotLog("SealDemon", npcID)
+ if sealDemonIpyData:
+ lineID = sealDemonIpyData.GetLineID()
+ else:
+ lineID = GameWorld.GetGameWorld().GetLineID()
+ return lineID
+
def DeletePlayerHurtList(curNPC):
## 删除伤血列表
- lineID = GameWorld.GetGameWorld().GetLineID()
objID = curNPC.GetID()
npcID = curNPC.GetNPCID()
+ lineID = GetBossLineID(npcID)
key = (lineID, objID, npcID)
if key in PyGameData.g_npcHurtDict:
hurtList =PyGameData.g_npcHurtDict.pop(key)
@@ -938,9 +946,9 @@
def GetPlayerHurtList(curNPC):
## 获取伤血列表，可能为None
- lineID = GameWorld.GetGameWorld().GetLineID()
objID = curNPC.GetID()
npcID = curNPC.GetNPCID()
+ lineID = GetBossLineID(npcID)
return GetPlayerHurtListEx(lineID, objID, npcID)
def GetPlayerHurtListEx(lineID, objID, npcID):
## 获取伤血列表，可能为None
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAssist.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAssist.py
index 30ad716..9a207ab 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAssist.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAssist.py
@@ -85,7 +85,7 @@
npcLV = curNPC.GetLV()
mapID = curPlayer.GetMapID()
- lineID = GameWorld.GetGameWorld().GetLineID()
+ lineID = NPCHurtManager.GetBossLineID(npcID)
queryData = [mapID, lineID, npcID, objID, npcLV]
QueryGameServer_PlayerAssist(playerID, "RequestAssistBoss", queryData)
return
--
Gitblit v1.8.0