From 2b91d1223f3d78bd2efa970478d1ed63666e131c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 十二月 2025 11:40:43 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（优化演武场匹配逻辑；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 68 +++++++++++++--------------------
1 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 39a115b..19843f7 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -93,6 +93,12 @@
Def_BuffValue_Count = 3 # buff记录的value个数
+# buff保留类型定义
+(
+BuffRetainType_Dead, # 死亡保留 1
+BuffRetainType_Revive, # 复活保留 2
+) = range(1, 1 + 2)
+
#游戏对象属性--------------------------------------------
# 属性ID列表，所有对象类型通用，如Player、NPC
AttrIDList = (
@@ -168,7 +174,9 @@
AttrID_ComboDamPerDef, # 连击减伤 70
AttrID_PVPDamPer, # PVP增伤 71
AttrID_PVPDamPerDef, # PVP减伤 72
-) = range(1, 1 + 72)
+AttrID_ReviveHPPer, # 复活生命加成 73
+AttrID_ReviveXPPer, # 复活怒气加成 74
+) = range(1, 1 + 74)
# 需要计算的武将战斗属性ID列表
CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef,
@@ -182,7 +190,8 @@
AttrID_WeiFinalDamPer, AttrID_WeiFinalDamPerDef, AttrID_ShuFinalDamPer, AttrID_ShuFinalDamPerDef,
AttrID_WuFinalDamPer, AttrID_WuFinalDamPerDef, AttrID_QunFinalDamPer, AttrID_QunFinalDamPerDef,
AttrID_BatDamPer, AttrID_BatDamPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
- AttrID_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_PVPDamPer, AttrID_PVPDamPerDef
+ AttrID_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_PVPDamPer, AttrID_PVPDamPerDef,
+ AttrID_ReviveHPPer, AttrID_ReviveXPPer,
]
# 基础三维属性ID列表
@@ -214,7 +223,7 @@
Def_CalcAttrList = (
Def_CalcAttr_LV, # 主公等级 0
Def_CalcAttr_MainEquip, # 主装备 1
-Def_CalcAttr_HeroBook, # 武将图鉴 2
+Def_CalcAttr_HeroFates, # 武将宿缘 2
Def_CalcAttr_Realm, # 官职 3
Def_CalcAttr_Gubao, # 古宝 4
Def_CalcAttr_HJG, # 幻境阁 5
@@ -225,7 +234,7 @@
CalcAttrName = {
Def_CalcAttr_LV:"主公等级",
Def_CalcAttr_MainEquip:"主装备",
- Def_CalcAttr_HeroBook:"武将图鉴",
+ Def_CalcAttr_HeroFates:"武将宿缘",
Def_CalcAttr_Realm:"官职",
Def_CalcAttr_Gubao:"古宝",
Def_CalcAttr_HJG:"幻境阁",
@@ -3075,7 +3084,6 @@
Def_PlayerKey_Frist_Lock = "Frist_Lock" # 是否接受了任务1
Def_PlayerKey_TaskExpRewardMultiple = "TaskExpRewardMultiple" # 任务经验奖励倍值
Def_PlayerKey_BuyItemCnt = "BuyItemCnt" # 购买物品数量
-Def_PlayerKey_QueryOpenServerAwardState = "QueryOpenServerAwardState" # 查询开服奖励状态
Def_PlayerKey_QueryMarkIdCardIndex = 'QueryMarkIdCardIndex' # 指定账号生成卡类型
Def_PlayerKey_QueryNewGuyCardType = 'QueryNewGuyCardType' # 查询的新手卡类型
@@ -3325,6 +3333,8 @@
Def_PDict_IsAddReviveTired = "IsAddReviveTired" # 死亡是否增加复活疲劳
+Def_PDict_DownloadAwardState = "DownloadAwardState" # 分包包下载奖励状态 0-未领 >0-已领奖励编号
+
Def_PDict_ChestsOpenCount = "ChestsOpenCount_%s" # 宝箱已开启次数, 参数(宝箱ID), 只有有开启次数额外奖励的才会记录
Def_PDict_DropCountToday = "DropCountToday_%s" # 今日物品已掉落次数，参数(物品ID)
@@ -3462,16 +3472,6 @@
Def_PDict_CollectWordsID = "CollectWordsID_%s" # 玩家身上的活动ID，唯一标识，取活动开始日期time值，参数(活动编号 1 或 2)
Def_PDict_CollectWordsExchangeCount = "CollectWordsCount_%s_%s" # 兑换编号对应已兑换次数，参数(活动编号, 兑换编号)
Def_PDict_CollectWordsGJSeconds = "CollectWordsGJSeconds_%s" # 挂机未处理收益的秒数，参数(活动编号)
-
-#BOSS复活
-Def_PDict_BossRebornID = "BossRebornID" # 玩家身上的BOSS复活活动ID，唯一标识，取活动开始日期time值
-Def_PDict_BossRebornTemplateID = "BossRebornTemplateID" # 玩家身上的BOSS复活模板ID
-Def_PDict_BRActionCurTimes = "BRActionCurTimes_%s" #当前完成次数 参数BOSS复活活动ID
-Def_PDict_BRActionGotTimes = "BRActionGotTimes_%s" #当前已领次数 参数BOSS复活活动ID
-Def_PDict_BRActionWorldLV = "BRActionWorldLV" #BOSS复活活动开启时世界等级
-
-#Boss首杀
-Def_PDict_BossFirstKillState = "BossFirstKillState_%s" # boss首杀相关状态记录
#限时抢购活动
Def_PDict_FlashSaleID = "FlashSaleID_%s" # 玩家身上的限时抢购活动ID，唯一标识，取活动开始日期time，参数（活动编号）
@@ -3696,6 +3696,10 @@
Def_PDict_SuccessValue = "Succ_%s_%s" # 当前次数值，参数(成就类型、条件)
Def_PDict_SuccessAward = "Succ_Award_%s" # 成就领奖记录，按成就ID位存储0-未领,1-已领，参数(key编号)
+# 开服庆典
+Def_PDict_OSACelebrationPoint = "OSACelebrationPoint" # 开服庆典累计积分
+Def_PDict_OSACelebrationAward = "OSACelebrationAward" # 开服庆典累计积分阶段奖励领奖状态，按积分排序后的索引位记录是否已领取
+
# 通天令
Def_PDict_TTL_StartTime = "TTL_StartTime" # 本轮通天令开始时间戳
Def_PDict_TTL_LVInfo = "TTL_LVInfo" # 当前通天令等级激活信息 = 等级*10+是否已购买通天令
@@ -3839,6 +3843,7 @@
Def_PDict_HeroBookH = "HeroBookH_%s" # 武将图鉴历史最高等级，参数(武将ID) cccbbba: bbb-存星级图鉴最高等级；ccc-存突破图鉴最高等级
Def_PDict_HeroAwakeRebirthCnt = "HeroAwakeRebirthCnt" # 已觉醒过的武将今日已重生次数，共享次数
Def_PDict_HeroRecommend = "HeroRecommend_%s" # 阵容推荐领奖状态，参数(推荐ID) 根据武将ID所在索引位记录是否领取
+Def_PDict_HeroFatesInfo = "HeroFatesInfo_%s" # 武将宿缘信息，参数(宿缘ID) 宿缘等级*10 + 宿缘状态
#主线
Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
@@ -3997,10 +4002,13 @@
TriggerWay_BeAtkBack, # 被反击时 39
TriggerWay_InBattlefield, # 在场时 40
TriggerWay_Revive, # 复活时 41
-) = range(1, 1 + 41)
+TriggerWay_BigTurnStartByDead, # 大回合开始时（死亡后有效） 42
+) = range(1, 1 + 42)
# 不加载的被动触发方式，一般用于本技能固定触发逻辑用的
TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
+# 死亡可以触发的方式
+DeadCanTriggerWayList = [TriggerWay_BigTurnStartByDead]
# 被动触发有效来源
TriggerSrc_Skill = 1 # 身上技能有效
@@ -4369,7 +4377,7 @@
Def_GiveMoney_Warehouse, # 仓库
Def_GiveMoney_SellPackItem, # 出售背包物品
Def_GiveMoney_CollectNPC, # 采集NPC
-Def_GiveMoney_BossFirstKill, # Boss首杀
+Def_GiveMoney_20,
Def_GiveMoney_21,
Def_GiveMoney_Trade, # 交易
Def_GiveMoney_23,
@@ -4404,7 +4412,6 @@
Def_GiveMoney_Warehouse:"Warehouse",
Def_GiveMoney_SellPackItem:"SellPackItem",
Def_GiveMoney_CollectNPC:"CollectNPC",
-Def_GiveMoney_BossFirstKill:"BossFirstKill",
Def_GiveMoney_Trade:"Trade",
Def_GiveMoney_FreeGoods:"FreeGoods",
Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
@@ -4785,13 +4792,13 @@
Def_RewardType_BeautyLVAward, # 红颜等级奖励 6
Def_RewardType_DayRealmPoint, # 每日任务修行点奖励7
Def_RewardType_FirstCharge, # 首充礼包奖励8
-Def_RewardType_MWSoulAward, # 法宝之魂奖励9 -废弃
+Def_RewardType_OSACelebrationPointAward, # 开服庆典积分阶段奖励 9
Def_RewardType_FreeGoods, # 极品白拿10
Def_RewardType_CostRebate, # 消费返利11
Def_RewardType_BossReborn, # BOSS复活12
Def_RewardType_FCRecharge, # 仙界盛典充值大礼13
Def_RewardType_FCParty, # 仙界盛典全民来嗨14
-Def_RewardType_15, # 分包下载奖励15
+Def_RewardType_DownLoad, # 分包下载奖励15
Def_RewardType_WishingWell, # 许愿池奖励16
Def_RewardType_OpenFunc, # 功能开启奖励17
Def_RewardType_TotalRecharge, # 累计充值奖励18
@@ -4860,27 +4867,6 @@
Def_RewardType_ADAward, # 广告奖励 81
Def_RewardType_TreeFreeTime, # 仙树免费减时 82
)= range(83)
-
-#boss复活相关活动定义
-BossRebornActIDList = (
-Def_BRAct_VIPBOSS, #进入VIPboss副本 1
-Def_BRAct_GodArea, #进入古神禁地副本 2
-Def_BRAct_MoneyPray, #铜钱祈愿 3
-Def_BRAct_ExpPray, #经验祈愿 4
-Def_BRAct_Treasure, #极品寻宝 5
-Def_BRAct_WorldBOSS, #击杀世界boss获得掉落归属 6
-Def_BRAct_BOSSHome, #击杀boss之家获得掉落归属 7
-Def_BRAct_FMT, #挑战封魔坛BOSS 8
-Def_BRAct_RunTask, #完成仙盟跑环 9
-Def_BRAct_XJMJ, #完成仙界秘境 10
-Def_BRAct_KirinHome, #完成麒麟之府 11
-Def_BRAct_TowerSweep, #符印塔扫荡 12
-Def_BRAct_RuneTreasure, #符印寻宝 13
-Def_BRAct_FairyDomain, #缥缈仙域 14
-Def_BRAct_FamilyBoss, #仙盟BOSS 15
-Def_BRAct_ActivityPlace, #活跃放置 16
-Def_BRAct_JSTreasure, #绝世寻宝 17
-) = range(1, 17+1)
#全民来嗨活动定义(仙界盛典)
PeoplePartyActIDList = (
--
Gitblit v1.8.0