From 3426606c42d2e94057e3c682890e26c8b50d9700 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 29 九月 2025 15:24:38 +0800
Subject: [PATCH] 125 战斗 强制结束战斗问题修复

---
 Main/System/Battle/Skill/SkillBase.cs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Main/System/Battle/Skill/SkillBase.cs b/Main/System/Battle/Skill/SkillBase.cs
index ed22592..1d1ae26 100644
--- a/Main/System/Battle/Skill/SkillBase.cs
+++ b/Main/System/Battle/Skill/SkillBase.cs
@@ -681,6 +681,11 @@
 	public virtual void ForceFinished()
 	{
 		skillEffect?.ForceFinished();
+		if (otherSkillAction != null)
+		{
+			otherSkillAction.ForceFinish();
+			otherSkillAction = null;
+		}
 		isFinished = true;
 		moveFinished = true;
 		isPlay = true;
@@ -694,12 +699,11 @@
 			{
 				if (combinePack.startTag.Tag.StartsWith("Skill_"))
 				{
-					BattleDebug.LogError("other skill casting " + combinePack.startTag.Tag);
 					otherSkillAction = combinePack.CreateSkillAction();
 					otherSkillAction.fromSkillId = skillConfig.SkillID;
 					//	寮哄埗缁撴潫鍏朵粬鎶�鑳�
 					otherSkillAction.ForceFinish();
-					return;
+					continue;
 				}
 			}
 			else if (pack is CustomB421ActionPack actionPack)

--
Gitblit v1.8.0