From fea3b9371fe60a177e34a975e26b61cacb9dc79a Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Wed, 11 Mar 2026 19:38:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=9E=E6=8E=A5=E6=97=B6=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=A8=A1=E6=8B=9F=E5=99=A8=E5=88=86=E8=BE=A8=E7=8E=87?= =?UTF-8?q?=EF=BC=8Cen=20=E6=9C=8D=E4=BD=BF=E7=94=A8=E9=9D=9E=201080p=20?= =?UTF-8?q?=E6=97=B6=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Controller/ControlScaleProxy.cpp | 4 ++++ src/MaaWpfGui/Main/AsstProxy.cs | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/MaaCore/Controller/ControlScaleProxy.cpp b/src/MaaCore/Controller/ControlScaleProxy.cpp index 9600a7335e..15890aa76c 100644 --- a/src/MaaCore/Controller/ControlScaleProxy.cpp +++ b/src/MaaCore/Controller/ControlScaleProxy.cpp @@ -56,6 +56,10 @@ asst::ControlScaleProxy::ControlScaleProxy( m_scale_size = std::make_pair(WindowWidthDefault, scale_height); m_control_scale = static_cast(width) / static_cast(WindowWidthDefault); } + + info["what"] = "ResolutionInfo"; + info["why"] = "Normal"; + callback(info); } bool asst::ControlScaleProxy::click(const Point& p) diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 99f8f6617f..9247590bb0 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -777,6 +777,17 @@ public class AsstProxy Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ResolutionNotSupported"), UiLogColor.Error); break; + case "ResolutionInfo": + { + int width = details["details"]?["width"]?.ToObject() ?? 0; + int height = details["details"]?["height"]?.ToObject() ?? 0; + if (SettingsViewModel.GameSettings.ClientType == ClientType.EN && (width != 1920 || height != 1080)) + { + Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ResolutionInfoYoStarEN"), UiLogColor.Warning); + } + } + break; + case "ResolutionError": Connected = false; Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ResolutionAcquisitionFailure"), UiLogColor.Error);