From 304b381ffa86f534e5335b48a156176a06e2f20e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 27 十二月 2018 15:59:44 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 5d76327..c5d9066 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3283,7 +3283,6 @@
 Def_PDict_OnDayEx = "OnDayEx" # 特殊时间点凌晨X点过天
 Def_PDict_OnWeekEx = "OnWeekEx" # 特殊时间点凌晨X点过周
 Def_PDict_OnMonthEx = "OnMonthEx" # 特殊时间点凌晨X点过月
-Def_Player_Dict_ServerGroupID = "ServerGroupID"    # 合服/混服时所属游戏服务器组ID
 Def_Player_Dict_PlayerFromPID = "PlayerFromPID"    # pid
 Def_Player_Dict_Account_Type = "account_type"    # account_type
 Def_Player_Dict_TencentPF = "tencentPF"    # 腾讯平台来源pf

--
Gitblit v1.8.0