sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-11 23:18:22 +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

5
module/ui/page.py
View File

@@ -125,9 +125,14 @@ page_main.link(button=MAIN_GOTO_RAID, destination=page_raid)
page_research = Page(RESEARCH_CHECK)
page_research.link(button=GOTO_MAIN, destination=page_main)
# Shipyard
page_shipyard = Page(SHIPYARD_CHECK)
page_shipyard.link(button=GOTO_MAIN, destination=page_main)
# Research menu
page_reshmenu = Page(RESHMENU_CHECK)
page_reshmenu.link(button=RESHMENU_GOTO_RESEARCH, destination=page_research)
page_reshmenu.link(button=RESHMENU_GOTO_SHIPYARD, destination=page_shipyard)
page_reshmenu.link(button=GOTO_MAIN, destination=page_main)
page_main.link(button=MAIN_GOTO_RESHMENU, destination=page_reshmenu)