From 9aca3cae32d7bbe5f8c2f1b77a6faaafa7ed2c4a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 03 一月 2019 19:26:49 +0800
Subject: [PATCH] 5665 【开发】【1.4.100】老服点数重置
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 5 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index b5b217c..2acf04c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -21,6 +21,7 @@
import IPY_GameServer
import CrossRealmPlayer
import CrossRealmPK
+import ChConfig
import GMShell
import traceback
@@ -55,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("没有该信息类型逻辑处理！")
@@ -72,10 +79,11 @@
return
def ClientServerMsg_ServerInitOK(serverGroupID, msgData, tick):
- ''' 收到子服启动成功通知
+ ''' 收到子服连接成功通知
当子服启动成功后，可同步一次跨服服务器活动状态及活动数据给子服
'''
- GameWorld.Log("收到跨服子服启动成功通知!")
+ GameWorld.Log("收到跨服子服连接成功通知!")
+ CrossRealmPlayer.ClientServerMsg_ServerInitOK(serverGroupID)
CrossRealmPK.ClientServerMsg_ServerInitOK(serverGroupID, tick)
return
@@ -119,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)
@@ -133,6 +144,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("没有该信息类型逻辑处理！")
@@ -151,8 +171,38 @@
## 子服收到跨服服务器信息
dataPack = IPY_GameServer.IPY_LGCrossLoginResult()
result = dataPack.GetResult()
- if result == 1:
- GameWorld.Log("OnConnCorossServer conn success!!!")
- else:
+ 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