From 75271d59ec27b370b0b0d76e8d7f03c436c96dbe Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 12 七月 2024 18:53:24 +0800
Subject: [PATCH] 10202 【越南】【香港】【主干】【砍树】聚魂(增加聚魂战令6; 增加战令GM命令: Zhanling)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 7c7fc54..e3fa8c6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -368,6 +368,13 @@
 ActKey_IpyDataInfo = "IpyDataInfo" # 活动对应 IpyData 信息
 ActKey_DBInfo = "DBInfo" # 保存db的历史活动信息
 
+#活动参与状态
+(
+ActStateJoin_None, # 参与前或未开启 0
+ActStateJoin_Start, # 开启参与中 1
+ActStateJoin_End, # 参与结束,仅有配置参与时间段的活动有该状态 2
+) = range(3)
+
 #答题类型枚举
 Def_Game_ExamTypeList = range(1, 4 + 1)
 (
@@ -835,6 +842,12 @@
 Def_CBT_BossTrialSubmitFamilyBak, # boss凭证 - 仙盟榜 上一期  161
 ) = range(150, 161 + 1)
 
+# 跨服榜单最大数据名次,没有设置的默认100
+CrossBillboard_MaxDataCount = {
+                               Def_CBT_BossTrialSubmit:1000,
+                               Def_CBT_BossTrialSubmitBak:1000,
+                               }
+
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
                               PlayerJob_Warrior:Def_BT_FightPower_Warrior,
@@ -1096,7 +1109,8 @@
 CDBPlayerRefresh_SuperHitHurtDefPer, # 弱化暴伤 260
 CDBPlayerRefresh_Lingyu, # 灵玉 261
 CDBPlayerRefresh_BossTrial, # 凭证积分 262
-) = range(146, 263)
+CDBPlayerRefresh_GatherSoul, # 聚魂精华 263
+) = range(146, 264)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来)
@@ -1128,6 +1142,7 @@
 TYPE_Price_Xiantao = 41    # 仙桃
 TYPE_Price_Lingyu = 42    # 灵玉
 TYPE_Price_BossTrial = 43    # boss历练凭证积分
+TYPE_Price_GatherSoul = 44    # 聚魂精华
 TYPE_Price_PayCoin = 99    # 代币
 
 #key可用于遍历所有货币,value仅GM相关会用到
@@ -1135,7 +1150,7 @@
                  1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令", 
                  16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘", 
                  29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点", 
-                 39:"成就积分", 40:"万界积分", 43:"凭证积分", 99:"代币"
+                 39:"成就积分", 40:"万界积分", 43:"凭证积分", 44:"聚魂精华", 99:"代币"
                  }
 
 #以下是旧的金钱类型
@@ -1168,6 +1183,7 @@
                            TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
                            TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
                            TYPE_Price_BossTrial:CDBPlayerRefresh_BossTrial,
+                           TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
                            }
 
 # 支持负值的货币及对应0418刷新类型
@@ -1291,7 +1307,23 @@
 Def_Weapon_Dual_Hands,  # 双持(左右手可互换)
 ) = range(3)
 
-#玩家通用信息记录类型
+#膜拜类型
+Def_WorshipTypeList = (
+                       Def_WorshipType_ServerNaming, # 服务器冠名 1
+                       Def_WorshipType_CrossChampionship, # 跨服排位冠军 2
+                       ) = range(1, 1 + 2)
+
+#跨服膜拜类型
+Def_WorshipTypeCross = [Def_WorshipType_CrossChampionship]
+
+#玩家记录类型
+Def_PlayerRecTypeList = (
+                         Def_PlayerRecType_WorshipPlayer, # 被膜拜的玩家 1
+                         Def_PlayerRecType_WorshipDaily, # 玩家每日膜拜记录 2
+                         Def_PlayerRecType_PayCoin, # 代币记录 3
+                         ) = range(1, 1 + 3)
+
+#通用信息记录类型
 Def_UniversalGameRecTypeList = (
                                 Def_UniversalGameRecType_XMZZPKInfoRecord, # 仙魔之争信息记录0
                                 Def_UniversalGameRecType_HijackTruck,   # 劫镖1
@@ -1535,6 +1567,7 @@
 CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
 CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver"  # 逐鹿万界结算信息
 CrossServerMsg_CrossBossTrialFamilyAward = "CrossBossTrialFamilyAward"  # 跨服boss历练仙盟奖励结算
+CrossServerMsg_Worship = "Worship"  # 膜拜信息
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1677,7 +1710,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 33
+Def_MFPType_Max = 34
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(装备本身) 1
@@ -1711,6 +1744,7 @@
 Def_MFPType_Gubao, # 古宝 29
 Def_MFPType_Shentong, # 神通 30
 Def_MFPType_FamilyZhenfa, # 阵法 31
+Def_MFPType_GatherTheSoul, # 聚魂新 32
 Def_MFPType_Other, # 其他
 ) = range(Def_MFPType_Max)
 
@@ -2008,7 +2042,10 @@
 SuccType_EquipWashTotal, # 全身洗炼总等级X级 175
 SuccType_CrossPK, # 跨服PK x次  176
 SuccType_FamilyZhenfaExp, # 仙盟阵法捐献累计经验 177
-) = range(1, 178)
+SuccType_PassAdventure, #通关冒险 178
+SuccType_GatherTheSoulColor, #聚魂激活x品质x个 179
+SuccType_GatherTheSoulLV, #聚魂总等级x 180
+) = range(1, 181)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
@@ -2042,6 +2079,7 @@
                                   SuccType_EquipStarClass:[0], # 阶不向下适配
                                   SuccType_EquipStoneClass:[0], # 阶不向下适配
                                   SuccType_EquipWashClass:[0], # 阶不向下适配
+                                  SuccType_GatherTheSoulColor:[0], # 品质不向下适配
                                   }
 
 #传进来的条件满足配置的条件列表中的一个就行的成就类型

--
Gitblit v1.8.0