修复95版本自动战斗报错

src/task/AutoCombatTask.py

@@ -43,6 +43,6 @@ class AutoCombatTask(BaseCombatTask, TriggerTask):
         if ret:
             self.combat_end()
             if self.config.get('Auto Pick Echo After Combat'):
-                while self.yolo_find_echo(use_color=False, walk=False, turn=False)[1]:
+                while self.yolo_find_echo(use_color=False, turn=False)[1]:
                     pass
         return ret

src/task/FarmEchoTask.py

@@ -1,90 +0,0 @@
-import time
-
-from qfluentwidgets import FluentIcon
-
-from ok import Logger
-from src.task.BaseCombatTask import BaseCombatTask
-from src.task.WWOneTimeTask import WWOneTimeTask
-
-logger = Logger.get_logger(__name__)
-
-
-class FarmEchoTask(WWOneTimeTask, BaseCombatTask):
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.description = "Click Start in Game World"
-        self.name = "Farm Echo in Dungeon"
-        self.default_config.update({
-            'Level': 1,
-            'Repeat Farm Count': 100,
-            'Boss': 'Dreamless'
-        })
-        self.config_description = {
-            'Level': '(1-6) Important, Choose which level to farm, lower levels might not produce a echo'
-        }
-        self.config_type["Boss"] = {'type': "drop_down", 'options': ['Hecate', 'Dreamless', 'Jue', 'Fleurdelys']}
-
-        self.icon = FluentIcon.ALBUM
-        self.add_exit_after_config()
-
-    def run(self):
-        WWOneTimeTask.run(self)
-        self.set_check_monthly_card()
-        self.ensure_main(time_out=180)
-        if not self.in_team()[0]:
-            self.log_error('must be in game world and in teams, please check you game resolution is 16:9', notify=True)
-            return
-
-        # loop here
-        count = 0
-
-        self.teleport_to_boss(self.config.get('Boss'))
-        self.sleep(1)
-        self.walk_until_f(time_out=10,
-                          raise_if_not_found=True)
-        logger.info(f'enter success')
-        challenge = self.wait_feature('gray_button_challenge', raise_if_not_found=True)
-        logger.info(f'found challenge {challenge}')
-        self.sleep(1)
-        self.choose_level(self.config.get("Level"))
-
-        while count < self.config.get("Repeat Farm Count", 0):
-            count += 1
-            self.wait_in_team_and_world(time_out=20)
-            self.sleep(1)
-
-            self.combat_once()
-            logger.info(f'farm echo move {self.config.get("Boss")} yolo_find_echo')
-            dropped = self.yolo_find_echo()[0]
-            self.incr_drop(dropped)
-            self.sleep(0.5)
-            self.send_key('esc', after_sleep=0.5)
-            self.wait_click_feature('confirm_btn_hcenter_vcenter', relative_x=-1, raise_if_not_found=True,
-                                    post_action=lambda: self.send_key('esc', after_sleep=1),
-                                    settle_time=2)
-            self.wait_in_team_and_world(time_out=120)
-            self.sleep(2)
-
-    def choose_level(self, start):
-        y = 0.17
-        x = 0.15
-        distance = 0.08
-
-        logger.info(f'choose level {start}')
-        self.click_relative(x, y + (start - 1) * distance)
-        self.sleep(0.5)
-
-        self.wait_click_feature('gray_button_challenge', raise_if_not_found=True,
-                                click_after_delay=0.5)
-        self.wait_click_feature('gray_confirm_exit_button', relative_x=-1, raise_if_not_found=False,
-                                time_out=3, click_after_delay=0.5, threshold=0.8)
-        self.wait_click_feature('gray_start_battle', relative_x=-1, raise_if_not_found=True,
-                                click_after_delay=0.5, threshold=0.8)
-
-
-echo_color = {
-    'r': (200, 255),  # Red range
-    'g': (150, 220),  # Green range
-    'b': (130, 170)  # Blue range
-}