tasks/bounty/bounty.py

@@ -39,7 +39,7 @@ class Bounty(BountyUI):
 
     @property
     def is_ticket_enough(self) -> bool:
-        return self.current_ticket >= self.current_count
+        return self.config.stored.BountyTicket.value >= self.current_count
 
     @property
     def current_bounty(self):
@@ -53,16 +53,10 @@ class Bounty(BountyUI):
     def current_count(self):
         return self.task[0][3]
 
-    @property
-    def current_ticket(self):
-        return self.config.stored.BountyTicket.value
-
     def handle_bounty(self, status):
         match status:
             case BountyStatus.OCR:
                 if self.get_ticket():
-                    if self.current_ticket == 0 or not self.task:
-                        return BountyStatus.FINISH
                     return BountyStatus.SELECT
             case BountyStatus.SELECT:
                 if not self.is_ticket_enough:
@@ -76,6 +70,8 @@ class Bounty(BountyUI):
             case BountyStatus.SWEEP:
                 if self.do_sweep(self.current_count):
                     self.task.pop(0)
+                    if not self.task:
+                        return BountyStatus.FINISH
                     return BountyStatus.END
                 return BountyStatus.ENTER
             case BountyStatus.END: