From f12bbdcbaebff76914ae6dc735941d19f8f4e87f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 25 六月 2019 02:00:11 +0800
Subject: [PATCH] 860312 印记飘字的优先级高于压制

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.py
index 282698d..90c1c76 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.py
@@ -56,10 +56,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)
 
 #BUFF对应中文名
 BuffNameList = ["无类型", "增益技能:", "减益技能:", "光环技能:", "增值技能:", "被动技能",

--
Gitblit v1.8.0