LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 03:09:28 +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

8
module/ui/ui.py
View File

@@ -419,7 +419,7 @@ class UI(InfoHandler):
return True
if self.appear_then_click(LOGIN_RETURN_SIGN, offset=(30, 30), interval=3):
return True
if self.appear(EVENT_LIST_CHECK, offset=(30, 30), interval=3):
if self.appear(EVENT_LIST_CHECK, offset=(30, 30), interval=5):
logger.info(f'UI additional: {EVENT_LIST_CHECK} -> {GOTO_MAIN}')
if self.appear_then_click(GOTO_MAIN, offset=(30, 30)):
return True
@@ -438,11 +438,11 @@ class UI(InfoHandler):
if self.handle_popup_single_white():
return True
# Routed from confirm click
if self.appear(SHIPYARD_CHECK, offset=(30, 30), interval=3):
if self.appear(SHIPYARD_CHECK, offset=(30, 30), interval=5):
logger.info(f'UI additional: {SHIPYARD_CHECK} -> {GOTO_MAIN}')
if self.appear_then_click(GOTO_MAIN, offset=(30, 30)):
return True
if self.appear(META_CHECK, offset=(30, 30), interval=3):
if self.appear(META_CHECK, offset=(30, 30), interval=5):
logger.info(f'UI additional: {META_CHECK} -> {GOTO_MAIN}')
if self.appear_then_click(GOTO_MAIN, offset=(30, 30)):
return True
@@ -609,6 +609,8 @@ class UI(InfoHandler):
for switch_button in page_main.links.values():
if button == switch_button:
self.interval_reset(GET_SHIP)
if button in [MAIN_GOTO_REWARD, MAIN_GOTO_REWARD_WHITE]:
self.interval_reset(GET_SHIP)
if button in [MAIN_GOTO_CAMPAIGN, MAIN_GOTO_CAMPAIGN_WHITE]:
self.interval_reset(GET_SHIP)
# Shinano event has the same title as raid