fix

module/clear_special_task_power.py

@@ -52,17 +52,12 @@ def start_sweep(self, skip_first_screenshot=False):
     res = picture.co_detect(self, None,None, img_ends, img_possibles, skip_first_screenshot)
     if res == "purchase_ap_notice" or res == "buy_ap_notice":
         return "inadequate_ap"
-    rgb_ends = [
-        "skip_sweep_complete",
-        "sweep_complete"
-    ]
-    rgb_possibles = {"start_sweep_notice": (765, 501)}
     img_ends = [
         "normal_task_skip-sweep-complete",
         "normal_task_sweep-complete",
     ]
     img_possibles = {"normal_task_start-sweep-notice": (765, 501)}
-    picture.co_detect(self, rgb_ends, rgb_possibles, img_ends, img_possibles, skip_first_screenshot)
+    picture.co_detect(self, None, None, img_ends, img_possibles, skip_first_screenshot)
     return "sweep_complete"
 
 
@@ -77,24 +72,14 @@ def to_commissions(self, num, skip_first_screenshot=False):
         'Global': 515,
         'JP': 515
     }
-    rgb_ends = "commissions"
-    rgb_possibles = {
-        "main_page":(1198, 580),
-        "campaign":(746, select_commissions_y[self.server]),
-        "choose_commissions":(992, commissions_y[self.server][num]),
-        "reward_acquired":(640, 116),
-        "mission_info":(1129, 142),
-        "start_sweep_notice":(886, 164),
-        "skip_sweep_complete":(649, 508),
-    }
     img_ends = 'special_task_level-list'
     img_possibles = {
         "main_page_home-feature": (1198, 580),
         "main_page_bus": (724, select_commissions_y[self.server]),
         "special_task_request-select": (992, commissions_y[self.server][num]),
         "special_task_task-info": (1085, 141),
     }
-    picture.co_detect(self, rgb_ends, rgb_possibles, img_ends, img_possibles, skip_first_screenshot)
+    picture.co_detect(self, None, None, img_ends, img_possibles, skip_first_screenshot)
 
 
 def one_detect(self,a,b):
@@ -109,11 +94,9 @@ def one_detect(self,a,b):
         else:
             i -= 1
     for i in range(0, len(los)):
-        rgb_possibles = {"commissions":(1118, los[i])}
-        rgb_ends = "mission_info"
         img_possibles = {"special_task_level-list": (1118, los[i])}
         img_ends = "special_task_task-info"
-        picture.co_detect(self, rgb_ends, rgb_possibles, img_ends, img_possibles, skip_first_screenshot=True)
+        picture.co_detect(self, None, None, img_ends, img_possibles, skip_first_screenshot=True)
         t = color.check_sweep_availability(self.latest_img_array, server=self.server)
         if t == "sss":
             if b == "max":
@@ -127,7 +110,6 @@ def one_detect(self,a,b):
             return start_sweep(self, skip_first_screenshot=True)
         elif t == "no-pass" or t == "pass":
             to_commissions(self, a, skip_first_screenshot=True)
-
     return "0SWEEPABLE"
 
 

module/scrimmage.py

@@ -140,15 +140,10 @@ def purchase_scrimmage_ticket(self, times):
         self.click(879, 346, wait=False, wait_over=True)
     else:
         self.click(807, 346, wait=False, count=times - 1, wait_over=True)
-    rgb_ends = "choose_scrimmage",
-    rgb_possibles = {
-        "purchase_scrimmage_ticket": (766, 507),
-        "purchase_ticket_notice": (766, 507),
-        "reward_acquired": (640, 116),
-    }
+    rgb_possibles = {"reward_acquired": (640, 116)}
     img_ends = "scrimmage_academy-select"
     img_possibles = {
         "scrimmage_task_purchase-scrimmage-ticket": (766, 507),
         "rewarded_task_purchase-scrimmage-ticket-notice": (766, 507),
     }
-    picture.co_detect(self, rgb_ends, rgb_possibles, img_ends, img_possibles, skip_first_screenshot=False)
+    picture.co_detect(self, None, rgb_possibles, img_ends, img_possibles, skip_first_screenshot=False)

module/tactical_challenge_shop.py

@@ -124,7 +124,7 @@ def to_tactical_challenge_shop(self, skip_first_screenshot=False):
 def to_refresh(self):
     refresh_lo = {
         'CN': [949, 664],
-        'Global': [1160, 620],
+        'Global': [1160, 657],
         'JP': [1160, 664]
     }
     img_ends = [

src/images/Global/x_y_range/arena.py

@@ -4,7 +4,7 @@
     'menu': (107, 9, 358, 40),
     'edit-force': (107, 9, 420, 37),
     'opponent-info': (504, 81, 782, 114),
-    'battle-win': (571, 124, 702, 162),
+    'battle-win': (520, 124, 750, 162),
     'battle-lost': (520, 191, 750, 228),
     'purchase-tactical-challenge-ticket': (411, 240, 877, 275),
     # 'season-record': (682, 137, 746, 172),