From 9d0b09356f6677b57544f9aebfe5ba9476bbdbda Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Wed, 24 Dec 2025 16:09:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=B3=E9=94=AE=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=82=AC=E6=B5=AE=E7=AA=97=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Res/Localizations/en-us.xaml | 1 + src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 1 + src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 3 ++- src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 3 ++- src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 3 ++- src/MaaWpfGui/Views/UI/NotifyIcon.xaml | 1 + src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs | 11 +++++++++-- 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 12054d308d..fa80bf6896 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -736,6 +736,7 @@ Do not adjust the proxy multiplier setting in the game Cancel Left Click: Toggle Log Floating Window Right Click: Select Target Process + Toggle Log Overlay Toolbox diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 5ff7a7d6b4..de7a0285c4 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -737,6 +737,7 @@ C:\\leidian\\LDPlayer9 キャンセル 左クリック:ログフローティングウィンドウの切り替え 右クリック:ターゲットプロセスの選択 + ログオーバーレイのオン/オフ ツールボックス diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index f87b260793..027869f5b0 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -738,6 +738,7 @@ C:\\leidian\\LDPlayer9 취소 왼쪽 클릭: 로그 플로팅 창 전환 오른쪽 클릭: 대상 프로세스 선택 + 로그 오버레이 켜기/끄기 툴박스 @@ -1338,7 +1339,7 @@ MAA를 독립된 새 폴더에 압축 해제하거나, MAA에 속하지 않는 D 와장창! 으악! 뭔가 엄청난 걸 건드려버렸나 봐요... 처리되지 않은 예외 발생으로 인한 크래시 로그 기록 - + 꾸미기 장인 바꾼 {key=BackgroundImage} 덕분에 화사해졌네요! {key=BackgroundImage} 1회 변경 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index b1c84d30a7..8d3e71bad7 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -735,8 +735,9 @@ C:\\leidian\\LDPlayer9。\n 刷新 确定 取消 - 左键:开关日志悬浮窗 + 左键:开/关日志悬浮窗 右键:选择目标进程 + 开/关日志悬浮窗 小工具 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 28a6cdbac7..45bbf0819b 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -735,8 +735,9 @@ C:\\leidian\\LDPlayer9。\n 重新整理 確定 取消 - 左鍵:開關日誌懸浮窗 + 左鍵:開/關日誌懸浮窗 右鍵:選擇目標進程 + 開/關日誌懸浮窗 小工具 diff --git a/src/MaaWpfGui/Views/UI/NotifyIcon.xaml b/src/MaaWpfGui/Views/UI/NotifyIcon.xaml index 7f18abaf0c..8727fd162c 100644 --- a/src/MaaWpfGui/Views/UI/NotifyIcon.xaml +++ b/src/MaaWpfGui/Views/UI/NotifyIcon.xaml @@ -21,6 +21,7 @@ + diff --git a/src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs b/src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs index e47752caec..1f403e483d 100644 --- a/src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs +++ b/src/MaaWpfGui/Views/UI/NotifyIcon.xaml.cs @@ -42,8 +42,9 @@ public partial class NotifyIcon InitializeComponent(); uint doubleClickTime = GetDoubleClickTime(); - _clickTimer = new(doubleClickTime); - _clickTimer.AutoReset = false; + _clickTimer = new(doubleClickTime) { + AutoReset = false, + }; _clickTimer.Elapsed += (s, e) => { _canClick = true; @@ -68,6 +69,7 @@ public partial class NotifyIcon stopMenu.Click += StopTask; forceShowMenu.Click += ForceShow; hideTrayMenu.Click += HideTray; + toggleOverlayMenu.Click += ToggleOverlay; restartMenu.Click += App_restart; exitMenu.Click += App_exit; @@ -149,6 +151,11 @@ public partial class NotifyIcon _logger.Information("Use tray icon: {0}", SettingsViewModel.GuiSettings.UseTray); } + private static void ToggleOverlay(object sender, RoutedEventArgs e) + { + Instances.TaskQueueViewModel?.ToggleOverlay(); + } + private static void App_restart(object sender, RoutedEventArgs e) { if (Instances.TaskQueueViewModel.ConfirmExit())