重构逻辑

Author: BnanZ0

assets/images/1.png

@@ -50,46 +50,50 @@
         },
         {
             "id": 1,
-            "name": "lv_text"
+            "name": "drop_item_2000"
         },
         {
             "id": 2,
-            "name": "percentage_icon"
+            "name": "lv_text"
         },
         {
             "id": 3,
-            "name": "quit_big_icon"
+            "name": "percentage_icon"
         },
         {
             "id": 4,
-            "name": "quit_icon"
+            "name": "quit_big_icon"
         },
         {
             "id": 5,
-            "name": "retry_icon"
+            "name": "quit_icon"
         },
         {
             "id": 6,
-            "name": "rogue_dialog"
+            "name": "retry_icon"
         },
         {
             "id": 7,
-            "name": "rogue_gift"
+            "name": "rogue_dialog"
         },
         {
             "id": 8,
-            "name": "serum_icon"
+            "name": "rogue_gift"
         },
         {
             "id": 9,
+            "name": "serum_icon"
+        },
+        {
+            "id": 10,
             "name": "start_icon"
         }
     ],
     "annotations": [
         {
             "id": 0,
             "image_id": 0,
-            "category_id": 1,
+            "category_id": 2,
             "segmentation": [],
             "bbox": [
                 118.0636168317864,
@@ -119,7 +123,7 @@
         {
             "id": 2,
             "image_id": 1,
-            "category_id": 9,
+            "category_id": 10,
             "segmentation": [],
             "bbox": [
                 1310.1749049429657,
@@ -133,8 +137,23 @@
         },
         {
             "id": 3,
+            "image_id": 1,
+            "category_id": 1,
+            "segmentation": [],
+            "bbox": [
+                1711.8403831039573,
+                623.1010910848565,
+                95.35907513336606,
+                63.57271675557723
+            ],
+            "ignore": 0,
+            "iscrowd": 0,
+            "area": 6062.235473527289
+        },
+        {
+            "id": 4,
             "image_id": 2,
-            "category_id": 5,
+            "category_id": 6,
             "segmentation": [],
             "bbox": [
                 1648.912547528517,
@@ -147,9 +166,9 @@
             "area": 2004.8602119446582
         },
         {
-            "id": 4,
+            "id": 5,
             "image_id": 2,
-            "category_id": 4,
+            "category_id": 5,
             "segmentation": [],
             "bbox": [
                 2084.988593155894,
@@ -162,9 +181,9 @@
             "area": 1591.7604707311048
         },
         {
-            "id": 5,
+            "id": 6,
             "image_id": 3,
-            "category_id": 3,
+            "category_id": 4,
             "segmentation": [],
             "bbox": [
                 2322.494296577947,
@@ -177,9 +196,9 @@
             "area": 6503.478494701384
         },
         {
-            "id": 6,
+            "id": 7,
             "image_id": 4,
-            "category_id": 2,
+            "category_id": 3,
             "segmentation": [],
             "bbox": [
                 451.6147162797465,
@@ -192,9 +211,9 @@
             "area": 1006.7143877706319
         },
         {
-            "id": 7,
+            "id": 8,
             "image_id": 5,
-            "category_id": 6,
+            "category_id": 7,
             "segmentation": [],
             "bbox": [
                 1504.8517110266162,
@@ -207,9 +226,9 @@
             "area": 1288.5680001156572
         },
         {
-            "id": 8,
+            "id": 9,
             "image_id": 5,
-            "category_id": 7,
+            "category_id": 8,
             "segmentation": [],
             "bbox": [
                 1504.8517110266162,
@@ -222,9 +241,9 @@
             "area": 1515.962353077242
         },
         {
-            "id": 9,
+            "id": 10,
             "image_id": 6,
-            "category_id": 8,
+            "category_id": 9,
             "segmentation": [],
             "bbox": [
                 56.108457166215146,
@@ -243,6 +262,6 @@
         "description": "",
         "contributor": "Label Studio",
         "url": "",
-        "date_created": "2025-11-06 05:31:40.249476"
+        "date_created": "2025-11-08 02:02:35.391865"
     }
 }

assets/result.json

@@ -12,10 +12,14 @@
     'Geniemon Key': 'z',
 }, description='In Game Hotkey for Skills')
 
-hint_config_option = ConfigOption('挂机设置', { #全局配置示例
+afk_config_option = ConfigOption('挂机设置', { #全局配置示例
     '提示音': 2,
+    '弹出通知': True,
+    '防止鼠标干扰': False,
 }, description='挂机相关设置', config_description={
     '提示音': '单次提示响几次',
+    '弹出通知': '是否弹出windows通知',
+    '防止鼠标干扰': '推荐在不使用电脑时开启，启动任务时会将鼠标移动到安全位置',
 })
 
 
@@ -57,7 +61,7 @@ def make_bottom_right_black(frame): #可选. 某些游戏截图时遮挡UID使
     'debug': False,  # Optional, default: False
     'use_gui': True, # 目前只支持True
     'config_folder': 'configs', #最好不要修改
-    'global_configs': [key_config_option, hint_config_option],
+    'global_configs': [key_config_option, afk_config_option],
     'screenshot_processor': make_bottom_right_black, # 在截图的时候对frame进行修改, 可选
     'gui_icon': 'icons/icon.png', #窗口图标, 最好不需要修改文件名
     'wait_until_before_delay': 0,

src/config.py

@@ -25,12 +25,14 @@ def __init__(self, *args, **kwargs):
             '任务超时时间': '放弃任务前等待的秒数',
         })
         self.setup_commission_config()
-        self.default_config.pop('启用自动穿引共鸣', None)
+        self.default_config.pop("启用自动穿引共鸣", None)
+        self.default_config.pop("自动选择首个密函和密函奖励", None)
         self.name = "自动65级魔之楔本"
         self.action_timeout = 10
 
     def run(self):
         DNAOneTimeTask.run(self)
+        self.move_mouse_to_safe_position()
         try:
             return self.do_run()
         except TaskDisabledException as e:

src/tasks/Auto65ArtifactTask.py

@@ -29,20 +29,22 @@ def __init__(self, *args, **kwargs):
             '波次超时时间': '超时后将重启',
         }
         self.setup_commission_config()
+        self.default_config.pop("启用自动穿引共鸣", None)
+        self.default_config.pop("自动选择首个密函和密函奖励", None)
         self.name = "自动70级皎皎币本"
         self.action_timeout = 10
         self.quick_move_task = QuickMoveTask(self)
 
     def run(self):
         DNAOneTimeTask.run(self)
+        self.move_mouse_to_safe_position()
         try:
             return self.do_run()
         except TaskDisabledException as e:
             pass
         except Exception as e:
             logger.error('AutoDefence error', e)
             raise
-        self.quick_move_task.stop()
 
     def do_run(self):
         self.init_param()
@@ -51,7 +53,6 @@ def do_run(self):
         _wait_next_wave = False
         _skill_time = 0
         _wave_start = 0
-        self.quick_move_task.stop()
         if self.in_team():
             self.open_in_mission_menu()
             self.sleep(0.5)
@@ -76,9 +77,10 @@ def do_run(self):
             _status = self.handle_mission_interface(stop_func=self.stop_func)
             if _status == Mission.START or _status == Mission.STOP:
                 if _status == Mission.STOP:
-                    self.restart_mission()
-                    self.log_info('任务中止，已重启')
+                    self.quit_mission()
+                    self.log_info('任务中止')
                     self.init_param()
+                    continue
                 else:
                     self.log_info('任务完成')
                 self.wait_until(self.in_team, time_out=30)                
@@ -97,7 +99,6 @@ def init_param(self):
         self.stop_mission = False
         self.current_round = -1
         self.current_wave = -1
-        self.quick_move_task.stop()
 
     def stop_func(self):
         self.get_round_info()

src/tasks/Auto70jjbTask.py

@@ -1,7 +1,5 @@
 from qfluentwidgets import FluentIcon
 import time
-import cv2
-import re
 
 from ok import Logger, TaskDisabledException, Box
 from src.tasks.DNAOneTimeTask import DNAOneTimeTask
@@ -21,24 +19,24 @@ def __init__(self, *args, **kwargs):
             '波次超时时间': 90,
         })
         self.config_description = {
-            '轮次': '打几个轮次',
-            '波次超时时间': '超时后将发出提示',
+            "轮次": "打几个轮次",
+            "波次超时时间": "超时后将发出提示",
         }
         self.setup_commission_config()
         self.name = "自动扼守"
         self.action_timeout = 10
         self.quick_move_task = QuickMoveTask(self)
-        
+
     def run(self):
         DNAOneTimeTask.run(self)
+        self.move_mouse_to_safe_position()
         try:
             return self.do_run()
         except TaskDisabledException as e:
             pass
         except Exception as e:
-            logger.error('AutoDefence error', e)
+            logger.error("AutoDefence error", e)
             raise
-        self.quick_move_task.stop()
 
     def do_run(self):
         self.init_param()
@@ -51,34 +49,35 @@ def do_run(self):
             if self.in_team():
                 self.get_wave_info()
                 if self.current_wave != -1:
-                    self.quick_move_task.stop()
                     if self.current_wave != _wave:
                         _wave = self.current_wave
                         _wave_start = time.time()
                         _wait_next_wave = False
+                        self.quick_move_task.reset()
 
-                    if not _wait_next_wave and time.time() - _wave_start >= self.config.get('波次超时时间', 120):
-                        self.log_info('任务超时', notify=True)
+                    if (not _wait_next_wave
+                        and time.time() - _wave_start >= self.config.get("波次超时时间", 120)
+                    ):
+                        self.log_info_notify("任务超时")
                         self.soundBeep()
                         _wait_next_wave = True
 
                     if not _wait_next_wave:
                         _skill_time = self.use_skill(_skill_time)
                 else:
                     self.quick_move_task.run()
-            
+
             _status = self.handle_mission_interface(stop_func=self.stop_func)
             if _status == Mission.START:
-                self.log_info('任务完成', notify=True)
-                self.soundBeep()
                 self.init_param()
-            elif _status == Mission.STOP:
-                self.restart_mission()
-                self.log_info('任务中止，已重启', notify=True)
+                self.log_info_notify("任务完成")
                 self.soundBeep()
+            elif _status == Mission.STOP:
+                self.quit_mission()
                 self.init_param()
+                self.log_info("任务中止")
             elif _status == Mission.CONTINUE:
-                self.log_info('任务继续')
+                self.log_info("任务继续")
                 self.wait_until(self.in_team, time_out=30)
                 self.current_wave = -1
 
@@ -88,10 +87,9 @@ def init_param(self):
         self.stop_mission = False
         self.current_round = -1
         self.current_wave = -1
-        self.quick_move_task.stop()
 
     def stop_func(self):
         self.get_round_info()
-        n = self.config.get('轮次', 3)
+        n = self.config.get("轮次", 3)
         if n == 1 or self.current_round >= n:
             return True