From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 76a086e..aca4e02 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -675,6 +675,8 @@
 Def_FBMapID_XMZZ = 31010
 #仙盟boss副本
 Def_FBMapID_FamilyBossMap = 31210
+#多仙盟Boss
+Def_FBMapID_AllFamilyBoss = 31260
 #宗门试炼
 Def_FBMapID_MunekadoTrial = 60010
 #混乱妖域
@@ -718,12 +720,6 @@
 
 # 邮件（补偿）默认发件人, 具体做活动再定
 Def_Mail_SenderSys = "SenderSys"    # 默认邮件发送人
-
-# 邮件类型划分，用于每种类型的保存上限
-(
-Mail_Type_Default,
-Mail_Type_Market,
-) = range(2)
 
 # 竖杠
 Def_Str_Montant = "|"
@@ -795,8 +791,6 @@
 VIPPrivilege_XianyuanCoinUpperAdd,    #33 仙缘币上限加成
 VIPPrivilege_XianyuanCoinAddPer,    #34 仙缘币获得倍率加成（万分比）
 ) = range(1, 35)
-
-Def_MailMoneySource = "MoneySource" # 邮件货币来源key
 
 #游戏货币来源类型定义
 (

--
Gitblit v1.8.0