Windy/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact synced 2025-01-08 11:57:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix domain and map retry

Browse Source
This commit is contained in:
辉鸭蛋 2024-12-29 20:54:31 +08:00
parent 741da4e0c7
commit d71ff06868
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs
View File

@ -81,6 +81,8 @@ public class AutoDomainTask : ISoloTask
try try
{ {
await DoDomain(); await DoDomain();
// 其他场景不重试
break;
} }
catch (Exception e) catch (Exception e)
{ {
@ -90,9 +92,11 @@ public class AutoDomainTask : ISoloTask
await Delay(2000, ct); await Delay(2000, ct);
continue; continue;
} }
else
{
throw;
}
} }
// 其他场景不重试
break;
} }

15
BetterGenshinImpact/GameTask/AutoTrackPath/TpTask.cs
View File

@ -41,6 +41,7 @@ public class TpTask(CancellationToken ct)
/// <param name="tpX"></param> /// <param name="tpX"></param>
/// <param name="tpY"></param> /// <param name="tpY"></param>
/// <param name="force">强制以当前的tpX,tpY坐标进行自动传送</param> /// <param name="force">强制以当前的tpX,tpY坐标进行自动传送</param>
/// <param name="initialZoomLevel">地图缩放等级</param>
public async Task<(double, double)> TpOnce(double tpX, double tpY, bool force = false, int initialZoomLevel = 4) public async Task<(double, double)> TpOnce(double tpX, double tpY, bool force = false, int initialZoomLevel = 4)
{ {
var (x, y) = (tpX, tpY); var (x, y) = (tpX, tpY);
@ -62,7 +63,7 @@ public class TpTask(CancellationToken ct)
{ {
await AdjustMapZoomLevel(true); await AdjustMapZoomLevel(true);
currentZoomLevel--; currentZoomLevel--;
Logger.LogInformation($"缩放等级过大，调整为{currentZoomLevel}。"); Logger.LogInformation("当前缩放等级过大，调整为{currentZoomLevel}。", currentZoomLevel);
} }
while (!IsPointInBigMapWindow(bigMapInAllMapRect, x, y) || currentZoomLevel > 2.5) // 左上角 350x400也属于禁止点击区域 while (!IsPointInBigMapWindow(bigMapInAllMapRect, x, y) || currentZoomLevel > 2.5) // 左上角 350x400也属于禁止点击区域
{ {
@ -159,10 +160,16 @@ public class TpTask(CancellationToken ct)
Simulation.SendInput.Keyboard.KeyPress(User32.VK.VK_M); Simulation.SendInput.Keyboard.KeyPress(User32.VK.VK_M);
await Delay(1000, ct); await Delay(1000, ct);
ra1 = CaptureToRectArea(); ra1 = CaptureToRectArea();
for (int i = 0; i < 3; i++)
{
if (!Bv.IsInBigMapUi(ra1))
{
await Delay(500, ct);
ra1 = CaptureToRectArea();
}
}
} }
currentZoomLevel = GetBigMapZoomLevel(ra1);
Logger.LogInformation($"当前缩放等级为{currentZoomLevel:F}，地图移动过程中不要操作鼠标中键。");
for (var i = 0; i < 3; i++) for (var i = 0; i < 3; i++)
{ {
try try