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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2020-08-21 20:27:07 +08:00
parent b717302b0e b5c361c858
commit 71c079bd0f
36 changed files with 1079 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/map/camera.py
View File

@@ -1,7 +1,7 @@
import numpy as np
from module.exception import MapDetectionError
from module.handler.assets import IN_MAP
from module.exception import MapDetectionError, CampaignEnd
from module.handler.assets import IN_MAP, IN_STAGE
from module.handler.info_handler import InfoHandler
from module.logger import logger
from module.map.map_base import CampaignMap, location2node, location_ensure
@@ -94,6 +94,9 @@ class Camera(InfoHandler):
logger.info('Perspective error cause by info bar. Waiting.')
self.handle_info_bar()
return self.update(camera=camera)
elif self.appear(IN_STAGE):
logger.warning('Image is in stage')
raise CampaignEnd('Image is in stage')
elif not self.appear(IN_MAP):
logger.warning('Image to detect is not in_map')
raise e