Merge branch 'master' into dev

tasks/assignment/assignment.py

@@ -105,9 +105,6 @@ class Assignment(AssignmentClaim, SynthesizeUI):
         for assignment in assignments:
             if assignment in self.dispatched:
                 continue
-            if remain <= 0:
-                yield assignment
-                continue
             logger.hr('Assignment inlist', level=2)
             logger.info(f'Check assignment inlist: {assignment}')
             self.goto_entry(assignment)
@@ -120,6 +117,9 @@ class Assignment(AssignmentClaim, SynthesizeUI):
                     self._get_assignment_time()
                 continue
             # General assignments must be dispatchable here
+            if remain <= 0:
+                yield assignment
+                continue
             self.dispatch(assignment, duration)
             remain -= 1
 

tasks/daily/assets/assets_daily_trial.py

@@ -48,7 +48,7 @@ REGULAR_GACHA_CHECK = ButtonWrapper(
     share=Button(
         file='./assets/share/daily/trial/REGULAR_GACHA_CHECK.png',
         area=(69, 332, 124, 367),
-        search=(15, 146, 150, 478),
+        search=(0, 144, 150, 588),
         color=(100, 92, 82),
         button=(69, 332, 124, 367),
     ),
@@ -58,7 +58,7 @@ REGULAR_GACHA_CLICK = ButtonWrapper(
     share=Button(
         file='./assets/share/daily/trial/REGULAR_GACHA_CLICK.png',
         area=(63, 324, 118, 349),
-        search=(15, 146, 150, 478),
+        search=(0, 144, 150, 588),
         color=(36, 34, 30),
         button=(63, 324, 118, 349),
     ),