From 6b458bedb17a2b272e19bbd1ffab00ead6c6089d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 13 四月 2019 14:35:52 +0800
Subject: [PATCH] 6459 【后端】【2.0】缥缈仙域开发单（设置充值成功SendDBFinishRecharge时机提前，在收到通知即设置，异常信息通过CTGError记录）
---
ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 76a086e..b65808d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -586,13 +586,6 @@
ShareDefine.Def_BT_NewFCCostGold : 5, #消费排行榜(仙界盛典)
ShareDefine.Def_BT_FBHelpBattle : 100, #助战次数榜
ShareDefine.Def_BT_ZhuXianTower : 100, #诛仙塔榜
- ShareDefine.Def_BT_HighLadder : 1000, #玩家天梯竞技场排行
- ShareDefine.Def_BT_HighLadder_Yester : 1000, #玩家天梯竞技场昨日排行
- ShareDefine.Def_BT_RechargeTeHuiLast : 20, #充值特惠活动排行榜-上一期记录
- ShareDefine.Def_BT_RechargeTeHui : 20, #充值特惠活动排行榜-当前期记录
-
- ShareDefine.Def_BT_CostTeHui : 10, #消费特惠排行榜
- ShareDefine.Def_BT_CostTeHuiLast : 10, #消费特惠排行榜上一期
}
#排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存，可配置进去
@@ -622,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' # 玩家答题连续正确数量
@@ -639,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
@@ -675,6 +665,8 @@
Def_FBMapID_XMZZ = 31010
#仙盟boss副本
Def_FBMapID_FamilyBossMap = 31210
+#多仙盟Boss
+Def_FBMapID_AllFamilyBoss = 31260
#宗门试炼
Def_FBMapID_MunekadoTrial = 60010
#混乱妖域
@@ -685,14 +677,26 @@
Def_FBMapID_CrossRealmPK = 32010
#跨服蓬莱仙境
Def_FBMapID_CrossPenglai = 32020
+#跨服妖王
+Def_FBMapID_CrossDemonKing = 32030
+#本服妖王
+Def_FBMapID_DemonKing = 22030
+#骑宠Boss
+Def_FBMapID_HorsePetBoss = 31200
#需要刷世界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]
+#跨服分区类型配置, 没配置的默认 CrossZoneComm
+Def_CrossZoneTypeName = {Def_FBMapID_CrossPenglai:"CrossZoneComm",
+ Def_FBMapID_CrossDemonKing:"CrossZonePK",
+ }
#跨服分区对应地图配置表名
Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
}
+#需要动态分配线路的跨服地图
+Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing]
#同系职业枚举
JOB_TYPY_COUNT = 5
@@ -718,12 +722,6 @@
# 邮件（补偿）默认发件人, 具体做活动再定
Def_Mail_SenderSys = "SenderSys" # 默认邮件发送人
-
-# 邮件类型划分，用于每种类型的保存上限
-(
-Mail_Type_Default,
-Mail_Type_Market,
-) = range(2)
# 竖杠
Def_Str_Montant = "|"
@@ -796,8 +794,6 @@
VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
) = range(1, 35)
-Def_MailMoneySource = "MoneySource" # 邮件货币来源key
-
#游戏货币来源类型定义
(
Def_GiveMoney_Unknown, # 未知 0
@@ -820,8 +816,8 @@
Def_GiveMoney_Warehouse, # 仓库
Def_GiveMoney_SellPackItem, # 出售背包物品
Def_GiveMoney_CollectNPC, # 采集NPC
-Def_GiveMoney_HighLadder, # 天梯竞技场 20
-Def_GiveMoney_StallItem, # 摆摊
+Def_GiveMoney_20,
+Def_GiveMoney_21,
Def_GiveMoney_Trade, # 交易
Def_GiveMoney_Truck, # 运镖
Def_GiveMoney_FreeGoods, # 极品白拿
--
Gitblit v1.8.0