diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index af542cf291..8edc8acc50 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -624,6 +624,7 @@ Then delete the entries corresponding to the paths. Closed stage is reset to Hide series Variable function button + Executes the first open stage. If all stages are closed, skips the current task.\nCurrent execution: {0} Manual entry of stage names Support most main stage names + stage names from the original list (e.g. 4-10, AP-5, H10-1-Hard, etc.) At the end of the stage, enter 「Normal/Hard」 to switch difficulty: Chapters 10-14 use Standard/Adverse, Chapters 15+ use Normal/Raid diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index da5d21b223..58495b8589 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -621,9 +621,10 @@ HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Notifications\Settin 今週中に期限切れとなる正気回復ポーションは、アクティビティ終了の48時間以内に使用してください。 活動なし リストに当日開放されないステージを隠す - 期限切れのレベルをこれにリセットする + 期限切れのステージをこれにリセットする 連戦回数を隠します スタート画面に表示する便利ボタン + 最初の開放したステージを実行します。すべてのステージが未開放の場合は、現在のタスクはスキップされます。\n現在実行中: {0} ステージ名を入力する (テスト機能)ステージ名と番号(例: 4-10、AP-5、H10-1-Hardなど) の両方がサポートされています。ステージの最後に「Normal/Hard」を入力すると難易度を切り替えできます(10〜14章は標準/厄難、15章以降は通常/険地) diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index 7c479ff278..2ae433ff97 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -621,9 +621,10 @@ HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Notifications\Settin 이벤트 종료 48시간 전, 이번 주 만료되는 이성 회복제 사용 활동 없음 미개방 스테이지 숨기기 - 만료된 단계가 다음으로 재설정됩니다 + 만료된 스테이지 재설정 {key=Series} 숨기기 메인 화면 버튼의 기능 + 열려 있는 첫 번째 스테이지로 진입합니다. 모든 스테이지가 열려 있지 않으면 현재 작업은 건너뜁니다.\n현재 실행 중: {0} 스테이지 코드 수동 입력 대부분의 기본 스테이지 이름과 원래 스테이지 이름 목록 지원 (예: 4-10, AP-5, H10-1-Hard) 스테이지 이름 끝에 「Normal/Hard」 를 입력해 난이도를 전환할 수 있습니다 (10-14장은 표준/재앙, 15장 이후는 일반/험지) diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index e22827dbdd..fd19bf38b8 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -624,6 +624,7 @@ HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Notifications\Settin 过期关卡重置为 隐藏代理倍率 主界面可选择按钮功能 + 将执行第一个开放的关卡, 如所有关卡均未开放则跳过当前任务\n当前执行: {0} 手动输入关卡名 支持大部分主线关卡名与原列表的关卡名(如 4-10、AP-5、H10-1-Hard) 可在关卡结尾输入 「Normal/Hard」 切换难度:10-14 章对应标准/磨难,15 章及以后对应常规/险地 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 506b28d1cf..e573aa735b 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -624,6 +624,7 @@ HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Notifications\Settin 過期關卡重設為 隱藏代理倍率 主介面可選擇按鈕功能 + 將執行第一個開放的關卡, 如所有關卡均未開放則跳過當前任務\n當前執行: {0} 手動輸入關卡名稱 支援大部分主線關卡名稱與原清單的關卡名稱(如 4-10、AP-5、H10-1-Hard) 可在關卡結尾輸入 「Normal/Hard」 切換難度:10-14 章對應標準/磨難,15 章及以後對應常規/險地 diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs index 9674758892..7a77a5981f 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs @@ -440,6 +440,23 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel, FightSetting #endregion Drops + public string StagePlanTip { get => field; set => SetAndNotify(ref field, value); } = string.Empty; + + public void StagePlanTipRefresh() + { + var stage = GetFightStage(StagePlan.Select(i => i.Stage)) ?? "--"; + if (stage == string.Empty) + { + stage = LocalizationHelper.GetString("DefaultStage"); + } + + StagePlanTip = LocalizationHelper.GetStringFormat("StagePlanTip", stage); + if (CustomStageCode) + { + StagePlanTip += $"\n\n{LocalizationHelper.GetString("CustomStageCodeTip")}"; + } + } + public static Dictionary AnnihilationModeList { get; } = new() { { LocalizationHelper.GetString("Annihilation.Current"), AnnihilationName }, @@ -694,6 +711,7 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel, FightSetting RefreshCurrentStagePlan(); RefreshWeeklySchedule(); RefreshDropName(); + StagePlanTipRefresh(); Refresh(); } diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml index 73b391e56c..675e568ab1 100644 --- a/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml @@ -219,9 +219,9 @@ Margin="0,5,6,0" HorizontalAlignment="Right" VerticalAlignment="Top" + MouseEnter="{s:Action StagePlanTipRefresh}" NormalOpacity="0.25" - TooltipText="{DynamicResource CustomStageCodeTip}" - Visibility="{c:Binding CustomStageCode}" /> + TooltipText="{Binding StagePlanTip}" />