From 3438771084326df8be2f4513c3fa737dc0f38d06 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Sun, 11 Aug 2024 23:21:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=94=E5=90=88=E4=B8=80?= =?UTF-8?q?=E4=BA=94=E4=B8=AA=E9=83=BD=E9=94=81=E4=BC=9A=E5=8D=A1=E4=BD=8F?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=B8=B8=E6=88=8F=E5=9C=A8=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E6=97=B6=E8=87=AA=E5=8A=A8=E9=9D=99=E9=9F=B3=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/combat/CombatCheck.py | 2 +- src/task/AutoCombatTask.py | 3 +++ src/task/AutoPickTask.py | 3 +++ src/task/FarmEchoTask.py | 3 +++ src/task/FarmWorldBossTask.py | 3 +++ src/task/FiveToOneTask.py | 3 ++- 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py index 9999707..ac6d424 100644 --- a/src/combat/CombatCheck.py +++ b/src/combat/CombatCheck.py @@ -69,7 +69,7 @@ class CombatCheck: return False def recent_liberation(self): - return time.time() - self._last_liberation < 0.3 + return time.time() - self._last_liberation < 0.15 def check_count_down(self): count_down_area = self.box_of_screen_scaled(3840, 2160, 1820, 266, 2100, diff --git a/src/task/AutoCombatTask.py b/src/task/AutoCombatTask.py index a8d0e07..4f74c76 100644 --- a/src/task/AutoCombatTask.py +++ b/src/task/AutoCombatTask.py @@ -1,3 +1,5 @@ +from qfluentwidgets import FluentIcon + from ok.logging.Logger import get_logger from ok.task.TriggerTask import TriggerTask from src.task.BaseCombatTask import BaseCombatTask, NotInCombatException @@ -12,6 +14,7 @@ class AutoCombatTask(BaseCombatTask, TriggerTask): self.trigger_interval = 0.1 self.name = "Auto Combat" self.description = "Enable auto combat in Abyss, Game World etc" + self.icon = FluentIcon.CALORIES def run(self): while self.in_combat(): diff --git a/src/task/AutoPickTask.py b/src/task/AutoPickTask.py index 28f46f1..87000d3 100644 --- a/src/task/AutoPickTask.py +++ b/src/task/AutoPickTask.py @@ -1,3 +1,5 @@ +from qfluentwidgets import FluentIcon + from ok.feature.FindFeature import FindFeature from ok.logging.Logger import get_logger from ok.task.TriggerTask import TriggerTask @@ -12,6 +14,7 @@ class AutoPickTask(TriggerTask, BaseWWTask, FindFeature): super().__init__() self.name = "Auto Pick" self.description = "Auto Pick Flowers in Game World" + self.icon = FluentIcon.SHOPPING_CART def run(self): self.send_key('f') diff --git a/src/task/FarmEchoTask.py b/src/task/FarmEchoTask.py index 04c2ab4..8eadea2 100644 --- a/src/task/FarmEchoTask.py +++ b/src/task/FarmEchoTask.py @@ -1,3 +1,5 @@ +from qfluentwidgets import FluentIcon + from ok.logging.Logger import get_logger from src.task.BaseCombatTask import BaseCombatTask @@ -21,6 +23,7 @@ class FarmEchoTask(BaseCombatTask): } self.config_type["Entrance Direction"] = {'type': "drop_down", 'options': ['Forward', 'Backward']} self.crownless_pos = (0.9, 0.4) + self.icon = FluentIcon.ALBUM def run(self): self.set_check_monthly_card() diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index ec5594b..d22cee3 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -1,5 +1,7 @@ import time +from qfluentwidgets import FluentIcon + from ok.feature.Feature import Feature from ok.logging.Logger import get_logger from src.task.BaseCombatTask import BaseCombatTask, CharDeadException @@ -44,6 +46,7 @@ class FarmWorldBossTask(BaseCombatTask): } self.config_type["Entrance Direction"] = {'type': "drop_down", 'options': ['Forward', 'Backward']} self.crownless_pos = (0.9, 0.4) + self.icon = FluentIcon.GLOBE def teleport_to_boss(self, boss_name): index = self.boss_names.index(boss_name) diff --git a/src/task/FiveToOneTask.py b/src/task/FiveToOneTask.py index 49cce18..1c49dd6 100644 --- a/src/task/FiveToOneTask.py +++ b/src/task/FiveToOneTask.py @@ -214,7 +214,8 @@ class FiveToOneTask(BaseCombatTask): if lock_count > 0: logger.info(f'本次加锁 {lock_count} 个, 重新添加5个') - self.try_add_or_remove_five() + if lock_count != 5: + self.try_add_or_remove_five() return self.loop_merge(True, start_col=5 - lock_count) else: logger.info(f'没有加锁 开始合成')