LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 23:29:30 +08:00
Code Activity

Merge branch 'refs/heads/LmeSzinc/master' into dev

Browse Source 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
This commit is contained in:
LA_DI_DA
2024-10-25 12:00:50 +08:00
parent e8525ffaf0 25b5349fd3
commit a2e6986dcd
217 changed files with 538 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/os/map.py
View File

@@ -560,11 +560,13 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=3):
continue
if pause_interval.reached() and self.is_combat_executing():
self.device.click(PAUSE)
self.interval_reset(MAINTENANCE_ANNOUNCE)
pause_interval.reset()
continue
if pause_interval.reached():
pause = self.is_combat_executing()
if pause:
self.device.click(pause)
self.interval_reset(MAINTENANCE_ANNOUNCE)
pause_interval.reset()
continue
if self.handle_combat_quit():
self.interval_reset(MAINTENANCE_ANNOUNCE)
pause_interval.reset()