Skip to content

Commit 79c92d8

Browse files
committed
chore(requirements): 更新ok-script版本
1 parent 66256e4 commit 79c92d8

10 files changed

Lines changed: 3490 additions & 61 deletions

File tree

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ venv/
5555
.venv/
5656
python/
5757
.python-version
58-
pyproject.toml
59-
uv.lock
6058
CLAUDE.md
6159

6260
# PyInstaller

pyproject.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[project]
2+
name = "ok-duet-night-abyss"
3+
version = "0.1.0"
4+
description = "Add your description here"
5+
readme = "README.md"
6+
requires-python = ">=3.12"
7+
dependencies = [
8+
"ok-script>=1.0.102",
9+
"onnxocr-ppocrv4==0.0.5",
10+
"opencv-python>=4.13.0.92",
11+
"openvino>=2026.1.0",
12+
"pynput==1.8.1",
13+
"pyside6==6.9.1",
14+
]
15+
16+
[dependency-groups]
17+
dev = [
18+
"polib>=1.2.0",
19+
]

requirements.in

Lines changed: 0 additions & 5 deletions
This file was deleted.

requirements.txt

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,35 @@
1-
#
2-
# This file is autogenerated by pip-compile with Python 3.12
3-
# by the following command:
4-
#
5-
# pip-compile --cert=None --client-cert=None --index-url=None --pip-args=None requirements.in
6-
#
7-
certifi==2026.1.4
1+
# This file was autogenerated by uv via the following command:
2+
# uv pip compile pyproject.toml --python-platform windows --no-reuse-hashes -o requirements.txt
3+
certifi==2026.2.25
84
# via requests
9-
charset-normalizer==3.4.4
5+
charset-normalizer==3.4.7
106
# via requests
11-
comtypes==1.4.15
7+
comtypes==1.4.16
128
# via pycaw
139
darkdetect==0.8.0
1410
# via pyside6-fluent-widgets
1511
idna==3.11
1612
# via requests
1713
mouse==0.7.1
1814
# via ok-script
19-
numpy==2.3.5
15+
numpy==2.4.4
2016
# via
2117
# opencv-python
2218
# openvino
2319
# shapely
24-
ok-script==1.0.51
25-
# via -r requirements.in
26-
playwright==1.57.0
20+
ok-script==1.0.102
21+
# via ok-duet-night-abyss (pyproject.toml)
2722
onnxocr-ppocrv4==0.0.5
28-
# via -r requirements.in
29-
opencv-python==4.13.0.90
30-
# via -r requirements.in
31-
openvino==2025.4.1
32-
# via -r requirements.in
23+
# via ok-duet-night-abyss (pyproject.toml)
24+
opencv-python==4.13.0.92
25+
# via ok-duet-night-abyss (pyproject.toml)
26+
openvino==2026.1.0
27+
# via ok-duet-night-abyss (pyproject.toml)
3328
openvino-telemetry==2025.2.0
3429
# via openvino
35-
packaging==25.0
36-
# via openvino
37-
pillow==12.1.0
30+
pillow==12.2.0
3831
# via onnxocr-ppocrv4
39-
psutil==7.2.1
32+
psutil==7.2.2
4033
# via
4134
# ok-script
4235
# pycaw
@@ -49,28 +42,30 @@ pyclipper==1.4.0
4942
pydirectinput==1.0.4
5043
# via ok-script
5144
pynput==1.8.1
52-
# via -r requirements.in
53-
pyside6==6.10.1
54-
# via pyside6-fluent-widgets
55-
pyside6-addons==6.10.1
45+
# via ok-duet-night-abyss (pyproject.toml)
46+
pyside6==6.9.1
47+
# via
48+
# ok-duet-night-abyss (pyproject.toml)
49+
# pyside6-fluent-widgets
50+
pyside6-addons==6.9.1
5651
# via pyside6
57-
pyside6-essentials==6.10.1
52+
pyside6-essentials==6.9.1
5853
# via
5954
# pyside6
6055
# pyside6-addons
6156
pyside6-fluent-widgets==1.8.3
6257
# via ok-script
63-
pysidesix-frameless-window==0.7.7
58+
pysidesix-frameless-window==0.8.1
6459
# via pyside6-fluent-widgets
6560
pywin32==311
6661
# via
6762
# ok-script
6863
# pysidesix-frameless-window
69-
requests==2.32.5
64+
requests==2.33.1
7065
# via ok-script
7166
shapely==2.1.2
7267
# via onnxocr-ppocrv4
73-
shiboken6==6.10.1
68+
shiboken6==6.9.1
7469
# via
7570
# pyside6
7671
# pyside6-addons

src/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ def make_bottom_right_black(frame): #可选. 某些游戏截图时遮挡UID使
8585
return frame
8686

8787
config = {
88+
'custom_tasks': True, # enable creating and editing custom tasks
8889
'debug': False, # Optional, default: False
8990
'use_gui': True, # 目前只支持True
9091
'config_folder': 'configs', #最好不要修改

src/tasks/AutoDefence.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,19 @@ def __init__(self, *args, **kwargs):
3434

3535
@property
3636
def config(self):
37-
if self.external_movement == _default_movement:
38-
return super().config
39-
else:
40-
if self._merged_config_cache is None:
41-
self._merged_config_cache = super().config.copy()
37+
if self.external_movement == _default_movement or not self._external_config:
38+
return getattr(self, '_base_config', None)
39+
40+
if self._merged_config_cache is None:
41+
base = getattr(self, '_base_config', {})
42+
self._merged_config_cache = base.copy() if base else {}
4243
self._merged_config_cache.update(self._external_config)
43-
return self._merged_config_cache
44+
return self._merged_config_cache
45+
46+
@config.setter
47+
def config(self, value):
48+
self._base_config = value
49+
self._merged_config_cache = None
4450

4551
def config_external_movement(self, func: Callable, config: dict):
4652
if callable(func):

src/tasks/AutoExploration.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,19 @@ def __init__(self, *args, **kwargs):
3434

3535
@property
3636
def config(self):
37-
if self.external_movement == _default_movement:
38-
return super().config
39-
else:
40-
if self._merged_config_cache is None:
41-
self._merged_config_cache = super().config.copy()
37+
if self.external_movement == _default_movement or not self._external_config:
38+
return getattr(self, '_base_config', None)
39+
40+
if self._merged_config_cache is None:
41+
base = getattr(self, '_base_config', {})
42+
self._merged_config_cache = base.copy() if base else {}
4243
self._merged_config_cache.update(self._external_config)
43-
return self._merged_config_cache
44+
return self._merged_config_cache
45+
46+
@config.setter
47+
def config(self, value):
48+
self._base_config = value
49+
self._merged_config_cache = None
4450

4551
def config_external_movement(self, func: Callable, config: dict):
4652
if callable(func):

src/tasks/AutoGeneral.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,19 @@ def __init__(self, *args, **kwargs):
4343

4444
@property
4545
def config(self):
46-
if self.external_movement == _default_movement:
47-
return super().config
48-
else:
49-
if self._merged_config_cache is None:
50-
self._merged_config_cache = super().config.copy()
46+
if self.external_movement == _default_movement or not self._external_config:
47+
return getattr(self, '_base_config', None)
48+
49+
if self._merged_config_cache is None:
50+
base = getattr(self, '_base_config', {})
51+
self._merged_config_cache = base.copy() if base else {}
5152
self._merged_config_cache.update(self._external_config)
52-
return self._merged_config_cache
53+
return self._merged_config_cache
54+
55+
@config.setter
56+
def config(self, value):
57+
self._base_config = value
58+
self._merged_config_cache = None
5359

5460
def config_external_movement(self, approach: Callable, config: dict, evacuation: Callable = _default_movement):
5561
if callable(approach):

src/tasks/AutoHedge.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,19 @@ def __init__(self, *args, **kwargs):
4949

5050
@property
5151
def config(self):
52-
if self.external_movement == _default_movement:
53-
return super().config
54-
else:
55-
if self._merged_config_cache is None:
56-
self._merged_config_cache = super().config.copy()
52+
if self.external_movement == _default_movement or not self._external_config:
53+
return getattr(self, '_base_config', None)
54+
55+
if self._merged_config_cache is None:
56+
base = getattr(self, '_base_config', {})
57+
self._merged_config_cache = base.copy() if base else {}
5758
self._merged_config_cache.update(self._external_config)
58-
return self._merged_config_cache
59+
return self._merged_config_cache
60+
61+
@config.setter
62+
def config(self, value):
63+
self._base_config = value
64+
self._merged_config_cache = None
5965

6066
def config_external_movement(self, approach: Callable, evacuation: Callable, config: dict):
6167
if callable(approach) and callable(evacuation):

0 commit comments

Comments
 (0)