Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2019-04-27 f44c22844d7176ed48b1963f36454637efaa0a54

 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py

@@ -72,6 +72,7 @@
import ChPyNetSendPack

import NetPackCommon

import AuctionHouse

import PlayerFairyDomain



import time

import datetime

@@ -329,16 +330,25 @@
            SyncPlayerCrossMapNPCInfo(curPlayer, mapID, npcIDList, mapNPCInfoDict)

            return

        

    serverGroupID = GameWorld.GetServerGroupID()

    zoneIpyData = CrossRealmPlayer.GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID)

    if not zoneIpyData:

        return

    zoneID = zoneIpyData.GetZoneID()

    
    # 本服缓存超时，发送跨服服务器查询

    playerID = curPlayer.GetPlayerID()

    CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_QueryNPCInfo, {"PlayerID":playerID, "MapID":mapID, "NPCIDList":npcIDList})

    dataMsg = {"PlayerID":playerID, "ZoneID":zoneID, "MapID":mapID, "NPCIDList":npcIDList}

    CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_QueryNPCInfo, dataMsg)

    return



def ClientServerMsg_QueryNPCInfo(serverGroupID, msgData):

    ## 收到子服请求查看跨服地图NPC个数信息

    

    zoneID = msgData["ZoneID"]

    mapID = msgData["MapID"]

    zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(mapID, serverGroupID)

    
    zoneIpyData = CrossRealmPlayer.GetServerCrossZoneMapIpyData(zoneID, mapID)

    if not zoneIpyData:

        return

    realMapID = zoneIpyData.GetMapID()

@@ -512,19 +522,12 @@
        PlayerControl.CrossNotify(serverGroupIDList, crossNotifyList)

        return

    

    if callName == "DynamicLineMapOpen":

        realMapID, copyMapID = eval(resultName)

        PlayerFB.OnCrossDynamicLineOpen(realMapID, copyMapID)

        return

    
    if callName == "DynamicLineMapClose":

        realMapID, copyMapID = eval(resultName)

        PlayerFB.OnCrossDynamicLineClose(realMapID, copyMapID)

    if callName == "DynamicLineMapStateChange":

        PlayerFB.OnCrossDynamicLineStateChange(eval(resultName))

        return

    

    if callName == "DynamicLineMapInitOK":

        realMapID, copyMapCount = eval(resultName)

        PlayerFB.OnCrossDynamicMapReset(realMapID, copyMapCount)

        PlayerFB.OnCrossDynamicMapReset(eval(resultName))

        return

    

    if callName == "CommMapServerInitOK":

@@ -837,6 +840,10 @@
    if callName =="HorsePetBossOver":

        PlayerHorsePetBoss.HorsePetBossKilled(int(resultName))

        return

    #缥缈仙域事件出现

    if callName =="AddFairyDomainEvent":

        PlayerFairyDomain.AddFairyDomainEvent(eval(resultName))

        return

    

#---return分割线-----------------------------------------------------------------