diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 3c389971fa..f079d81f77 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -476,6 +476,11 @@ namespace MaaWpfGui copilotModel.AddLog(Localization.GetString("CombatError"), UILogColor.Error); } + if (taskChain == "Fight" && (mainModel.Stage == "Annihilation")) + { + mainModel.AddLog(Localization.GetString("AnnihilationTaskFailed"), UILogColor.Warning); + } + break; case AsstMsg.TaskChainStart: diff --git a/src/MaaWpfGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs index 4854f3ff92..89f40b7c17 100644 --- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs @@ -782,6 +782,17 @@ namespace MaaWpfGui var asstProxy = _container.Get(); bool mainFightRet = asstProxy.AsstAppendFight(Stage, medicine, stone, times, DropsItemId, drops_quantity); + if (mainFightRet && (Stage == "Annihilation") && _container.Get().UseAlternateStage) + { + foreach (var stage in new[] { Stage1, Stage2, Stage3 }) + { + if (IsStageOpen(stage) && (stage != Stage)) + { + mainFightRet = asstProxy.AsstAppendFight(stage, medicine, 0, int.MaxValue, string.Empty, 0); + } + } + } + if (mainFightRet && UseRemainingSanityStage && (RemainingSanityStage != string.Empty)) { return asstProxy.AsstAppendFight(RemainingSanityStage, 0, 0, int.MaxValue, string.Empty, 0, false); diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 997398bd03..8754c3100e 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -74,7 +74,7 @@ Starting Roles Starting Oper (single, CN name only) Only supports the CN name of a single oper, default if not filled. - Select "Starting Oper" from support unit list + Select "Starting Oper" from support unit list Enable nonfirend support Deployment with Pause, Works for IS, Copilot and SSS, Beta function, Not recommended yet Use Adb Lite (Experimental) @@ -100,6 +100,10 @@ Overcoming Your Weaknesses As Your Heart Desires + Algorithm Finish + Algorithm Badge + Algorithm Construction Point + Not selected Official (CN) Bilibili @@ -242,6 +246,7 @@ Credit Store Collect mission rewards Auto I.S. + Reclamation Algorithm Select All Inverse @@ -324,6 +329,7 @@ All tasks are completed shutting down. Do you want to cancel? Tip Task(s) completed, about to hibernate + Annihilation task failed, will try to use alternate stage, some combat settings will not be effective diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index a31d0096a8..f0b6de2821 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -329,6 +329,7 @@ 已刷完,即将关机,是否取消? 提示 已刷完,即将休眠 + 剿灭任务失败,将尝试使用剩余备选关卡,部分战斗设置将不生效