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

Fix: Detection on unfinished OS daily (#492)

Browse Source 
- This reverts d989591a56, which modified an old function
This commit is contained in:
LmeSzinc
2021-06-20 17:50:05 +08:00
parent 3f38f0c7d4
commit 39b36c429f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/os_handler/mission.py
View File

@@ -95,17 +95,13 @@ class MissionHandler(GlobeOperation, ZoneManager):
in: is_in_map in: is_in_map
out: is_in_map out: is_in_map
""" """
def handle_mission_at_current_zone(): def handle_mission_at_current_zone():
if self.info_bar_count(): if self.info_bar_count():
raise MissionAtCurrentZone raise MissionAtCurrentZone
self.os_mission_enter() self.os_mission_enter()
# If not having enough items to claim a mission, if self.appear(MISSION_CHECKOUT, offset=(20, 20)):
# there will still be MISSION_CHECKOUT, but button is transparent.
# So here needs to use both template matching and color detection.
if MISSION_CHECKOUT.match_appear_on(self.device.image):
try: try:
self.ui_click(MISSION_CHECKOUT, check_button=MISSION_MAP_CHECK, self.ui_click(MISSION_CHECKOUT, check_button=MISSION_MAP_CHECK,
additional=handle_mission_at_current_zone, skip_first_screenshot=True) additional=handle_mission_at_current_zone, skip_first_screenshot=True)
@@ -143,7 +139,11 @@ class MissionHandler(GlobeOperation, ZoneManager):
""" """
self.os_mission_enter() self.os_mission_enter()
if not self.appear(MISSION_CHECKOUT, offset=(20, 20)): if not self.appear(MISSION_CHECKOUT, offset=(20, 20)) \
and MISSION_CHECKOUT.match_appear_on(self.device.image):
# If not having enough items to claim a mission,
# there will still be MISSION_CHECKOUT, but button is transparent.
# So here needs to use both template matching and color detection.
self.os_mission_quit() self.os_mission_quit()
return False return False