From bb652eeae4e39ee66f342975a2804ae305f0f969 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 11 十二月 2020 10:26:41 +0800
Subject: [PATCH] 4869 【主干】【长尾】【BT】七日巡礼重置逻辑优化;运营活动所处天索引逻辑优化;

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index c83e7ad..fe630dd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -568,12 +568,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 +583,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匹配), 默认保存, 如果不保存,可配置进去
@@ -649,6 +653,8 @@
 
 Def_PlayerKey_ViewCrossPKBillboardTick = "ViewCrossPKBillboardTick_%s_%s"  #查询PK排行榜tick,参数(zoneID, seasonID)
 
+#主城地图、缥缈宗
+Def_FBMapID_MainCity = 10010
 #渡劫副本
 Def_FBMapID_DuJie = 31110
 #仙盟联赛
@@ -671,22 +677,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
@@ -780,8 +809,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)
 
 #游戏货币来源类型定义
@@ -806,8 +835,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