From c613115bfffc33e6daa7ba37ec0628c580d232d3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 30 十二月 2018 10:38:44 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(查看玩家信息增加标记是否跨服玩家)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
index 571ee07..c1fae3c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
@@ -38,7 +38,6 @@
 import PlayerUniversalGameRec
 import PlayerCompensation
 import IpyGameDataPY
-import MergePlayer
 import PyGameDataStruct
 import PyDataManager
 import PlayerControl
@@ -306,6 +305,20 @@
 #        
 #    return
 
+#// A9 04 查询boss信息 #tagCGQueryBossInfo
+#
+#
+#struct    tagCGQueryBossInfo
+#{
+#    tagHead        Head;
+#    BYTE        Count;    //数量
+#    DWORD        BossIDList[Count];    //boosid
+#};
+def OnQueryBossInfo(index, clientData, tick):
+    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+    bossIDList = clientData.BossIDList
+    Sync_BossInfo(curPlayer, bossIDList)
+    return
 
 
 ## 同步boss相关信息
@@ -567,15 +580,6 @@
                 playerCntDict[bossid] = playerCntDict.get(bossid, 0) + 1
     GameWorld.DebugLog('    boss等级信息对应本服在线人数 %s' % playerCntDict)
     
-    # 此处需要统计累加当前在跨服服务器的玩家
-    mergeServerOnlinePlayerDict = MergePlayer.GetMergeServerOnlinePlayerInfo()
-    for playerInfo in mergeServerOnlinePlayerDict.values():
-        findLV = playerInfo[MergePlayer.Def_MSOLPlayer_LV]
-        for bossid, lvLimit in bossRebornDict.items():
-            if lvLimit[0] <= findLV <= lvLimit[1]:
-                playerCntDict[bossid] = playerCntDict.get(bossid, 0) + 1
-    GameWorld.DebugLog('    boss等级信息对应本服及跨服在线人数 %s' % playerCntDict)
-    
     for bossid, curOnlineCnt in playerCntDict.items():
         SetBossOnlineHeroCnt(bossid, curOnlineCnt)
         
@@ -620,7 +624,7 @@
     onlineCnt = __GetBossOnlineHeroCnt(bossid)[0]
     LVLimit = ipyData.GetLVLimit()
     openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)
-    if openServerDay != 0:
+    if openServerDay != 0 and LVLimit and len(LVLimit) == 2:
         yesterdayCnt = len([1 for lv in PyGameData.g_yesterdayPlayerLVDict.values() if LVLimit[0]<=lv <= LVLimit[1]]) #参数昨日活跃人数
     else:
         yesterdayCnt = IpyGameDataPY.GetFuncCfg('FirstDayActivePlayerCnt')
@@ -950,8 +954,10 @@
             refreshTime = 0
             PyGameData.g_sortBOSSRefreshList[i] = [bossID, killedTime, refreshTime]
             bossIDList.append(bossID)
+        curTime = int(time.time())
+        PyGameData.g_sortBOSSRefreshList.sort(key=lambda asd:max(0, asd[2] - (curTime - asd[1])))
         GameWorld.Log(' boss复活活动 重生boss bossIDList=%s'%bossIDList)
-        g_lastBossRebornTime = int(time.time())
+        g_lastBossRebornTime = curTime
     else:
         #广播
         needNotifyPointPerList = IpyGameDataPY.GetFuncEvalCfg('BossRebornNotify')
@@ -1215,6 +1221,6 @@
     if curMember.GetFamilyLV() == IPY_GameServer.fmlMember:
         GameWorld.DebugLog("普通成员无法召集!", playerID)
         return
-    PlayerControl.FamilyNotify(curFamily.GetID(), "FairyGrabBossHelp", [npcID])
+    PlayerControl.FamilyNotify(curFamily.GetID(), "FairyGrabBossHelp", [curPlayer.GetName(), npcID])
     return
 

--
Gitblit v1.8.0