修复五合一五个都锁会卡住

添加游戏在后台时自动静音选项

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,

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():

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')

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()

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)

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'没有加锁 开始合成')