From 229d066301a40c3e20a1167571c42185a4e6029b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 20 三月 2026 11:03:56 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(主线关卡每个房间开始战斗时补通知当前进度;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |   78 +++++++++++++++++++++++----------------
 1 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index ddc2529..6eb013c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -42,11 +42,13 @@
 '''
 Def_InitOpenServerTime = 'InitOpenServerTime'
 Def_SetOpenServerTime = 'SetOpenServerTime' # GM工具预定的开服时间
+Def_CanCross = 'CanCross' # 是否允许加入跨服,暂时仅对将要加入的做限制,已加入的暂不处理
 
 Def_FamilyCrossState = 'FamilyCrossState' # 本服公会跨服状态, 0-未跨服;1-已跨服
 Def_FamilyTransDataTime = 'FamilyTransDataTime' # 本服公会首次跨服互通数据开始传输时间戳,不为0代表传输数据中
 Def_OSAAwardState = 'OSAAwardState' #开服冲榜活动结算状态
 Def_OperationActID = 'OperationActID_%s_%s' # 运营活动ID的标记,参数(运营活动名, actNum)
+Def_OperationActCfgID = 'OperationActCfgID_%s_%s' # 运营活动CfgID的标记,参数(运营活动名, actNum)
 
 #---奇迹, 职业枚举定义---
 (
@@ -211,35 +213,24 @@
 
 #运营活动表名定义
 OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动
+OperationActionName_HeroAppear = "ActHeroAppear" # 武将登场活动
 
 #所有的运营活动列表,默认都支持多活动分组编号的活动名
-OperationActionNameList = [OperationActionName_Lunhuidian]
+OperationActionNameList = [OperationActionName_Lunhuidian, OperationActionName_HeroAppear]
+
+#活动对应活动类型,每种活动如有需要可以设置对应的唯一类型,可与ActNum组合成唯一的记录key  {ActionName:ActType, ...}
+#一般用于有需要做记录的通用功能,如签到等
+OperationActTypeDict = {OperationActionName_HeroAppear:1,
+                        }
 
 OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
 OperationActionName_CollectWords = "ActCollectWords" # 集字活动
 OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
 OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
 OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动
-OperationActionName_ActLoginNew = "ActLoginNew" # 登录活动-新
 OperationActionName_ActTask = "ActTask" # 活动任务
 OperationActionName_BuyCountGift = "ActBuyCountGift" # 购买次数礼包活动
 OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助
-
-##所有的运营活动列表,含节日活动
-#OperationActionNameList = [
-#                           OperationActionName_TotalRecharge,
-#                           OperationActionName_SingleRecharge,
-#                           OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
-#                           OperationActionName_BuyOne,
-#                           OperationActionName_ActLoginNew, OperationActionName_ActTask,
-#                           OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
-#                           OperationActionName_Lunhuidian,
-#                           ]
-##需要记录开启活动时的世界等级的运营活动
-#NeedWorldLVOperationActNameList = [OperationActionName_TotalRecharge,
-#                                   OperationActionName_CollectWords,
-#                                   OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
-#                                   ]
 
 #跨服运营活动表名定义
 CrossActName_Lianqi = "CrossActLianqi" # 炼器 - 跨服
@@ -335,7 +326,12 @@
 Def_BT_OSA_MainLevel,    # 开服关卡榜 3
 Def_BT_OSA_HeroCall,    # 开服招募榜 4
 Def_BT_Dingjunge,    # 定军阁过关榜 5
-) = range(0, 6) 
+Def_BT_ActHeroAppear,    # 武将登场招募榜 6
+Def_BT_OSA_HeroTrain,    # 开服武将冲榜 7
+Def_BT_OSA_BeautyTrain,    # 开服红颜冲榜 8
+Def_BT_OSA_MinggeTrain,    # 开服命格冲榜 9
+Def_BT_Qunying,    # 群英榜积分周榜 10
+) = range(0, 11)
 
 ''' 跨服排行榜类型, 从 150 开始,最大条数在功能配置表 CrossBillboardSet 配置,没配默认100
 与本服榜单存储的是不一样的数据库表格,理论上类型可以和本服榜单类型重复,为了做下区分防误导,跨服榜单从 150 开始
@@ -343,13 +339,17 @@
 本服榜单表(tagDBBillboard)
 '''
 CrossBillboardTypeList = (
-Def_CBT_ActCTG, # 跨服运营活动 - 充值榜 150
+Def_CBT_Qunying, # 跨服群英榜积分周榜 - 150
 ) = range(150, 150 + 1)
 
 BillboardTypeAllList = BillboardTypeList + CrossBillboardTypeList
 
 BillboardNameDict = {Def_BT_MainLevel:"主线过关榜", Def_BT_Arena:"演武场积分周榜", Def_BT_Tianzi:"天子考验伤害榜", 
-                     Def_BT_OSA_MainLevel:"开服关卡榜", Def_BT_OSA_HeroCall:"开服招募榜", Def_BT_Dingjunge:"定军阁过关榜"}
+                     Def_BT_OSA_MainLevel:"开服关卡榜", Def_BT_OSA_HeroCall:"开服招募榜", Def_BT_Dingjunge:"定军阁过关榜", 
+                     Def_BT_OSA_HeroTrain:"开服武将冲榜", Def_BT_OSA_BeautyTrain:"开服红颜冲榜", Def_BT_OSA_MinggeTrain:"开服命格冲榜", 
+                     Def_BT_ActHeroAppear:"武将登场招募榜(分组值1-ActNum)", Def_BT_Qunying:"群英榜积分周榜",
+                     Def_CBT_Qunying:"跨服群英榜积分周榜(分组值1-zoneID)",
+                     }
 
 #仙盟榜单类型
 FamilyBillboardList = []
@@ -599,7 +599,10 @@
 CDBPlayerRefresh_ArenaTicket, # 挑战券 286
 CDBPlayerRefresh_TehuiPoint, # 特惠印绶 287
 CDBPlayerRefresh_OSAPoint, # 开服庆典积分 288
-) = range(146, 289)
+CDBPlayerRefresh_QunyingTicket, # 群英榜挑战令 289
+CDBPlayerRefresh_QunyingPoint, # 群英榜积分 290
+CDBPlayerRefresh_SkinPoint, # 时装碎片 291
+) = range(146, 292)
 
 TYPE_Price_Gold_Paper_Money = 5    # 金钱类型,(先用礼券,再用金子)
 TYPE_Price_FamilyExp = 6 # 战盟经验
@@ -643,13 +646,16 @@
 TYPE_Price_ArenaTicket = 53    # 演武场挑战券
 TYPE_Price_TehuiPoint = 54    # 特惠印绶
 TYPE_Price_OSAPoint = 55    # 开服庆典积分
+TYPE_Price_QunyingTicket = 56    # 群英榜挑战令
+TYPE_Price_QunyingPoint = 57    # 群英榜积分
+TYPE_Price_SkinPoint = 58    # 时装碎片
 TYPE_Price_PayCoinDay = 98    # 代币时效,每日过天重置
 TYPE_Price_PayCoin = 99    # 代币
 
 #key可用于遍历所有货币,value仅GM相关会用到
 MoneyNameDict = {
                  1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 43:"将魂", 51:"招募积分", 52:"淘金令", 53:"挑战券", 54:"特惠印绶", 
-                 55:"可用开服庆典积分",
+                 55:"可用开服庆典积分", 56:"群英榜挑战令", 57:"群英榜积分", 58:"时装碎片",
                  98:"代币时效", 99:"代币"
                  }
 #MoneyNameDict = {
@@ -675,6 +681,9 @@
                            TYPE_Price_ArenaTicket:CDBPlayerRefresh_ArenaTicket,
                            TYPE_Price_TehuiPoint:CDBPlayerRefresh_TehuiPoint,
                            TYPE_Price_OSAPoint:CDBPlayerRefresh_OSAPoint,
+                           TYPE_Price_QunyingTicket:CDBPlayerRefresh_QunyingTicket,
+                           TYPE_Price_QunyingPoint:CDBPlayerRefresh_QunyingPoint,
+                           TYPE_Price_SkinPoint:CDBPlayerRefresh_SkinPoint,
                            TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,
                            #TYPE_Price_Rune:CDBPlayerRefresh_Rune,
                            #TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
@@ -714,9 +723,10 @@
 GameFuncID_OSA_HeroCall = 46    # 开服招募榜
 GameFuncID_OSA_Celebration = 47 # 开服庆典
 GameFuncID_Mingge = 54          # 命格
-
-# 以下为暂时无用的
-GameFuncID_Pet = -1             # 宠物,灵宠 6
+GameFuncID_OSA_HeroTrain = 59   # 开服武将冲榜
+GameFuncID_OSA_BeautyTrain = 60 # 开服红颜冲榜
+GameFuncID_OSA_MinggeTrain = 61 # 开服命格冲榜
+GameFuncID_Qunying = 62         # 群英榜
 
 #背包类型
 (
@@ -784,13 +794,15 @@
                        Def_GameRecType_ArenaRecord, # 演武场玩家挑战记录,playerID 308
                        Def_GameRecType_BatPreset, # 战斗方案预设额外存储信息,playerID 309
                        Def_GameRecType_Setting, # 前端自定义存储的设置内容,playerID 310
-                       ) = range(300, 1 + 310)
+                       Def_GameRecType_Treasure, # 寻宝记录,treasureType 311
+                       Def_GameRecType_QunyingRecord, # 群英榜玩家挑战记录,playerID 312
+                       ) = range(300, 1 + 312)
 #通用信息记录新 - 字典key配置,如果有配置,则可额外按对应记录Value值存储字典,方便快速取值,可配置Value编号 1~8,配空默认 Value1
 Def_GameRecValueKeyDict = {
                            Def_GameRecType_Xiangong:[1],
                            }
 #仅查看自己的记录
-Def_ViewGameRecSelfList = [Def_GameRecType_ArenaRecord, Def_GameRecType_BatPreset, Def_GameRecType_Setting]
+Def_ViewGameRecSelfList = [Def_GameRecType_ArenaRecord, Def_GameRecType_BatPreset, Def_GameRecType_Setting, Def_GameRecType_QunyingRecord]
 
 #UserData不使用json的记录类型
 UserDataNOJsonRecTypeList = []
@@ -1175,8 +1187,9 @@
 Def_IudetHeroStar = 72 # 英雄星级
 Def_IudetHeroBreakLV = 74 # 英雄突破等级
 Def_IudetHeroAwakeLV = 76 # 英雄觉醒等级
-Def_IudetHeroSkin = 78 # 英雄使用的皮肤索引
+Def_IudetHeroSkin = 78 # 英雄使用的皮肤索引 - 形象
 Def_IudetHeroCardEffective = 80 # 卡牌在主线预设中生效标识,每个武将在某一阵容预设中仅有一张卡牌生效,废弃,使用 Def_IudetHeroEffPresetID 代替
+Def_IudetHeroSkinAttr = 82 # 英雄使用的皮肤索引 - 属性
 
 # 200~300 宠物数据用
 Def_IudetPet_NPCID = 200  # npcID
@@ -1197,12 +1210,13 @@
 BatPresetList = (
 BatPreset_Main, # 主线战斗 1
 BatPreset_ArenaDef, # 演武场防守 2
-) = range(1, 1 + 2)
+BatPreset_QunyingDef, # 群英榜防守 3
+) = range(1, 1 + 3)
 
 # 需要缓存的战斗功能预设,一般只要主线+防守功能预设,主动攻击的PVE功能可以不用,如某个副本的主动攻击预设
-NeedCacheBatPresetList = [BatPreset_Main, BatPreset_ArenaDef]
+NeedCacheBatPresetList = [BatPreset_Main, BatPreset_ArenaDef, BatPreset_QunyingDef]
 
-BatPresetName = {BatPreset_Main:"主线", BatPreset_ArenaDef:"演武场防守"}
+BatPresetName = {BatPreset_Main:"主线", BatPreset_ArenaDef:"演武场防守", BatPreset_QunyingDef:"群英榜防守"}
 
 # 功能预设定义
 FuncPresetList = (

--
Gitblit v1.8.0