From 68dd06e06c1a4a155884c31403da1155be6f10e8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 18 四月 2019 17:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.py
index 03ea28d..e4427d0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/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)
Def_GMKey_Type = 'pack_type'
Def_GMKey_ResultType = 'ResultType'
@@ -459,7 +461,8 @@
ChConfig.TYPE_ActionOpenAndCloseByDayCountGoOn]
for acKey in actionControlTickList:
worldMgr.SetTickByType(acKey, 0)
-
+
+ GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_ProcessMinute, 0)
#处理重开服务器后, 活动继续开启逻辑根据天数
#GameWorldActionControl.Dispose_Action_GoOn_ByDay(tick)
return
--
Gitblit v1.8.0