sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-27 14:25:38 +08:00
Code Activity

Merge pull request #1797 from Horizon101011/dockScanner

Browse Source 
Opt: More accurate fleet scan
This commit is contained in:
LmeSzinc
2022-10-31 21:47:05 +08:00
committed by GitHub
parent 6f61f1e828 2cb1fe25ea
commit f31c6bf7e8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/base/template.py
View File

@@ -18,6 +18,7 @@ class Template(Resource):
""" """
self.raw_file = file self.raw_file = file
self._image = None self._image = None
self._image_binary = None
self.resource_add(self.file) self.resource_add(self.file)

9
module/retire/scanner.py
View File

@@ -172,7 +172,7 @@ class FleetScanner(Scanner):
def __init__(self) -> None: def __init__(self) -> None:
super().__init__() super().__init__()
self._results = [] self._results = []
self.grids = CARD_GRIDS self.grids = CARD_GRIDS.crop(area=(0, 117, 35, 162), name='FLEET')
self.templates = { self.templates = {
TEMPLATE_FLEET_1: 1, TEMPLATE_FLEET_1: 1,
TEMPLATE_FLEET_2: 2, TEMPLATE_FLEET_2: 2,
@@ -206,7 +206,12 @@ class FleetScanner(Scanner):
if template.match(image): if template.match(image):
return fleet return fleet
return 0 if TEMPLATE_FLEET_1.match(image, similarity=0.80):
return 1
elif TEMPLATE_FLEET_3.match(image, similarity=0.80):
return 3
else:
return 0
def _scan(self, image) -> List: def _scan(self, image) -> List:
image = self.pre_process(image) image = self.pre_process(image)