all assets to singleton

This commit is contained in:
辉鸭蛋
2024-04-04 14:38:04 +08:00
parent f41cbcdab4
commit bdc99e9e06
14 changed files with 345 additions and 381 deletions

View File

@@ -44,7 +44,7 @@ public class AutoDomainTask
public AutoDomainTask(AutoDomainParam taskParam)
{
_taskParam = taskParam;
_simulator = AutoFightContext.Instance().Simulator;
_simulator = AutoFightContext.Instance.Simulator;
var captureArea = TaskContext.Instance().SystemInfo.CaptureAreaRect;
var assetScale = TaskContext.Instance().SystemInfo.AssetScale;
@@ -181,7 +181,7 @@ public class AutoDomainTask
private void EnterDomain()
{
var fightAssets = AutoFightContext.Instance().FightAssets;
var fightAssets = AutoFightContext.Instance.FightAssets;
var fRectArea = GetContentFromDispatcher().CaptureRectArea.Find(AutoPickAssets.Instance.FRo);
if (!fRectArea.IsEmpty())
@@ -217,7 +217,7 @@ public class AutoDomainTask
while (retryTimes < 120)
{
retryTimes++;
var cactRectArea = GetContentFromDispatcher().CaptureRectArea.Find(AutoFightContext.Instance().FightAssets.ClickAnyCloseTipRa);
var cactRectArea = GetContentFromDispatcher().CaptureRectArea.Find(AutoFightContext.Instance.FightAssets.ClickAnyCloseTipRa);
if (!cactRectArea.IsEmpty())
{
Sleep(1000, _taskParam.Cts);
@@ -366,7 +366,7 @@ public class AutoDomainTask
{
var content = GetContentFromDispatcher();
var endTipsRect = content.CaptureRectArea.Crop(AutoFightContext.Instance().FightAssets.EndTipsUpperRect);
var endTipsRect = content.CaptureRectArea.Crop(AutoFightContext.Instance.FightAssets.EndTipsUpperRect);
var text = OcrFactory.Paddle.Ocr(endTipsRect.SrcGreyMat);
if (text.Contains("挑战") || text.Contains("达成"))
{
@@ -374,7 +374,7 @@ public class AutoDomainTask
return true;
}
endTipsRect = content.CaptureRectArea.Crop(AutoFightContext.Instance().FightAssets.EndTipsRect);
endTipsRect = content.CaptureRectArea.Crop(AutoFightContext.Instance.FightAssets.EndTipsRect);
text = OcrFactory.Paddle.Ocr(endTipsRect.SrcGreyMat);
if (text.Contains("自动") || text.Contains("退出"))
{
@@ -661,7 +661,7 @@ public class AutoDomainTask
break;
}
var useCondensedResinRa = GetContentFromDispatcher().CaptureRectArea.Find(AutoFightContext.Instance().FightAssets.UseCondensedResinRa);
var useCondensedResinRa = GetContentFromDispatcher().CaptureRectArea.Find(AutoFightContext.Instance.FightAssets.UseCondensedResinRa);
if (!useCondensedResinRa.IsEmpty())
{
useCondensedResinRa.ClickCenter();
@@ -687,13 +687,13 @@ public class AutoDomainTask
// 优先点击继续
var content = GetContentFromDispatcher();
var confirmRectArea = content.CaptureRectArea.Find(AutoFightContext.Instance().FightAssets.ConfirmRa);
var confirmRectArea = content.CaptureRectArea.Find(AutoFightContext.Instance.FightAssets.ConfirmRa);
if (!confirmRectArea.IsEmpty())
{
if (isLastTurn)
{
// 最后一回合 退出
var exitRectArea = content.CaptureRectArea.Find(AutoFightContext.Instance().FightAssets.ExitRa);
var exitRectArea = content.CaptureRectArea.Find(AutoFightContext.Instance.FightAssets.ExitRa);
if (!exitRectArea.IsEmpty())
{
exitRectArea.ClickCenter();
@@ -711,7 +711,7 @@ public class AutoDomainTask
if (condensedResinCount == 0 && fragileResinCount < 20)
{
// 没有体力了退出
var exitRectArea = content.CaptureRectArea.Find(AutoFightContext.Instance().FightAssets.ExitRa);
var exitRectArea = content.CaptureRectArea.Find(AutoFightContext.Instance.FightAssets.ExitRa);
if (!exitRectArea.IsEmpty())
{
exitRectArea.ClickCenter();
@@ -742,7 +742,7 @@ public class AutoDomainTask
var content = GetContentFromDispatcher();
// 浓缩树脂
var condensedResinCountRa = content.CaptureRectArea.Find(AutoFightContext.Instance().FightAssets.CondensedResinCountRa);
var condensedResinCountRa = content.CaptureRectArea.Find(AutoFightContext.Instance.FightAssets.CondensedResinCountRa);
if (!condensedResinCountRa.IsEmpty())
{
// 图像右侧就是浓缩树脂数量
@@ -753,7 +753,7 @@ public class AutoDomainTask
}
// 脆弱树脂
var fragileResinCountRa = content.CaptureRectArea.Find(AutoFightContext.Instance().FightAssets.FragileResinCountRa);
var fragileResinCountRa = content.CaptureRectArea.Find(AutoFightContext.Instance.FightAssets.FragileResinCountRa);
if (!fragileResinCountRa.IsEmpty())
{
// 图像右侧就是脆弱树脂数量