From 71ea04a0d2f445b3b3947175bacc6829a5996af9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 三月 2019 21:26:48 +0800
Subject: [PATCH] 6385 【后端】【2.0】五行灵根开发（修复洗点报错 ）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 183 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 163 insertions(+), 20 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index 43bc593..2440c9b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -20,11 +20,16 @@
import PlayerControl
import IPY_GameServer
import CrossRealmPlayer
+import GameWorldBoss
import CrossRealmPK
+import PlayerQuery
+import PlayerTalk
+import CrossBoss
+import ChConfig
import GMShell
import traceback
-import json
+import cPickle
def SendMsgToCrossServer(msgType, dataMsg):
## 发送信息到跨服服务器上
@@ -32,21 +37,32 @@
return
if not dataMsg:
return
- sendMsg = str({"MsgType":msgType, "Data":dataMsg, "ServerGroupID":GameWorld.GetServerGroupID()})
- GameWorld.Log("SendMsgToCrossServer => %s" % (sendMsg))
+
+ # 协议要用最高级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" % (srcMsg))
+ return
+ GameWorld.Log("SendMsgToCrossServer => %s" % (srcMsg))
GameWorld.GetGameWorld().SendMergerChildToCenterStringData(sendMsg, len(sendMsg))
return
def OnCrossServerReceiveMsg(recvMsg, tick):
## 跨服服务器收到信息处理
try:
- GameWorld.Log("OnCrossServerReceiveMsg: %s" % recvMsg)
- msgDict = eval(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", "")
serverGroupID = msgDict.get("ServerGroupID", 0)
-
+
if msgType == ShareDefine.ClientServerMsg_PKMatch:
CrossRealmPK.ClientServerMsg_PKMatch(serverGroupID, msgData, tick)
@@ -59,30 +75,80 @@
elif msgType == ShareDefine.ClientServerMsg_PKBillboard:
CrossRealmPK.ClientServerMsg_PKBillboard(serverGroupID, msgData)
+ elif msgType == ShareDefine.ClientServerMsg_ChatCrossWorld:
+ PlayerTalk.ClientServerMsg_ChatCrossWorld(serverGroupID, msgData, tick)
+
elif msgType == ShareDefine.ClientServerMsg_GMCMD:
GMShell.ClientServerMsg_GMCMD(msgData, tick)
elif msgType == ShareDefine.ClientServerMsg_ServerInitOK:
- ClientServerMsg_ServerInitOK(serverGroupID, msgData, tick)
+ ClientServerMsg_ServerInitOK(serverGroupID, tick)
elif msgType == ShareDefine.ClientServerMsg_ViewPlayerCache:
CrossRealmPlayer.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_QueryNPCInfo:
+ PlayerQuery.ClientServerMsg_QueryNPCInfo(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_SetPlayerAttrValue:
+ MapServer_CrossSetPlayerAttrValue(msgData)
+
+ # 需要发送到地图服务器处理的
+ elif msgType in [ShareDefine.ClientServerMsg_Reborn, ShareDefine.ClientServerMsg_CollectNPC]:
+ MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID)
else:
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
-def ClientServerMsg_ServerInitOK(serverGroupID, msgData, tick):
- ''' 收到子服启动成功通知
+def ClientServerMsg_ServerInitOK(serverGroupID, tick):
+ ''' 收到子服连接成功通知
当子服启动成功后，可同步一次跨服服务器活动状态及活动数据给子服
'''
- GameWorld.Log("收到跨服子服启动成功通知!")
- CrossRealmPK.ClientServerMsg_ServerInitOK(serverGroupID, tick)
+ GameWorld.Log("收到跨服子服连接成功通知! serverGroupID=%s" % serverGroupID)
+ Sync_CrossServerInitDataToClientServer(tick, serverGroupID)
+ return
+
+def Sync_CrossServerInitDataToClientServer(tick, serverGroupID=0):
+ ''' 同步跨服功能数据到子服服务器
+ 本函数调用时机：
+ 1.跨服服务器启动成功，主动广播同步所有子服，此时设置 serverGroupID 为 0
+ 2.子服启动成功，由子服主动发起请求同步最新数据，此时有指定子服 serverGroupID
+ 3.子服重新连接跨服服务器成功，逻辑同2
+ @param serverGroupID: 子服服务器组ID，为0时为全部子服务器组
+ '''
+ CrossRealmPlayer.Sync_CrossCommInitDataToClientServer(serverGroupID)
+ CrossRealmPK.Sync_CrossPKInitDataToClientServer(tick, serverGroupID)
+ CrossBoss.Sync_CrossBossInitDataToClientServer(serverGroupID)
+ return
+
+def MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID):
+ ## 收到子服信息，需要发送到地图服务器处理
+
+ if not isinstance(msgData, dict):
+ return
+ tagPlayerID = msgData.get("PlayerID")
+ if not tagPlayerID:
+ return
+ tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagPlayerID)
+ if not tagPlayer:
+ return
+ msgInfo = str([msgType, msgData, serverGroupID])
+ tagPlayer.MapServer_QueryPlayerResult(0, 0, "CrossServerReceiveMsg", msgInfo, len(msgInfo))
+ return
+
+def MapServer_CrossSetPlayerAttrValue(msgData):
+ for playerID, setAttrInfoList in msgData.items():
+ player = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if not player:
+ return
+ msgInfo = str(setAttrInfoList)
+ player.MapServer_QueryPlayerResult(0, 0, "CrossSetPlayerAttrValue", msgInfo, len(msgInfo))
return
## ================================================================================================
@@ -96,15 +162,20 @@
return
if not dataMsg:
return
- sendMsg = str({"MsgType":msgType, "Data":dataMsg})
- GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, sendMsg=%s" % (serverGroupIDList, sendMsg))
+
+ srcMsg = {"MsgType":msgType, "Data":dataMsg}
+ sendMsg = cPickle.dumps(srcMsg, 2)
+ if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
+ GameWorld.ErrLog("跨服服务器未启动好,不允许向子服发送数据! serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
+ return
+ GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
if not serverGroupIDList:
GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg)
else:
serverGroupIDList = list(set(serverGroupIDList)) # 去重
#for serverGroupID in serverGroupIDList:
# GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg)
- jsonGroupIDInfo = json.dumps(serverGroupIDList, ensure_ascii=False)
+ jsonGroupIDInfo = cPickle.dumps(serverGroupIDList, 2)
GameWorld.GetGameWorld().SendMergeMsgToClientByGroupList(jsonGroupIDInfo, sendMsg)
return
@@ -112,18 +183,26 @@
## 子服收到跨服服务器信息
dataPack = IPY_GameServer.IPY_MGBroadcastMergeClient()
dataMsg = dataPack.GetData()
- GameWorld.Log("OnClientServerReceiveMsg: %s" % dataMsg)
try:
- msgDict = eval(dataMsg)
+ GameWorld.Log("收到OnClientServerReceiveMsg" )
+ if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
+ GameWorld.Log("服务器未启动好，不处理跨服信息!")
+ return
+
+ 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)
elif msgType == ShareDefine.CrossServerMsg_Notify:
PlayerControl.CrossServerMsg_Notify(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_ChatCrossWorld:
+ PlayerTalk.CrossServerMsg_ChatCrossWorld(msgData)
elif msgType == ShareDefine.CrossServerMsg_ViewPlayerCacheRet:
CrossRealmPlayer.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)
@@ -149,16 +228,55 @@
elif msgType == ShareDefine.CrossServerMsg_PKSyncBillboard:
CrossRealmPK.CrossServerMsg_PKSyncBillboard(msgData)
+ elif msgType == ShareDefine.CrossServerMsg_CrossBossInfo:
+ CrossBoss.CrossServerMsg_CrossBossInfo(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_CrossBossState:
+ CrossBoss.CrossServerMsg_CrossBossState(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_PutInItem:
+ CrossRealmPlayer.CrossServerMsg_PutInItem(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_GiveMoney:
+ CrossRealmPlayer.CrossServerMsg_GiveMoney(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_DropGoodItem:
+ GameWorldBoss.CrossServerMsg_DropGoodItem(msgData, tick)
+
+ elif msgType == ShareDefine.CrossServerMsg_NPCInfoRet:
+ PlayerQuery.CrossServerMsg_NPCInfoRet(msgData, tick)
+
+ # 需要发送到地图服务器处理的
+ elif msgType in [ShareDefine.CrossServerMsg_RebornRet, ShareDefine.CrossServerMsg_CollectNPCOK]:
+ MapServer_ClientServerReceiveMsg(msgType, msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_CrossServerState:
+ CrossRealmPlayer.CrossServerMsg_CrossServerState(msgData)
+
else:
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()))
return
+def MapServer_ClientServerReceiveMsg(msgType, msgData):
+ ## 收到跨服服务器信息，需要发送到地图服务器处理
+
+ if not isinstance(msgData, dict):
+ return
+ tagPlayerID = msgData.get("PlayerID")
+ if not tagPlayerID:
+ return
+ tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagPlayerID)
+ if not tagPlayer:
+ return
+ msgInfo = str([msgType, msgData])
+ tagPlayer.MapServer_QueryPlayerResult(0, 0, "ClientServerReceiveMsg", msgInfo, len(msgInfo))
+ return
# 连接跨服服务器状态
# 1 为连接成功; 其他为失败，失败会延迟通知
@@ -166,11 +284,19 @@
## 子服收到跨服服务器信息
dataPack = IPY_GameServer.IPY_LGCrossLoginResult()
result = dataPack.GetResult()
+ connState = 1 if result == 1 else 0
+ GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_CrossServerConnState, connState)
+
if result != 1:
- GameWorld.Log("--OnClientServerReceiveMsg disconn")
+ GameWorld.Log("===与跨服服务器断开连接!")
+ CrossRealmPlayer.CrossServerMsg_CrossServerState({"isOpen":0})
return
- GameWorld.Log("OnConnCorossServer conn success!!!")
+ GameWorld.Log("===与跨服服务器连接成功!")
+ if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
+ GameWorld.Log(" 服务器还未启动好，暂不处理! 等服务器启动好后再处理！")
+ return
+
serverGroupID = GameWorld.GetServerGroupID()
if GameWorld.IsCrossRealmOpen() and not GameWorld.IsCrossServer():
GameWorld.Log("通知跨服主服务器链接成功, 可接收最新跨服活动状态及数据...")
@@ -179,4 +305,21 @@
return
+def OnGameServerInitOK():
+ ## 服务器启动成功
+
+ tick = GameWorld.GetGameWorld().GetTick()
+
+ if GameWorld.IsCrossServer():
+ Sync_CrossServerInitDataToClientServer(tick, serverGroupID=0) # 这里设置为0，广播所有子服务器组
+ return
+
+ serverGroupID = GameWorld.GetServerGroupID()
+ if GameWorld.IsCrossRealmOpen() and not GameWorld.IsCrossServer():
+ GameWorld.Log("通知跨服主服务器启动成功, 可接收最新跨服活动状态及数据...")
+ dataMsg = {"ServerGroupID":serverGroupID}
+ SendMsgToCrossServer(ShareDefine.ClientServerMsg_ServerInitOK, dataMsg)
+ return
+
+
\ No newline at end of file
--
Gitblit v1.8.0