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

Fix: Add offset argument to all uses of MAP_PREPARATION and FLEET_PREPARATION (#493)

Browse Source
This commit is contained in:
LmeSzinc
2021-06-20 17:03:35 +08:00
parent d6d56c79d6
commit 3f38f0c7d4
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/daemon/daemon.py
View File

@@ -37,9 +37,9 @@ class AzurLaneDaemon(CampaignBase):
# Map preparation
if self.config.ENABLE_SEMI_MAP_PREPARATION:
if self.appear_then_click(MAP_PREPARATION, interval=2):
if self.appear_then_click(MAP_PREPARATION, offset=(20, 20), interval=2):
continue
if self.appear_then_click(FLEET_PREPARATION, interval=2):
if self.appear_then_click(FLEET_PREPARATION, offset=(20, 20), interval=2):
continue
# Retire

2
module/handler/enemy_searching.py
View File

@@ -37,7 +37,7 @@ class EnemySearchingHandler(InfoHandler):
else:
return False
else:
if self.appear(MAP_PREPARATION) or self.appear(FLEET_PREPARATION):
if self.appear(MAP_PREPARATION, offset=(20, 20)) or self.appear(FLEET_PREPARATION, offset=(20, 20)):
self.device.click(MAP_PREPARATION_CANCEL)
self.in_stage_timer.reset()
return False

4
module/map/map_operation.py
View File

@@ -136,7 +136,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
else:
self.device.screenshot()
if self.appear(MAP_PREPARATION) or self.appear(FLEET_PREPARATION):
if self.appear(MAP_PREPARATION, offset=(20, 20)) or self.appear(FLEET_PREPARATION, offset=(20, 20)):
self.device.click(MAP_PREPARATION_CANCEL)
continue
@@ -150,7 +150,7 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand
Returns:
bool: If MAP_PREPARATION and tha animation of map information finished
"""
if not self.appear(MAP_PREPARATION):
if not self.appear(MAP_PREPARATION, offset=(20, 20)):
self.map_clear_percentage_prev = -1
self.map_clear_percentage_timer.reset()
return False