fix(cafe): adjust timer of Cafe No.2

tasks/cafe/cafe.py

@@ -63,7 +63,7 @@ class Cafe(CafeUI):
                 if handle_invitation(self):
                     return CafeStatus.CLICK
             case CafeStatus.CLICK:
-                buttons = self.get_clickable_buttons(offset=(45, 10))
+                buttons = self.get_clickable_buttons()
                 self.click = len(buttons)
                 logger.attr('Clickable', self.click)
                 if not buttons:
@@ -109,7 +109,6 @@ class Cafe(CafeUI):
         status = CafeStatus.STUDENT_LIST
         loading_timer = Timer(2).start()
         action_timer = Timer(1, count=1)
-        is_list = False
         is_reset = False
         is_second = False
         is_enable = is_reward_on or is_touch_on
@@ -126,11 +125,6 @@ class Cafe(CafeUI):
             if not loading_timer.reached():
                 continue
 
-            if not is_list and status == CafeStatus.STUDENT_LIST and self.appear(STUDENT_LIST):
-                is_list = True
-                loading_timer = Timer(3).start()
-                continue
-
             if not is_reward_on and status == CafeStatus.OCR:
                 logger.info('Skip reward')
                 status = CafeStatus.CLICK
@@ -159,9 +153,9 @@ class Cafe(CafeUI):
                         case '2':
                             logger.info('Cafe second arrived')
                             status = CafeStatus.STUDENT_LIST
-                            is_list = False
                             is_second = True
                             self.check = 0
+                            loading_timer.reset().start()
                 else:
                     if not SWITCH_CAFE.appear(main=self):
                         logger.warning('Cafe switch not found')
@@ -180,7 +174,6 @@ class Cafe(CafeUI):
                             logger.info('Cafe second arrived')
                             SWITCH_CAFE.set('off', main=self)
                             status = CafeStatus.STUDENT_LIST
-                            is_list = False
                             is_second = True
                             self.check = 0
 

tasks/cafe/ui.py

@@ -31,7 +31,7 @@ class CafeUI(UI):
         # generate result
         return cv2.bitwise_and(image, image, mask=mask)
 
-    def get_clickable_buttons(self, similarity=0.8, offset=(45, 10)):
+    def get_clickable_buttons(self, similarity=0.8, offset=(40, 10)):
         image = self.extract_clickable_from_image(self.device.image)
         self.template.matched_button._button_offset = offset
         self.template.load_offset(self.template)