From b80f8275de86d33adc273c1fdc5739bc5c81500e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com> Date: Sat, 20 May 2023 17:56:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=89=98?= =?UTF-8?q?=E7=9B=98=E5=9B=BE=E6=A0=87=E5=BC=BA=E5=88=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?MAA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 双击托盘图标很容易导致窗口位置错误 不会修这个（ --- src/MaaWpfGui/Helper/WindowManager.cs | 6 ++++++ src/MaaWpfGui/Res/Localizations/en-us.xaml | 1 + src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 1 + src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 1 + src/MaaWpfGui/Services/Managers/IMainWindowManager.cs | 5 +++++ src/MaaWpfGui/Services/Managers/MainWindowManager.cs | 6 ++++++ src/MaaWpfGui/Services/TrayIcon.cs | 10 +++++++++- 9 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/MaaWpfGui/Helper/WindowManager.cs b/src/MaaWpfGui/Helper/WindowManager.cs index 19d344c9a4..7cb9cd3532 100644 --- a/src/MaaWpfGui/Helper/WindowManager.cs +++ b/src/MaaWpfGui/Helper/WindowManager.cs @@ -141,6 +141,12 @@ namespace MaaWpfGui.Helper return false; } + public bool ForceShow(Window window) + { + WindowPlacement wp = default; + return SetWindowPlacement(window, ref wp); + } + private bool SetWindowPlacement(WindowHandle window, ref WindowPlacement wp) { try diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 4e343e2456..3385013d34 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -557,6 +557,7 @@ The video resolution is required to be 16:9, and there are no interference facto + Force display of MAA Exit diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 674cb908fd..6b6bcf0b06 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -523,6 +523,7 @@ + MAAの強制表示 終了 diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index ab55318f6c..a48bf39cbf 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -501,6 +501,7 @@ + MAA 강제 표시 종료 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index ecded7eaaa..be8b84c1ce 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -578,6 +578,7 @@ + 强制显示MAA 退出 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 2257621247..69bc4f6af8 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -460,6 +460,7 @@ + 強制顯示MAA 退出 diff --git a/src/MaaWpfGui/Services/Managers/IMainWindowManager.cs b/src/MaaWpfGui/Services/Managers/IMainWindowManager.cs index a7ea1a2d4b..efa8ac48c0 100644 --- a/src/MaaWpfGui/Services/Managers/IMainWindowManager.cs +++ b/src/MaaWpfGui/Services/Managers/IMainWindowManager.cs @@ -25,6 +25,11 @@ namespace MaaWpfGui.Services.Managers /// void Show(); + /// + /// Force show the main window + /// + void ForceShow(); + /// /// Collapse the main window /// diff --git a/src/MaaWpfGui/Services/Managers/MainWindowManager.cs b/src/MaaWpfGui/Services/Managers/MainWindowManager.cs index 2c2a4bbb8d..0f369d898e 100644 --- a/src/MaaWpfGui/Services/Managers/MainWindowManager.cs +++ b/src/MaaWpfGui/Services/Managers/MainWindowManager.cs @@ -50,6 +50,12 @@ namespace MaaWpfGui.Services.Managers MainWindow.Activate(); } + /// + public virtual void ForceShow() + { + ((WindowManager)Instances.WindowManager).ForceShow(MainWindow); + } + /// public virtual void Collapse() { diff --git a/src/MaaWpfGui/Services/TrayIcon.cs b/src/MaaWpfGui/Services/TrayIcon.cs index c920d5ce43..212eb47122 100644 --- a/src/MaaWpfGui/Services/TrayIcon.cs +++ b/src/MaaWpfGui/Services/TrayIcon.cs @@ -64,9 +64,12 @@ namespace MaaWpfGui.Services switchLangMenu.MenuItems.Add(langMenu); } + MenuItem forceShowMenu = new MenuItem(LocalizationHelper.GetString("ForceShow")); + forceShowMenu.Click += ForceShow; + MenuItem exitMenu = new MenuItem(LocalizationHelper.GetString("Exit")); exitMenu.Click += App_exit; - MenuItem[] menuItems = new MenuItem[] { startMenu, stopMenu, switchLangMenu, exitMenu }; + MenuItem[] menuItems = new MenuItem[] { startMenu, stopMenu, switchLangMenu, forceShowMenu, exitMenu }; this._notifyIcon.ContextMenu = new ContextMenu(menuItems); } @@ -91,6 +94,11 @@ namespace MaaWpfGui.Services Instances.TaskQueueViewModel?.Stop(); } + private void ForceShow(object sender, EventArgs e) + { + Instances.MainWindowManager.ForceShow(); + } + private void App_exit(object sender, EventArgs e) { System.Windows.Application.Current.MainWindow.Close(); From b2441d4eff4a959ccb7f3834643dbd459fc26315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com> Date: Sat, 20 May 2023 22:38:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #4818 --- src/MaaWpfGui/Constants/ConfigurationKeys.cs | 1 + src/MaaWpfGui/Res/Localizations/en-us.xaml | 1 + src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 1 + src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 1 + src/MaaWpfGui/ViewModels/UI/RootViewModel.cs | 12 ++++ .../ViewModels/UI/SettingsViewModel.cs | 17 ++++++ src/MaaWpfGui/Views/UI/RootView.xaml | 1 + .../UserControl/GUISettingsUserControl.xaml | 58 +++++++++++-------- 10 files changed, 70 insertions(+), 24 deletions(-) diff --git a/src/MaaWpfGui/Constants/ConfigurationKeys.cs b/src/MaaWpfGui/Constants/ConfigurationKeys.cs index 55645c6600..373be82984 100644 --- a/src/MaaWpfGui/Constants/ConfigurationKeys.cs +++ b/src/MaaWpfGui/Constants/ConfigurationKeys.cs @@ -20,6 +20,7 @@ namespace MaaWpfGui.Constants { public const string Localization = "GUI.Localization"; public const string MinimizeToTray = "GUI.MinimizeToTray"; + public const string HideCloseButton = "GUI.HideCloseButton"; public const string UseNotify = "GUI.UseNotify"; public const string WindowPlacement = "GUI.Placement"; public const string LoadWindowPlacement = "GUI.Placement.Load"; diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 3385013d34..89ca394fd9 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -246,6 +246,7 @@ Hide to tray when minimized System Notification + Hide close button Whether to restart immediately to apply changes Use alternate stage Use remaining sanity stage diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 6b6bcf0b06..f6787162d0 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -241,6 +241,7 @@ 最小化した際にトレイに表示 重要な通知をポップアップする + 「閉じる」ボタンを隠す 代替ステージを選択可能にする 余剰理性の使用 メインタスク終了後に指定されたレベルを選択しても、自動的に理性を回復しません diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index a48bf39cbf..adecbdc1aa 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -235,6 +235,7 @@ 트레이로 최소화 중요 알림 팝업 + 닫기 버튼 숨기기 대체 스테이지 사용 남은 이성 활용 미개방 스테이지 숨기기 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index be8b84c1ce..c8efa9f65e 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -249,6 +249,7 @@ 最小化时隐藏至托盘 重要信息弹出系统通知 + 隐藏关闭按钮 是否立刻重启应用更改 使用备选关卡 使用剩余理智 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 69bc4f6af8..d569c87480 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -193,6 +193,7 @@ 最小化時隱藏至托盤 重要訊息彈出系統通知 + 隱藏關閉按鈕 使用備選關卡 使用剩餘理智 在完成主任務後刷取指定關卡，不再自動回復理智 diff --git a/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs b/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs index 2450466513..e243018573 100644 --- a/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/RootViewModel.cs @@ -15,6 +15,7 @@ using System; using System.ComponentModel; using System.Threading.Tasks; using System.Windows; +using MaaWpfGui.Constants; using MaaWpfGui.Helper; using Stylet; using StyletIoC; @@ -66,6 +67,17 @@ namespace MaaWpfGui.ViewModels.UI set => SetAndNotify(ref _windowTitle, value); } + private bool _showCloseButton = !Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.HideCloseButton, bool.FalseString)); + + /// + /// Gets or sets a value indicating whether to show close button. + /// + public bool ShowCloseButton + { + get => _showCloseButton; + set => SetAndNotify(ref _showCloseButton, value); + } + protected override void OnInitialActivate() { base.OnInitialActivate(); diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index 77c44ceb63..c2999d7622 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -2429,6 +2429,23 @@ namespace MaaWpfGui.ViewModels.UI } } + private bool _hideCloseButton = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.HideCloseButton, bool.FalseString)); + + /// + /// Gets or sets a value indicating whether to hide close button. + /// + public bool HideCloseButton + { + get => _hideCloseButton; + set + { + SetAndNotify(ref _hideCloseButton, value); + ConfigurationHelper.SetValue(ConfigurationKeys.HideCloseButton, value.ToString()); + var rvm = (RootViewModel)this.Parent; + rvm.ShowCloseButton = !value; + } + } + private bool _useNotify = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.UseNotify, bool.TrueString)); /// diff --git a/src/MaaWpfGui/Views/UI/RootView.xaml b/src/MaaWpfGui/Views/UI/RootView.xaml index 2f6b376c6e..84f099e7d7 100644 --- a/src/MaaWpfGui/Views/UI/RootView.xaml +++ b/src/MaaWpfGui/Views/UI/RootView.xaml @@ -16,6 +16,7 @@ MinHeight="600" d:DataContext="{d:DesignInstance {x:Type ui:RootViewModel}}" Icon="../../newlogo.ico" + ShowCloseButton="{Binding ShowCloseButton}" mc:Ignorable="d"> diff --git a/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml index d2101a9340..d7c4e4da82 100644 --- a/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml @@ -22,7 +22,7 @@ HorizontalAlignment="Center" VerticalAlignment="Center"> - + @@ -34,7 +34,7 @@ + + Text="{Binding LanguageInfo, Mode=OneTime}" + TextWrapping="Wrap" /> + Text="UI Theme" + TextWrapping="Wrap" /> - - - - + Block.TextAlignment="Center" + Text="{DynamicResource MainViewButtonFeature}" + TextWrapping="Wrap" /> + From 5eba940aa24f7e7ca2e27c0d2fce697fa712d170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com> Date: Sat, 20 May 2023 23:02:20 +0800 Subject: [PATCH 3/5] chore: improve ConfirmExit() --- src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index cef45ee4c7..8b399d4761 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -171,18 +171,20 @@ namespace MaaWpfGui.ViewModels.UI return true; } + if (!Instances.RecognizerViewModel.GachaDone) + { + // no need to confirm if Gacha running + return true; + } + var window = Instances.MainWindowManager.GetWindowIfVisible(); var result = MessageBoxHelper.ShowNative(window, LocalizationHelper.GetString("ConfirmExitText"), LocalizationHelper.GetString("ConfirmExitTitle"), "MAA", MessageBoxButton.YesNo, MessageBoxImage.Information, MessageBoxResult.No); return result == MessageBoxResult.Yes; } -#pragma warning disable CS0672 // Member overrides obsolete member - - // WHY OBSOLETED? - protected override bool CanClose() -#pragma warning restore CS0672 // Member overrides obsolete member + public override Task CanCloseAsync() { - return ConfirmExit(); + return Task.FromResult(this.ConfirmExit()); } private void InitTimer() From a69f0fcd841f7955b862718b158df9ac4298c8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com> Date: Sun, 21 May 2023 01:08:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=88=B7?= =?UTF-8?q?=E7=90=86=E6=99=BA=E4=BB=BB=E5=8A=A1=E8=AE=BE=E7=BD=AE=E4=B8=AD?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9F=BA=E5=BB=BA=E8=AE=A1=E5=88=92=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Constants/ConfigurationKeys.cs | 1 + .../Models/TaskSettingVisibilityInfo.cs | 22 ++++++++-- src/MaaWpfGui/Res/Localizations/en-us.xaml | 1 + src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 1 + src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 1 + .../UserControl/FightSettingsUserControl.xaml | 44 +++++++++++++++++-- 8 files changed, 65 insertions(+), 7 deletions(-) diff --git a/src/MaaWpfGui/Constants/ConfigurationKeys.cs b/src/MaaWpfGui/Constants/ConfigurationKeys.cs index 373be82984..8e1a0c6656 100644 --- a/src/MaaWpfGui/Constants/ConfigurationKeys.cs +++ b/src/MaaWpfGui/Constants/ConfigurationKeys.cs @@ -84,6 +84,7 @@ namespace MaaWpfGui.Constants public const string CustomInfrastEnabled = "Infrast.CustomInfrastEnabled"; public const string CustomInfrastFile = "Infrast.CustomInfrastFile"; public const string CustomInfrastPlanIndex = "Infrast.CustomInfrastPlanIndex"; + public const string CustomInfrastPlanShowInFightSettings = "Infrast.CustomInfrastPlanShowInFightSettings"; public const string UseRemainingSanityStage = "Fight.UseRemainingSanityStage"; public const string UseExpiringMedicine = "Fight.UseExpiringMedicine"; diff --git a/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs b/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs index 541a5e8bbb..c7185718eb 100644 --- a/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs +++ b/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs @@ -54,7 +54,7 @@ namespace MaaWpfGui.Models { if (Guide && enable) { - currentEnable = taskName; + currentEnableSetting = taskName; enable = false; } @@ -110,7 +110,7 @@ namespace MaaWpfGui.Models set => SetAndNotify(ref _advancedSettingsVisibility, value); } - private string currentEnable; + private string currentEnableSetting; private bool _guide = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.GuideStepIndex, "0")) < SettingsViewModel.GuideMaxStep; @@ -120,8 +120,24 @@ namespace MaaWpfGui.Models set { SetAndNotify(ref _guide, value); - Set(currentEnable, !value); + Set(currentEnableSetting, !value); } } + + #region 双入口设置可见性 + + private bool _customInfrastPlanShowInFightSettings = bool.Parse(ConfigurationHelper.GetValue(ConfigurationKeys.CustomInfrastPlanShowInFightSettings, false.ToString())); + + public bool CustomInfrastPlanShowInFightSettings + { + get => _customInfrastPlanShowInFightSettings; + set + { + SetAndNotify(ref _customInfrastPlanShowInFightSettings, value); + ConfigurationHelper.SetValue(ConfigurationKeys.CustomInfrastPlanShowInFightSettings, value.ToString()); + } + } + + #endregion } } diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 89ca394fd9..79ab94fbbb 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -253,6 +253,7 @@ Brush the specified stage after completing the main task, no longer automatically revert to sanity Unlimited use of expiring sanity potion Hide today not open stage + Show Base Plan Variable function button Manual entry of level 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 level, enter "Normal/Hard" to switch between Normal and Tough difficulty diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index f6787162d0..e083957e8a 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -247,6 +247,7 @@ メインタスク終了後に指定されたレベルを選択しても、自動的に理性を回復しません 48時間以内に期限が切れる理性剤を無制限に使用 当日開放されないステージを隠す + 基地計画を表示する スタート画面に表示する便利ボタン ステージ名を入力する (テスト機能)ステージ名と番号（例：4-10、AP-5、H10-1-Hardなど）の両方がサポートされています。レベルの最後に"Normal/Hard"を入力することで、標準とハードの難易度を切り替えることができます。 diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index adecbdc1aa..e549bbae8b 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -239,6 +239,7 @@ 대체 스테이지 사용 남은 이성 활용 미개방 스테이지 숨기기 + 기반시설 계획 표시 메인 화면 버튼의 기능 스테이지 코드 수동 입력 대부분의 메인 스테이지와 원래 목록(예: 4-10, AP-5, H10-1-Hard)에 있는 검문소 이름을 지원합니다. diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index c8efa9f65e..2a8cd242b0 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -256,6 +256,7 @@ 在完成主任务后刷取指定关卡，不再自动回复理智 无限吃48小时内过期的理智药 隐藏当日不开放关卡 + 显示基建计划 主界面可选择按钮功能 手动输入关卡名 支持大部分主线关卡名与原列表的关卡名（如4-10、AP-5、H10-1-Hard） 可在关卡结尾输入"Normal/Hard"表示需要切换标准与磨难难度 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index d569c87480..28b5423670 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -199,6 +199,7 @@ 在完成主任務後刷取指定關卡，不再自動回復理智 無限吃48小時內過期的理智藥 隱藏當日不開放關卡 + 顯示基建計劃 主介面可選擇按鈕功能 手動輸入關卡代名 支持大部分主線關卡名與原列表的關卡名（如4-10、AP-5、H10-1-Hard） 可在關卡結尾輸入"Normal/Hard"表示需要切換標準與磨難難度 diff --git a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml index e0ea1c3abe..e55c2763ab 100644 --- a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml @@ -22,10 +22,11 @@ + - + @@ -88,7 +89,7 @@ - + @@ -134,9 +135,40 @@ Value="{Binding DropsQuantity, UpdateSourceTrigger=PropertyChanged}" /> - + - + + + + + + + + + + + + + + + @@ -294,6 +326,10 @@ Content="{DynamicResource HideUnavailableStage}" IsChecked="{Binding HideUnavailableStage}" IsEnabled="{c:Binding !CustomStageCode}" /> + Date: Sun, 21 May 2023 02:03:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=E6=89=A9=E5=A4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=BE=E7=BD=AE=E5=8F=AF=E9=80=89=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #4826 --- src/MaaWpfGui/Views/UI/TaskQueueView.xaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml index c201f4b30d..282764ab8e 100644 --- a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml +++ b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml @@ -65,18 +65,23 @@ ToolTip="{DynamicResource LabelSequenceTip}"> - + + + + + + --> - + - +