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: load offset of AUTO_SEARCH_SETTINGS first to avoid click effects masking buttons (#5238)

Browse Source
This commit is contained in:
guoh064
2025-10-20 11:57:28 +08:00
committed by GitHub
parent 553acf2417
commit c6957dcee2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module/map/map_fleet_preparation.py
View File

@@ -318,6 +318,15 @@ class FleetPreparation(InfoHandler):
choose=SUBMARINE_CHOOSE, advice=SUBMARINE_ADVICE, bar=SUBMARINE_BAR, clear=SUBMARINE_CLEAR, choose=SUBMARINE_CHOOSE, advice=SUBMARINE_ADVICE, bar=SUBMARINE_BAR, clear=SUBMARINE_CLEAR,
in_use=SUBMARINE_IN_USE, hard_satisfied=SUBMARINE_HARD_SATIESFIED, main=self) in_use=SUBMARINE_IN_USE, hard_satisfied=SUBMARINE_HARD_SATIESFIED, main=self)
if self.appear(FLEET_1_CLEAR, offset=(-20, -80, 20, 5)):
AUTO_SEARCH_SET_MOB.load_offset(FLEET_1_CLEAR)
AUTO_SEARCH_SET_BOSS.load_offset(FLEET_1_CLEAR)
AUTO_SEARCH_SET_ALL.load_offset(FLEET_1_CLEAR)
AUTO_SEARCH_SET_STANDBY.load_offset(FLEET_1_CLEAR)
if self.appear(SUBMARINE_CLEAR, offset=(-20, -80, 20, 5)):
AUTO_SEARCH_SET_SUB_AUTO.load_offset(SUBMARINE_CLEAR)
AUTO_SEARCH_SET_SUB_STANDBY.load_offset(SUBMARINE_CLEAR)
# Check if ship is prepared in hard mode # Check if ship is prepared in hard mode
h1, h2, h3 = fleet_1.is_hard_satisfied(), fleet_2.is_hard_satisfied(), submarine.is_hard_satisfied() h1, h2, h3 = fleet_1.is_hard_satisfied(), fleet_2.is_hard_satisfied(), submarine.is_hard_satisfied()
logger.info(f'Hard satisfied: Fleet_1: {h1}, Fleet_2: {h2}, Submarine: {h3}') logger.info(f'Hard satisfied: Fleet_1: {h1}, Fleet_2: {h2}, Submarine: {h3}')
@@ -378,13 +387,4 @@ class FleetPreparation(InfoHandler):
else: else:
self.config.SUBMARINE = 0 self.config.SUBMARINE = 0
if self.appear(FLEET_1_CLEAR, offset=(-20, -80, 20, 5)):
AUTO_SEARCH_SET_MOB.load_offset(FLEET_1_CLEAR)
AUTO_SEARCH_SET_BOSS.load_offset(FLEET_1_CLEAR)
AUTO_SEARCH_SET_ALL.load_offset(FLEET_1_CLEAR)
AUTO_SEARCH_SET_STANDBY.load_offset(FLEET_1_CLEAR)
if self.appear(SUBMARINE_CLEAR, offset=(-20, -80, 20, 5)):
AUTO_SEARCH_SET_SUB_AUTO.load_offset(SUBMARINE_CLEAR)
AUTO_SEARCH_SET_SUB_STANDBY.load_offset(SUBMARINE_CLEAR)
return True return True