From fd569f371890909dc35c09d1275d9204b39d77f9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 19 四月 2024 11:41:09 +0800
Subject: [PATCH] 10054 【后端】任务系统（支持功能开启任务条件；支持任务分组如主线、支线等；）

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

diff --git a/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.py b/ServerPython/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.py
index 1a10ab9..cc591f3 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)
 
 
 (
@@ -87,7 +89,8 @@
 (
 Def_PysForbidByPy,
 Def_PysForbidTalk,
-) = range(4, 4 + 2 )
+Def_PysForbidTalkDevice,
+) = range(4, 4 + 3)
 
 Def_GMKey_Type = 'pack_type'
 Def_GMKey_ResultType = 'ResultType'
@@ -95,6 +98,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