From fbf3fe5655d97c67db3bf07706ab5af232dcc9a5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 18 九月 2025 19:17:48 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(甘夫人技能;增加连击、追击增伤减伤属性;)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py | 11 +++++++++++
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 088c9db..0594b0b 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列表
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
index a6dbf23..69bc764 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -1043,6 +1043,7 @@
skillID = curSkill.GetSkillID()
pmType = GetPMType(atkObj, curSkill)
ignoreDef = IsIgnoreDef(curSkill)
+ batType = curSkill.GetBatType()
changeHurtType = TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_ChangeHurtType, curSkill)
if changeHurtType == 1:
@@ -1137,6 +1138,14 @@
aPMDamPer = atkObj.GetBatAttrValue(ChConfig.AttrID_PhyDamPer)
dPMDamPerDef = defObj.GetBatAttrValue(ChConfig.AttrID_PhyDamPerDef)
+ aComboDamPer = 0 # 连击增伤
+ if batType == ChConfig.TurnBattleType_Combo:
+ aComboDamPer = atkObj.GetBatAttrValue(ChConfig.AttrID_ComboDamPer)
+
+ aPursueDamPer = 0 # 追击增伤
+ if batType == ChConfig.TurnBattleType_Pursue:
+ aPursueDamPer = atkObj.GetBatAttrValue(ChConfig.AttrID_PursueDamPer)
+
# 所有万分率参数统一除10000.0
atkSkillPer /= 10000.0
aNormalSkillPer /= 10000.0
@@ -1150,6 +1159,8 @@
dSuperDamPerDef /= 10000.0
aFinalDamPer /= 10000.0
dFinalDamPerDef /= 10000.0
+ aComboDamPer /= 10000.0
+ aPursueDamPer /= 10000.0
if calcType != ChConfig.Def_Calc_Attack:
aAtk = GetCalcBaseValue(calcType, atkObj, defObj)
--
Gitblit v1.8.0