From 07a5b93ce90a08c7d60cecc7c61b984ca0b2ea97 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 12 十二月 2019 16:37:17 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统(封魔坛支持协助,去除封魔坛旧版伤血统计)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAssist.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

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 fae0769..169a3ae 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAssist.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAssist.py
@@ -54,8 +54,11 @@
         return
     
     curNPC = GameWorld.FindNPCByNPCID(npcID)
-    if not curNPC or curNPC.GetID() != objID:
-        GameWorld.DebugLog("协助NPC不存在无法协助!", playerID)
+    if not curNPC:
+        GameWorld.DebugLog("协助NPC不存在无法协助!npcID=%s" % npcID, playerID)
+        return
+    if curNPC.GetID() != objID:
+        GameWorld.DebugLog("协助NPC实例ID不一致无法协助!npcID=%s,curNPC.GetID()=%s,sendObjID=%s" % (npcID, curNPC.GetID(), objID), playerID)
         return
     
     ipyData = IpyGameDataPY.GetIpyGameDataNotLog('BOSSInfo', npcID)
@@ -73,9 +76,7 @@
         return
     
     mapID = curPlayer.GetMapID()
-    lineID = 0
-    if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull: # 副本型boss,如封魔坛
-        lineID = PlayerControl.GetFBFuncLineID(curPlayer)
+    lineID = GameWorld.GetGameWorld().GetLineID()
     queryData = [mapID, lineID, npcID, objID]
     QueryGameServer_PlayerAssist(playerID, "RequestAssistBoss", queryData)
     return

--
Gitblit v1.8.0