From 5bf6c005367d359cdea3e27c2d343e68d88ed318 Mon Sep 17 00:00:00 2001
From: NBOOK <NBOOK@users.noreply.github.com>
Date: Mon, 16 Sep 2024 04:38:02 -0400
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=9C=88=E6=90=9C=E7=B4=A2=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8A+=E8=A7=86=E8=A7=92=E9=87=8D=E7=BD=AE=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2WASD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

鸣潮的A和D并不是径直左右走，而是边走边以每秒10°向左/右偏。按此方法WASD循环会导致轨迹逐渐右偏，搜索范围分布不均。这个PR改用A+鼠标中键重置视角，保证转向均为90°且每段轨迹为直线。
---
 src/task/BaseCombatTask.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py
index 6264b04..90953b4 100644
--- a/src/task/BaseCombatTask.py
+++ b/src/task/BaseCombatTask.py
@@ -78,8 +78,8 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck):
         self.sleep(0.2)
 
     def run_in_circle_to_find_echo(self, circle_count=3):
-        directions = ['w', 'a', 's', 'd']
-        step = 1.2
+        directions = ['w', 'w', 'w', 'w']
+        step = 0.8
         duration = 0.8
         total_index = 0
         for count in range(circle_count):
@@ -92,6 +92,15 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck):
                 if picked:
                     self.mouse_up(key="right")
                     return True
+                
+                self.sleep(0.1)
+                self.send_key_down('a')
+                self.sleep(0.01)
+                self.send_key_up('a')
+                self.sleep(0.1)
+                self.middle_click()
+                self.sleep(1)
+
                 total_index += 1
 
     def switch_next_char(self, current_char, post_action=None, free_intro=False, target_low_con=False):