From d5e9bbcf96cf98d767ba073774b1ee287569659d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 18:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 49d2bb0..bcff5b0 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -262,9 +262,9 @@
 
 #创建家族,最大字符数
 Def_CreatFamily_MaxStr = 33
-#创建角色,最大字符数, UTF8是3个字节 客户端取名在2-6个汉字
-Def_CreatRole_MaxStr = 18
-Def_CreatRole_MinStr = 6
+#创建角色,最大字符数, UTF8是3个字节 最少3个字母  最大5中文加1个字母
+Def_CreatRole_MaxStr = 16
+Def_CreatRole_MinStr = 3
 
 
 #---------------------------------------------------------------------
@@ -371,6 +371,8 @@
 Def_WorldKey_BossIsGeTui = "BossGeTui%s"                     #当前复活通知
 Def_WorldKey_OperationActionState = "OperationActState_%s"   #运营活动状态,参数为运营活动名
 Def_WorldKey_BossRebornNeedPoint = "BossRebornNeedPoint"     #boss复活需要总点数
+Def_WorldKey_BossIsAlive = 'BossIsAlive_%s'                  #boss是否活着
+Def_WorldKey_IsGameWorldInit = 'IsGameWorldInit'             #GameWold是否初始化完成
 #---------------------------------------------------------------------
 #个人时间间隔
 TYPE_Player_Tick_Requestkey = 0                       # 玩家请求处理间隔
@@ -570,7 +572,7 @@
             ShareDefine.Def_BT_Campaign_LV              : 100,           #冲级排行(开服活动榜)
             ShareDefine.Def_BT_Campaign_RealmLV         : 100,           #境界等级(开服活动榜)
             ShareDefine.Def_BT_Campaign_FightPower      : 100,           #战力排行(开服活动榜)
-            
+            ShareDefine.Def_BT_Campaign_RuneLV          : 100,           #符印等级(开服活动榜)
             ShareDefine.Def_BT_FCCostGold               : 5,             #消费排行榜(仙界盛典)
             
             ShareDefine.Def_BT_HighLadder               : 1000,          #玩家天梯竞技场排行
@@ -636,6 +638,8 @@
 Def_PlayerKey_FreshmanGuiderDay = "FreshmanGuiderDay"  #新手指导员天数
 
 Def_PlayerKey_PlayerFromPID = "PlayerFromPID"  #pid
+
+Def_PDict_LoginMapID = "LoginMapID"  #登录处理时的地图ID
 
 Def_PlayerKey_OnGotoMergeServerTick = "OnGotoMergeServerTick"  #即将跳转到跨服服务器的时间
 
@@ -709,6 +713,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