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

Merge branch 'main' of https://git.zhaozuohong.vip/mower-ng/mower-ng
All checks were successful
ci/woodpecker/push/check_format Pipeline was successful
Details

Browse source
This commit is contained in:
EightyDollars 2024-11-01 19:50:50 +08:00
commit 5e9c7e7f94
8 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mower/data/scene.json
View file

@ -85,7 +85,7 @@
},
"18": {
"label": "STORY_SKIP",
"comment": "作战剧情"
"comment": "跳过剧情对话框"
},
"101": {
"label": "LOGIN_MAIN",

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

Binary file not shown.

BIN
mower/resources/navigation/activity/entry.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: 274 KiB

After

Width:  |  Height:  |  Size: 240 KiB

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

@ -30,21 +30,24 @@ class classproperty:
class ActivityNavigation(SceneGraphSolver):
solver_name = "活动关卡导航"
_location = {
"GO-1": (0, 0),
"GO-2": (996, 0),
"GO-3": (1464, 0),
"GO-4": (1461, -341),
"GO-5": (2088, -341),
"GO-6": (2088, 126),
"GO-7": (2659, 126),
"GO-8": (2967, -340),
"GO-9": (3312, -105),
"PV-1": (0, 0),
"PV-2": [337, -199],
"PV-3": [558, 56],
"PV-4": [920, 57],
"PV-5": [1481, 81],
"PV-6": [1715, 242],
"PV-7": [1928, 42],
"PV-8": [2208, 200],
"PV-9": [2803, 71],
"PV-10": [3046, -166],
}
@classproperty
def location(cls):
if datetime.now() > datetime(2024, 10, 23, 4):
if datetime.now() > datetime(2024, 11, 22, 4):
return {}
return cls._location
@ -86,7 +89,7 @@ class ActivityNavigation(SceneGraphSolver):
flags=cv2.DrawMatchesFlags_NOT_DRAW_SINGLE_POINTS,
)
saveimg(debug_img, "navigation")
self.tap(kp2[good[0].trainIdx].pt, interval=3)
self.tap(kp2[good[0].trainIdx].pt, interval=4)
elif scene == Scene.ACTIVITY_MAIN:
self.tap_element("navigation/activity/entry")
elif scene == Scene.ACTIVITY_CHOOSE_LEVEL:

4
mower/utils/recognize/__init__.py
View file

@ -327,8 +327,8 @@ class Recognizer:
self.scene = Scene.LOGIN_CAPTCHA
elif self.find("sign_in/banner"):
self.scene = Scene.SIGN_IN_DAILY
elif self.find("sign_in/moon_festival/banner"):
self.scene = Scene.MOON_FESTIVAL
# elif self.find("sign_in/moon_festival/banner"):
# self.scene = Scene.MOON_FESTIVAL
elif self.find("navigation/activity/entry"):
self.scene = Scene.ACTIVITY_MAIN
elif self.find("navigation/activity/banner"):

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

@ -61,6 +61,8 @@ color = {
"mission_trainee_on": (690, 17),
"nav_bar": (655, 0),
"nav_button": (26, 20),
"navigation/activity/banner": (1103, 901),
"navigation/activity/entry": (155, 833),
"navigation/collection/AP-1": (203, 821),
"navigation/collection/CA-1": (203, 821),
"navigation/collection/CE-1": (243, 822),
@ -206,8 +208,6 @@ template_matching = {
"materiel_ico": (892, 61),
"mission_daily_on": ((685, 15), (1910, 100)),
"mission_weekly_on": ((685, 15), (1910, 100)),
"navigation/activity/banner": (1468, 855),
"navigation/activity/entry": (1256, 829),
"navigation/collection/AP_entry": ((0, 170), (1920, 870)),
"navigation/collection/CA_entry": ((0, 170), (1920, 870)),
"navigation/collection/CE_entry": ((0, 170), (1920, 870)),
@ -286,7 +286,7 @@ template_matching = {
"sss/terminated": (29, 241),
"stone_fragment": None,
"story_skip": (1718, 58),
"story_skip_confirm_dialog": (685, 655),
"story_skip_confirm_dialog": ((685, 504), (1234, 730)),
"switch_order/check": None,
"switch_order/lmb": (1442, 891),
"switch_order/oru": (1442, 891),

4
mower/utils/scene.py
View file

@ -42,7 +42,7 @@ class Scene:
STORY = 17
"作战剧情"
STORY_SKIP = 18
"作战剧情"
"跳过剧情对话框"
LOGIN_MAIN = 101
"登录页面"
LOGIN_INPUT = 102
@ -375,7 +375,7 @@ SceneComment = {
15: "首页源石换玉",
16: "首页源石换理智",
17: "作战剧情",
18: "作战剧情",
18: "跳过剧情对话框",
101: "登录页面",
102: "登录页面（输入）",
103: "登录页面（快速）",