From 6cd229135f9d68fd116638fb00c859419f75b76c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 09 一月 2025 18:19:38 +0800
Subject: [PATCH] 9936 【BT】【英文】【越南】【砍树】人族法宝(增加任务进度奖励领取事件通知CustomAward)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   75 +++++++++++++++++++++++++------------
 1 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index a6fb13b..86a391e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -182,6 +182,9 @@
 Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID"  # 本服跨服PK当前赛季
 Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState"  # 本服跨服PK赛季状态 0-关闭,1-开启中
 
+Def_Notify_WorldKey_CrossChampionshipState = "CrossChampionshipState"  # 跨服排位赛状态
+Def_Notify_WorldKey_CrossChampionshipStateError = "CrossChampionshipStateError"  # 跨服排位赛状态是否已经异常
+
 Def_Notify_WorldKey_LuckyCloudBuyInfo = "LuckyCloudBuyInfo"  # 本服幸运云购最新一期信息
 
 Def_Notify_WorldKey_CrossBattlefieldCallTeamInfo = "CrossBattlefieldCallTeamInfo" # 跨服战场召集队伍信息
@@ -360,10 +363,11 @@
 CrossActName_XianXiaMJ = "CrossActXianXiaMJ" # 仙匣秘境 - 跨服
 CrossActName_Gubao = "CrossActGubao" # 古宝养成 - 跨服
 CrossActName_HorsePetTrain = "CrossActHorsePetTrain" # 骑宠养成 - 跨服
+CrossActName_Lianqi = "CrossActLianqi" # 炼器 - 跨服
 
 #跨服运营活动列表
 CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy, CrossActName_BossTrial, 
-                    CrossActName_XianXiaMJ, CrossActName_Gubao, CrossActName_HorsePetTrain]
+                    CrossActName_XianXiaMJ, CrossActName_Gubao, CrossActName_HorsePetTrain, CrossActName_Lianqi]
 #需要锁定活动分区分配直到活动结束的跨服运营活动,即使热更分区配置,也不会改变正在活动中的分区设定,直到活动结束
 CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge]
 
@@ -737,6 +741,34 @@
 #法器防御百分比
 Def_Effect_FaQiDefPer = 169
 
+#坐骑幻化生命加成
+Def_Effect_HorseSkinMaxHPPer = 170 # 坐骑幻化生命加成
+#坐骑幻化攻击加成
+Def_Effect_HorseSkinAtkPer = 171 # 坐骑幻化攻击加成
+#坐骑幻化防御加成
+Def_Effect_HorseSkinDefPer = 172 # 坐骑幻化防御加成
+
+#称号生命加成
+Def_Effect_TitleMaxHPPer = 173 # 称号生命加成
+#称号攻击加成
+Def_Effect_TitleAtkPer = 174 # 称号攻击加成
+#称号防御加成
+Def_Effect_TitleDefPer = 175 # 称号防御加成
+
+#头像生命加成
+Def_Effect_FaceMaxHPPer = 176 # 头像生命加成
+#头像攻击加成
+Def_Effect_FaceAtkPer = 177 # 头像攻击加成
+#头像防御加成
+Def_Effect_FaceDefPer = 178 # 头像防御加成
+
+#头像框生命加成
+Def_Effect_FacePicMaxHPPer = 179 # 头像框生命加成
+#头像框攻击加成
+Def_Effect_FacePicAtkPer = 180 # 头像框攻击加成
+#头像框防御加成
+Def_Effect_FacePicDefPer = 181 # 头像框防御加成
+
 Def_Effect_ComboDefRate = 210 # 抗连击概率
 Def_Effect_AtkBackRate = 211 # 反击概率
 Def_Effect_AtkBackDefRate = 212 # 抗反击概率
@@ -862,7 +894,7 @@
     Def_BT_Max, #排行榜最大类型
 ) = range(0, 40 + 2) 
 
-''' 跨服排行榜类型, 从 150 开始
+''' 跨服排行榜类型, 从 150 开始,最大条数在功能配置表 CrossBillboardSet 配置,没配默认100
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
 跨服榜单表(tagDBCrossBillboard)
 本服榜单表(tagDBBillboard)
@@ -883,20 +915,9 @@
 Def_CBT_XianXiaMJScore, # 仙匣秘境积分 - 个人榜  162
 Def_CBT_GubaoScore, # 古宝养成积分 - 个人榜  163
 Def_CBT_HorsePetTrainScore, # 骑宠养成积分 - 个人榜  164
-) = range(150, 164 + 1)
-
-# 跨服榜单最大数据名次,没有设置的默认100
-CrossBillboard_MaxDataCount = {
-                               Def_CBT_BattlefieldWJoin:1000,
-                               Def_CBT_BattlefieldWCall:1000,
-                               Def_CBT_BattlefieldWScore:1000,
-                               Def_CBT_BattlefieldWScoreLastWeek:1000,
-                               Def_CBT_BossTrialSubmit:1000,
-                               Def_CBT_BossTrialSubmitBak:1000,
-                               Def_CBT_XianXiaMJScore:1000,
-                               Def_CBT_GubaoScore:1000,
-                               Def_CBT_HorsePetTrainScore:1000,
-                               }
+Def_CBT_CrossRealmPK, # 跨服PK竞技场  165
+Def_CBT_LianqiScore, # 炼器积分 - 个人榜  166
+) = range(150, 166 + 1)
 
 #职业对应战力排行榜类型
 JobFightPowerBillboardDict = {
@@ -1620,13 +1641,13 @@
 CrossServerMsg_Notify = "Notify"                        # 提示信息
 CrossServerMsg_ChatCrossWorld = "ChatCrossWorld"        # 跨服世界聊天
 CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
+CrossServerMsg_PullPlayerViewCache = "PullPlayerViewCache"# 拉取玩家缓存数据
+CrossServerMsg_PlayerPackDataState = "PlayerPackDataState"# 玩家打包数据同步状态
+CrossServerMsg_PullPlayerPackData = "PullPlayerPackData"# 拉取玩家打包数据
+CrossServerMsg_PushPlayerPackData = "PushPlayerPackData"# 推送玩家打包数据
 CrossServerMsg_PKMatchReqRet = "PKMatchReqRet"          # 跨服PK匹配请求结果
-CrossServerMsg_PKMatchResult = "PKMatchResult"          # 跨服PK匹配结果
-CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList"  # 跨服PK已准备好的房间列表
-CrossServerMsg_PKTimeoutRoomList = "PKTimeoutRoomList"  # 跨服PK已超时的房间列表
 CrossServerMsg_PKOverInfo = "PKOverInfo"                # 跨服PK结果
 CrossServerMsg_PKSeasonInfo = "PKSeasonInfo"            # 跨服PK赛季信息
-CrossServerMsg_PKSyncBillboard = "PKSyncBillboard"      # 跨服PK同步排行榜 
 CrossServerMsg_SyncBillboard = "SyncBillboard"          # 跨服同步排行榜 
 CrossServerMsg_CrossBossInfo = "CrossBossInfo"          # 跨服Boss信息
 CrossServerMsg_CrossBossState = "CrossBossState"        # 跨服Boss状态
@@ -1677,10 +1698,11 @@
 ClientServerMsg_ChatCrossWorld = "ChatCrossWorld"       # 跨服世界聊天
 ClientServerMsg_GMCMD = "GMCMD"                         # GM命令
 ClientServerMsg_ViewPlayerCache = "ViewPlayerCache"     # 查看跨服玩家信息
+ClientServerMsg_PushPlayerCache = "PushPlayerCache"     # 推送玩家缓存信息
+ClientServerMsg_PullOtherPlayerPackData = "PullOtherPlayerPackData"   # 拉其他服玩家打包数据
+ClientServerMsg_PlayerPackData = "PlayerPackData"       # 玩家打包数据同步
 ClientServerMsg_PKMatch = "PKMatch"                     # 跨服PK匹配
-ClientServerMsg_PKRobotOver = "PKRobotOver"             # 跨服PK机器人结算
-ClientServerMsg_PKCancel = "PKCancel"                   # 跨服PK取消匹配
-ClientServerMsg_PKPrepareOK = "PKPrepareOK"             # 跨服PK准备完毕
+ClientServerMsg_PKOver = "PKOver"                       # 跨服PK结算
 ClientServerMsg_PKBillboard = "PKBillboard"             # 跨服PK排行榜
 ClientServerMsg_QueryBillboard = "QueryBillboard"       # 跨服排行榜 - 查询、同步等
 ClientServerMsg_UpdateBillboard = "UpdateBillboard"     # 跨服排行榜 - 更新
@@ -1698,6 +1720,7 @@
 ClientServerMsg_BattlefieldCallKick = "BattlefieldCallKick"   # 跨服战场召集 - 踢出
 ClientServerMsg_ActDropSpecItem = "ActDropSpecItem"     # 活动特殊掉落
 ClientServerMsg_CrossAssist = "CrossAssist"             # 跨服协助
+ClientServerMsg_ChampionshipPKOver = "ChampionshipPKOver" # 跨服排位PK结束
 ClientServerMsg_ChampionshipOfficialApply = "ChampionshipOfficialApply" # 跨服排位申请官职
 ClientServerMsg_ChampionshipOfficialApplyReply = "ChampionshipOfficialApplyReply" # 跨服排位官职申请回应
 ClientServerMsg_ChampionshipOfficialKick = "ChampionshipOfficialKick" # 跨服排位辞退下级仙官
@@ -1716,6 +1739,7 @@
 ClientServerMsg_GubaoScore = "GubaoScore" # 古宝养成积分
 ClientServerMsg_HorsePetTrainScore = "HorsePetTrainScore" # 骑宠养成积分
 ClientServerMsg_QueryXiangong = "QueryXiangong" # 查看仙宫仙名录
+ClientServerMsg_LianqiScore = "LianqiScore" # 炼器积分
 
 #跨服广播类型定义
 CrossNotify_CrossAct = "CrossAct"
@@ -2164,7 +2188,10 @@
 SuccType_PassAdventure, #通关冒险 178
 SuccType_GatherTheSoulColor, #聚魂激活x品质x个 179
 SuccType_GatherTheSoulLV, #聚魂总等级x 180
-) = range(1, 181)
+SuccType_MineAreaCnt, #采集福地x次数 181
+SuccType_MineAreaSelfCnt, #采集自己福地x次数 182
+SuccType_MineAreaRobCnt, #采集他人福地x次数 183
+) = range(1, 184)
 
 # 节日红包成就类型
 FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)

--
Gitblit v1.8.0