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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc 2024-05-21 12:36:54 +08:00
commit 6682f0c158
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/share/assignment/dispatch/ASSIGNMENT_STARTED_CHECK.2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

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

@ -50,10 +50,10 @@ ASSIGNMENT_STARTED_CHECK = ButtonWrapper(
),
Button(
file='./assets/share/assignment/dispatch/ASSIGNMENT_STARTED_CHECK.2.png',
area=(508, 316, 526, 384),
search=(488, 296, 546, 404),
color=(225, 217, 196),
button=(508, 316, 526, 384),
area=(509, 317, 525, 383),
search=(489, 297, 545, 403),
color=(253, 243, 219),
button=(509, 317, 525, 383),
),
],
)

13
tasks/assignment/assignment.py
View File

@ -143,7 +143,7 @@ class Assignment(AssignmentClaim, SynthesizeUI):
continue
logger.hr('Assignment all', level=2)
logger.info(f'Check assignment all: {assignment}')
self.goto_entry(assignment, insight)
self.goto_entry(assignment, insight=insight)
status = self._check_assignment_status()
if status == AssignmentStatus.CLAIMABLE:
self.claim(assignment, None, should_redispatch=False)
@ -202,22 +202,25 @@ class Assignment(AssignmentClaim, SynthesizeUI):
if not isinstance(group, AssignmentEventGroup):
continue
self.goto_group(group)
insight = False
for assignment in self._iter_entries():
if assignment in self.dispatched:
continue
logger.hr('Assignment event', level=2)
logger.info(f'Check assignment event: {assignment}')
# Order of entries changes if claimed
self.goto_entry(assignment, insight=claimed)
self.goto_entry(assignment, insight=insight)
insight = False
status = self._check_assignment_status()
if status == AssignmentStatus.LOCKED:
continue
if status == AssignmentStatus.CLAIMABLE:
elif status == AssignmentStatus.CLAIMABLE:
self.claim(assignment, None, should_redispatch=False)
claimed = True
if status == AssignmentStatus.DISPATCHABLE:
insight = True
elif status == AssignmentStatus.DISPATCHABLE:
self.dispatch(assignment, None)
if status == AssignmentStatus.DISPATCHED:
elif status == AssignmentStatus.DISPATCHED:
self.dispatched[assignment] = datetime.now() + \
self._get_assignment_time()
return claimed