From 45d3d873a7740886fa09f35c9fea2830f4563072 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 11:04:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/Battle/BattleObject/HeroBattleObject.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Main/System/Battle/BattleObject/HeroBattleObject.cs b/Main/System/Battle/BattleObject/HeroBattleObject.cs
index d26e314..8b6f0ad 100644
--- a/Main/System/Battle/BattleObject/HeroBattleObject.cs
+++ b/Main/System/Battle/BattleObject/HeroBattleObject.cs
@@ -186,9 +186,9 @@
}
}
- public override Spine.TrackEntry PlaySkillAnimation(SkillConfig skillConfig, SkillBase skillBase, bool isCounter, Action onComplete)
+ public override Spine.TrackEntry PlaySkillAnimation(SkillConfig skillConfig, SkillSkinConfig skillSkinConfig, SkillBase skillBase, bool isCounter, Action onComplete)
{
- return motionBase.PlaySkillAnimation(skillConfig, skillBase, isCounter, onComplete);
+ return motionBase.PlaySkillAnimation(skillConfig, skillSkinConfig, skillBase, isCounter, onComplete);
}
public override bool CanStartDeath()
@@ -196,9 +196,9 @@
return motionBase.CanStartDeath();
}
- public override bool CanCastSkillAnimation(SkillConfig skillConfig)
+ public override bool CanCastSkillAnimation(SkillSkinConfig skillSkinConfig)
{
- return motionBase.CanCastSkill(skillConfig);
+ return motionBase.CanCastSkill(skillSkinConfig);
}
public override SkeletonAnimation GetSkeletonAnimation()
@@ -339,7 +339,7 @@
public override DeathRecordAction Hurt(BattleHurtParam battleHurtParam, SkillRecordAction _parentSkillAction = null)
{
DeathRecordAction recordAction = null;
- bool isLastHit = battleHurtParam.hitIndex >= battleHurtParam.skillConfig.DamageDivide.Length - 1;
+ bool isLastHit = battleHurtParam.hitIndex >= battleHurtParam.skillSkinConfig.DamageDivide.Length - 1;
bool firstHit = battleHurtParam.hitIndex == 0;
// 娣诲姞璋冭瘯鏃ュ織
@@ -704,7 +704,7 @@
}
// ============ 搴旂敤鏂芥硶鑰呯殑琛�閲忓拰鎶ょ浘鍙樺寲 ============
- bool isLastHit = battleHurtParam.hitIndex >= battleHurtParam.skillConfig.DamageDivide.Length - 1;
+ bool isLastHit = battleHurtParam.hitIndex >= battleHurtParam.skillSkinConfig.DamageDivide.Length - 1;
ApplyHurtToCaster(battleHurtParam, isLastHit);
// 鍜孒urt涓�鏍凤紝璋冪敤PopDamage澶勭悊鍚歌/鍙嶄激鐨勬樉绀�
--
Gitblit v1.8.0