From c0146533c921960d5ce6640446b42c1e38df3629 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:22 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（掉落的暂时默认拍品）
---
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