From f78b5c4fb02a016c43398f512a302b8c24d62698 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 18:16:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 1 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index 0ed63b0..7d9c53d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -21,6 +21,10 @@
import ReadChConfig
import ChConfig
import PlayerControl
+import PlayerViewCache
+import ChPyNetSendPack
+import NetPackCommon
+import PyGameData
# 获取玩家跨服服务器上的名字
def GetCrossPlayerName(curPlayer):
@@ -67,7 +71,7 @@
GameWorld.Log("跨服报名成功 , actionType=%s" % (actionType), playerID)
# 跨服PK上传数据完毕，通知跨服服务器，准备完毕
- if actionType == ShareDefine.Def_MergeAction_MergePK:
+ if actionType == ShareDefine.Def_CrossAction_PK:
regVSRoomID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterRoomID)
vsRoomID = curPlayer.GetVsRoomId()
@@ -104,9 +108,88 @@
# DWORD PlayerID; // 跨服玩家ID
#};
def OnViewCrossPlayerInfo(index, clientData, tick):
+ if GameWorld.IsCrossServer():
+ return
+
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ playerID = curPlayer.GetPlayerID()
+ tagPlayerID = clientData.PlayerID
+ curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID)
+ ## 本服有，直接回客户端
+ if curCache:
+ GameWorld.DebugLog("查看跨服玩家，是本服玩家，直接回复!tagPlayerID=%s" % (tagPlayerID), playerID)
+ sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
+ sendPack.PlayerID = tagPlayerID
+ sendPack.PropData = curCache.GetPropData()
+ sendPack.PropDataSize = len(sendPack.PropData)
+ sendPack.ItemData = PlayerViewCache.GetItemData(curCache)
+ sendPack.ItemDataSize = len(sendPack.ItemData)
+ sendPack.PlusData = PlayerViewCache.GetPlusData(curCache)
+ sendPack.PlusDataSize = len(sendPack.PlusData)
+ NetPackCommon.SendFakePack(curPlayer, sendPack)
+ return
+ if tagPlayerID in PyGameData.g_crossPlayerViewCache:
+ validChaheTime = 5 * 60 * 1000
+ cacheInfo, updTick = PyGameData.g_crossPlayerViewCache[tagPlayerID]
+ if tick - updTick <= validChaheTime:
+ GameWorld.DebugLog("查看跨服玩家数据同步CD中，直接用缓存数据回复!tagPlayerID=%s" % (tagPlayerID), playerID)
+ SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo)
+ return
+
+ for crossPlayerID, cacheInfoList in PyGameData.g_crossPlayerViewCache.items():
+ if tick - cacheInfoList[1] > validChaheTime:
+ PyGameData.g_crossPlayerViewCache.pop(crossPlayerID)
+
+ # 发送跨服服务器查询
+ dataMsg = {"tagPlayerID":tagPlayerID, "playerID":playerID}
+ CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_ViewPlayerCache, dataMsg)
return
+
+def ClientServerMsg_ViewPlayerCache(serverGroupID, msgData):
+ tagPlayerID = msgData["tagPlayerID"]
+ playerID = msgData["playerID"]
+ GameWorld.Log("收到子服查看跨服玩家信息: serverGroupID=%s,playerID=%s,tagPlayerID=%s" % (serverGroupID, playerID, tagPlayerID))
+
+ cacheInfo = []
+ curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID)
+ if curCache:
+ cacheInfo = [curCache.GetPropData(), PlayerViewCache.GetItemData(curCache), PlayerViewCache.GetPlusData(curCache)]
+
+ viewPlayerCacheRet = [playerID, tagPlayerID, cacheInfo]
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ViewPlayerCacheRet, viewPlayerCacheRet, [serverGroupID])
+ return
+
+def CrossServerMsg_ViewPlayerCacheRet(msgData, tick):
+
+ playerID, tagPlayerID, cacheInfo = msgData
+ GameWorld.Log("收到跨服服务器回复的查看玩家信息: playerID=%s,tagPlayerID=%s" % (playerID, tagPlayerID))
+
+ PyGameData.g_crossPlayerViewCache[tagPlayerID] = [cacheInfo, tick] # 更新信息
+
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if curPlayer:
+ SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo)
+
+ return
+
+def SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo):
+ if not cacheInfo:
+ PlayerControl.NotifyCode(curPlayer, "ViewPlayer_OffLine")
+ return
+ PropData, ItemData, PlusData = cacheInfo
+ sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
+ sendPack.PlayerID = tagPlayerID
+ sendPack.PropData = PropData
+ sendPack.PropDataSize = len(sendPack.PropData)
+ sendPack.ItemData = ItemData
+ sendPack.ItemDataSize = len(sendPack.ItemData)
+ sendPack.PlusData = PlusData
+ sendPack.PlusDataSize = len(sendPack.PlusData)
+ NetPackCommon.SendFakePack(curPlayer, sendPack)
+ return
+
+
\ No newline at end of file
--
Gitblit v1.8.0