From c215892f0f794eb86a641e56a99d535faeab3a7f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 20 十一月 2025 18:49:05 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（赵云所有技能；增加效果5023 6019 6020；5011效果增加可验证战斗类型；5022效果支持多属性；战斗增减伤改名；增加触发方式28~39）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 35 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index ee41b3f..0bf8cb5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -160,14 +160,14 @@
AttrID_WuFinalDamPerDef, # 对吴减伤 62
AttrID_QunFinalDamPer, # 对群增伤 63
AttrID_QunFinalDamPerDef, # 对群减伤 64
-AttrID_SkillPer, # 技能增伤 65
-AttrID_SkillPerDef, # 技能减伤 66
+AttrID_BatDamPer, # 战斗增伤 65
+AttrID_BatDamPerDef, # 战斗减伤 66
AttrID_PursueDamPer, # 追击增伤 67
AttrID_PursueDamPerDef, # 追击减伤 68
AttrID_ComboDamPer, # 连击增伤 69
AttrID_ComboDamPerDef, # 连击减伤 70
-AttrID_ArenaDamPer, # 竞技增伤 71
-AttrID_ArenaDamPerDef, # 竞技减伤 72
+AttrID_PVPDamPer, # PVP增伤 71
+AttrID_PVPDamPerDef, # PVP减伤 72
) = range(1, 1 + 72)
# 需要计算的武将战斗属性ID列表
@@ -181,8 +181,8 @@
AttrID_ShieldPer, AttrID_ShieldPerDef, AttrID_DOTPer, AttrID_DOTPerDef,
AttrID_WeiFinalDamPer, AttrID_WeiFinalDamPerDef, AttrID_ShuFinalDamPer, AttrID_ShuFinalDamPerDef,
AttrID_WuFinalDamPer, AttrID_WuFinalDamPerDef, AttrID_QunFinalDamPer, AttrID_QunFinalDamPerDef,
- AttrID_SkillPer, AttrID_SkillPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
- AttrID_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_ArenaDamPer, AttrID_ArenaDamPerDef
+ AttrID_BatDamPer, AttrID_BatDamPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
+ AttrID_ComboDamPer, AttrID_ComboDamPerDef, AttrID_XPRecoverPer, AttrID_PVPDamPer, AttrID_PVPDamPerDef
]
# 基础三维属性ID列表
@@ -915,7 +915,7 @@
(
HurtType_Fail, # 失败 - 如概率没有触发 0
HurtType_Normal, # 伤害 1
-HurtTYpe_Recovery, # 回血 2
+HurtTYpe_Cure, # 治疗 2
HurtType_3,
HurtType_Immune, # 免疫 4
HurtType_Parry, # 格挡 5
@@ -926,7 +926,8 @@
HurtType_PoisonCureHurt, # 伤害毒奶 10
HurtType_PoisonCureSuck, # 吸血毒奶 11
HurtType_HarmSelf, # 自残 12
-) = range(13)
+HurtType_CaorenProtect, # 本次伤害有受曹仁防护标记 13
+) = range(14)
#伤害类型
(
@@ -1448,7 +1449,7 @@
Def_SkillType_Passive , #被动技能（与被动BUFF无直接关系） 7
Def_SkillType_Revive , #复活 8
Def_SkillType_Increment , #增值技能（不可清除）9
- Def_SkillType_Aura , #光环技能 10
+ Def_SkillType_Halo , #光环技能 10
Def_SkillType_Equip , #装备技能 11
Def_SkillType_Area , #场景技能（buff） 12
Def_SkillType_Summon , #召唤 13
@@ -1457,6 +1458,7 @@
) = range(0, 1 + 15)
# 以下废弃
+Def_SkillType_Aura = 10 #光环技能，旧命名 10
(
Def_SkillType_LstPlsBuffAtk, #持续攻击类BUFF 15
Def_SkillType_PassivePlsBuff, #被动触发增益类buff 16
@@ -1532,6 +1534,10 @@
Def_BuffLayer_Add = 0 # 每次触发层级递增
Def_BuffLayer_Sub = 1 # 每次触发层级递减
+# Buff时间计算规则
+#【注】光环类buff默认与光源（施法者）同步，其他受光环影响的目标同步该buff持续时间，持续时间及效果由施法者决定
+BuffLastTimeType_Default = 0 # 默认以获得buff时自身回合前后判断
+BuffLastTimeType_BigTurn = 1 # 大回合buff，每大回合开始固定减1回合
#动作类区分标识
(
@@ -2865,7 +2871,9 @@
TurnBattleType_Pursue, # 追击 3
TurnBattleType_Enhance, # 额外技能（一般是主技能拆分为多个效果的技能） 4
TurnBattleType_Passive, # 被动触发的技能 5
-) = range(6)
+TurnBattleType_Dot, # 持续伤害触发 6
+TurnBattleType_Cot, # 持续治疗触发 7
+) = range(8)
Def_PerTurnTick = 1000 # 每回合等同于常规tick时长
@@ -2971,7 +2979,9 @@
BatObjState_RebornLimit, # 无法复活 25
BatObjState_26, # 脆弱 26
BatObjState_27, # 阴咒 27
-) = range(1 + 27)
+ BatObjState_Zhiming, # 织命（甄宓） 28
+ BatObjState_Link, # 链接（董白） 29
+) = range(1 + 29)
#玩家状态定义，不能超过31个，如超过，需扩展多个key支持
Def_PlayerStateList = (
@@ -3670,11 +3680,9 @@
Def_PDict_LastEnterFBTick = "LastEnterFBTick_%s" # 上次进入副本的时间%s副本id
# 投资理财
-Def_PDict_InvestTime = "InvestTime_%s" # 投资时的时间，参数为投资类型
-Def_PDict_InvestProgress = "InvestProgress_%s_%s" # 投资可领奖进度值，参数为(投资类型, key编号)
-Def_PDict_InvestReward = "InvestReward_%s_%s" # 投资领奖记录，参数为(投资类型, key编号)
-Def_PDict_InvestRewardTime = "InvestRewardTime_%s" # 投资最后一次领奖时间，参数为(投资类型)
-Def_PDict_InvestKeyCount = 3 # key编号数
+Def_PDict_InvestTime = "InvestTime_%s" # 投资时的时间，参数(投资类型)
+Def_PDict_InvestEndTime = "InvestEndTime_%s" # 投资到期时间，参数(投资类型)
+Def_PDict_InvestRewardTime = "InvestRewardTime_%s" # 投资最后一次领奖时间，参数(投资类型)
# 成就 Def_PDictType_Success
Def_PDict_SuccessValue = "Succ_%s_%s" # 当前次数值，参数(成就类型、条件)
@@ -3771,10 +3779,6 @@
#古宝
Def_PDict_GubaoInfo = "Gubao_%s" # 古宝信息，参数(古宝ID)，特殊效果层*100000 + 等级*100 + 星级
-#神通
-Def_PDict_ShentongLVInfo = "ShentongLVInfo_%s" # 神通等级信息，参数(神通ID)，阶级*100+等级
-Def_PDict_ShentongSkillID = "ShentongSkillID_%s" # 神通出战技能ID，参数(编号)
-
#自定义奖励
Def_PDict_CustomAwardCanGet = "CustomAwardCanGet_%s" # 是否可领取，参数(key编号)
Def_PDict_CustomAwardGetState = "CustomAwardGetState_%s" # 是否已领取，参数(key编号)
@@ -3784,8 +3788,8 @@
Def_PDict_TreeLVUPState = "TreeLVUPState" # 仙树升级状态；0-未升级；1-升级中
Def_PDict_TreeLVUPRemainTime = "TreeLVUPRemainTime" # 仙树升级剩余时间，秒
Def_PDict_TreeLVUPRefreshTime = "TreeLVUPRefreshTime" # 仙树升级上次刷新时间戳
-Def_PDict_TreeFreeTimeCnt = "TreeFreeTimeCnt" # 今日已领取免费减时次数，过天重置
-Def_PDict_TreeFreeTimeLast = "TreeFreeTimeLast" # 今日上次领取免费减时时间戳，过天重置
+Def_PDict_TreeEnergy = "TreeEnergy" # 当前可用充能次数
+Def_PDict_TreeEnergyTimeLast = "TreeEnergyTimeLast" # 上次获得免费充能次数时间戳
#历练秘笈
Def_PDict_LLMJLVInfo = "LLMJLVInfo" # 秘笈等级，消耗战锤*100 + 秘笈等级
@@ -3829,7 +3833,7 @@
#主线
Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
-Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数，有3位小数，即 1234 实际为 1.234
+Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数
Def_PDict_UnXiantaoCntBooty = "UnXiantaoCntBooty_%s" # 累计未结算战利品掉落的战锤数，参数(itemID)
Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量，参数(itemID)
Def_PDict_AppointDropEquipCnt = "AppointDropEquipCnt" # 定制掉落装备掉落第x次，只记录到配置的最高次数
@@ -3969,7 +3973,19 @@
TriggerWay_BeDOTHurt, # 受到持续伤害 25
TriggerWay_EnemyDie, # 敌方单位死亡时 26
TriggerWay_FriendDie, # 己方单位死亡时 27
-) = range(1, 1 + 27)
+TriggerWay_Combo, # 连击时 28
+TriggerWay_Pursue, # 追击时 29
+TriggerWay_Stun, # 击晕时 30
+TriggerWay_SuperHit, # 暴击时 31
+TriggerWay_Parry, # 格挡时 32
+TriggerWay_Miss, # 闪避时 33
+TriggerWay_AtkBack, # 反击时 34
+TriggerWay_BeStun, # 被击晕时 35
+TriggerWay_BeSuperHit, # 被暴击时 36
+TriggerWay_BeParry, # 被格挡时 37
+TriggerWay_BeMiss, # 被闪避时 38
+TriggerWay_BeAtkBack, # 被反击时 39
+) = range(1, 1 + 39)
# 不加载的被动触发方式，一般用于本技能固定触发逻辑用的
TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
@@ -3999,6 +4015,8 @@
PassiveEff_AddShieldHurtPer = 6016 # 对护盾造成伤害加成
PassiveEff_SkillInvalid = 6017 # 使技能无效
PassiveEff_AddAngerSkillPerByXP = 6018 # 增加怒气技能伤害（按消耗怒气值）
+PassiveEff_AddBatDamPerByTagLostHP = 6019 # 战斗增伤（按目标已损失生命）
+PassiveEff_AddSkillPerByBuffState = 6020 # 增加技能系数（验证由buff状态触发的）
# 被动效果ID有触发值时就返回的
PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit, PassiveEff_SkillInvalid]
@@ -4168,7 +4186,7 @@
Def_Cost_UseSpeaker, # 喇叭发言
Def_Cost_Revive, # 复活
Def_Cost_5, # 副本鼓舞 5
-Def_Cost_GoldInvest, # 理财投资
+Def_Cost_6, # 理财投资
Def_Cost_Pray, # 祈祷
Def_Cost_8, # 资源找回
Def_Cost_BuyVIPItem, # 购买VIP礼包
@@ -4253,7 +4271,6 @@
# 有分消费对象子类的
Def_Cost_BuyVIPItem:"BuyVIPItem",
-Def_Cost_GoldInvest:"GoldInvest",
Def_Cost_Pray:"Pray",
Def_Cost_Treasure:"Treasure",
Def_Cost_OpenNoble:"OpenNoble",
@@ -4328,7 +4345,7 @@
Def_GiveMoney_UseItem, # 使用物品
Def_GiveMoney_Pickup, # 拾取
Def_GiveMoney_Bourse, # 交易所 10
-Def_GiveMoney_GoldInvest, # 绑钻投资
+Def_GiveMoney_11, # 绑钻投资
Def_GiveMoney_12, # 资源找回
Def_GiveMoney_13, # 红包
Def_GiveMoney_RefineGift, # 炼制奖励
@@ -4366,7 +4383,6 @@
Def_GiveMoney_UseItem:"UseItem",
Def_GiveMoney_Pickup:"Pickup",
Def_GiveMoney_Bourse:"Bourse",
-Def_GiveMoney_GoldInvest:"GoldInvest",
Def_GiveMoney_RefineGift:"RefineGift",
Def_GiveMoney_Mail:"Mail",
Def_GiveMoney_RuneDecompose:"RuneDecompose",
@@ -4702,6 +4718,11 @@
HeroSpecialty_SuckHP, # 吸血 6
) = range(1, 1 + 6)
+# 部分武将ID
+HeroID_Zhenfu = 510013
+HeroID_Caoren = 510015
+HeroID_Dongbai = 540009
+
# 经验倍率限制类型
(
ExpRateLimitType_Recover, # 资源找回
@@ -4710,13 +4731,9 @@
# 投资理财类型，和前端对应，从7开始
InvestTypeList = (
-InvestType_NewMonth, # 至尊月卡投资7
-InvestType_Month1, # 新30元月卡投资8
-InvestType_Login, # 登录 9
-InvestType_LV, # 等级 10
-InvestType_Boss, # Boss 11
-InvestType_Life, # 终身卡 12
-) = range(7, 7 + 6)
+InvestType_Month, # 月卡 1
+InvestType_Life, # 终身卡 2
+) = range(1, 1 + 2)
(
tttLeaveMap, # 退出倒计时 0
--
Gitblit v1.8.0