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

Refactor: Use numpy image cache instead of pillow image

Browse Source
This commit is contained in:
LmeSzinc
2022-01-23 15:50:15 +08:00
parent 6df7684a37
commit 65f166ad12
51 changed files with 286 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/os_handler/map_order.py
View File

@@ -145,7 +145,7 @@ class MapOrderHandler(MapOperation, ActionPointHandler, MapEventHandler, ZoneMan
"""
if not self.map_cat_attack_timer.reached():
return False
if np.sum(color_similarity_2d(self.image_area(MAP_CAT_ATTACK), (255, 231, 123)) > 221) > 100:
if np.sum(color_similarity_2d(self.image_crop(MAP_CAT_ATTACK), (255, 231, 123)) > 221) > 100:
logger.info('Skip map cat attack')
self.device.click(CLICK_SAFE_AREA)
self.map_cat_attack_timer.reset()

2
module/os_handler/mission.py
View File

@@ -22,7 +22,7 @@ class MissionHandler(GlobeOperation, ZoneManager):
"""
area = (341, 72, 1217, 648)
# Points of the yellow `!`
image = color_similarity_2d(self.image_area(area), color=(255, 207, 66))
image = color_similarity_2d(self.image_crop(area), color=(255, 207, 66))
points = np.array(np.where(image > 235)).T[:, ::-1]
if not len(points):
logger.warning('Unable to find mission on OS mission map')