Skip to content

Commit 0ef6ae8

Browse files
committed
🔧 chore(deps): 更新项目依赖版本
1 parent 652131c commit 0ef6ae8

6 files changed

Lines changed: 30 additions & 31 deletions

File tree

requirements.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ certifi==2026.1.4
88
# via requests
99
charset-normalizer==3.4.4
1010
# via requests
11-
comtypes==1.4.14
11+
comtypes==1.4.15
1212
# via pycaw
1313
darkdetect==0.8.0
1414
# via pyside6-fluent-widgets
1515
idna==3.11
1616
# via requests
1717
mouse==0.7.1
1818
# via ok-script
19-
numpy==2.2.6
19+
numpy==2.3.5
2020
# via
2121
# opencv-python
2222
# openvino
2323
# shapely
24-
ok-script==1.0.24
24+
ok-script==1.0.28
2525
# via -r requirements.in
2626
onnxocr-ppocrv4==0.0.5
2727
# via -r requirements.in
28-
opencv-python==4.12.0.88
28+
opencv-python==4.13.0.90
2929
# via -r requirements.in
3030
openvino==2025.4.1
3131
# via -r requirements.in
@@ -59,7 +59,7 @@ pyside6-essentials==6.10.1
5959
# pyside6-addons
6060
pyside6-fluent-widgets==1.8.3
6161
# via ok-script
62-
pysidesix-frameless-window==0.7.5
62+
pysidesix-frameless-window==0.7.7
6363
# via pyside6-fluent-widgets
6464
pywin32==311
6565
# via

src/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ def make_bottom_right_black(frame): #可选. 某些游戏截图时遮挡UID使
123123
'links': { # 关于里显示的链接, 可选
124124
'default': {
125125
'github': 'https://github.com/BnanZ0/ok-duet-night-abyss',
126+
'sponsor': 'https://ko-fi.com/bnanz',
126127
'qq_group': 'https://qm.qq.com/q/iF3bfUflY',
127128
'qq_channel': 'https://pd.qq.com/s/djmm6l44y',
128129
'discord': 'https://discord.gg/vVyCatEBgA',

src/tasks/BaseDNATask.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def in_team(self, frame=None) -> bool:
151151
return True
152152
# start_time = time.perf_counter()
153153
mat = self.get_feature_by_name("ultimate_key_icon").mat
154-
mat2 = self.get_box_by_name("ultimate_key_icon").crop_frame(_frame)
154+
mat2 = self.box_of_screen(0.8832, 0.9132, 0.8977, 0.9389, name="ultimate_key_icon", hcenter=True).crop_frame(_frame)
155155
max_area1 = invert_max_area_only(mat)[2]
156156
max_area2 = invert_max_area_only(mat2)[2]
157157
result = False
@@ -642,7 +642,6 @@ def setup_fidget_action(self):
642642

643643
lalt_pressed = False
644644
needs_resync = False
645-
_in_team = None
646645

647646
def send_key_raw(key, is_down):
648647
interaction = self.executor.interaction
@@ -665,16 +664,12 @@ def get_magic_sleep_time():
665664
])
666665

667666
def in_team():
668-
nonlocal _in_team
669-
local_frame = self.shared_frame
670-
if _in_team is None and local_frame is not None:
671-
_in_team = self.in_team(local_frame)
672-
elif local_frame is None:
673-
_in_team = True
674-
return _in_team
667+
if self.shared_frame is None:
668+
return True
669+
return self.in_team(self.shared_frame)
675670

676671
def check_alt_logic():
677-
nonlocal lalt_pressed, needs_resync, _in_team
672+
nonlocal lalt_pressed, needs_resync
678673

679674
if not self.afk_config.get("鼠标抖动", True):
680675
return
@@ -694,8 +689,8 @@ def check_alt_logic():
694689
elif needs_resync and in_team():
695690
self.log_info("[LAlt保持] 恢复: 检测到重回队伍,重新按下 LAlt")
696691
needs_resync = False
692+
time.sleep(0.2)
697693
send_key_raw("lalt", True)
698-
_in_team = None
699694
else:
700695
if lalt_pressed:
701696
self.log_info("[LAlt保持] 停止: 功能关闭,彻底释放 LAlt")

src/tasks/fullauto/ImportTask.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,18 @@ def load_png_files(self, folder_path):
223223

224224
def walk_to_aim(self, former_index=None, delay=0):
225225
try:
226+
self.shared_frame = None
226227
self.fidget_params.update({"skip_jitter": True})
227-
self.sleep(1)
228+
self.sleep(1.5)
228229
self.fidget_params.update({"hold_lalt": True})
229-
self.sleep(0.5)
230+
self.sleep(0.1)
230231
self.fidget_params.update({"skip_jitter": False})
231-
self.sleep(delay-1.5)
232+
self.sleep(delay-1.6)
233+
self.sleep_check_interval = 0.1
232234
ret = self._walk_to_aim(former_index)
233235
finally:
234236
self.fidget_params.update({"hold_lalt": False})
237+
self.sleep_check_interval = -1
235238
return ret
236239

237240
def _walk_to_aim(self, former_index=None):
@@ -334,7 +337,6 @@ def match_map(self, index, max_conf=0.0, pattern=None): # 建议给 max_conf
334337

335338
# 只裁剪和转换一次屏幕
336339
frame = self.frame
337-
self.shared_frame = frame
338340
cropped_screen = box.crop_frame(frame)
339341
screen_gray = cv2.cvtColor(cropped_screen, cv2.COLOR_BGR2GRAY)
340342

@@ -438,17 +440,16 @@ def play_macro_actions(self, map_index):
438440
if self.check_for_monthly_card()[0]:
439441
raise MacroFailedException
440442

441-
self.next_frame()
442-
self.shared_frame = self.frame
443-
444443
current_offset = time.perf_counter() - start_time
445444
delay = target_time - current_offset
446445
target = time.perf_counter() + delay
447446
if delay > 0.02:
448447
self.sleep(delay - 0.02)
449448

450-
while time.perf_counter() < target:
451-
pass
449+
while True:
450+
now = time.perf_counter()
451+
if target - now <= 0 or target - now > 1:
452+
break
452453

453454
if action['type'] == "delay":
454455
self.delay_index = map_index
@@ -566,6 +567,8 @@ def execute_mouse_rotation(self, action):
566567
self.move_mouse_relative(dx, dy, self.original_Xsensitivity, self.original_Ysensitivity)
567568
logger.debug(f"鼠标视角旋转: {direction}, 角度: {angle}, 像素: {pixels}")
568569

570+
def sleep_check(self):
571+
self.shared_frame = self.frame
569572

570573
def normalize_key(key: str) -> str:
571574
"""

src/tasks/trigger/AutoAimTask.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ def right_click_scope(self):
8585
def do_aim(self):
8686
try:
8787
with self.right_click_scope():
88-
self.sleep_check(self.config.get('按下时间', 0.50))
89-
self.sleep_check(self.config.get("间隔时间", 0.50))
88+
self.trig_sleep_check(self.config.get('按下时间', 0.50))
89+
self.trig_sleep_check(self.config.get("间隔时间", 0.50))
9090
except CharDeadException:
9191
self.log_error("Characters dead", notify=True)
9292
self.running = False
@@ -96,7 +96,7 @@ def do_aim(self):
9696
self.running = False
9797
return False
9898

99-
def sleep_check(self, sec, check_signal_flag=True):
99+
def trig_sleep_check(self, sec, check_signal_flag=True):
100100
if sec <= 0:
101101
return
102102
end_time = time.perf_counter() + sec

src/tasks/trigger/AutoMoveTask.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ def left_click_scope(self):
7878
def do_move(self):
7979
try:
8080
with self.left_click_scope():
81-
self.sleep_check(self.config.get('按下时间', 0.50))
82-
self.sleep_check(self.config.get("间隔时间", 0.50))
81+
self.trig_sleep_check(self.config.get('按下时间', 0.50))
82+
self.trig_sleep_check(self.config.get("间隔时间", 0.50))
8383
except TriggerDeactivateException as e:
8484
logger.info(f"auto_aim_task_deactivate {e}")
8585
self.running = False
8686
return False
8787

88-
def sleep_check(self, sec, check_signal_flag=True):
88+
def trig_sleep_check(self, sec, check_signal_flag=True):
8989
if sec <= 0:
9090
return
9191
end_time = time.perf_counter() + sec

0 commit comments

Comments
 (0)