Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-04-12 15:33:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

test and make "move to" functional

Browse Source
This commit is contained in:
lwh9346
2024-08-17 19:16:26 +08:00
parent 6812f30732
commit 9393b0cb24
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BetterGenshinImpact/GameTask/AutoPathing/Navigation.cs
View File

@@ -20,10 +20,8 @@ internal class Navigation
internal static int GetTargetOrientation(Waypoint waypoint, Point2f position)
{
var target = MapCoordinate.GameToMain2048(waypoint.X, waypoint.Y);
double deltaX = target.x - position.X;
double deltaY = target.y - position.Y;
double deltaX = waypoint.X - position.X;
double deltaY = waypoint.Y - position.Y;
double vectorLength = Math.Sqrt(deltaX * deltaX + deltaY * deltaY);
if (vectorLength == 0)
{
@@ -36,8 +34,6 @@ internal class Navigation
{
angle = 2 * Math.PI - angle;
}
// 将角度转换为顺时针方向
angle = 2 * Math.PI - angle;
return (int)(angle * (180.0 / Math.PI));
}

8
BetterGenshinImpact/GameTask/AutoPathing/PathExecutor.cs
View File

@@ -107,6 +107,7 @@ public class PathExecutor
}
position = await Task.Run(Navigation.GetPosition);
var distance = Navigation.GetDistance(waypoint, position);
TaskControl.Logger.LogInformation("接近目标点中，距离为{distance}", distance);
if (distance < 4)
{
TaskControl.Logger.LogInformation("到达路径点附近");
@@ -123,7 +124,7 @@ public class PathExecutor
prevPositions.Add(position);
if (prevPositions.Count > 8)
{
var delta = prevPositions[-1] - prevPositions[-8];
var delta = prevPositions[prevPositions.Count - 1] - prevPositions[prevPositions.Count - 8];
if (Math.Abs(delta.X) + Math.Abs(delta.Y) < 3)
{
TaskControl.Logger.LogWarning("疑似卡死，尝试脱离并跳过路径点");
@@ -141,7 +142,7 @@ public class PathExecutor
}
// 旋转视角
targetOrientation = Navigation.GetTargetOrientation(waypoint, position);
RotateTo(targetOrientation);
await WaitUntilRotatedTo(targetOrientation, 2);
// 根据指定方式进行移动
if (waypoint.MoveType == MoveType.Fly)
{
@@ -236,11 +237,12 @@ public class PathExecutor
{
var cao = CameraOrientation.Compute(TaskControl.CaptureToRectArea().SrcGreyMat);
var diff = (cao - targetOrientation + 180) % 360 - 180;
diff += diff < -180 ? 360 : 0;
if (diff == 0)
{
return diff;
}
Simulation.SendInput.Mouse.MoveMouseBy(30 * diff + 10 * diff > 0 ? 1 : -1, 0);
Simulation.SendInput.Mouse.MoveMouseBy(-6 * diff - 6 * (diff > 0 ? 1 : -1), 0);
return diff;
}