From fdda19a424007b36196501ae9f828b8978b3f5f0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 20 四月 2019 15:14:55 +0800
Subject: [PATCH] 6459 【后端】【2.0】缥缈仙域开发单(增加请求进入跨服CD,暂定5秒)

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 6aac95c..24d8716 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -615,7 +615,6 @@
 Def_PlayerDataCollect_Key = 0x86
 
 #---SetDict  玩家字典不存数据库---
-Def_Player_NoSave_Dict_RecallCountGift = 'RecallCountGift_0'    # 召回玩家个数奖励发包限制
 Def_Player_NoSave_Dict_PlayerExamRightCnt = 'PlayerExamRightCnt_1_%s'  # 玩家答题正确数量
 Def_Player_NoSave_Dict_PlayerExamCRightCnt = 'PlayerExamCRightCnt_1_%s'  # 玩家答题连续正确数量
 
@@ -632,8 +631,6 @@
 Def_PlayerKey_MergeRegisterRoomID = "MergeRegisterRoomID"  #当前上传数据的roomID
 Def_PlayerKey_IsLoginToMergeServer = "IsLoginToMergeServer"  #是否要登陆跨服服务器
 Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching"  #是否跨服匹配中
-
-Def_PlayerKey_FreshmanGuiderDay = "FreshmanGuiderDay"  #新手指导员天数
 
 Def_PlayerKey_PlayerFromPID = "PlayerFromPID"  #pid
 
@@ -680,16 +677,33 @@
 Def_FBMapID_CrossRealmPK = 32010
 #跨服蓬莱仙境
 Def_FBMapID_CrossPenglai = 32020
+#跨服妖王
+Def_FBMapID_CrossDemonKing = 32030
+#本服妖王
+Def_FBMapID_DemonKing = 22030
 #骑宠Boss
 Def_FBMapID_HorsePetBoss = 31200
+#跨服灵草园
+Def_FBMapID_CrossGrasslandLing = 32040
+#跨服仙草园
+Def_FBMapID_CrossGrasslandXian = 32050
 
 #需要刷世界BOSS的副本
-WorldBossFBMapIDList = [Def_FBMapID_SealDemon, Def_FBMapID_ZhuXianBoss]
+WorldBossFBMapIDList = [Def_FBMapID_SealDemon, Def_FBMapID_ZhuXianBoss, Def_FBMapID_DemonKing]
 #跨服地图
-Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
+Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
+#跨服分区类型配置, 没配置的默认 CrossZoneComm
+Def_CrossZoneTypeName = {0:"CrossZoneComm", # 特殊0,默认常规分区
+                         Def_FBMapID_CrossPenglai:"CrossZoneComm",
+                         Def_FBMapID_CrossDemonKing:"CrossZonePK",
+                         Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
+                         Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
+                         }
 #跨服分区对应地图配置表名
 Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
                              }
+#需要动态分配线路的跨服地图
+Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
 
 #同系职业枚举
 JOB_TYPY_COUNT = 5
@@ -810,7 +824,7 @@
 Def_GiveMoney_SellPackItem, # 出售背包物品
 Def_GiveMoney_CollectNPC, # 采集NPC
 Def_GiveMoney_20,
-Def_GiveMoney_StallItem, # 摆摊
+Def_GiveMoney_21,
 Def_GiveMoney_Trade, # 交易
 Def_GiveMoney_Truck, # 运镖
 Def_GiveMoney_FreeGoods, # 极品白拿 

--
Gitblit v1.8.0