xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-25 18:05:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upd: UI navigation to forgotten hall

Browse Source
This commit is contained in:
LmeSzinc 2024-02-06 15:58:34 +08:00
parent dc917c553c
commit e9d700bd53
6 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/share/dungeon/ui/TREASURES_LIGHTWARD_LOADED.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

BIN
assets/share/dungeon/ui/TREASURES_LIGHTWARD_LOADED.SEARCH.png → assets/share/dungeon/ui/TREASURES_LIGHTWARD_LOCKED.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
assets/share/forgotten_hall/ui/TELEPORT.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

18
tasks/dungeon/assets/assets_dungeon_ui.py
View File

@ -137,9 +137,19 @@ TREASURES_LIGHTWARD_LOADED = ButtonWrapper(
name='TREASURES_LIGHTWARD_LOADED', name='TREASURES_LIGHTWARD_LOADED',
share=Button( share=Button(
file='./assets/share/dungeon/ui/TREASURES_LIGHTWARD_LOADED.png', file='./assets/share/dungeon/ui/TREASURES_LIGHTWARD_LOADED.png',
area=(1029, 288, 1047, 306), area=(1028, 288, 1048, 308),
search=(1024, 283, 1052, 311), search=(1008, 268, 1068, 328),
color=(149, 149, 152), color=(82, 80, 80),
button=(1029, 288, 1047, 306), button=(1028, 288, 1048, 308),
),
)
TREASURES_LIGHTWARD_LOCKED = ButtonWrapper(
name='TREASURES_LIGHTWARD_LOCKED',
share=Button(
file='./assets/share/dungeon/ui/TREASURES_LIGHTWARD_LOCKED.png',
area=(789, 423, 817, 457),
search=(769, 403, 837, 477),
color=(112, 112, 112),
button=(789, 423, 817, 457),
), ),
) )

7
tasks/dungeon/ui.py
View File

@ -243,6 +243,8 @@ class DungeonUI(DungeonState):
in: page_guide, Survival_Index in: page_guide, Survival_Index
""" """
timeout = Timer(2, count=4).start() timeout = Timer(2, count=4).start()
TREASURES_LIGHTWARD_LOADED.set_search_offset((5, 5))
TREASURES_LIGHTWARD_LOCKED.set_search_offset((5, 5))
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@ -253,7 +255,10 @@ class DungeonUI(DungeonState):
logger.warning('Wait treasures lightward loaded timeout') logger.warning('Wait treasures lightward loaded timeout')
return False return False
if self.appear(TREASURES_LIGHTWARD_LOADED): if self.appear(TREASURES_LIGHTWARD_LOADED):
logger.info('Treasures lightward loaded') logger.info('Treasures lightward loaded (event unlocked)')
return True
if self.appear(TREASURES_LIGHTWARD_LOCKED):
logger.info('Treasures lightward loaded (event locked)')
return True return True
def _dungeon_wait_until_echo_or_war_stabled(self, skip_first_screenshot=True): def _dungeon_wait_until_echo_or_war_stabled(self, skip_first_screenshot=True):

6
tasks/forgotten_hall/assets/assets_forgotten_hall_ui.py
View File

@ -155,9 +155,9 @@ TELEPORT = ButtonWrapper(
name='TELEPORT', name='TELEPORT',
share=Button( share=Button(
file='./assets/share/forgotten_hall/ui/TELEPORT.png', file='./assets/share/forgotten_hall/ui/TELEPORT.png',
area=(1019, 451, 1037, 470), area=(1018, 355, 1038, 375),
search=(993, 176, 1088, 658), search=(993, 176, 1088, 658),
color=(166, 165, 166), color=(80, 83, 85),
button=(1019, 451, 1037, 470), button=(1018, 355, 1038, 375),
), ),
) )