From b6ba2976a06e9d288c740e8ab83186b7feb5dcea Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 08:03:05 +0800
Subject: [PATCH] 860312 buff封包补齐
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index db3b4d1..101d467 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -24,6 +24,7 @@
import GMShell
import traceback
+import json
def SendMsgToCrossServer(msgType, dataMsg):
## 发送信息到跨服服务器上
@@ -54,6 +55,9 @@
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)
@@ -95,8 +99,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):
@@ -131,6 +137,12 @@
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)
+
else:
GameWorld.ErrLog("没有该信息类型逻辑处理！")
@@ -141,3 +153,24 @@
return
+
+# 连接跨服服务器状态
+# 1 为连接成功; 其他为失败，失败会延迟通知
+def OnConnCorossServer(index, tick):
+ ## 子服收到跨服服务器信息
+ dataPack = IPY_GameServer.IPY_LGCrossLoginResult()
+ result = dataPack.GetResult()
+ if result != 1:
+ GameWorld.Log("--OnClientServerReceiveMsg disconn")
+ return
+
+ GameWorld.Log("OnConnCorossServer conn success!!!")
+ 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