From 1ea73e1885835466265ce788d93556b7030ee0e8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 30 十二月 2018 18:42:00 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(GM工具增加子服服务器维护,文字翻译版)

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.py
index c76cf70..3ae54e7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.py
@@ -18,6 +18,7 @@
 import ShareDefine
 import DataRecordPack
 import CrossRealmMsg
+import ReadChConfig
 import GameWorld
 import GMCommon
 
@@ -33,15 +34,16 @@
     GameWorld.Log("GMT_CrossClientServerMaintain gmCmdDict=%s" % str(gmCmdDict))
     operate = gmCmdDict.get('operate', '')
     
-    strMsg = ""
+    strMsg = {"operate":operate}
     if GameWorld.IsCrossServer():
-        strMsg = "this server is cross server. can not do!"
+        strMsg.update({"error":1})
         
     # 查询跨服状态
     elif operate == "cross_server_state":
+        crossServerIP = ReadChConfig.GetPyMongoConfig("Merge", "MergeServerIP")
         isOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
         isConn = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerConnState)
-        strMsg = {"OpenState":isOpen, "ConnState":isConn}
+        strMsg.update({"OpenState":isOpen, "ConnState":isConn, "CrossServerIP":crossServerIP})
         
     # 查询跨服PK状态        
     elif operate == "cross_pk_state":
@@ -51,11 +53,12 @@
         seasonState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState)
         matchState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK)
         
-        strMsg = {"GroupID":GameWorld.GetServerGroupID(), "ZoneID":zoneID, "SeasonID":seasonID, "SeasonState":seasonState, "MatchState":matchState}
+        strMsg.update({"GroupID":GameWorld.GetServerGroupID(), "ZoneID":zoneID, "SeasonID":seasonID, "SeasonState":seasonState, "MatchState":matchState})
         
     # 重新同步跨服状态
     elif operate == "reconn_cross_Server":
         CrossRealmMsg.OnGameServerInitOK()
+        strMsg.update({"OK":1})
         
     else:
         GMCommon.GMCommandResult(orderId, gmCmdDict, GMCommon.Def_ParamErr)

--
Gitblit v1.8.0