Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat:新增自动深眠 #125

Merged
merged 10 commits into from
Jul 1, 2024
Merged

feat:新增自动深眠 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a721f93
增加肉鸽启动入口；优化了一下寻路；镜的馈赠选项优化；修复快捷编队按钮偶尔点不到的问题；修复卡结局一BOSS对话框的问题。
a16797 Jun 27, 2024
0b91d01
修复战令领取；修复肉鸽bug；肉鸽开局改仪式匕首
a16797 Jun 27, 2024
c6042d3
Merge branch 'MaaXYZ:main' into main
a16797 Jun 27, 2024
d55cfb2
Merge branch 'MaaXYZ:main' into main
a16797 Jul 1, 2024
fd5274c
feat:新增自动深眠
a16797 Jul 1, 2024
6b6fbf9
fix：改下说明
a16797 Jul 1, 2024
aec24c7
fix：修复自动深眠bug
a16797 Jul 1, 2024
3a2e3cf
fix：修复深眠bug
a16797 Jul 1, 2024
4860ee2
fix:修复深眠bug
a16797 Jul 1, 2024
1fbbdea
fix:修复深眠bug
a16797 Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
- 刷体力、最优材料关卡、活动关卡导航、吃糖选项
- 山麓的回音（肉鸽）
- 领取日常奖励
- 每周深眠域（使用游戏自带自动战斗）

近期可能会支持的功能：

- 每周深眠域（使用游戏自带自动战斗）
- 自定义刷体力关卡

## 使用说明
Expand Down
4 changes: 4 additions & 0 deletions assets/interface.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
"name": "每日心相（意志解析）",
"entry": "Psychube"
},
{
"name": "自动深眠（配置一二队后再运行，队列名称默认）",
"entry": "Limbo"
},
{
"name": "常规作战",
"entry": "Combat",
Expand Down
Binary file added assets/resource/base/image/Limbo/LimboAwards.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Limbo/LimboEnd.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/resource/base/image/Limbo/LimboEntry.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Limbo/LimboFinish.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Limbo/LimboObtainedAwards.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Limbo/LimboTeamSelection_11.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Limbo/LimboTeamSelection_12.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Limbo/LimboTeamSelection_21.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/resource/base/image/Limbo/LimboTeamSelection_22.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
295 changes: 286 additions & 9 deletions assets/resource/base/pipeline/limbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,14 @@
]
},
"LimboEntry": {
"enabled": false,
"enabled_doc": "还没写完",
"enabled_doc": "正在写",
"recognition": "TemplateMatch",
"template": "Limbo/LimboEntry.png",
"roi": [
873,
244,
264,
231
864,
393,
297,
162
],
"action": "Click",
"next": [
Expand All @@ -110,6 +109,7 @@
],
"post_wait_freezes": 1,
"next": [
"LimboEnd",
"LimboStageRightest",
"LimboStageFlag"
]
Expand All @@ -124,10 +124,11 @@
134
],
"next": [
"LimboStageLightest"
"LimboStageLightest_1"
]
},
"LimboStageLightest": {
"LimboStageLightest_1": {
"doc": "最靓的位置，要多点几次",
"recognition": "ColorMatch",
"method": 6,
"roi": [
Expand All @@ -144,6 +145,282 @@
],
"connected": true,
"count": 500,
"action": "Click"
"action": "Click",
"next": [
"LimboActionFlag_1",
"LimboStageLightest_1"
]
},
"LimboActionFlag_1": {
"recognition": "OCR",
"text": "开始行动",
"roi": [
988,
566,
256,
154
],
"next": [
"LimboTeamSelection_1",
"LimboActionFlag_1"
]
},
"LimboTeamSelection_1": {
"recognition": "OCR",
"text": "成员队列",
"roi": [
786,
631,
156,
43
],
"action": "Click",
"next": [
"LimboTeamSelection_11",
"LimboTeamSelection_1"
]
},
"LimboTeamSelection_11": {
"recognition": "TemplateMatch",
"template": [
"Limbo/LimboTeamSelection_11.png",
"Limbo/LimboTeamSelection_12.png"
],
"order_by": "Score",
"threshold": 0.9,
"roi": [
722,
342,
272,
219
],
"action": "Click",
"next": [
"LimboAction_1",
"LimboTeamSelection_11"
]
},
"LimboAction_1": {
"recognition": "OCR",
"text": "开始行动",
"roi": [
988,
566,
256,
154
],
"timeout": 2000000,
"action": "Click",
"next": [
"LimboVictory_1",
"LimboAction_1"
]
},
"LimboVictory_1": {
"recognition": "OCR",
"text": [
"战斗胜利",
"战斗失败"
],
"roi": [
678,
10,
473,
240
],
"action": "Click",
"next": [
"LimboVictory_1",
"LimboStageLightest_2"
]
},
"LimboStageLightest_2": {
"doc": "最靓的位置，要多点几次",
"recognition": "ColorMatch",
"method": 6,
"roi": [
0,
70,
1280,
560
],
"lower": [
200
],
"upper": [
255
],
"connected": true,
"count": 500,
"action": "Click",
"next": [
"LimboActionFlag_2",
"LimboStageLightest_2"
]
},
"LimboActionFlag_2": {
"recognition": "OCR",
"text": "开始行动",
"roi": [
988,
566,
256,
154
],
"next": [
"LimboTeamSelection_2",
"LimboActionFlag_2"
]
},
"LimboTeamSelection_2": {
"recognition": "OCR",
"text": "成员队列",
"roi": [
786,
631,
156,
43
],
"action": "Click",
"next": [
"LimboTeamSelection_22",
"LimboTeamSelection_2"
]
},
"LimboTeamSelection_22": {
"recognition": "TemplateMatch",
"template": [
"Limbo/LimboTeamSelection_21.png",
"Limbo/LimboTeamSelection_22.png"
],
"order_by": "Score",
"threshold": 0.9,
"roi": [
722,
342,
272,
219
],
"action": "Click",
"next": [
"LimboAction_2",
"LimboTeamSelection_22"
]
},
"LimboAction_2": {
"recognition": "OCR",
"text": "开始行动",
"roi": [
988,
566,
256,
154
],
"timeout": 2000000,
"action": "Click",
"next": [
"LimboVictory_2",
"LimboAction_2"
]
},
"LimboVictory_2": {
"recognition": "OCR",
"text": [
"战斗胜利",
"战斗失败"
],
"roi": [
678,
10,
473,
240
],
"action": "Click",
"next": [
"LimboFinish",
"LimboVictory_2"
]
},
"LimboFinish": {
"recognition": "TemplateMatch",
"template": "Limbo/LimboFinish.png",
"roi": [
400,
199,
569,
354
],
"green_mask": true,
"action": "Click",
"next": [
"LimboAwards",
"LimboFinish"
]
},
"LimboAwards": {
"recognition": "TemplateMatch",
"template": "Limbo/LimboAwards.png",
"roi": [
139,
589,
109,
110
],
"green_mask": true,
"action": "Click",
"next": [
"LimboObtainedAwards_1"
]
},
"LimboObtainedAwards_1": {
"recognition": "TemplateMatch",
"template": "Limbo/LimboObtainedAwards.png",
"roi": [
941,
132,
205,
176
],
"action": "Click",
"next": [
"Sub_ObtainedAwards",
"LimboObtainedAwards_2"
]
},
"LimboObtainedAwards_2": {
"recognition": "OCR",
"text": "深眠试验酬劳",
"roi": [
104,
36,
358,
157
],
"action": "Click",
"target": [
20,
20,
20,
20
],
"next": [
"Sub_ObtainedAwards",
"LimboEnd",
"LimboStageRightest",
"Sub_BackButton",
"LimboObtainedAwards_2"
]
},
"LimboEnd": {
"recognition": "TemplateMatch",
"template": "Limbo/LimboEnd.png",
"threshold": 0.9,
"roi": [
843,
431,
231,
135
],
"next": []
}
}
Loading