mirror of
https://github.com/babalae/better-genshin-impact.git
synced 2026-05-17 09:26:50 +08:00
* GetFishBarRect方法添加更复杂的算法,并为其配备独立的单元测试,和分离难度较大的测试用例(未熟练时两侧出现黄色动态折线的情况);GetFishBoxArea行为去掉拉条框初始位置必须位于屏幕中轴线的条件,并添加其后续Fishing行为的单元测试来验证可行性;EnterFishingMode行为使用结束时间来代替Sleep,并添加整体超时时间;添加一个鱼咬钩的假阳性测试用例仅供娱乐 * 补充GetFishBarRect算法,使通过遗漏的测试"20250314002439020_Fishing_Succeeded.png" * 拉条增加1秒未检测持续时间以应对瞬间丢失拉条框的情况;新增一个检查提竿结果的行为;新增一个检查开始钓一条鱼的初始状态的方法,以应对行为状态错配的情况;一些行为将Sleep优化为DateTime;修改上述改动对应的单元测试 * 解决合并冲突剩余问题,删掉ImageRegion的Bitmap构造函数重载 * 提供给测试用例初始化的 SystemInfo、TaskContext 方法,使用 InitForTest 即可 * InitForTest * 和鸭蛋昨夜的提交撞车了。。。抽象了ISystemInto供单元测试实例化Fake类;给BaseAssets类定义了成员字段systemInfo(我想,既然都是图片模板数据集,如此定义是合理的),供继承类AutoFishingAssets使用,并定义了其在单元测试的派生类;添加了一个900p的选取鱼饵测试用例;blackboard改为负责携带AutoFishingAssets,并将其实例化时机挪到独立任务的Start方法中,避免由于TaskContext尚未初始化导致获取到的SystemInfo为空 * 一个特殊的测试用例:抛竿的瞬间、开始检测咬杆时遇到了假阳性 * Revert "InitForTest" This reverts commit225e9783a7. * Revert "提供给测试用例初始化的 SystemInfo、TaskContext 方法,使用 InitForTest 即可" This reverts commit610c57263a. * 为始终没有找到落点的情况添加计数,在第3次时直接退出,并添加此情况的单元测试 --------- Co-authored-by: 辉鸭蛋 <huiyadanli@gmail.com>
95 lines
3.9 KiB
C#
95 lines
3.9 KiB
C#
using BetterGenshinImpact.Core.Recognition;
|
|
using BetterGenshinImpact.GameTask.Model;
|
|
using OpenCvSharp;
|
|
|
|
namespace BetterGenshinImpact.GameTask.AutoFishing.Assets;
|
|
|
|
public class AutoFishingAssets : BaseAssets<AutoFishingAssets>
|
|
{
|
|
public RecognitionObject SpaceButtonRo;
|
|
|
|
public RecognitionObject BaitButtonRo;
|
|
public RecognitionObject WaitBiteButtonRo;
|
|
public RecognitionObject LiftRodButtonRo;
|
|
public RecognitionObject ExitFishingButtonRo;
|
|
|
|
#pragma warning disable CS8618 // 在退出构造函数时,不可为 null 的字段必须包含非 null 值。请考虑添加 "required" 修饰符或声明为可为 null。
|
|
private AutoFishingAssets() : base()
|
|
{
|
|
Initialization(this.systemInfo);
|
|
}
|
|
|
|
protected AutoFishingAssets(ISystemInfo systemInfo) : base(systemInfo)
|
|
{
|
|
Initialization(systemInfo);
|
|
}
|
|
#pragma warning restore CS8618 // 在退出构造函数时,不可为 null 的字段必须包含非 null 值。请考虑添加 "required" 修饰符或声明为可为 null。
|
|
|
|
private void Initialization(ISystemInfo systemInfo)
|
|
{
|
|
SpaceButtonRo = new RecognitionObject
|
|
{
|
|
Name = "SpaceButton",
|
|
RecognitionType = RecognitionTypes.TemplateMatch,
|
|
TemplateImageMat = GameTaskManager.LoadAssetImage("AutoFishing", "space.png", systemInfo),
|
|
RegionOfInterest = new Rect(CaptureRect.Width - CaptureRect.Width / 3,
|
|
CaptureRect.Height - CaptureRect.Height / 5,
|
|
CaptureRect.Width / 3,
|
|
CaptureRect.Height / 5),
|
|
DrawOnWindow = false
|
|
}.InitTemplate();
|
|
|
|
BaitButtonRo = new RecognitionObject
|
|
{
|
|
Name = "BaitButton",
|
|
RecognitionType = RecognitionTypes.TemplateMatch,
|
|
TemplateImageMat = GameTaskManager.LoadAssetImage("AutoFishing", "switch_bait.png", systemInfo),
|
|
RegionOfInterest = new Rect(CaptureRect.Width - CaptureRect.Width / 2,
|
|
CaptureRect.Height - CaptureRect.Height / 4,
|
|
CaptureRect.Width / 2,
|
|
CaptureRect.Height / 4),
|
|
Threshold = 0.7,
|
|
DrawOnWindow = false
|
|
}.InitTemplate();
|
|
WaitBiteButtonRo = new RecognitionObject
|
|
{
|
|
Name = "WaitBiteButton",
|
|
RecognitionType = RecognitionTypes.TemplateMatch,
|
|
TemplateImageMat = GameTaskManager.LoadAssetImage("AutoFishing", "wait_bite.png", systemInfo),
|
|
RegionOfInterest = new Rect(CaptureRect.Width - CaptureRect.Width / 2,
|
|
CaptureRect.Height - CaptureRect.Height / 4,
|
|
CaptureRect.Width / 2,
|
|
CaptureRect.Height / 4),
|
|
Threshold = 0.7,
|
|
DrawOnWindow = false
|
|
}.InitTemplate();
|
|
LiftRodButtonRo = new RecognitionObject
|
|
{
|
|
Name = "LiftRodButton",
|
|
RecognitionType = RecognitionTypes.TemplateMatch,
|
|
TemplateImageMat = GameTaskManager.LoadAssetImage("AutoFishing", "lift_rod.png", systemInfo),
|
|
RegionOfInterest = new Rect(CaptureRect.Width - CaptureRect.Width / 2,
|
|
CaptureRect.Height - CaptureRect.Height / 4,
|
|
CaptureRect.Width / 2,
|
|
CaptureRect.Height / 4),
|
|
Threshold = 0.7,
|
|
DrawOnWindow = false
|
|
}.InitTemplate();
|
|
|
|
var w = (int)(140 * AssetScale);
|
|
var h = (int)(150 * AssetScale);
|
|
ExitFishingButtonRo = new RecognitionObject
|
|
{
|
|
Name = "ExitFishingButton",
|
|
RecognitionType = RecognitionTypes.TemplateMatch,
|
|
TemplateImageMat = GameTaskManager.LoadAssetImage("AutoFishing", "exit_fishing.png", systemInfo),
|
|
RegionOfInterest = new Rect(CaptureRect.Width - w,
|
|
CaptureRect.Height - h,
|
|
w,
|
|
h),
|
|
Threshold = 0.8,
|
|
DrawOnWindow = false
|
|
}.InitTemplate();
|
|
}
|
|
}
|