From 178eaa47ec3ec62c584676d42c1b4594d56513d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E4=BA=91?= <physligl@gmail.com>
Date: Mon, 21 Jul 2025 01:48:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E7=AE=80=E6=98=93=E7=AD=96=E7=95=A5=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=A2=E5=A4=B1=20(#1899)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GameTask/AutoFight/Model/CombatScenes.cs                | 4 ++--
 .../GameTask/AutoFight/Script/CombatCommand.cs              | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs b/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
index 4f85d80f..bab92d4f 100644
--- a/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
+++ b/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
@@ -308,12 +308,12 @@ public class CombatScenes : IDisposable
     /// </summary>
     /// <param name="avatarIndex">从1开始</param>
     /// <returns></returns>
-    public Avatar? SelectAvatar(int avatarIndex)
+    public Avatar SelectAvatar(int avatarIndex)
     {
         if (avatarIndex < 1 || avatarIndex > AvatarCount)
         {
             Logger.LogError("切换角色编号错误，当前角色数量{Count}，编号{Index}", AvatarCount, avatarIndex);
-            return null;
+            throw new Exception("不存在的角色编号");
         }
 
         return Avatars[avatarIndex - 1];
diff --git a/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs b/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs
index e973f505..be9df420 100644
--- a/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs
+++ b/BetterGenshinImpact/GameTask/AutoFight/Script/CombatCommand.cs
@@ -69,9 +69,7 @@ public class CombatCommand
         Avatar? avatar;
         if (Name == CombatScriptParser.CurrentAvatarName)
         {
-            // 如果是当前角色，不进行角色切换
-            var avatarName = combatScenes.CurrentAvatar();
-            avatar = avatarName is not null ? combatScenes.SelectAvatar(avatarName) : combatScenes.SelectAvatar(1);
+            avatar = combatScenes.SelectAvatar(1);
         }
         else
         {
@@ -81,7 +79,6 @@ public class CombatCommand
             {
                 return;
             }
-
             // 非宏类脚本，等待切换角色成功
             if (Method != Method.Wait
                 && Method != Method.MouseDown
@@ -95,7 +92,6 @@ public class CombatCommand
                 avatar.Switch();
             }
         }
-
         Execute(avatar);
     }