From ea35a6c42253a7b8fce96f998db74de0920d74ee Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 04 一月 2019 17:58:15 +0800
Subject: [PATCH] 860312 任务增加输出
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index db3b4d1..2acf04c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -21,9 +21,11 @@
import IPY_GameServer
import CrossRealmPlayer
import CrossRealmPK
+import ChConfig
import GMShell
import traceback
+import json
def SendMsgToCrossServer(msgType, dataMsg):
## 发送信息到跨服服务器上
@@ -54,12 +56,18 @@
elif msgType == ShareDefine.ClientServerMsg_PKPrepareOK:
CrossRealmPK.ClientServerMsg_PKPrepareOK(msgData, tick)
+
+ elif msgType == ShareDefine.ClientServerMsg_PKBillboard:
+ CrossRealmPK.ClientServerMsg_PKBillboard(serverGroupID, msgData)
elif msgType == ShareDefine.ClientServerMsg_GMCMD:
GMShell.ClientServerMsg_GMCMD(msgData, tick)
elif msgType == ShareDefine.ClientServerMsg_ServerInitOK:
ClientServerMsg_ServerInitOK(serverGroupID, msgData, tick)
+
+ elif msgType == ShareDefine.ClientServerMsg_ViewPlayerCache:
+ CrossRealmPlayer.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
else:
GameWorld.ErrLog("没有该信息类型逻辑处理！")
@@ -71,10 +79,11 @@
return
def ClientServerMsg_ServerInitOK(serverGroupID, msgData, tick):
- ''' 收到子服启动成功通知
+ ''' 收到子服连接成功通知
当子服启动成功后，可同步一次跨服服务器活动状态及活动数据给子服
'''
- GameWorld.Log("收到跨服子服启动成功通知!")
+ GameWorld.Log("收到跨服子服连接成功通知!")
+ CrossRealmPlayer.ClientServerMsg_ServerInitOK(serverGroupID)
CrossRealmPK.ClientServerMsg_ServerInitOK(serverGroupID, tick)
return
@@ -95,8 +104,10 @@
GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg)
else:
serverGroupIDList = list(set(serverGroupIDList)) # 去重
- for serverGroupID in serverGroupIDList:
- GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg)
+ #for serverGroupID in serverGroupIDList:
+ # GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg)
+ jsonGroupIDInfo = json.dumps(serverGroupIDList, ensure_ascii=False)
+ GameWorld.GetGameWorld().SendMergeMsgToClientByGroupList(jsonGroupIDInfo, sendMsg)
return
def OnClientServerReceiveMsg(index, tick):
@@ -116,6 +127,9 @@
elif msgType == ShareDefine.CrossServerMsg_Notify:
PlayerControl.CrossServerMsg_Notify(msgData)
+ elif msgType == ShareDefine.CrossServerMsg_ViewPlayerCacheRet:
+ CrossRealmPlayer.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)
+
elif msgType == ShareDefine.CrossServerMsg_PKMatchReqRet:
CrossRealmPK.CrossServerMsg_PKMatchReqRet(msgData)
@@ -131,6 +145,15 @@
elif msgType == ShareDefine.CrossServerMsg_PKOverInfo:
CrossRealmPK.CrossServerMsg_PKOverInfo(msgData)
+ elif msgType == ShareDefine.CrossServerMsg_PKSeasonInfo:
+ CrossRealmPK.CrossServerMsg_PKSeasonInfo(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_PKSyncBillboard:
+ CrossRealmPK.CrossServerMsg_PKSyncBillboard(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_CrossServerState:
+ CrossRealmPlayer.CrossServerMsg_CrossServerState(msgData)
+
else:
GameWorld.ErrLog("没有该信息类型逻辑处理！")
@@ -141,3 +164,45 @@
return
+
+# 连接跨服服务器状态
+# 1 为连接成功; 其他为失败，失败会延迟通知
+def OnConnCorossServer(index, tick):
+ ## 子服收到跨服服务器信息
+ 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")
+ CrossRealmPlayer.CrossServerMsg_CrossServerState({"isOpen":0})
+ return
+
+ GameWorld.Log("OnConnCorossServer conn success!!!")
+ if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_IsGameWorldInit):
+ GameWorld.Log(" 服务器还未启动好，暂不处理! 等服务器启动好后再处理！")
+ return
+
+ serverGroupID = GameWorld.GetServerGroupID()
+ if GameWorld.IsCrossRealmOpen() and not GameWorld.IsCrossServer():
+ GameWorld.Log("通知跨服主服务器链接成功, 可接收最新跨服活动状态及数据...")
+ dataMsg = {"ServerGroupID":serverGroupID}
+ SendMsgToCrossServer(ShareDefine.ClientServerMsg_ServerInitOK, dataMsg)
+
+ return
+
+def OnGameServerInitOK():
+ ## 子服启动成功
+ if GameWorld.IsCrossServer():
+ 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