mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-09 18:39:04 +08:00
Merge pull request #1797 from Horizon101011/dockScanner
Opt: More accurate fleet scan
This commit is contained in:
commit
f31c6bf7e8
@ -18,6 +18,7 @@ class Template(Resource):
|
||||
"""
|
||||
self.raw_file = file
|
||||
self._image = None
|
||||
self._image_binary = None
|
||||
|
||||
self.resource_add(self.file)
|
||||
|
||||
|
||||
@ -172,7 +172,7 @@ class FleetScanner(Scanner):
|
||||
def __init__(self) -> None:
|
||||
super().__init__()
|
||||
self._results = []
|
||||
self.grids = CARD_GRIDS
|
||||
self.grids = CARD_GRIDS.crop(area=(0, 117, 35, 162), name='FLEET')
|
||||
self.templates = {
|
||||
TEMPLATE_FLEET_1: 1,
|
||||
TEMPLATE_FLEET_2: 2,
|
||||
@ -206,7 +206,12 @@ class FleetScanner(Scanner):
|
||||
if template.match(image):
|
||||
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:
|
||||
image = self.pre_process(image)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user