离解复合导航

mower/solvers/navigation/activity.py

@@ -29,34 +29,37 @@ class ActivityNavigation(BaseSolver):
 
     _location = {
         "normal": {
-            "EA-1": (0, 0),
-            "EA-2": [668, 424],
-            "EA-3": [1008, 163],
-            "EA-4": [1352, -93],
-            "EA-5": [1696, 298],
-            "EA-6": [2167, -140],
-            "EA-7": [2742, 409],
-            "EA-8": [3058, -16],
-            "EA-TR-1": [400, 0],
-        },
-        "ex": {
-            "EA-EX-1": (0, 0),
-            "EA-EX-2": [0, 384],
-            "EA-EX-3": [339, 139],
-            "EA-EX-4": [680, -123],
-            "EA-EX-5": [680, 443],
-            "EA-EX-6": [1087, 129],
-            "EA-EX-7": [1437, 397],
-            "EA-EX-8": [1437, -2],
+            "15-1": (0, 0),
+            "15-2": [343, 116],
+            "15-3": [667, -52],
+            "15-4": [1035, 135],
+            "15-5": [1503, 0],
+            "15-6": [1769, -115],
+            "15-7": [1960, 84],
+            "15-8": [2287, 17],
+            "15-9": [2630, 17],
+            "15-10": [2960, 17],
+            "15-11": [3236, -115],
+            "15-12": [3438, 74],
+            "15-13": [3870, -89],
+            "15-14": [4451, -9],
+            "15-15": [4781, -88],
+            "15-16": [5057, 56],
+            "15-17": [5414, 147],
+            "15-18": [5807, 41],
+            "15-19": [6096, -133],
+            "15-20": [6487, -133],
+            "15-21": [7802, -133],
         },
+        "ex": {},
     }
 
     @classproperty
     def location(cls):
         result = {"normal": {}, "ex": {}}
-        if (now := datetime.now()) < datetime(2025, 3, 21, 4):
+        if (now := datetime.now()) < datetime(2025, 4, 21, 4):
             result["normal"] = cls._location["normal"]
-            if now > datetime(2025, 3, 14, 16):
+            if now > datetime(2025, 4, 14, 16):
                 result["ex"] = cls._location["ex"]
         return result
 
@@ -65,6 +68,8 @@ class ActivityNavigation(BaseSolver):
         font_size = 37 if self.difficulty == "ex" else 40
         for name in self._location[self.difficulty].keys():
             style = "dark" if "TR-" in self.name else "light"
+            if name in ["15-2", "15-10", "15-14", "15-19", "15-20"]:
+                style = "dark"
             names[name] = generate_name(name, font_size, pad_right=10, style=style)
         self.names = names
 

mower/utils/recognize/data.py

@@ -74,7 +74,7 @@ color = {
     "nav_bar": (655, 0),
     "nav_button": (26, 20),
     "navigation/activity/entry_ex": (1540, 904),
-    "navigation/activity/entry_normal": (1657, 753),
+    "navigation/activity/entry_normal": (1633, 924),
     "navigation/activity/entry_s": (1709, 804),
     "navigation/collection/AP-1": (203, 821),
     "navigation/collection/CA-1": (203, 821),
@@ -193,7 +193,6 @@ color = {
     "sign_in/orundum/complete": (1561, 776),
     "sign_in/orundum/confirm": (1561, 778),
     "sign_in/shop/banner": (110, 118),
-    "sign_in/shop/entry": (83, 669),
     "sign_in/shop/insufficient": (1573, 158),
     "sign_in/shop/max": (1566, 617),
     "sign_in/shop/price_black": (1238, 279),
@@ -321,8 +320,9 @@ template_matching = {
     "mission_weekly": ((685, 15), (1910, 100)),
     "mission_weekly_on": ((685, 15), (1910, 100)),
     "navigation/activity/banner_ex": (1644, 941),
-    "navigation/activity/banner_normal": (1377, 941),
+    "navigation/activity/banner_normal": (1656, 43),
     "navigation/activity/banner_s": (1735, 896),
+    "sign_in/shop/entry": (1599, 689),
     "navigation/collection/AP_entry": ((0, 170), (1920, 870)),
     "navigation/collection/CA_entry": ((0, 170), (1920, 870)),
     "navigation/collection/CE_entry": ((0, 170), (1920, 870)),