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 |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index 43bc593..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
@@ -78,10 +79,11 @@
     return
 
 def ClientServerMsg_ServerInitOK(serverGroupID, msgData, tick):
-    ''' 收到子服启动成功通知 
+    ''' 收到子服连接成功通知 
          当子服启动成功后,可同步一次跨服服务器活动状态及活动数据给子服
     '''
-    GameWorld.Log("收到跨服子服启动成功通知!")
+    GameWorld.Log("收到跨服子服连接成功通知!")
+    CrossRealmPlayer.ClientServerMsg_ServerInitOK(serverGroupID)
     CrossRealmPK.ClientServerMsg_ServerInitOK(serverGroupID, tick)
     return
 
@@ -149,6 +151,9 @@
         elif msgType == ShareDefine.CrossServerMsg_PKSyncBillboard:
             CrossRealmPK.CrossServerMsg_PKSyncBillboard(msgData)
             
+        elif msgType == ShareDefine.CrossServerMsg_CrossServerState:
+            CrossRealmPlayer.CrossServerMsg_CrossServerState(msgData)
+            
         else:
             GameWorld.ErrLog("没有该信息类型逻辑处理!")
             
@@ -166,11 +171,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")
+        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("通知跨服主服务器链接成功, 可接收最新跨服活动状态及数据...")
@@ -179,4 +192,17 @@
         
     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