From 052d8f095ae80b4588c88e74d77bbc7f363ec2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sun, 2 Mar 2025 13:11:46 +0800 Subject: [PATCH] fix bug --- BetterGenshinImpact/GameTask/Common/Job/CheckRewardsTask.cs | 2 +- BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BetterGenshinImpact/GameTask/Common/Job/CheckRewardsTask.cs b/BetterGenshinImpact/GameTask/Common/Job/CheckRewardsTask.cs index 40f27f8c..33b33b78 100644 --- a/BetterGenshinImpact/GameTask/Common/Job/CheckRewardsTask.cs +++ b/BetterGenshinImpact/GameTask/Common/Job/CheckRewardsTask.cs @@ -32,7 +32,7 @@ public class CheckRewardsTask // OCR识别每日是否完成 var assetScale = TaskContext.Instance().SystemInfo.AssetScale; using var ra = CaptureToRectArea(); - var ocrList = ra.FindMulti(RecognitionObject.Ocr(0, ra.Height * 1.0 / 3, 360 * assetScale, ra.Height)); + var ocrList = ra.FindMulti(RecognitionObject.Ocr(0, ra.Height - ra.Height / 3.0, 730 * assetScale, ra.Height / 3.0)); var done = ocrList.FirstOrDefault(txt => txt.Text.Contains("今日奖励已领取")); if (done != null) { diff --git a/BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs index b75112d7..9ab483c0 100644 --- a/BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Pages/OneDragonFlowViewModel.cs @@ -16,6 +16,7 @@ using BetterGenshinImpact.GameTask; using BetterGenshinImpact.GameTask.Common.Element.Assets; using BetterGenshinImpact.GameTask.Common.Job; using BetterGenshinImpact.GameTask.Model.Enum; +using BetterGenshinImpact.Helpers; using BetterGenshinImpact.Service; using BetterGenshinImpact.Service.Notification; using BetterGenshinImpact.Service.Notification.Model.Enum; @@ -238,7 +239,7 @@ public partial class OneDragonFlowViewModel : ObservableObject, INavigationAware break; case "关闭游戏和软件": SystemControl.CloseGame(); - Application.Current.Shutdown(); + Application.Current.Dispatcher.Invoke(() => { Application.Current.Shutdown(); }); break; case "关机": SystemControl.CloseGame();