mower-ng/mower-ng
4
0
Fork 0
Code Issues 51 Pull requests Wiki Activity

离解复合导航

Browse source
This commit is contained in:
Elaina 2025-04-07 21:48:22 +08:00
parent 4a1ec7f3dc
commit cccf58d32b
7 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
mower/resources/navigation/activity/banner_normal.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
mower/resources/navigation/activity/entry_normal.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
mower/resources/navigation/activity/terminal.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Before After
Before After

BIN
mower/resources/navigation/whole_scene/activity_normal.png (Stored with Git LFS)
View file

Binary file not shown.

BIN
mower/resources/sign_in/shop/entry.png (Stored with Git LFS)
View file

Binary file not shown.

47
mower/solvers/navigation/activity.py
View file

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

6
mower/utils/recognize/data.py
View file

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