Fix: EVENT_SHOP_SCROLL.match_color()

Author: guoh064

module/shop_event/ui.py

@@ -1,8 +1,6 @@
-import cv2
 import numpy as np
 import re
 from datetime import datetime, timedelta
-from scipy import signal
 
 import module.config.server as server
 from module.base.button import ButtonGrid
@@ -18,34 +16,44 @@
 from module.shop.assets import SHOP_OCR_BALANCE, SHOP_OCR_OIL_CHECK, SHOP_OCR_OIL
 from module.shop_event.assets import *
 from module.ui.navbar import Navbar
-from module.ui.scroll import AdaptiveScroll
+from module.ui.scroll import Scroll
 from module.ui.ui import UI
 
 
-class EventShopAdaptiveScroll(AdaptiveScroll):
+class EventShopScroll(Scroll):
     def match_color(self, main):
-        area = (self.area[0] - self.background, self.area[1], self.area[2] + self.background, self.area[3])
+        delta_y = 5
+        delta_x = 3
+        area = (self.area[0] - delta_x, self.area[1] - delta_y, self.area[2] + delta_x, self.area[3] + delta_y)
         image = main.image_crop(area, copy=False)
         image = rgb2luma(image)
-        cv2.bitwise_not(image, dst=image)
-        image = image.flatten()
-        width = area[2] - area[0]
-        parameters = {
-            'prominence': 60,
-            'wlen': 2 * width + 1,
-        }
-        parameters.update(self.parameters)
-        peaks, _ = signal.find_peaks(image, **parameters)
-        peaks //= width
-        self.length = len(peaks)
+        dif = image[:, 0].astype(np.int) + image[:, -1]- image[:, image.shape[1] // 2] - image[:, image.shape[1] // 2]
+        dif = dif.flatten()
+        delta = np.diff(dif)
+        up_candidates = np.where(delta < -15)[0]
+        down_candidates = np.where(delta > 15)[0]
+        up_candidates -= delta_y - 1
+        down_candidates -= delta_y - 1
+        pairs = []
+        for down in down_candidates:
+            # only consider up spikes that occur AFTER the down spike
+            ups = up_candidates[up_candidates > down]
+            if len(ups) == 0:
+                continue
+            dists = ups - down
+            for up, dist in zip(ups, dists):
+                pairs.append((dist, down, up))
+
+        nearest = min(pairs, key=lambda x: x[0])
+        _, nearest_down, nearest_up = nearest
         mask = np.zeros((self.total,), dtype=np.bool_)
-        mask[peaks] = 1
+        mask[nearest_down:nearest_up] = True
         return mask
 
 
-EVENT_SHOP_SCROLL = EventShopAdaptiveScroll(
-    EVENT_SHOP_SCROLL_AREA.button,
-    background=2,
+EVENT_SHOP_SCROLL = EventShopScroll(
+    EVENT_SHOP_SCROLL_AREA,
+    color=(0, 0, 0),
     name="EVENT_SHOP_SCROLL"
 )