From 7e7b08bed3a685f5e8a2e32a475be60c8fe6449d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 18 九月 2018 20:05:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 7d9406f..5f1322b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -205,7 +205,7 @@
Def_FamilySetting_MaxZhangLaoCnt, #最大长老数
Def_FamilySetting_LvUpCost, #家族升级需要消耗升级所需资金
Def_FamilySetting_WeekMissionMoneyMax,#每周任务最大可获得仙盟资金
-Def_FamilySetting_SystemLostMoney, #系统每日维护费
+Def_FamilySetting_BossFBCnt, #BOSS副本次数
Def_FamilySetting_Max, #表长度异常(必须放最后)
) = range(0, 6 + 1)
FamilySettingDict = {
@@ -214,6 +214,7 @@
Def_FamilySetting_MaxZhangLaoCnt:'EliteCnt',
Def_FamilySetting_LvUpCost:'NeedMoney',
Def_FamilySetting_WeekMissionMoneyMax:'WeekMissionMoneyMax',
+ Def_FamilySetting_BossFBCnt:'BossFBCnt',
}
#家族成员接口对应家族配置表索引
@@ -437,7 +438,7 @@
Def_Billboard_MaxCnt = 100
#---------------------------------------------------------------------
#请求类型(需要和MapServer中的一致)
-Def_QueryType_Count = 54
+Def_QueryType_Count = 55
(
queryType_sqtPlayer, #查询玩家
queryType_sqtFamilyWar, #家族战
@@ -493,6 +494,7 @@
queryType_ServerRewardNotify, #全服奖励提示
queryType_EnterFB, #进入副本
queryType_NPCInfo, #查询NPCInfo
+queryType_NPCCnt, #查询NPC数量
) = range(0, Def_QueryType_Count)
#------------------------------------------------------------------------------
#家族某行为类型保存的条数
@@ -707,6 +709,12 @@
Def_FBMapID_XMZZ = 31010
#仙盟boss副本
Def_FBMapID_FamilyBossMap = 31210
+#宗门试炼
+Def_FBMapID_MunekadoTrial = 60010
+#混乱妖域
+Def_FBMapID_ChaosDemon = 31180
+#娲皇遗迹
+Def_FBMapID_QueenRelics = 51010
#同系职业枚举
JOB_TYPY_COUNT = 5
--
Gitblit v1.8.0