sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-20 23:45:36 +08:00
Code Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
SevCrane
2024-06-07 18:00:59 +08:00
parent 5eea0e6fe4 ef4ba50992
commit 2796c85486
50 changed files with 253 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/campaign/campaign_ocr.py
View File

@@ -115,7 +115,7 @@ class CampaignOcr(ModuleBase):
@cached_property
def _stage_image(self):
return crop(self.device.image, self._stage_detect_area)
return crop(self.device.image, self._stage_detect_area, copy=False)
@cached_property
def _stage_image_gray(self):
@@ -270,6 +270,8 @@ class CampaignOcr(ModuleBase):
del_cached_property(self, '_stage_image')
del_cached_property(self, '_stage_image_gray')
buttons = self.campaign_extract_name_image(image)
del_cached_property(self, '_stage_image')
del_cached_property(self, '_stage_image_gray')
if len(buttons) == 0:
logger.info('No stage found.')
raise CampaignNameError

6
module/campaign/gems_farming.py
View File

@@ -297,7 +297,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
scanner.set_limitation(fleet=0)
candidates = [ship for ship in scanner.scan(self.device.image, output=False)
if template.match(self.image_crop(ship.button), similarity=SIM_VALUE)]
if template.match(self.image_crop(ship.button, copy=False), similarity=SIM_VALUE)]
if candidates:
return candidates
@@ -306,7 +306,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
self.dock_sort_method_dsc_set(False)
candidates = [ship for ship in scanner.scan(self.device.image)
if template.match(self.image_crop(ship.button), similarity=SIM_VALUE)]
if template.match(self.image_crop(ship.button, copy=False), similarity=SIM_VALUE)]
return candidates
@@ -366,7 +366,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
candidates = []
for item in template:
candidates = [ship for ship in scanner.scan(self.device.image, output=False)
if item.match(self.image_crop(ship.button), similarity=SIM_VALUE)]
if item.match(self.image_crop(ship.button, copy=False), similarity=SIM_VALUE)]
if candidates:
break
return candidates