From 2a54477d35896bd3f1bd6f48e222a438034a11b9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 27 十二月 2021 12:28:44 +0800
Subject: [PATCH] 5323 【主干】【后端】法器自动培养问题(自动购买支持按指定的商城表商品标识ID购买)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 90b5dac..7a8650d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -369,7 +369,7 @@
 Def_WorldKey_BossIsAlive = 'BossIsAlive_%s'                  #boss是否活着
 Def_WorldKey_IsGameWorldInit = 'IsGameWorldInit'             #GameWold是否初始化完成
 Def_WorldKey_BossIsGeTui = "BossGeTui%s"                     #当前复活通知
-Def_WorldKey_OperationActionState = "OperationActState_%s"   #运营活动状态,参数为运营活动名
+Def_WorldKey_OperationActionState = "State_%s"               #运营活动状态,参数为(运营活动名)
 Def_WorldKey_BossRebornNeedPoint = "BossRebornNeedPoint"     #boss复活需要总点数
 Def_WorldKey_CrossBossIsAlive = 'CrossBossIsAlive_%s_%s'     #跨服boss是否活着,参数(zoneID, bossID)
 Def_WorldKey_GameWorldInitOK = 'GameWorldInitOK'             #GameWold是否初始化完成OK
@@ -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,17 @@
             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,          #竞技场榜
+            ShareDefine.Def_BT_Environment              : 20,            #环保榜 (垃圾分类活动)
+            ShareDefine.Def_BT_CharmTotal               : 100,           #魅力总榜
+            ShareDefine.Def_BT_CharmWeek                : 100,           #魅力周榜
+            ShareDefine.Def_BT_CharmDay                 : 100,           #魅力日榜
             }
 
 #排行榜保存类型(和BillboardType匹配), 默认保存, 如果不保存,可配置进去
@@ -649,6 +658,8 @@
 
 Def_PlayerKey_ViewCrossPKBillboardTick = "ViewCrossPKBillboardTick_%s_%s"  #查询PK排行榜tick,参数(zoneID, seasonID)
 
+#主城地图、缥缈宗
+Def_FBMapID_MainCity = 10010
 #渡劫副本
 Def_FBMapID_DuJie = 31110
 #仙盟联赛
@@ -671,12 +682,16 @@
 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_CrossDemonLand = 32080
 #跨服妖王
 Def_FBMapID_CrossDemonKing = 32030
 #本服妖王
@@ -687,14 +702,17 @@
 Def_FBMapID_CrossGrasslandLing = 32040
 #跨服仙草园
 Def_FBMapID_CrossGrasslandXian = 32050
+#情缘副本
+Def_FBMapID_Love = 31300
 
 #需要刷世界BOSS的副本
 WorldBossFBMapIDList = [Def_FBMapID_SealDemon, Def_FBMapID_ZhuXianBoss, Def_FBMapID_DemonKing]
 #跨服地图
-Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
+Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonLand, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
 #跨服分区类型配置, 没配置的默认 CrossZoneComm
 Def_CrossZoneTypeName = {0:"CrossZoneComm", # 特殊0,默认常规分区
                          Def_FBMapID_CrossPenglai:"CrossZoneComm",
+                         Def_FBMapID_CrossDemonLand:"CrossZoneComm",
                          Def_FBMapID_CrossRealmPK:"CrossZonePK",
                          Def_FBMapID_CrossDemonKing:"CrossZonePK",
                          Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
@@ -702,9 +720,13 @@
                          }
 #跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法
 Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
+                             Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
                              }
 #需要动态分配线路的跨服地图
 Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
+
+#需要统计副本功能线路ID人数的跨服地图
+Def_NeedCountFBFuncLinePlayerCrossMap = [Def_FBMapID_CrossDemonKing]
 
 #同系职业枚举
 JOB_TYPY_COUNT = 5
@@ -739,13 +761,14 @@
 Def_Online = 1
 Def_OnlineNoClient = 2
 
-# 分组 1 最近联系人 2 好友 3 仇人 4 黑名单
+# 分组 1 最近联系人 2 好友 3 仇人 4 黑名单 5 亲密
 (
 Def_SocialGroup_Contacts,
 Def_SocialGroup_Friend,
 Def_SocialGroup_Enemy,
 Def_SocialGroup_Black,
-) = range(1, 5)
+Def_SocialGroup_Intimacy,
+) = range(1, 6)
 
 Def_CDBPlayerRefresh_Online = "OnlineType"
 
@@ -798,8 +821,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)
 
 #游戏货币来源类型定义
@@ -824,7 +847,7 @@
 Def_GiveMoney_Warehouse, # 仓库
 Def_GiveMoney_SellPackItem, # 出售背包物品
 Def_GiveMoney_CollectNPC, # 采集NPC
-Def_GiveMoney_20,
+Def_GiveMoney_BossFirstKill, # Boss首杀
 Def_GiveMoney_21,
 Def_GiveMoney_Trade, # 交易
 Def_GiveMoney_Truck, # 运镖

--
Gitblit v1.8.0