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

Fix: Check EVENT_FINISHED

Browse Source 
TODO: [EN] Add EVENT_FINISHED
This commit is contained in:
Zebartin 2024-05-20 23:49:36 +08:00 committed by LmeSzinc
parent de53612530
commit c43a0837c4
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/assignment/ui/EVENT_FINISHED.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

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

@ -116,6 +116,17 @@ ENTRY_LOADED = ButtonWrapper(
button=(474, 161, 491, 615), button=(474, 161, 491, 615),
), ),
) )
EVENT_FINISHED = ButtonWrapper(
name='EVENT_FINISHED',
cn=Button(
file='./assets/cn/assignment/ui/EVENT_FINISHED.png',
area=(700, 300, 752, 331),
search=(680, 280, 772, 351),
color=(223, 215, 195),
button=(700, 300, 752, 331),
),
en=None,
)
EXP_MATERIALS_CREDITS_CHECK = ButtonWrapper( EXP_MATERIALS_CREDITS_CHECK = ButtonWrapper(
name='EXP_MATERIALS_CREDITS_CHECK', name='EXP_MATERIALS_CREDITS_CHECK',
cn=Button( cn=Button(

4
tasks/assignment/claim.py
View File

@ -4,6 +4,7 @@ from module.config.stored.classes import now
from module.logger import logger from module.logger import logger
from module.ocr.ocr import Duration from module.ocr.ocr import Duration
from tasks.assignment.assets.assets_assignment_claim import * from tasks.assignment.assets.assets_assignment_claim import *
from tasks.assignment.assets.assets_assignment_ui import EVENT_FINISHED
from tasks.assignment.dispatch import AssignmentDispatch from tasks.assignment.dispatch import AssignmentDispatch
from tasks.assignment.keywords import AssignmentEntry from tasks.assignment.keywords import AssignmentEntry
from tasks.base.page import page_assignment from tasks.base.page import page_assignment
@ -79,6 +80,9 @@ class AssignmentClaim(AssignmentDispatch):
if self.appear(page_assignment.check_button): if self.appear(page_assignment.check_button):
logger.info('Assignment report is closed') logger.info('Assignment report is closed')
break break
if self.appear(EVENT_FINISHED):
logger.info('Event finished')
return
# Close report # Close report
if self.appear(REPORT, interval=1): if self.appear(REPORT, interval=1):
self.device.click(click_button) self.device.click(click_button)

6
tasks/assignment/ui.py
View File

@ -217,6 +217,9 @@ class AssignmentUI(UI):
if timeout.reached(): if timeout.reached():
logger.warning('Wait entry loaded timeout') logger.warning('Wait entry loaded timeout')
break break
if self.appear(EVENT_FINISHED):
logger.info('Event finished')
break
if self.appear(ASSIGNMENT_CHECK) and \ if self.appear(ASSIGNMENT_CHECK) and \
self.image_color_count(ENTRY_LOADED, (35, 35, 35), count=800): self.image_color_count(ENTRY_LOADED, (35, 35, 35), count=800):
logger.info('Entry loaded') logger.info('Entry loaded')
@ -234,6 +237,9 @@ class AssignmentUI(UI):
if timeout.reached(): if timeout.reached():
logger.warning('Wait correct entry loaded timeout') logger.warning('Wait correct entry loaded timeout')
break break
if self.appear(EVENT_FINISHED):
logger.info('Event finished')
break
ASSIGNMENT_ENTRY_LIST.load_rows(self) ASSIGNMENT_ENTRY_LIST.load_rows(self)
if all( if all(