diff --git a/BetterGenshinImpact/GameTask/Common/Element/Assets/MapAssets.cs b/BetterGenshinImpact/GameTask/Common/Element/Assets/MapAssets.cs index 3c34b36c..1e6d768a 100644 --- a/BetterGenshinImpact/GameTask/Common/Element/Assets/MapAssets.cs +++ b/BetterGenshinImpact/GameTask/Common/Element/Assets/MapAssets.cs @@ -14,6 +14,9 @@ namespace BetterGenshinImpact.GameTask.Common.Element.Assets; public class MapAssets : BaseAssets { public Rect MimiMapRect { get; } + + public static Rect MimiMapRect1080P = new Rect(62, 19,212,212); + public MapAssets() { diff --git a/BetterGenshinImpact/GameTask/MapMask/MapMaskTrigger.cs b/BetterGenshinImpact/GameTask/MapMask/MapMaskTrigger.cs index e457c462..8f21ee61 100644 --- a/BetterGenshinImpact/GameTask/MapMask/MapMaskTrigger.cs +++ b/BetterGenshinImpact/GameTask/MapMask/MapMaskTrigger.cs @@ -144,7 +144,7 @@ public class MapMaskTrigger : ITaskTrigger if (miniPoint != default) { // 展示窗口是 212 - const double viewportSize = 353; + double viewportSize = MapAssets.MimiMapRect1080P.Width / 3.0 * 10; UIDispatcherHelper.Invoke(() => { MaskWindow.Instance().MiniMapPointsCanvasControl.UpdateViewport( diff --git a/BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs b/BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs index 3fef8334..b4480e80 100644 --- a/BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs +++ b/BetterGenshinImpact/ViewModel/MaskWindowViewModel.cs @@ -20,6 +20,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Media; using System.Windows.Threading; +using BetterGenshinImpact.GameTask.Common.Element.Assets; using BetterGenshinImpact.Model.MaskMap; using Vanara.PInvoke; using MaskMapPoint = BetterGenshinImpact.Model.MaskMap.MaskMapPoint; @@ -70,11 +71,11 @@ namespace BetterGenshinImpact.ViewModel [ObservableProperty] private string _mapPointsLoadingText = "正在加载点位..."; - public double MiniMapOverlayLeftRatio => 50d / 1920d; + public double MiniMapOverlayLeftRatio => MapAssets.MimiMapRect1080P.X / 1920d; - public double MiniMapOverlayTopRatio =>14d / 1080d; + public double MiniMapOverlayTopRatio => MapAssets.MimiMapRect1080P.Y / 1080d; - public double MiniMapOverlaySizeRatio => 212d / 1080d; + public double MiniMapOverlaySizeRatio => MapAssets.MimiMapRect1080P.Width / 1080d; public sealed record MapPointApiProviderOption(MapPointApiProvider Provider, string DisplayName);