sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-05-26 06:07:12 +08:00
Code Activity

Opt: Allow to set multiple template scaling ratios

Browse Source
This commit is contained in:
LmeSzinc
2021-09-17 18:28:59 +08:00
parent 017df17029
commit b6f5dca0c4
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
campaign/event_20210916_cn/a1.py
View File

@@ -71,8 +71,8 @@ class Config:
HOMO_CANNY_THRESHOLD = (50, 50)
MAP_ENEMY_GENRE_DETECTION_SCALING = {
'DD': 1.111,
'CL': 1.111,
'CA': 1.111,
'CL': (1, 1.111),
'CA': (1, 1.111),
'CV': 1.111,
'BB': 1.111,
}

4
campaign/event_20210916_cn/b1.py
View File

@@ -85,8 +85,8 @@ class Config:
HOMO_CANNY_THRESHOLD = (60, 60)
MAP_ENEMY_GENRE_DETECTION_SCALING = {
'DD': 1.111,
'CL': 1.111,
'CA': 1.111,
'CL': (1, 1.111),
'CA': (1, 1.111),
'CV': 1.111,
'BB': 1.111,
}

4
campaign/event_20210916_cn/c1.py
View File

@@ -77,8 +77,8 @@ class Config:
HOMO_CANNY_THRESHOLD = (50, 50)
MAP_ENEMY_GENRE_DETECTION_SCALING = {
'DD': 1.111,
'CL': 1.111,
'CA': 1.111,
'CL': (1, 1.111),
'CA': (1, 1.111),
'CV': 1.111,
'BB': 1.111,
}

4
campaign/event_20210916_cn/d1.py
View File

@@ -85,8 +85,8 @@ class Config:
HOMO_CANNY_THRESHOLD = (60, 60)
MAP_ENEMY_GENRE_DETECTION_SCALING = {
'DD': 1.111,
'CL': 1.111,
'CA': 1.111,
'CL': (1, 1.111),
'CA': (1, 1.111),
'CV': 1.111,
'BB': 1.111,
}

12
module/map_detection/grid_predictor.py
View File

@@ -168,12 +168,14 @@ class GridPredictor:
short_name = name[6:] if name.startswith('Siren_') else name
scaling = scaling_dic.get(short_name, 1)
if scaling not in image_dic:
shape = tuple(np.round(np.array((60, 60)) * scaling).astype(int))
image_dic[scaling] = rgb2gray(self.relative_crop((-0.5, -1, 0.5, 0), shape=shape))
scaling = (scaling,) if not isinstance(scaling, tuple) else scaling
for scale in scaling:
if scale not in image_dic:
shape = tuple(np.round(np.array((60, 60)) * scale).astype(int))
image_dic[scale] = rgb2gray(self.relative_crop((-0.5, -1, 0.5, 0), shape=shape))
if template.match(image_dic[scaling]):
return name
if template.match(image_dic[scale]):
return name
return None