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 00000000..61af702f Binary files /dev/null and b/BetterGenshinImpact/GameTask/GameLoading/Assets/1920x1080/girl_moon.png differ 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();