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/BattleObject.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Main/System/Battle/BattleObject/BattleObject.cs b/Main/System/Battle/BattleObject/BattleObject.cs
index 90ba56a..b30a55c 100644
--- a/Main/System/Battle/BattleObject/BattleObject.cs
+++ b/Main/System/Battle/BattleObject/BattleObject.cs
@@ -93,7 +93,7 @@
/// <summary>
/// 鎾斁鎶�鑳藉姩鐢�
/// </summary>
- public abstract Spine.TrackEntry PlaySkillAnimation(SkillConfig skillConfig, SkillBase skillBase, bool isCounter, Action onComplete);
+ public abstract Spine.TrackEntry PlaySkillAnimation(SkillConfig skillConfig, SkillSkinConfig skillSkinConfig, SkillBase skillBase, bool isCounter, Action onComplete);
/// <summary>
/// 妫�鏌ユ槸鍚﹀彲浠ュ紑濮嬫浜�
@@ -103,7 +103,7 @@
/// <summary>
/// 妫�鏌ユ槸鍚﹀彲浠ラ噴鏀炬妧鑳�
/// </summary>
- public abstract bool CanCastSkillAnimation(SkillConfig skillConfig);
+ public abstract bool CanCastSkillAnimation(SkillSkinConfig skillSkinConfig);
/// <summary>
/// 鑾峰彇楠ㄩ鍔ㄧ敾缁勪欢锛堢敤浜庣壒鏁堟寕杞界瓑锛�
@@ -405,7 +405,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