From 8d2ee35b7c2132da7c7939885045e34e3551ec16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sun, 10 Nov 2024 01:20:45 +0800 Subject: [PATCH] edit fight end judge --- .../AutoFight/Assets/AutoFightAssets.cs | 6 +++ .../GameTask/AutoFight/AutoFightTask.cs | 44 ++++++++++++++----- .../GameTask/Common/BgiVision/BvStatus.cs | 2 +- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/BetterGenshinImpact/GameTask/AutoFight/Assets/AutoFightAssets.cs b/BetterGenshinImpact/GameTask/AutoFight/Assets/AutoFightAssets.cs index b20444cd..03c7cdc3 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/Assets/AutoFightAssets.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/Assets/AutoFightAssets.cs @@ -36,6 +36,9 @@ public class AutoFightAssets : BaseAssets public Dictionary> AvatarSideIconRectListMap; // 侧边栏角色头像 联机状态下 public Dictionary> AvatarIndexRectListMap; // 侧边栏角色头像对应的白色块 联机状态下 + // 小道具位置 + public Rect GadgetRect; + private AutoFightAssets() { TeamRectNoIndex = new Rect(CaptureRect.Width - (int)(355 * AssetScale), (int)(220 * AssetScale), @@ -46,6 +49,9 @@ public class AutoFightAssets : BaseAssets (int)(77 * AssetScale), (int)(77 * AssetScale)); QRect = new Rect(CaptureRect.Width - (int)(157 * AssetScale), CaptureRect.Height - (int)(165 * AssetScale), (int)(110 * AssetScale), (int)(110 * AssetScale)); + // 小道具位置 1920-133,800,60,50 + GadgetRect = new Rect(CaptureRect.Width - (int)(133 * AssetScale), (int)(800 * AssetScale), + (int)(60 * AssetScale), (int)(50 * AssetScale)); // 结束提示从中间开始找相对位置 EndTipsUpperRect = new Rect(CaptureRect.Width / 2 - (int)(100 * AssetScale), (int)(243 * AssetScale), (int)(200 * AssetScale), (int)(50 * AssetScale)); diff --git a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs index da562670..9633ae96 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs @@ -1,17 +1,18 @@ using BetterGenshinImpact.Core.Recognition.ONNX; +using BetterGenshinImpact.Core.Simulator; using BetterGenshinImpact.GameTask.AutoFight.Model; using BetterGenshinImpact.GameTask.AutoFight.Script; -using BetterGenshinImpact.GameTask.AutoPathing; using BetterGenshinImpact.GameTask.Model.Area; using Microsoft.Extensions.Logging; using System; -using System.Collections.Generic; using System.Diagnostics; +using System.Linq; using System.Threading; using System.Threading.Tasks; -using BetterGenshinImpact.Core.Config; -using BetterGenshinImpact.Helpers; +using BetterGenshinImpact.GameTask.AutoFight.Assets; using static BetterGenshinImpact.GameTask.Common.TaskControl; +using BetterGenshinImpact.Core.Recognition.OpenCv; +using OpenCvSharp; namespace BetterGenshinImpact.GameTask.AutoFight; @@ -29,6 +30,8 @@ public class AutoFightTask : ISoloTask private DateTime _lastFightFlagTime = DateTime.Now; // 战斗标志最近一次出现的时间 + private readonly double _dpi = TaskContext.Instance().DpiScale; + public AutoFightTask(AutoFightParam taskParam) { _taskParam = taskParam; @@ -128,8 +131,15 @@ public class AutoFightTask : ISoloTask private async Task CheckFightFinish() { + // 小道具判断 + if (HasFightFlagByGadget(CaptureToRectArea())) + { + _lastFightFlagTime = DateTime.Now; + return false; + } + // YOLO 判断血条和怪物位置 - if (HasFightFlag(CaptureToRectArea())) + if (HasFightFlagByYolo(CaptureToRectArea())) { _lastFightFlagTime = DateTime.Now; return false; @@ -139,14 +149,15 @@ public class AutoFightTask : ISoloTask if ((DateTime.Now - _lastFightFlagTime).TotalSeconds > 5) { // 旋转完毕后都没有检测到血条和怪物位置，则按L键确认战斗结束 - List angles = [0, 90, 180, 270]; - var rotateTask = new CameraRotateTask(_ct); - foreach (var a in angles) + Simulation.SendInput.Mouse.MiddleButtonClick(); + await Delay(300, _ct); + for (var i = 0; i < 10; i++) { - await rotateTask.WaitUntilRotatedTo(a, 5, 30); - await Delay(1000, _ct!); // 等待视角稳定 - if (HasFightFlag(CaptureToRectArea())) + Simulation.SendInput.Mouse.MoveMouseBy((int)(100 * _dpi), 0); + await Delay(800, _ct); // 等待视角稳定 + if (HasFightFlagByYolo(CaptureToRectArea())) { + _lastFightFlagTime = DateTime.Now; return false; } } @@ -159,7 +170,7 @@ public class AutoFightTask : ISoloTask return false; } - private bool HasFightFlag(ImageRegion imageRegion) + private bool HasFightFlagByYolo(ImageRegion imageRegion) { // if (RuntimeHelper.IsDebug) // { @@ -168,4 +179,13 @@ public class AutoFightTask : ISoloTask var dict = _predictor.Detect(imageRegion); return dict.ContainsKey("health_bar") || dict.ContainsKey("enemy_identify"); } + + private bool HasFightFlagByGadget(ImageRegion imageRegion) + { + // 小道具位置 1920-133,800,60,50 + var gadgetMat = imageRegion.DeriveCrop(AutoFightAssets.Instance.GadgetRect).SrcMat; + var list = ContoursHelper.FindSpecifyColorRects(gadgetMat, new Scalar(225, 220, 225), new Scalar(255, 255, 255)); + // 要大于 gadgetMat 的 1/2 + return list.Any(r => r.Width > gadgetMat.Width / 2 && r.Height > gadgetMat.Height / 2); + } } diff --git a/BetterGenshinImpact/GameTask/Common/BgiVision/BvStatus.cs b/BetterGenshinImpact/GameTask/Common/BgiVision/BvStatus.cs index 4b0b5614..c4d64bee 100644 --- a/BetterGenshinImpact/GameTask/Common/BgiVision/BvStatus.cs +++ b/BetterGenshinImpact/GameTask/Common/BgiVision/BvStatus.cs @@ -74,7 +74,7 @@ public static partial class Bv /// /// /// - public static async Task WaitForPartyViewUi(CancellationToken ct, int retryTimes = 3) + public static async Task WaitForPartyViewUi(CancellationToken ct, int retryTimes = 5) { return await NewRetry.WaitForAction(() => IsInPartyViewUi(TaskControl.CaptureToRectArea()), ct, retryTimes); }