Upd: island_season_task task_grid

(cherry picked from commit 7377fd5)

Author: guoh064

assets/cn/island/TEMPLATE_ISLAND_SEASON_REWARD.png

@@ -6,5 +6,5 @@
 
 ISLAND_SEASON_TASK_SCROLL_AREA = Button(area={'cn': (1236, 171, 1237, 604), 'en': (1236, 171, 1237, 604), 'jp': (1236, 171, 1237, 604), 'tw': (1236, 171, 1237, 604)}, color={'cn': (186, 192, 191), 'en': (186, 192, 191), 'jp': (186, 192, 191), 'tw': (186, 192, 191)}, button={'cn': (1236, 171, 1237, 604), 'en': (1236, 171, 1237, 604), 'jp': (1236, 171, 1237, 604), 'tw': (1236, 171, 1237, 604)}, file={'cn': './assets/cn/island/ISLAND_SEASON_TASK_SCROLL_AREA.png', 'en': './assets/cn/island/ISLAND_SEASON_TASK_SCROLL_AREA.png', 'jp': './assets/cn/island/ISLAND_SEASON_TASK_SCROLL_AREA.png', 'tw': './assets/cn/island/ISLAND_SEASON_TASK_SCROLL_AREA.png'})
 ISLAND_TECHNOLOGY_TAB1 = Button(area={'cn': (20, 575, 109, 644), 'en': (20, 575, 109, 644), 'jp': (20, 575, 109, 644), 'tw': (20, 575, 109, 644)}, color={'cn': (76, 109, 130), 'en': (76, 109, 130), 'jp': (76, 109, 130), 'tw': (76, 109, 130)}, button={'cn': (20, 575, 109, 644), 'en': (20, 575, 109, 644), 'jp': (20, 575, 109, 644), 'tw': (20, 575, 109, 644)}, file={'cn': './assets/cn/island/ISLAND_TECHNOLOGY_TAB1.png', 'en': './assets/cn/island/ISLAND_TECHNOLOGY_TAB1.png', 'jp': './assets/cn/island/ISLAND_TECHNOLOGY_TAB1.png', 'tw': './assets/cn/island/ISLAND_TECHNOLOGY_TAB1.png'})
-TEMPLATE_ISLAND_SEASON_TASK_ICON = Template(file={'cn': './assets/cn/island/TEMPLATE_ISLAND_SEASON_TASK_ICON.png', 'en': './assets/cn/island/TEMPLATE_ISLAND_SEASON_TASK_ICON.png', 'jp': './assets/cn/island/TEMPLATE_ISLAND_SEASON_TASK_ICON.png', 'tw': './assets/cn/island/TEMPLATE_ISLAND_SEASON_TASK_ICON.png'})
+TEMPLATE_ISLAND_SEASON_REWARD = Template(file={'cn': './assets/cn/island/TEMPLATE_ISLAND_SEASON_REWARD.png', 'en': './assets/cn/island/TEMPLATE_ISLAND_SEASON_REWARD.png', 'jp': './assets/cn/island/TEMPLATE_ISLAND_SEASON_REWARD.png', 'tw': './assets/cn/island/TEMPLATE_ISLAND_SEASON_REWARD.png'})
 TEMPLATE_ISLAND_SEASON_TASK_OBTAINED = Template(file={'cn': './assets/cn/island/TEMPLATE_ISLAND_SEASON_TASK_OBTAINED.png', 'en': './assets/cn/island/TEMPLATE_ISLAND_SEASON_TASK_OBTAINED.png', 'jp': './assets/jp/island/TEMPLATE_ISLAND_SEASON_TASK_OBTAINED.png', 'tw': './assets/cn/island/TEMPLATE_ISLAND_SEASON_TASK_OBTAINED.png'})

assets/cn/island/TEMPLATE_ISLAND_SEASON_TASK_ICON.png

@@ -23,28 +23,28 @@
 TASK_COUNTER_OCR = DigitCounter([], letter=(128, 128, 128), name='TASK_COUNTER_OCR')
 
 class IslandSeasonTaskHandler(IslandUI):
-    def _get_bars(self):
+    def _get_icons(self):
         """
         Returns:
-            np.array: [[x1, y1], [x2, y2]], location of the bar icon upper left corner.
+            np.array: [[x1, y1], [x2, y2]], location of the expbook icon upper left corner.
         """
-        area = (43, 178, 875, 478)
+        area = (43, 298, 875, 604)
         image = self.image_crop(area, copy=True)
-        bars = TEMPLATE_ISLAND_SEASON_TASK_ICON.match_multi(image, threshold=5)
+        bars = TEMPLATE_ISLAND_SEASON_REWARD.match_multi(image, threshold=5)
         bars = Points([(0., b.area[1]) for b in bars]).group(threshold=5)
         logger.attr('bars_icon', len(bars))
         return bars
 
-    def wait_until_bar_appear(self, skip_first_screenshot=False):
+    def wait_until_icon_appear(self, skip_first_screenshot=False):
         """
         After entering season task page,
         tasks are not loaded that fast,
         wait until any bar icon appears.
         """
         confirm_timer = Timer(1.5, count=3).start()
         for _ in self.loop(skip_first=skip_first_screenshot):
-            bars = self._get_bars()
-            if len(bars):
+            icons = self._get_icons()
+            if len(icons):
                 if confirm_timer.reached():
                     return
                 else:
@@ -54,35 +54,35 @@ def wait_until_bar_appear(self, skip_first_screenshot=False):
 
     @cached_property
     def task_grid(self):
-        return self.task_bar_grid()
+        return self.task_icon_grid()
 
-    def task_bar_grid(self):
+    def task_icon_grid(self):
         """
         Returns:
             ButtonGrid:
         """
-        bars = self._get_bars()
-        count = len(bars)
+        icons = self._get_icons()
+        count = len(icons)
         if count == 0:
             logger.warning('Unable to find bar icon, assume task list is at top')
             origin_y = 178
             delta_y = 229
             row = 2
         elif count == 1:
-            y_list = bars[:, 1]
-            # -16 to adjust the bar position to grid position
-            origin_y = y_list[0] - 16 + 178
+            y_list = icons[:, 1]
+            # -18 to adjust the icon position to grid position
+            origin_y = y_list[0] - 18 + 178
             delta_y = 229
             row = 1
         elif count == 2:
-            y_list = bars[:, 1]
-            origin_y = min(y_list) - 16 + 178
+            y_list = icons[:, 1]
+            origin_y = min(y_list) - 18 + 178
             delta_y = abs(y_list[1] - y_list[0])
             row = 2
         else:
-            logger.warning(f'Too many bars found ({count}), assume max rows')
-            y_list = bars[:, 1]
-            origin_y = min(y_list) - 16 + 178
+            logger.warning(f'Too many icons found ({count}), assume max rows')
+            y_list = icons[:, 1]
+            origin_y = min(y_list) - 18 + 178
             delta_y = abs(y_list[1] - y_list[0])
             row = 2
         task_grid = ButtonGrid(
@@ -152,7 +152,7 @@ def scan_all(self):
                 recipe_id: (item_id, current, total)
             }
         """
-        self.wait_until_bar_appear()
+        self.wait_until_icon_appear()
         logger.hr('Scanning seasonal tasks')
         ISLAND_SEASON_TASK_SCROLL.set_top(main=self)
         unfinished_tasks = {}