Skip to content

Commit bbd4299

Browse files
committed
fix: minor bugs
1 parent 5bf2429 commit bbd4299

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

src/tasks/AutoSkill.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
from qfluentwidgets import FluentIcon
22
import time
3-
import cv2
4-
import re
53

64
from ok import Logger, TaskDisabledException
75
from src.tasks.BaseCombatTask import BaseCombatTask
@@ -23,7 +21,7 @@ def __init__(self, *args, **kwargs):
2321
})
2422

2523
self.setup_commission_config()
26-
keys_to_remove = ["委托手册", "启用自动穿引共鸣", "自动选择首个密函和密函奖励"]
24+
keys_to_remove = ["委托手册", "启用自动穿引共鸣", "自动选择首个密函和密函奖励", "优先选择持有数为0的密函奖励"]
2725
for key in keys_to_remove:
2826
self.default_config.pop(key, None)
2927

@@ -38,7 +36,7 @@ def run(self):
3836
DNAOneTimeTask.run(self)
3937
try:
4038
return self.do_run()
41-
except TaskDisabledException as e:
39+
except TaskDisabledException:
4240
pass
4341
except Exception as e:
4442
logger.error('AutoCombatSkill error', e)

src/tasks/CommissionsTask.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ def choose_letter(self, timeout=10):
205205
action_timeout = self.safe_get("action_timeout", timeout)
206206
if self.config.get("自动选择首个密函和密函奖励", False):
207207
if self.find_letter_interface():
208+
self.sleep(0.5)
208209
self.move_mouse_to_safe_position()
209210
self.click(0.56, 0.5)
210211
self.move_back_from_safe_position()
@@ -235,13 +236,13 @@ def choose_letter_reward_zero(self):
235236
and self.find_next_hint(0.33, 0.64, 0.40, 0.67, r'[::]'),
236237
time_out=4)
237238
if self.find_next_hint(0.33, 0.64, 0.40, 0.67, r'[::]0'):
238-
self.log_info("选择第一个奖励", True)
239+
self.log_info_notify("选择第一个奖励")
239240
self.click(0.36, 0.66, after_sleep=0.5)
240241
elif self.find_next_hint(0.47, 0.64, 0.53, 0.67, r'[::]0'):
241-
self.log_info("选择第二个奖励", True)
242+
self.log_info_notify("选择第二个奖励")
242243
self.click(0.50, 0.66, after_sleep=0.5)
243244
elif self.find_next_hint(0.60, 0.64, 0.67, 0.67, r'[::]0'):
244-
self.log_info("选择第三个奖励", True)
245+
self.log_info_notify("选择第三个奖励")
245246
self.click(0.63, 0.66, after_sleep=0.5)
246247
else:
247248
self.log_info("未识别到持有数为0的奖励")

0 commit comments

Comments
 (0)