From 01bb36eca00e1fcd14bef76d78a6aa2e1ce0d803 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 30 十二月 2019 18:52:26 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统(添加第一名无归属时原因日志)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.py |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.py
index 3308367..2a17501 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.py
@@ -351,6 +351,7 @@
     if GameWorld.IsCrossServer():
         __DoRefreshWorldBossCrossServer(npcRefresh, tick)
         return
+    rebornLineID = 0
     mapID = GameWorld.GetMap().GetMapID()
     refreshMark = npcRefresh.GetRefreshMark()
     lineID = GameWorld.GetGameWorld().GetLineID()
@@ -366,7 +367,20 @@
         bossID = GameLogic_ZhuXianBoss.CurFBLineBOSSID()
         stoneNPCID = 0
     else:
-        ipyData = IpyGameDataPY.GetIpyGameDataByCondition('BOSSInfo', {'RefreshMark':refreshMark, 'MapID':mapID}, isLogNone=False)
+        ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('BOSSInfo', {'RefreshMark':refreshMark, 'MapID':mapID}, True, isLogNone=False)
+        if not ipyDataList:
+            return
+        if len(ipyDataList) == 1:
+            ipyData = ipyDataList[0]
+        else:
+            # 同地图同标试点有多条数据的则为不同指定分线
+            ipyData = None
+            for ipyD in ipyDataList:
+                refreshLine = ipyD.GetRefreshLine()
+                rebornLineID = refreshLine - 1
+                if rebornLineID == lineID:
+                    ipyData = ipyD
+                    break
         if not ipyData:
             return
         stoneNPCID = ipyData.GetStoneNPCID()
@@ -391,7 +405,6 @@
         bosskey = ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID
         rebornBossState = gameWorldMgr.GetGameWorldDictByKey(bosskey)
         
-    rebornLineID = 0
     activityLineID = 0 # 活动线, 默认1线
     activityMapLineDict = IpyGameDataPY.GetFuncEvalCfg("MapLine", 2, {})
     if mapID in activityMapLineDict:

--
Gitblit v1.8.0