perf(popup): improve reward handle stability

TheFunny · Nov 4, 2023 · 61fa6ad · 61fa6ad
1 parent 0551207
commit 61fa6ad
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/tasks/base/popup.py b/tasks/base/popup.py
@@ -27,23 +27,21 @@ def handle_loading(self) -> bool:
 
         return False
 
-    def handle_reward(self, interval=5) -> bool:
+    def handle_reward(self) -> bool:
         """
         Args:
             interval:
 
         Returns:
             If handled.
         """
-        if self.appear_then_click(GET_REWARD, interval=interval):
-            timer = Timer(0.2).start()
+        if self.appear(GET_REWARD) or self.match_color(GET_REWARD, threshold=30):
             while 1:
-                if timer.reached_and_reset():
-                    self.device.screenshot()
-                    if self.appear(GET_REWARD):
-                        self.device.click(GET_REWARD)
-                    else:
-                        break
+                self.device.screenshot()
+                if self.appear(GET_REWARD) or self.match_color(GET_REWARD, threshold=30):
+                    self.click_with_interval(GET_REWARD, interval=0.5)
+                else:
+                    break
             return True
 
         return False