sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00
Code Activity

Fix: Resolve merge conflict ui/ui.py and ui/assets.py

Browse Source
This commit is contained in:
nEEtdo0d
2021-07-18 10:05:21 -04:00
parent 7f6fcaf508 96e388d7ab
commit 0477870c41
59 changed files with 225 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/ui/ui.py
View File

@@ -13,13 +13,13 @@ class UI(InfoHandler):
# Pages that Alas supported.
ui_pages = [page_main, page_campaign_menu, page_campaign, page_fleet,
page_exercise, page_daily, page_event, page_sp, page_mission,
page_raid, page_reward, page_reshmenu, page_research, page_dormmenu, page_dorm, page_meowfficer,
page_raid, page_reward, page_reshmenu, page_research, page_shipyard, page_dormmenu, page_dorm, page_meowfficer,
page_archives, page_guild, page_os, page_academy, page_shop, page_munitions, page_build]
# All pages defined.
ui_pages_all = [page_main, page_campaign_menu, page_campaign, page_fleet,
page_exercise, page_daily, page_event, page_sp, page_mission,
page_raid, page_commission, page_event_list, page_tactical, page_reward, page_unknown,
page_reshmenu, page_research, page_dormmenu, page_dorm, page_meowfficer, page_archives,
page_reshmenu, page_research, page_shipyard, page_dormmenu, page_dorm, page_meowfficer, page_archives,
page_guild, page_os, page_academy, page_shop, page_munitions, page_build]
ui_current: Page
@@ -300,7 +300,8 @@ class UI(InfoHandler):
return True
if self.appear(EVENT_LIST_CHECK, offset=(30, 30), interval=5) \
or self.appear(RESHMENU_CHECK, offset=(30, 30), interval=5) \
or self.appear(RESEARCH_CHECK, offset=(30, 30), interval=5):
or self.appear(RESEARCH_CHECK, offset=(30, 30), interval=5) \
or self.appear(SHIPYARD_CHECK, offset=(30, 30), interval=5):
self.device.click(GOTO_MAIN)
self._ui_additional_reward_goto_main_timer.reset()
return True