mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-04-22 16:28:19 +08:00
Fix: Handle action point popup during globe_update()
This commit is contained in:
@@ -6,8 +6,8 @@ from module.os.assets import *
|
|||||||
from module.os.globe_detection import GLOBE_MAP_SHAPE, GlobeDetection
|
from module.os.globe_detection import GLOBE_MAP_SHAPE, GlobeDetection
|
||||||
from module.os.globe_operation import GlobeOperation
|
from module.os.globe_operation import GlobeOperation
|
||||||
from module.os.globe_zone import Zone, ZoneManager
|
from module.os.globe_zone import Zone, ZoneManager
|
||||||
from module.os_ash.assets import ASH_SHOWDOWN, ASH_QUIT
|
from module.os_ash.assets import ASH_QUIT, ASH_SHOWDOWN
|
||||||
from module.os_handler.assets import AUTO_SEARCH_REWARD
|
from module.os_handler.assets import ACTION_POINT_CANCEL, ACTION_POINT_USE, AUTO_SEARCH_REWARD
|
||||||
|
|
||||||
|
|
||||||
class GlobeCamera(GlobeOperation, ZoneManager):
|
class GlobeCamera(GlobeOperation, ZoneManager):
|
||||||
@@ -66,6 +66,11 @@ class GlobeCamera(GlobeOperation, ZoneManager):
|
|||||||
self.device.click(ASH_QUIT)
|
self.device.click(ASH_QUIT)
|
||||||
timeout.reset()
|
timeout.reset()
|
||||||
continue
|
continue
|
||||||
|
# Action point popup
|
||||||
|
if self.appear(ACTION_POINT_USE, offset=(20, 20), interval=3):
|
||||||
|
self.device.click(ACTION_POINT_CANCEL)
|
||||||
|
timeout.reset()
|
||||||
|
continue
|
||||||
|
|
||||||
logger.warning('Trying to do globe_update(), but not in os globe map')
|
logger.warning('Trying to do globe_update(), but not in os globe map')
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user