From 6c995efde15ba0f95497a5d2a8b5ccfa868ae64d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 13 四月 2019 11:43:21 +0800
Subject: [PATCH] 6459 【后端】【2.0】缥缈仙域开发单（开始自定义场景封包导出）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index 456a8e5..23a8356 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -26,6 +26,7 @@
import PlayerTalk
import CrossBoss
import ChConfig
+import PlayerFB
import GMShell
import traceback
@@ -39,22 +40,25 @@
return
# 协议要用最高级2，可减少长度
- sendMsg = cPickle.dumps({"MsgType":msgType, "Data":dataMsg, "ServerGroupID":GameWorld.GetServerGroupID()}, 2)
+ srcMsg = {"MsgType":msgType, "Data":dataMsg, "ServerGroupID":GameWorld.GetServerGroupID()}
+ sendMsg = cPickle.dumps(srcMsg, 2)
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
- GameWorld.ErrLog("服务器未启动好,不允许向跨服服务器发送数据! %s" % (sendMsg))
+ GameWorld.ErrLog("服务器未启动好,不允许向跨服服务器发送数据! %s" % (srcMsg))
return
- GameWorld.Log("SendMsgToCrossServer => %s" % (sendMsg))
+ GameWorld.Log("SendMsgToCrossServer => %s" % (srcMsg))
GameWorld.GetGameWorld().SendMergerChildToCenterStringData(sendMsg, len(sendMsg))
return
def OnCrossServerReceiveMsg(recvMsg, tick):
## 跨服服务器收到信息处理
try:
- GameWorld.Log("OnCrossServerReceiveMsg: %s" % recvMsg)
+ GameWorld.Log("收到OnCrossServerReceiveMsg" )
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
GameWorld.Log("服务器未启动好，不处理子服信息!")
return
msgDict = cPickle.loads(recvMsg)
+
+ GameWorld.Log("OnCrossServerReceiveMsg: %s" % msgDict)
msgType = msgDict.get("MsgType", -1)
msgData = msgDict.get("Data", "")
@@ -87,6 +91,9 @@
elif msgType == ShareDefine.ClientServerMsg_QueryNPCInfo:
PlayerQuery.ClientServerMsg_QueryNPCInfo(serverGroupID, msgData)
+ elif msgType == ShareDefine.ClientServerMsg_EnterFB:
+ PlayerFB.ClientServerMsg_EnterFB(serverGroupID, msgData)
+
elif msgType == ShareDefine.ClientServerMsg_SetPlayerAttrValue:
MapServer_CrossSetPlayerAttrValue(msgData)
@@ -98,7 +105,7 @@
GameWorld.ErrLog("没有该信息类型逻辑处理！")
except:
- GameWorld.ErrLog("OnCrossServerReceiveMsg:%s; except:%s" % (recvMsg, traceback.format_exc()))
+ GameWorld.ErrLog("OnCrossServerReceiveMsg:%s; except:%s" % (cPickle.loads(recvMsg), traceback.format_exc()))
if GameWorld.GetGameWorld().GetDebugLevel():
raise BaseException(str(traceback.format_exc()))
return
@@ -159,19 +166,21 @@
return
if not dataMsg:
return
- sendMsg = cPickle.dumps({"MsgType":msgType, "Data":dataMsg}, 2)
+
+ srcMsg = {"MsgType":msgType, "Data":dataMsg}
+ sendMsg = cPickle.dumps(srcMsg, 2)
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
- GameWorld.ErrLog("跨服服务器未启动好,不允许向子服发送数据! serverGroupIDList=%s, sendMsg=%s" % (serverGroupIDList, sendMsg))
+ GameWorld.ErrLog("跨服服务器未启动好,不允许向子服发送数据! serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
return
- GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, sendMsg=%s" % (serverGroupIDList, sendMsg))
+ GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
if not serverGroupIDList:
- GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg)
+ GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg, len(sendMsg))
else:
serverGroupIDList = list(set(serverGroupIDList)) # 去重
#for serverGroupID in serverGroupIDList:
- # GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg)
+ # GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg, len(sendMsg))
jsonGroupIDInfo = cPickle.dumps(serverGroupIDList, 2)
- GameWorld.GetGameWorld().SendMergeMsgToClientByGroupList(jsonGroupIDInfo, sendMsg)
+ GameWorld.GetGameWorld().SendMergeMsgToClientByGroupList(jsonGroupIDInfo, len(jsonGroupIDInfo), sendMsg, len(sendMsg))
return
def OnClientServerReceiveMsg(index, tick):
@@ -180,7 +189,7 @@
dataMsg = dataPack.GetData()
try:
- GameWorld.Log("OnClientServerReceiveMsg: %s" % dataMsg)
+ GameWorld.Log("收到OnClientServerReceiveMsg" )
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
GameWorld.Log("服务器未启动好，不处理跨服信息!")
return
@@ -188,6 +197,7 @@
msgDict = cPickle.loads(dataMsg)
msgType = msgDict.get("MsgType", -1)
msgData = msgDict.get("Data", "")
+ GameWorld.Log("OnClientServerReceiveMsg: %s" % msgDict)
if msgType == ShareDefine.CrossServerMsg_ExitCrossServer:
CrossRealmPlayer.CrossServerMsg_ExitCrossServer(msgData)
@@ -240,8 +250,11 @@
elif msgType == ShareDefine.CrossServerMsg_NPCInfoRet:
PlayerQuery.CrossServerMsg_NPCInfoRet(msgData, tick)
+ elif msgType == ShareDefine.CrossServerMsg_EnterFBRet:
+ PlayerFB.CrossServerMsg_EnterFBRet(msgData, tick)
+
# 需要发送到地图服务器处理的
- elif msgType in [ShareDefine.CrossServerMsg_RebornRet, ShareDefine.CrossServerMsg_CollectNPCOK]:
+ elif msgType in [ShareDefine.CrossServerMsg_RebornRet, ShareDefine.CrossServerMsg_CollectNPCOK, ShareDefine.CrossServerMsg_FBEnd]:
MapServer_ClientServerReceiveMsg(msgType, msgData)
elif msgType == ShareDefine.CrossServerMsg_CrossServerState:
@@ -251,7 +264,7 @@
GameWorld.ErrLog("没有该信息类型逻辑处理！")
except:
- GameWorld.ErrLog("OnClientServerReceiveMsg:%s; except:%s" % (dataMsg, traceback.format_exc()))
+ GameWorld.ErrLog("OnClientServerReceiveMsg:%s; except:%s" % (cPickle.loads(dataMsg), traceback.format_exc()))
if GameWorld.GetGameWorld().GetDebugLevel():
raise BaseException(str(traceback.format_exc()))
@@ -260,6 +273,22 @@
def MapServer_ClientServerReceiveMsg(msgType, msgData):
## 收到跨服服务器信息，需要发送到地图服务器处理
+ if msgType in [ShareDefine.CrossServerMsg_FBEnd]:
+ curServerGroupID = GameWorld.GetServerGroupID()
+ for tagPlayerID, msgInfo in msgData.items():
+ if not msgInfo:
+ continue
+ serverGroupID = msgInfo[0]
+ if curServerGroupID != serverGroupID:
+ continue
+ tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagPlayerID)
+ if not tagPlayer:
+ continue
+ msgInfo = str([msgType, msgInfo[1:]])
+ tagPlayer.MapServer_QueryPlayerResult(0, 0, "ClientServerReceiveMsg", msgInfo, len(msgInfo))
+
+ return
+
if not isinstance(msgData, dict):
return
tagPlayerID = msgData.get("PlayerID")
--
Gitblit v1.8.0