Fix: Change of assignment ui in ver 1.3

tasks/assignment/assets/assets_assignment_claim.py

@@ -27,10 +27,10 @@ OCR_ASSIGNMENT_REPORT_TIME = ButtonWrapper(
     name='OCR_ASSIGNMENT_REPORT_TIME',
     share=Button(
         file='./assets/share/assignment/claim/OCR_ASSIGNMENT_REPORT_TIME.png',
-        area=(894, 191, 1003, 216),
-        search=(874, 171, 1023, 236),
-        color=(62, 63, 63),
-        button=(894, 191, 1003, 216),
+        area=(870, 222, 1002, 247),
+        search=(850, 202, 1022, 267),
+        color=(57, 57, 60),
+        button=(870, 222, 1002, 247),
     ),
 )
 REDISPATCH = ButtonWrapper(

tasks/assignment/claim.py

@@ -3,10 +3,9 @@ from datetime import datetime, timedelta
 from module.logger import logger
 from module.ocr.ocr import Duration
 from tasks.assignment.assets.assets_assignment_claim import *
-from tasks.assignment.assets.assets_assignment_dispatch import EMPTY_SLOT
-from tasks.assignment.assets.assets_assignment_ui import DISPATCHED
 from tasks.assignment.dispatch import AssignmentDispatch
 from tasks.assignment.keywords import AssignmentEntry
+from tasks.base.page import page_assignment
 
 
 class AssignmentClaim(AssignmentDispatch):
@@ -32,6 +31,7 @@ class AssignmentClaim(AssignmentDispatch):
             ) + timedelta(hours=duration_expected)
         elif should_redispatch:
             # Re-select duration and dispatch
+            self.goto_entry(assignment)
             self.dispatch(assignment, duration_expected)
 
     def _wait_for_report(self):
@@ -61,11 +61,9 @@ class AssignmentClaim(AssignmentDispatch):
 
         Pages:
             in: CLOSE_REPORT and REDISPATCH
-            out: EMPTY_SLOT or DISPATCHED
+            out: page_assignment
         """
-        click_button, check_button = CLOSE_REPORT, EMPTY_SLOT
-        if should_redispatch:
-            click_button, check_button = REDISPATCH, DISPATCHED
+        click_button = REDISPATCH if should_redispatch else CLOSE_REPORT
         skip_first_screenshot = True
         while 1:
             if skip_first_screenshot:
@@ -73,7 +71,7 @@ class AssignmentClaim(AssignmentDispatch):
             else:
                 self.device.screenshot()
             # End
-            if self.appear(check_button):
+            if self.appear(page_assignment.check_button):
                 logger.info('Assignment report is closed')
                 break
             # Close report

tasks/assignment/ui.py

@@ -43,6 +43,7 @@ class AssignmentOcr(Ocr):
             (KEYWORDS_ASSIGNMENT_ENTRY.Root_Out_the_Turpitude.name,
              '根除恶[擎薯尊掌鞋]?'),
             (KEYWORDS_ASSIGNMENT_ENTRY.Akashic_Records.name, '阿[未][夏复]记录'),
+            (KEYWORDS_ASSIGNMENT_ENTRY.The_Wages_of_Humanity.name, '[赠]养人类'),
         ]
     }
 

tasks/combat/state.py

@@ -94,7 +94,6 @@ class CombatState(UI):
                     self._combat_auto_checked = True
                 else:
                     if self._combat_click_interval.reached():
-                        self.device.image_save()
                         self.device.click(COMBAT_AUTO)
                         self._combat_click_interval.reset()
                         return True

tasks/forgotten_hall/ui.py

@@ -185,7 +185,6 @@ class ForgottenHallUI(DungeonUI):
                 timeout.reset()
 
             if interval.reached() and self._forgotten_hall_enter_appear():
-                self.device.image_save()
                 self.device.click(ENTER_FORGOTTEN_HALL_DUNGEON)
                 interval.reset()