mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 15:36:59 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -145,9 +145,14 @@ page_campaign.link(button=CAMPAIGN_GOTO_EVENT, destination=page_sp)
|
||||
# page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition)
|
||||
# page_coalition_menu.link(button=COALITION_ACADEMY_GOTO_CAMPAIGN, destination=page_coalition)
|
||||
# NEONCITY
|
||||
page_coalition = Page(NEONCITY_COALITION_CHECK)
|
||||
page_coalition.link(button=NEONCITY_UI_HOME, destination=page_main)
|
||||
page_coalition.link(button=NEONCITY_UI_BACK, destination=page_campaign)
|
||||
# page_coalition = Page(NEONCITY_COALITION_CHECK)
|
||||
# page_coalition.link(button=NEONCITY_UI_HOME, destination=page_main)
|
||||
# page_coalition.link(button=NEONCITY_UI_BACK, destination=page_campaign)
|
||||
# page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition)
|
||||
# DAL
|
||||
page_coalition = Page(FROSTFALL_COALITION_CHECK)
|
||||
page_coalition.link(button=GOTO_MAIN, destination=page_main)
|
||||
page_coalition.link(button=BACK_ARROW, destination=page_campaign)
|
||||
page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition)
|
||||
|
||||
# Operation Siren
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from module.base.button import Button
|
||||
from module.base.decorator import run_once
|
||||
from module.base.timer import Timer
|
||||
from module.coalition.assets import NEONCITY_FLEET_PREPARATION, NEONCITY_PREPARATION_EXIT
|
||||
from module.coalition.assets import NEONCITY_FLEET_PREPARATION, NEONCITY_PREPARATION_EXIT, DAL_DIFFICULTY_EXIT
|
||||
from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_SHIP
|
||||
from module.event_hospital.assets import HOSIPITAL_CLUE_CHECK, HOSPITAL_BATTLE_EXIT
|
||||
from module.exception import (GameNotRunningError, GamePageUnknownError,
|
||||
@@ -559,9 +559,12 @@ class UI(InfoHandler):
|
||||
# if self.appear_then_click(HOSPITAL_BATTLE_EXIT, offset=(20, 20), interval=2):
|
||||
# return True
|
||||
# Neon city (coalition_20250626)
|
||||
if self.appear(NEONCITY_FLEET_PREPARATION, offset=(20, 20), interval=3):
|
||||
logger.info(f'{NEONCITY_FLEET_PREPARATION} -> {NEONCITY_PREPARATION_EXIT}')
|
||||
self.device.click(NEONCITY_PREPARATION_EXIT)
|
||||
# if self.appear(NEONCITY_FLEET_PREPARATION, offset=(20, 20), interval=3):
|
||||
# logger.info(f'{NEONCITY_FLEET_PREPARATION} -> {NEONCITY_PREPARATION_EXIT}')
|
||||
# self.device.click(NEONCITY_PREPARATION_EXIT)
|
||||
# return True
|
||||
# DATE A LANE (coalition_20251120)
|
||||
if self.appear_then_click(DAL_DIFFICULTY_EXIT, offset=(20, 20), interval=3):
|
||||
return True
|
||||
|
||||
# Idle page
|
||||
|
||||
Reference in New Issue
Block a user