From 9393b0cb2463cc19ec0044c63b18cddbd325a476 Mon Sep 17 00:00:00 2001
From: lwh9346 <lwh9346@163.com>
Date: Sat, 17 Aug 2024 19:16:26 +0800
Subject: [PATCH] test and make "move to" functional

---
 BetterGenshinImpact/GameTask/AutoPathing/Navigation.cs   | 8 ++------
 BetterGenshinImpact/GameTask/AutoPathing/PathExecutor.cs | 8 +++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/BetterGenshinImpact/GameTask/AutoPathing/Navigation.cs b/BetterGenshinImpact/GameTask/AutoPathing/Navigation.cs
index 3902a38e..dd69ed32 100644
--- a/BetterGenshinImpact/GameTask/AutoPathing/Navigation.cs
+++ b/BetterGenshinImpact/GameTask/AutoPathing/Navigation.cs
@@ -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));
     }
 
diff --git a/BetterGenshinImpact/GameTask/AutoPathing/PathExecutor.cs b/BetterGenshinImpact/GameTask/AutoPathing/PathExecutor.cs
index 2fc904bd..76647aef 100644
--- a/BetterGenshinImpact/GameTask/AutoPathing/PathExecutor.cs
+++ b/BetterGenshinImpact/GameTask/AutoPathing/PathExecutor.cs
@@ -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;
     }