From 81f21e5bc93a2c1ea5f06f797162cb004c431903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BA=81=E5=8A=A8=E7=9A=84=E5=B0=8F=E6=B0=A8=E6=B0=94?= Date: Thu, 15 Jan 2026 12:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=91=E5=A5=B3=E6=9C=88=E5=8D=A1=E6=94=AF?= =?UTF-8?q?=E6=8C=81=20(#2622)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameTask/Common/BgiVision/BvStatus.cs | 9 ++++++++- .../GameLoading/Assets/1920x1080/girl_moon.png | Bin 0 -> 16126 bytes .../GameLoading/Assets/GameLoadingAssets.cs | 10 ++++++++++ .../GameTask/GameLoading/GameLoading.cs | 3 +-- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 BetterGenshinImpact/GameTask/GameLoading/Assets/1920x1080/girl_moon.png diff --git a/BetterGenshinImpact/GameTask/Common/BgiVision/BvStatus.cs b/BetterGenshinImpact/GameTask/Common/BgiVision/BvStatus.cs index 9fc33d17..2c80c863 100644 --- a/BetterGenshinImpact/GameTask/Common/BgiVision/BvStatus.cs +++ b/BetterGenshinImpact/GameTask/Common/BgiVision/BvStatus.cs @@ -256,7 +256,14 @@ public static partial class Bv /// public static bool IsInBlessingOfTheWelkinMoon(ImageRegion captureRa) { - return captureRa.Find(GameLoadingAssets.Instance.WelkinMoonRo).IsExist(); + var ra = captureRa; + + if (ra.Find(GameLoadingAssets.Instance.GirlMoonRo).IsExist()) + { + return true; + } + + return ra.Find(GameLoadingAssets.Instance.WelkinMoonRo).IsExist(); } /// diff --git a/BetterGenshinImpact/GameTask/GameLoading/Assets/1920x1080/girl_moon.png b/BetterGenshinImpact/GameTask/GameLoading/Assets/1920x1080/girl_moon.png new file mode 100644 index 0000000000000000000000000000000000000000..61af702f7df8cec120c77c4513f0de9fe04d9289 GIT binary patch literal 16126 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 literal 0 HcmV?d00001 diff --git a/BetterGenshinImpact/GameTask/GameLoading/Assets/GameLoadingAssets.cs b/BetterGenshinImpact/GameTask/GameLoading/Assets/GameLoadingAssets.cs index 178780aa..a7b0dfe3 100644 --- a/BetterGenshinImpact/GameTask/GameLoading/Assets/GameLoadingAssets.cs +++ b/BetterGenshinImpact/GameTask/GameLoading/Assets/GameLoadingAssets.cs @@ -9,6 +9,7 @@ public class GameLoadingAssets : BaseAssets public RecognitionObject ChooseEnterGameRo; public RecognitionObject EnterGameRo; public RecognitionObject WelkinMoonRo; + public RecognitionObject GirlMoonRo; private GameLoadingAssets() { @@ -38,5 +39,14 @@ public class GameLoadingAssets : BaseAssets RegionOfInterest = new Rect(0, CaptureRect.Height / 2, CaptureRect.Width, CaptureRect.Height / 2), DrawOnWindow = false }.InitTemplate(); + + GirlMoonRo = new RecognitionObject + { + Name = "GirlMoon", + RecognitionType = RecognitionTypes.TemplateMatch, + TemplateImageMat = GameTaskManager.LoadAssetImage("GameLoading", "girl_moon.png"), + RegionOfInterest = new Rect(0, CaptureRect.Height / 2, CaptureRect.Width, CaptureRect.Height / 2), + DrawOnWindow = false + }.InitTemplate(); } } diff --git a/BetterGenshinImpact/GameTask/GameLoading/GameLoading.cs b/BetterGenshinImpact/GameTask/GameLoading/GameLoading.cs index fc368de9..219ad711 100644 --- a/BetterGenshinImpact/GameTask/GameLoading/GameLoading.cs +++ b/BetterGenshinImpact/GameTask/GameLoading/GameLoading.cs @@ -343,8 +343,7 @@ public class GameLoadingTrigger : ITaskTrigger } } - var wmRa = content.CaptureRectArea.Find(_assets.WelkinMoonRo); - if (!wmRa.IsEmpty()) + if (Bv.IsInBlessingOfTheWelkinMoon(content.CaptureRectArea)) { GameCaptureRegion.GameRegion1080PPosMove(100, 100); TaskContext.Instance().PostMessageSimulator.LeftButtonClickBackground();