diff --git a/assets/share/assignment/dispatch/CHARACTER_SUPPORT.png b/assets/share/assignment/dispatch/CHARACTER_SUPPORT.png index d28c642f3..86b891970 100644 Binary files a/assets/share/assignment/dispatch/CHARACTER_SUPPORT.png and b/assets/share/assignment/dispatch/CHARACTER_SUPPORT.png differ diff --git a/assets/share/assignment/ui/OCR_ASSIGNMENT_GROUP_LIST.png b/assets/share/assignment/ui/OCR_ASSIGNMENT_GROUP_LIST.png deleted file mode 100644 index 7948b5001..000000000 Binary files a/assets/share/assignment/ui/OCR_ASSIGNMENT_GROUP_LIST.png and /dev/null differ diff --git a/tasks/assignment/assets/assets_assignment_dispatch.py b/tasks/assignment/assets/assets_assignment_dispatch.py index daa797545..7c95bc0fa 100644 --- a/tasks/assignment/assets/assets_assignment_dispatch.py +++ b/tasks/assignment/assets/assets_assignment_dispatch.py @@ -93,7 +93,7 @@ CHARACTER_SUPPORT = ButtonWrapper( file='./assets/share/assignment/dispatch/CHARACTER_SUPPORT.png', area=(103, 212, 435, 302), search=(83, 192, 455, 322), - color=(62, 60, 63), + color=(69, 65, 80), button=(103, 212, 435, 302), ), ) diff --git a/tasks/assignment/assets/assets_assignment_ui.py b/tasks/assignment/assets/assets_assignment_ui.py index e381e559f..fb9e5f8f6 100644 --- a/tasks/assignment/assets/assets_assignment_ui.py +++ b/tasks/assignment/assets/assets_assignment_ui.py @@ -118,16 +118,6 @@ OCR_ASSIGNMENT_ENTRY_LIST = ButtonWrapper( button=(133, 139, 494, 620), ), ) -OCR_ASSIGNMENT_GROUP_LIST = ButtonWrapper( - name='OCR_ASSIGNMENT_GROUP_LIST', - share=Button( - file='./assets/share/assignment/ui/OCR_ASSIGNMENT_GROUP_LIST.png', - area=(116, 81, 827, 131), - search=(96, 61, 847, 151), - color=(80, 79, 77), - button=(116, 81, 827, 131), - ), -) OCR_ASSIGNMENT_LIMIT = ButtonWrapper( name='OCR_ASSIGNMENT_LIMIT', share=Button( diff --git a/tasks/assignment/ui.py b/tasks/assignment/ui.py index 5c14f5ded..6cd8e9762 100644 --- a/tasks/assignment/ui.py +++ b/tasks/assignment/ui.py @@ -174,8 +174,8 @@ class AssignmentUI(UI): if timeout.reached(): logger.warning('Wait group loaded timeout') break - if self.image_color_count(OCR_ASSIGNMENT_GROUP_LIST, (40, 40, 40), count=20000) and \ - self.image_color_count(OCR_ASSIGNMENT_GROUP_LIST, (240, 240, 240), count=7000): + if self.image_color_count(GROUP_SEARCH, (40, 40, 40), count=25000) and \ + self.image_color_count(GROUP_SEARCH, (240, 240, 240), count=8000): logger.info('Group loaded') break @@ -239,7 +239,7 @@ class AssignmentUI(UI): for state in ASSIGNMENT_GROUP_SWITCH.state_list: check = state['check_button'] click = state['click_button'] - if ASSIGNMENT_GROUP_SWITCH.appear(check) or ASSIGNMENT_GROUP_SWITCH.appear(click): + if self.appear(check) or self.appear(click): yield state['state'] def _iter_entries(self) -> Iterator[AssignmentEntry]: