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

Fix: Ensure exiting assignment report

Browse Source
This commit is contained in:
Zebartin 2023-09-28 17:35:25 +08:00
parent 23b210d820
commit f791265a4b
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/share/assignment/ui/ENTRY_LOADED.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 16 KiB

8
tasks/assignment/assets/assets_assignment_ui.py
View File

@ -58,10 +58,10 @@ ENTRY_LOADED = ButtonWrapper(
name='ENTRY_LOADED', name='ENTRY_LOADED',
share=Button( share=Button(
file='./assets/share/assignment/ui/ENTRY_LOADED.png', file='./assets/share/assignment/ui/ENTRY_LOADED.png',
area=(467, 235, 498, 619), area=(474, 161, 491, 615),
search=(447, 215, 518, 639), search=(454, 141, 511, 635),
color=(217, 214, 205), color=(197, 193, 186),
button=(467, 235, 498, 619), button=(474, 161, 491, 615),
), ),
) )
EXP_MATERIALS_CREDITS_CHECK = ButtonWrapper( EXP_MATERIALS_CREDITS_CHECK = ButtonWrapper(

4
tasks/assignment/claim.py
View File

@ -80,9 +80,11 @@ class AssignmentClaim(AssignmentDispatch):
logger.info('Assignment report is closed') logger.info('Assignment report is closed')
break break
# Close report # Close report
if self.appear(REPORT, interval=2): if self.appear(REPORT, interval=1):
self.device.click(click_button) self.device.click(click_button)
continue continue
# Ensure report totally disappears
self._wait_until_entry_loaded()
def _is_duration_expected(self, duration: int) -> bool: def _is_duration_expected(self, duration: int) -> bool:
""" """

3
tasks/assignment/ui.py
View File

@ -196,8 +196,7 @@ class AssignmentUI(UI):
if timeout.reached(): if timeout.reached():
logger.warning('Wait entry loaded timeout') logger.warning('Wait entry loaded timeout')
break break
# Maybe not reliable if self.image_color_count(ENTRY_LOADED, (35, 35, 35), count=800):
if self.image_color_count(ENTRY_LOADED, (35, 35, 35)):
logger.info('Entry loaded') logger.info('Entry loaded')
break break