mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 07:28:21 +08:00
Merge branch 'master' of LmeSzinc
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
import traceback
|
||||
|
||||
from module.coalition.assets import *
|
||||
from module.ui.assets import *
|
||||
from module.ui_white.assets import *
|
||||
|
||||
@@ -125,10 +126,20 @@ page_sp.link(button=BACK_ARROW, destination=page_campaign)
|
||||
page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_sp)
|
||||
page_campaign.link(button=CAMPAIGN_GOTO_EVENT, destination=page_sp)
|
||||
|
||||
page_coalition = Page(COALITION_CHECK)
|
||||
page_coalition.link(button=GOTO_MAIN, destination=page_main)
|
||||
page_coalition.link(button=BACK_ARROW, destination=page_campaign)
|
||||
# Coalition
|
||||
# FROSTFALL
|
||||
# page_coalition = Page(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)
|
||||
# ACADEMY
|
||||
page_coalition_menu = Page(COALITION_ACADEMY_MAIN_CHECK)
|
||||
page_coalition_menu.link(button=COALITION_ACADEMY_HOME, destination=page_main)
|
||||
page_coalition = Page(COALITION_ACADEMY_CAMPAIGN_CHECK)
|
||||
page_coalition.link(button=COALITION_ACADEMY_HOME, destination=page_main)
|
||||
page_coalition.link(button=COALITION_ACADEMY_BACK, destination=page_coalition_menu)
|
||||
page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_coalition)
|
||||
page_coalition_menu.link(button=COALITION_ACADEMY_GOTO_CAMPAIGN, destination=page_coalition)
|
||||
|
||||
# Operation Siren
|
||||
page_os = Page(OS_CHECK)
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
from module.base.button import Button
|
||||
from module.base.decorator import run_once
|
||||
from module.base.timer import Timer
|
||||
from module.coalition.assets import FLEET_PREPARATION as COALITION_FLEET_PREPARATION
|
||||
from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_SHIP
|
||||
from module.exception import (GameNotRunningError, GamePageUnknownError,
|
||||
GameTooManyClickError)
|
||||
@@ -19,7 +18,7 @@ from module.ocr.ocr import Ocr
|
||||
from module.os_handler.assets import (AUTO_SEARCH_REWARD, EXCHANGE_CHECK, RESET_FLEET_PREPARATION, RESET_TICKET_POPUP)
|
||||
from module.raid.assets import *
|
||||
from module.ui.assets import *
|
||||
from module.ui.page import (Page, page_campaign, page_event, page_main, page_sp, page_main_white)
|
||||
from module.ui.page import (Page, page_campaign, page_event, page_main, page_main_white, page_sp)
|
||||
from module.ui_white.assets import *
|
||||
|
||||
|
||||
@@ -495,8 +494,7 @@ class UI(InfoHandler):
|
||||
# Campaign preparation
|
||||
if self.appear(MAP_PREPARATION, offset=(30, 30), interval=3) \
|
||||
or self.appear(FLEET_PREPARATION, offset=(20, 50), interval=3) \
|
||||
or self.appear(RAID_FLEET_PREPARATION, offset=(30, 30), interval=3) \
|
||||
or self.appear(COALITION_FLEET_PREPARATION, offset=(30, 30), interval=3):
|
||||
or self.appear(RAID_FLEET_PREPARATION, offset=(30, 30), interval=3):
|
||||
self.device.click(MAP_PREPARATION_CANCEL)
|
||||
return True
|
||||
if self.appear_then_click(AUTO_SEARCH_MENU_EXIT, offset=(200, 30), interval=3):
|
||||
|
||||
Reference in New Issue
Block a user