1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 05:08:19 +08:00

Merge branch 'master' of LmeSzinc

This commit is contained in:
2024-09-15 14:05:38 +08:00
41 changed files with 81 additions and 32 deletions

View File

@@ -4,10 +4,10 @@ from sys import maxsize
import inflection
from module.base.timer import Timer
from module.combat.assets import PAUSE
from module.combat_ui.assets import PAUSE
from module.config.utils import get_os_reset_remain
from module.exception import CampaignEnd, GameTooManyClickError, MapWalkError, RequestHumanTakeover, ScriptError
from module.exercise.assets import QUIT_CONFIRM, QUIT_RECONFIRM
from module.exercise.assets import QUIT_RECONFIRM
from module.handler.login import LoginHandler, MAINTENANCE_ANNOUNCE
from module.logger import logger
from module.map.map import Map
@@ -559,7 +559,7 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
self.interval_reset(MAINTENANCE_ANNOUNCE)
pause_interval.reset()
continue
if self.appear_then_click(QUIT_CONFIRM, offset=(20, 20), interval=5):
if self.handle_combat_quit():
self.interval_reset(MAINTENANCE_ANNOUNCE)
pause_interval.reset()
continue