From 2d1e1831dc6a29031bf85010e2f0d804d3e342bc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 二月 2020 18:44:08 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.173on.com:10010/r/SnxxServerCode

---
 ServerPython/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.py b/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.py
index 1a10ab9..d37589e 100644
--- a/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.py
+++ b/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.py
@@ -68,10 +68,12 @@
 Def_CurTimeGreaterEndTime, # 28当前时间大于结束时间
 Def_ActionAllreadyOpen, #29 活动已经设置过了
 Def_GMForbidMergeWar, #30 gm设置这个服不参加跨服塞
-Def_IsNotMergeServer, #31 该服不是跨服服务器
+Def_IsNotCrossServer, #31 该服不是跨服服务器
 Def_ServerAlreadyOpen, #32 已经正式开服过
+Def_ServerClose, #33 服务器维护中
+Def_ServerOpen, #34 服务器正常
 Def_ResultTypeMax, 
-) = range(34)
+) = range(36)
 
 
 (
@@ -95,6 +97,7 @@
 Def_GMKey_PlayerName = 'playerName'
 Def_GMKey_PlayerAccID = 'accID'
 Def_GMKey_FamilyName = 'familyName'
+Def_GMKey_FamilyID = 'familyID'
 Def_GMKey_PackIndex = 'packIndex'
 Def_GMKey_IP = 'IP'
 Def_GMKey_QueryType = 'queryType'

--
Gitblit v1.8.0