Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
5881a1b
feat: 初步实现坐标识别&小地图显示
May 29, 2026
f0c9749
Merge branch 'master' into 9268-master
May 30, 2026
db28c00
feat: 大地图匹配&附加层初步实现
May 31, 2026
b3c45fe
Merge branch 'ok-oldking:master' into master
9268 May 31, 2026
661c93f
Merge branch 'ok-oldking:master' into master
9268 Jun 1, 2026
f8df2ba
feat: npy流转途径优化 & 匹配算法增加直接调用入口
Jun 1, 2026
22ff0bf
feat: 优化大地图表现逻辑&尝试优化匹配准确率
Jun 3, 2026
26719dc
Merge branch 'ok-oldking:master' into master
9268 Jun 3, 2026
0d4ad1a
Merge branch 'ok-oldking:master' into master
9268 Jun 5, 2026
9819207
Merge branch 'ok-oldking:master' into master
9268 Jun 6, 2026
2c75246
Merge branch 'ok-oldking:master' into master
9268 Jun 9, 2026
393995b
Merge branch 'ok-oldking:master' into master
9268 Jun 10, 2026
8129edf
Merge branch 'ok-oldking:master' into master
9268 Jun 11, 2026
1012a76
Merge branch 'ok-oldking:master' into master
9268 Jun 12, 2026
491dee6
feat: 优化匹配
Jun 12, 2026
21bf0b3
feat: 缺少的文件
Jun 12, 2026
2b7d97e
feat: 缺少的文件
Jun 12, 2026
76d9b0b
feat: i18n支持&配置调整
Jun 13, 2026
6520ece
feat: 默认开启&搜索范围调整
Jun 13, 2026
e20fe46
feat: 优化一些细节
Jun 13, 2026
8ffe633
feat: 一些小调整&pr问题修复
Jun 14, 2026
3a95219
Merge branch 'master' into 9268-master
Jun 14, 2026
0e8d68d
Merge branch 'ok-oldking:master' into master
9268 Jun 14, 2026
58808cd
Merge branch 'master' into 9268-master
Jun 15, 2026
cca5624
fix: 缩放比上界导致的定位不准问题
Jun 15, 2026
a5b6e55
feat:删除多余文件
Jun 16, 2026
c11a708
Merge branch 'ok-oldking:master' into master
9268 Jun 16, 2026
eb99bc3
Merge branch 'ok-oldking:master' into master
9268 Jun 17, 2026
0a04528
Merge branch 'ok-oldking:master' into master
9268 Jun 18, 2026
95e3e39
Merge branch 'ok-oldking:master' into master
9268 Jun 20, 2026
1beb16a
Merge branch 'ok-oldking:master' into master
9268 Jun 21, 2026
590bb0b
Merge branch 'ok-oldking:master' into master
9268 Jun 22, 2026
55ed59e
Merge branch 'ok-oldking:master' into master
9268 Jun 24, 2026
05e010c
Merge branch 'ok-oldking:master' into master
9268 Jun 25, 2026
37cb87c
Merge branch 'ok-oldking:master' into master
9268 Jun 25, 2026
c5aa295
Merge branch 'ok-oldking:master' into master
9268 Jun 26, 2026
22afea2
Merge branch 'ok-oldking:master' into master
9268 Jun 28, 2026
671c5ab
Merge branch 'ok-oldking:master' into master
9268 Jul 1, 2026
a6a64c7
feat:初步实现路径相关功能
Jul 2, 2026
936490d
Merge branch 'ok-oldking:master' into master
9268 Jul 2, 2026
714485f
Merge branch 'ok-oldking:master' into master
9268 Jul 11, 2026
202d8f2
Merge branch 'ok-oldking:master' into master
9268 Jul 14, 2026
1624454
Merge branch 'ok-oldking:master' into master
9268 Jul 17, 2026
508af79
Merge branch 'ok-oldking:master' into master
9268 Jul 29, 2026
ba2b797
feat:优化匹配逻辑,提高成功率&优化一些小细节
Aug 2, 2026
18211e7
feat:增加一个探针用于测试直接拖动方案
Aug 3, 2026
621ee64
feat:增加一个探针用于测试直接拖动方案
Aug 3, 2026
68bfac3
feat:测试拖动方案实现
Aug 15, 2026
50f2868
Merge branch 'refs/heads/master' into 9268-master
Aug 15, 2026
0116895
Merge branch 'ok-oldking:master' into master
9268 Sep 18, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added assets/stitched/.gitkeep
Empty file.
22 changes: 22 additions & 0 deletions assets/stitched/8_coords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"offset": [
-298247.744,
-944132.992
],
"scale": [
83.008,
83.008
],
"center": [
557108.192,
237734.9119999999
],
"min": [
-298247.744,
-944132.992
],
"max": [
1412464.128,
1419602.8159999996
]
}
22 changes: 22 additions & 0 deletions assets/stitched/900_coords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"offset": [
-95708.224,
-56362.43199999999
],
"scale": [
83.008,
83.008
],
"center": [
-10998.560000000012,
44990.336
],
"min": [
-95708.224,
-56362.43199999999
],
"max": [
73711.10399999998,
146343.104
]
}
22 changes: 22 additions & 0 deletions assets/stitched/902_coords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"offset": [
151738.62399999998,
-70805.824
],
"scale": [
83.008,
83.008
],
"center": [
222170.91199999998,
14484.896000000008
],
"min": [
151738.62399999998,
-70805.824
],
"max": [
292603.19999999995,
99775.61600000001
]
}
22 changes: 22 additions & 0 deletions assets/stitched/903_coords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"offset": [
-153232.76799999998,
-143686.848
],
"scale": [
83.008,
83.008
],
"center": [
-954.5920000000042,
9130.880000000005
],
"min": [
-153232.76799999998,
-143686.848
],
"max": [
151323.58399999997,
161948.608
]
}
22 changes: 22 additions & 0 deletions assets/stitched/905_coords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"offset": [
-587613.632,
-151572.60799999998
],
"scale": [
83.008,
83.008
],
"center": [
-61550.43200000003,
159458.368
],
"min": [
-587613.632,
-151572.60799999998
],
"max": [
464512.7679999999,
470489.3439999999
]
}
22 changes: 22 additions & 0 deletions assets/stitched/906_coords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"offset": [
-552335.232,
-1085412.608
],
"scale": [
83.008,
83.008
],
"center": [
-139536.44799999997,
-674024.96
],
"min": [
-552335.232,
-1085412.608
],
"max": [
273262.336,
-262637.31200000003
]
}
22 changes: 22 additions & 0 deletions assets/stitched/909_coords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"offset": [
-119531.51999999999,
-138789.376
],
"scale": [
83.008,
83.008
],
"center": [
45405.37599999999,
16643.103999999992
],
"min": [
-119531.51999999999,
-138789.376
],
"max": [
210342.27199999997,
172075.58399999997
]
}
22 changes: 22 additions & 0 deletions assets/stitched/910_coords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"offset": [
-77778.496,
-81181.824
],
"scale": [
83.008,
83.008
],
"center": [
3361.8239999999932,
0.0
],
"min": [
-77778.496,
-81181.824
],
"max": [
84502.14399999999,
81181.824
]
}
1 change: 1 addition & 0 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ def blur_area(width, height):
["src.task.AutoLoginTask", "AutoLoginTask"],
["src.task.MouseResetTask", "MouseResetTask"],
["src.task.FastTravelTask", "FastTravelTask"],
["src.task.MapOverlayTask", "MapOverlayTask"],
], 'scene': ["src.scene.WWScene", "WWScene"],
'update_pyappify': {
'to_version': '1.1.3',
Expand Down
Binary file added pick/map_items.db
Binary file not shown.
9 changes: 9 additions & 0 deletions src/globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Globals(QObject):
def __init__(self, exit_event):
super().__init__()
self._yolo_model = None
self._position_detector = None
self.mini_map_arrow = None
self.logged_in = False

Expand All @@ -36,6 +37,14 @@ def yolo_model(self):
def yolo_detect(self, image, threshold=0.6, label=-1):
return self.yolo_model.detect(image, threshold=threshold, label=label)

@property
def position_detector(self):
if self._position_detector is None:
from src.utils.positionDetector import PositionDetector
logger.info("Initializing PositionDetector")
self._position_detector = PositionDetector()
return self._position_detector


if __name__ == "__main__":
glbs = Globals(exit_event=None)
3 changes: 3 additions & 0 deletions src/match_engine/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from .surf import SurfEngine
from .sift import SiftEngine
from .common import MatchOutput, CoordsRef, MapCache, KeyPoint, load_npz, save_npz
Empty file.
Loading
Loading