From d239cbad5cf507978ce52cfbc13269c133d42db8 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Thu, 11 Sep 2025 16:40:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=9F=BA=E5=BB=BA?=
=?UTF-8?q?=E8=AE=A1=E5=88=92=20ToolTip=20=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/MaaWpfGui/Res/Localizations/en-us.xaml | 3 ++
src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 3 ++
src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 3 ++
src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 3 ++
src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 3 ++
.../ViewModels/UI/TaskQueueViewModel.cs | 12 --------
.../InfrastSettingsUserControlModel.cs | 1 -
.../TaskQueue/InfrastSettingsUserControl.xaml | 28 +++++++++++++------
8 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index e901186f73..3db0f3c6a9 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -140,6 +140,9 @@ To customize rotation schedules, please use ｢{key=InfrastModeCustom}｣.Base Configuration Parsing Error!
Base Configuration:
Base Plan
+
+ If ｢{key=CustomInfrastPlan}｣ has execution time, it will not switch automatically before ｢{key=Base}｣ task starts or during task execution, and will remain in the state at {key=LinkStart}. Switching only occurs when idle or after the task is completed.
+
Auto save for next plan
Custom Base infrastructure selection is empty. Please check your configuration or turn off the Custom Base function.
General Mode
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 4e6c75c7a0..75538e90a7 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -140,6 +140,9 @@
基地構成ファイルのパースエラー！
基地構成ファイルの設定:
基地計画
+
+ ｢{key=CustomInfrastPlan}｣に実行時間が設定されている場合、｢{key=Base}｣タスク開始前やタスク実行中には自動で切り替わらず、{key=LinkStart}時点の状態を維持します。切り替えはアイドル時またはタスク完了後のみ行われます。
+
次の計画を自動保存
カスタム施設設定が空です。設定を確認するか、カスタマイズ機能をオフにしてください。
一般モード
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 1573872370..3faaef167d 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -140,6 +140,9 @@
기반시설 구성 인식 실패!
기반시설 구성:
기반시설 계획
+
+ ｢{key=CustomInfrastPlan}｣에 실행 시간이 존재할 경우, ｢{key=Base}｣ 작업 시작 전이나 작업 중에는 자동으로 전환되지 않으며, {key=LinkStart} 상태를 유지합니다. 전환은 오직 대기 중이거나 작업이 완료된 후에만 이루어집니다.
+
다음 계획용으로 자동 저장
커스텀 시설 설정 선택이 비어 있습니다. 구성을 확인하거나 커스텀 기능을 끄세요.
일반 모드
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 4b4e2be49f..2bd4382185 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -140,6 +140,9 @@
自定义基建配置文件解析错误！
自定义基建配置:
基建计划
+
+ 如 ｢{key=CustomInfrastPlan}｣ 存在执行时间，｢{key=Base}｣ 任务开始前或任务运行时不会自动切换，将保持 {key=LinkStart} 时的状态，仅在空闲或任务完成后切换。
+
自动保存为下个计划
自定义设施配置选择为空，请检查配置或关闭自定义功能。
通用模式
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index f7b077c913..1857672297 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -139,6 +139,9 @@
自定義基建配置檔案解析錯誤！
自定義基建配置:
基建計劃
+
+ 若 ｢{key=CustomInfrastPlan}｣ 存在執行時間，則在 ｢{key=Base}｣ 任務開始前或任務執行時不會自動切換，將保持 {key=LinkStart} 狀態，僅於空閒或任務完成後才會切換。
+
自動保存爲下個計劃
自訂設施配置選擇為空，請檢查配置或關閉自訂功能。
通用模式
diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index c87a299575..1505f24102 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1617,18 +1617,6 @@ namespace MaaWpfGui.ViewModels.UI
Instances.AsstProxy.AsstSetTaskParamsEncoded(id, taskParams);
}
- public static void SetInfrastParams()
- {
- int id = Instances.AsstProxy.TasksStatus.FirstOrDefault(i => i.Value.Type == TaskType.Infrast).Key;
- if (id == 0)
- {
- return;
- }
-
- var taskParams = InfrastSettingsUserControlModel.Instance.Serialize().Params;
- Instances.AsstProxy.AsstSetTaskParamsEncoded(id, taskParams);
- }
-
public bool AppendInfrast()
{
if (InfrastTask.InfrastMode == InfrastMode.Custom && (!File.Exists(InfrastTask.CustomInfrastFile) || InfrastTask.CustomInfrastPlanInfoList.Count == 0))
diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs
index 864a13b53e..ad617a0ade 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs
@@ -435,7 +435,6 @@ public class InfrastSettingsUserControlModel : TaskViewModel
}
SetAndNotify(ref _customInfrastPlanIndex, value);
- TaskQueueViewModel.SetInfrastParams();
ConfigurationHelper.SetValue(ConfigurationKeys.CustomInfrastPlanIndex, value.ToString());
}
}
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
index ea45a94245..91f90fb9ff 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
@@ -44,17 +44,29 @@
SelectedValuePath="Value" />
-
+
+
+
+
+
+ ItemsSource="{Binding CustomInfrastPlanList}"
+ SelectedValue="{Binding CustomInfrastPlanIndex}"
+ SelectedValuePath="Value" />
+