From 09b880f5f1728c443b77a1fe83a6b9c34b8e7ede Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 02 二月 2021 16:51:13 +0800
Subject: [PATCH] 4925 【主干】【BT】【BT2】【BTZF】红包雨65535报错
---
ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 6aac95c..ef72280 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -534,6 +534,7 @@
ShareDefine.Def_UniversalGameRecType_DujieHelpRecord:10000, #渡劫副本护法详细记录
ShareDefine.Def_UniversalGameRecType_ZhuXianBossRecord:100, #诛仙BOSS结算记录
ShareDefine.Def_UniversalGameRecType_LuckyTreasure:5, #幸运鉴宝记录
+ ShareDefine.Def_UniversalGameRecType_FeastWish:30, #节日祝福大奖记录
}
#---------------------------------------------------------------------
#比较标识
@@ -568,12 +569,13 @@
ShareDefine.Def_BT_FightPower_Horse : 100, #坐骑战斗力总榜
ShareDefine.Def_BT_FightPower_Pet : 100, #宠物总战力榜
ShareDefine.Def_BT_TrialTower : 100, #天神之塔榜
+ ShareDefine.Def_BT_SkyTower : 100, #天星塔榜
ShareDefine.Def_BT_OffLineEfficient : 100, #脱机效率榜
ShareDefine.Def_BT_Realm : 100, #境界榜
ShareDefine.Def_BT_TotalRecharge : 100, #充值榜
- ShareDefine.Def_BT_Campaign_PlusLV : 100, #强化等级(开服活动榜)
- ShareDefine.Def_BT_Campaign_HorseLV : 100, #坐骑等级(开服活动榜)
+ ShareDefine.Def_BT_Campaign_Plus : 100, #强化战力(开服活动榜)
+ ShareDefine.Def_BT_Campaign_Horse : 100, #坐骑战力(开服活动榜)
ShareDefine.Def_BT_Campaign_StoneLV : 100, #宝石等级(开服活动榜)
ShareDefine.Def_BT_Campaign_LV : 100, #冲级排行(开服活动榜)
ShareDefine.Def_BT_Campaign_RealmLV : 100, #境界等级(开服活动榜)
@@ -582,10 +584,13 @@
ShareDefine.Def_BT_Campaign_GodWeaponLV : 100, #神兵等级(开服活动榜)
ShareDefine.Def_BT_Campaign_Recharge : 100, #累计充值(开服活动榜)
ShareDefine.Def_BT_Campaign_PetLV : 100, #灵宠等级(开服活动榜)
+ ShareDefine.Def_BT_Campaign_LingGen : 100, #灵根总点(开服活动榜)
+ ShareDefine.Def_BT_Campaign_StarLV : 100, #升星等级(开服活动榜)
+ ShareDefine.Def_BT_Campaign_Wash : 100, #洗练战力(开服活动榜)
ShareDefine.Def_BT_FCCostGold : 5, #消费排行榜(仙界盛典)
ShareDefine.Def_BT_NewFCCostGold : 5, #消费排行榜(仙界盛典)
- ShareDefine.Def_BT_FBHelpBattle : 100, #助战次数榜
- ShareDefine.Def_BT_ZhuXianTower : 100, #诛仙塔榜
+
+ ShareDefine.Def_BT_Arena : 1000, #竞技场榜
}
#排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存，可配置进去
@@ -615,7 +620,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 +636,6 @@
Def_PlayerKey_MergeRegisterRoomID = "MergeRegisterRoomID" #当前上传数据的roomID
Def_PlayerKey_IsLoginToMergeServer = "IsLoginToMergeServer" #是否要登陆跨服服务器
Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching" #是否跨服匹配中
-
-Def_PlayerKey_FreshmanGuiderDay = "FreshmanGuiderDay" #新手指导员天数
Def_PlayerKey_PlayerFromPID = "PlayerFromPID" #pid
@@ -652,6 +654,8 @@
Def_PlayerKey_ViewCrossPKBillboardTick = "ViewCrossPKBillboardTick_%s_%s" #查询PK排行榜tick，参数（zoneID, seasonID）
+#主城地图、缥缈宗
+Def_FBMapID_MainCity = 10010
#渡劫副本
Def_FBMapID_DuJie = 31110
#仙盟联赛
@@ -674,22 +678,45 @@
Def_FBMapID_MunekadoTrial = 60010
#混乱妖域
Def_FBMapID_ChaosDemon = 31180
+#讨伐妖魔
+Def_FBMapID_KillDevil = 31280
#娲皇遗迹
Def_FBMapID_QueenRelics = 51010
#跨服竞技场
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_CrossRealmPK:"CrossZonePK",
+ 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]
+
+#需要统计副本功能线路ID人数的跨服地图
+Def_NeedCountFBFuncLinePlayerCrossMap = [Def_FBMapID_CrossDemonKing]
#同系职业枚举
JOB_TYPY_COUNT = 5
@@ -783,8 +810,8 @@
VIPPrivilege_BindJadeWheel, #30 绑玉转盘次数
VIPPrivilege_PrayElixir, #31 丹药祈福次数
VIPPrivilege_32, #32 封魔坛自动挑战
-VIPPrivilege_XianyuanCoinUpperAdd, #33 仙缘币上限加成
-VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
+VIPPrivilege_33, #33
+VIPPrivilege_34, #34
) = range(1, 35)
#游戏货币来源类型定义
@@ -809,8 +836,8 @@
Def_GiveMoney_Warehouse, # 仓库
Def_GiveMoney_SellPackItem, # 出售背包物品
Def_GiveMoney_CollectNPC, # 采集NPC
-Def_GiveMoney_20,
-Def_GiveMoney_StallItem, # 摆摊
+Def_GiveMoney_BossFirstKill, # Boss首杀
+Def_GiveMoney_21,
Def_GiveMoney_Trade, # 交易
Def_GiveMoney_Truck, # 运镖
Def_GiveMoney_FreeGoods, # 极品白拿
--
Gitblit v1.8.0