sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 03:58:22 +08:00
Code Activity

Fix: Siren scanning tower and logging device are not detected if they are covered by other fleets

Browse Source
This commit is contained in:
LmeSzinc
2022-05-16 19:54:51 +08:00
parent 39f720718c
commit 32f939f2bb
11 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/map_detection/os_grid.py
View File

@@ -1,7 +1,7 @@
from module.base.utils import *
from module.map_detection.grid import Grid, GridInfo, GridPredictor
from module.map_detection.utils_assets import ASSETS
from module.os.assets import TEMPLATE_LoggingTower, TEMPLATE_ScanningDevice
from module.os.assets import *
from module.os.radar import RadarGrid
from module.template.assets import *
@@ -203,6 +203,10 @@ class OSGridPredictor(GridPredictor):
'ScanningDevice': TEMPLATE_ScanningDevice,
'LoggingTower': TEMPLATE_LoggingTower,
}
_os_template_enemy_upper = {
'ScanningDevice': TEMPLATE_ScanningDeviceUpper,
'LoggingTower': TEMPLATE_LoggingTowerUpper,
}
def predict_enemy_genre(self):
image = rgb2gray(self.relative_crop((-0.5, -1, 0.5, 0), shape=(60, 60)))
@@ -210,6 +214,11 @@ class OSGridPredictor(GridPredictor):
if template.match(image):
return name
image = rgb2gray(self.relative_crop((-0.5, -2, 0.5, -1), shape=(60, 60)))
for name, template in self._os_template_enemy_upper.items():
if template.match(image):
return name
return None
def predict_enemy_scale(self):