From 4ec47a0dab32729d20389078ee78f89b64c12cab Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 22 九月 2025 15:58:57 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(张星彩怒技,觉醒技能;增加buff消失后触发时机;增加效果6007 6008 7001 7002;技能友好目标增加类型2:一定包含自己的友方单位)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   43 +++++++++++++++++++++++++++++++------------
 1 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index c21574c..7726a8f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -162,7 +162,11 @@
 AttrID_QunFinalDamPerDef,                   # 对群减伤 64
 AttrID_SkillPer,                            # 技能增伤 65
 AttrID_SkillPerDef,                         # 技能减伤 66
-) = range(1, 1 + 66)
+AttrID_PursueDamPer,                        # 追击增伤 67
+AttrID_PursueDamPerDef,                     # 追击减伤 68
+AttrID_ComboDamPer,                         # 连击增伤 69
+AttrID_ComboDamPerDef,                      # 连击减伤 70
+) = range(1, 1 + 70)
 
 # 需要计算的武将战斗属性ID列表
 CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef, 
@@ -175,6 +179,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,
                         ]
 
 # 基础三维属性ID列表
@@ -207,12 +213,14 @@
 Def_CalcAttr_LV, # 主公等级 0
 Def_CalcAttr_MainEquip, # 主装备 1
 Def_CalcAttr_HeroBook, # 武将图鉴 2
-) = range(3)
+Def_CalcAttr_Realm, # 官职 3
+) = range(4)
 
 CalcAttrName = {
                 Def_CalcAttr_LV:"主公等级",
                 Def_CalcAttr_MainEquip:"主装备",
                 Def_CalcAttr_HeroBook:"武将图鉴",
+                Def_CalcAttr_Realm:"官职",
                 }
 
 ##-----------------------------------------------------------------------------------------------
@@ -960,7 +968,7 @@
 HurtType_Normal,            # 伤害 1
 HurtTYpe_Recovery,          # 回血 2
 HurtType_3,
-HurtType_4,
+HurtType_Immune,            # 免疫 4
 HurtType_Parry,             # 格挡 5
 HurtType_IgnoreDef,         # 无视防御/真实伤害 6
 HurtType_SuperHit,          # 暴击 7
@@ -1321,7 +1329,8 @@
 Def_Calc_MaxHP, # 最大生命值 1
 Def_Calc_LastHurt, # 最后一次伤害值 2
 Def_Calc_TagMaxHP, # 目标最大生命值 3
-) = range(4)
+Def_Calc_ByBuffValue, # 触发buff的buff值 4
+) = range(5)
 
 #治疗类型(影响公式参数)
 Def_CureTypeList = (
@@ -3063,9 +3072,6 @@
 Def_Obj_Dict_SkinID = 'SkinID' # 该战斗NPC所绑定的武将皮肤ID,一般仅玩家阵容有
 Def_Obj_Dict_TurnFightPosInfo = 'TurnFightPosInfo' # 回合制站位: 阵营编号*100+阵型站位,阵型站位为0时代表非主战单位
 Def_Obj_Dict_TurnFightTimeline = 'TurnFightTimeline' # 回合制战斗时间线: 回合数*100+行动编号节点
-Def_Obj_Dict_TurnComboNum = 'TurnComboNum' # 单次累计连击次数
-Def_Obj_Dict_TurnAtkBackNum = 'TurnAtkBackNum' # 单次累计反击次数
-Def_Obj_Dict_TurnParryNum = 'TurnParryNum' # 单次累计格挡次数
 Def_Obj_Dict_TurnMissNum = 'TurnMissNum' # 单次累计闪避次数
 Def_Obj_Dict_TurnBattleType = 'TurnBattleType' # 本次攻击战斗类型:TurnBattleType_xxx
 
@@ -3137,7 +3143,7 @@
     BatObjState_Poison, # 中毒 5
     BatObjState_Bleeding, # 流血 6
     BatObjState_EasyHurt, # 易伤 7
-    BatObjState_Wudi, # 无敌 8
+    BatObjState_Wudi, # 无敌( 受任意伤害、控制类、dot效果,全部飘“免疫”) 8
     BatObjState_Sneer, # 嘲讽 9
     BatObjState_LimitSkill, # 沉默 10
     BatObjState_LimitAddHP, # 禁疗 11
@@ -4273,13 +4279,19 @@
 TriggerWay_HeroActionStart, # 武将行动前    6
 TriggerWay_HeroActionEnd, # 武将行动后    7
 TriggerWay_CalcEffValue, # 统计计算效果值时  8
-TriggerWay_9, # 9
-TriggerWay_AttackOverDirect, # 直接攻击后 (非buff攻击)10
+TriggerWay_UseSkillOver, # 使用技能后(每个目标触发一次)9
+TriggerWay_AttackOverDirect, # 直接攻击后(除dot或buff外的攻击,每个目标触发一次)10
 TriggerWay_BeAttackedDirect, # 受到直接攻击时 (非buff攻击)11
 TriggerWay_ShieldBroken, # 承伤盾被击破时 12
 TriggerWay_CurSkillEff, # 本技能/buff释放后,一般用于本技能/buff释放后触发,仅该技能释放后有效 13
 TriggerWay_CurSkillEffLst, # 本持续buff结算后额外触发效果,仅该持续buff结算后有效 14
-) = range(1, 1 + 14)
+TriggerWay_KillOneObj, # 击杀目标后(单次击杀多目标只触发一次) 15
+TriggerWay_KillTagObj, # 击杀每目标后(单次击杀多目标每个目标触发一次) 16
+TriggerWay_BuffDel, # buff消失后  17
+) = range(1, 1 + 17)
+
+# 不加载的被动触发方式,一般用于本技能固定触发逻辑用的
+TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]
 
 # 被动触发有效来源
 TriggerSrc_Skill = 1    # 身上技能有效
@@ -4291,6 +4303,9 @@
 PassiveEff_AddBuffLayerByWeight = 6001 # 根据权重随机添加buff层数 数值1-[[权重,层级], ...]
 PassiveEff_ChangeHurtType = 6002 # 变更伤害类型: 值1-伤害类型;值2-可附加验证处于xx状态 [状态1, 状态2, ...]
 PassiveEff_ChangeHurtMulti = 6003 # 变更伤害倍值(可增可减): 值1-变更倍值;值2-可附加验证处于xx状态 [状态1, 状态2, ...]
+PassiveEff_AddSkillPer = 6004 # 增加本次技能万分比: 值1-增加的万分比;值2-可附加验证处于xx状态 [状态1, 状态2, ...]
+PassiveEff_AddSkillTagCnt = 6007 # 增加技能目标数:值1-增加目标个数
+PassiveEff_ImmuneControlBuff = 6008 # 生命值低于x%时免疫控制效果:值1-百分比
 
 # 被动效果ID有触发值时就返回的
 PassiveEffHappenValueList = [PassiveEff_ChangeHurtType]
@@ -4298,6 +4313,10 @@
 PassiveEffValueMaxList = []
 # 被动效果ID触发值取最小值的
 PassiveEffValueMinList = []
+
+# 技能效果 - 不需要配置触发方式的
+SkillEff_CureWayEx = 7001 # 额外治疗值计算(对CalcType、SkillPer治疗计算方式扩展): 值1-计算方式;值2-万分比
+SkillEff_HurtShare = 7002 # 均摊伤害
 
 (
 TriggerType_BeSuperHit, # 被暴击触发技能 1
@@ -4390,7 +4409,7 @@
 TriggerType_ThumpSkillValue, # 重击增加技能固定值伤害 88
 TriggerType_HitValue, # 记录命中个数 89
 TriggerType_ChangeSkillEff, # 改变技能特效广播 90
-) = range(1, 91)
+) = range(1001, 1091)
 
 
 #不可以佩戴翅膀的地图

--
Gitblit v1.8.0