Skip to content

Cafe #14

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

Closed
EeeMaoY wants to merge 6 commits into from
Closed

Cafe #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe35240
1. 修改自动提取收益流程，现在流程包括自动补货
EeeMaoY Apr 28, 2026
ac73464
Merge branches 'main' and 'main' of github.com:EeeMaoY/MaaNTE
EeeMaoY Apr 28, 2026
f8ef88b
Merge branch '1bananachicken:main' into main
EeeMaoY Apr 29, 2026
fef505d
优化logo图片，去除了白色背景，使其更适合在不同背景下使用。
EeeMaoY Apr 29, 2026
0aa83be
Merge branches 'main' and 'main' of github.com:EeeMaoY/MaaNTE
EeeMaoY Apr 29, 2026
80f73d6
withdraw cafe fix
EeeMaoY Apr 29, 2026
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
Binary file modified assets/logo.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/Common/EscPhone.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/auto_withdraw_money/24h_black.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/auto_withdraw_money/24h_white.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/auto_withdraw_money/InventoryFull.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.
0 ...base/image/auto_withdraw_money/coffee.png → ...e/base/image/auto_withdraw_money/cafe.png
View file
Open in desktop
File renamed without changes
Binary file removed assets/resource/base/image/auto_withdraw_money/confirm.png
View file
Open in desktop
Binary file not shown.
Binary file added assets/resource/base/image/auto_withdraw_money/confirm_pinkwithblack.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/auto_withdraw_money/confirm_white.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/auto_withdraw_money/delivery.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/auto_withdraw_money/replenish_cafe.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/auto_withdraw_money/replenish_list.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/auto_withdraw_money/withdraw.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.
15 changes: 15 additions & 0 deletions assets/resource/base/pipeline/Common/PressKey.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"__PressEsc": {
"desc": "按下Esc键",
"action": {
"type": "ClickKey",
"param": {
"key": [
27
]
}
},
"pre_delay": 0,
"post_delay": 2000
}
}
23 changes: 23 additions & 0 deletions assets/resource/base/pipeline/Common/ScenceMenu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"__ScenePrivateMenuListEnterWorld": {
"desc": "从菜单总列表退出到大世界，避免电脑反复在菜单总列表和大世界之间切换",
"recognition": "And",
"all_of": [
"InEscMenu"
],
"pre_delay": 2000,
"action": {
"type": "ClickKey",
"param": {
"key": [
27
]
}
},
"post_delay": 1500, // 3D动画菜单会一直动无法用wait_freeze
"rate_limit": 0,
"next": [
"__ScenePrivateAnyEnterWorldSuccess"
]
},
}
26 changes: 26 additions & 0 deletions assets/resource/base/pipeline/Common/Scene.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"SceneExampleNormalTask": {
"desc": "普通接口使用示例",
"pre_delay": 0,
"post_delay": 0,
"next": [
"SceneExampleNormalTaskContinue",
"[JumpBack]__ScenePrivateBackToWorldAny"
]
},
"SceneExampleNormalTaskContinue": {
"desc": "判断成功进入目标菜单，继续业务流程",
"recognition": "And",
"all_of": [
"InWorld"
],
"pre_delay": 0,
"post_delay": 0,
"next": []
},
"SceneExampleRewardNext": {
"desc": "后续业务流程",
"pre_delay": 0,
"post_delay": 0
}
}
27 changes: 27 additions & 0 deletions assets/resource/base/pipeline/Common/SceneWorld.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"__ScenePrivateBackToWorldAny": {
"desc": "从任意界面返回大世界界面",
"pre_delay": 0,
"post_delay": 0,
"rate_limit": 4000,
"next": [
"__ScenePrivateMenuListEnterWorld",
"__ScenePrivateAnyEnterWorldSuccess",
"[JumpBack]__PressEsc"
]
},
"__ScenePrivateAnyEnterWorldSuccess": {
"desc": "从任意界面返回入大世界成功",
"recognition": {
"type": "And",
"param": {
"all_of": [
"InWorld"
]
}
},
"pre_wait_freezes": 0,
"pre_delay": 200,
"post_delay": 0
}
}
57 changes: 57 additions & 0 deletions assets/resource/base/pipeline/Common/Status.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"InWorld":{
"desc":"在大世界界面",
"recognition":{
"type": "TemplateMatch",
"param": {
"roi": [
1222,
14,
33,
57
],
"template": [
"Common/EscPhone.png"
],
"threshold": 0.8
}
},
"pre_delay": 0,
"post_delay": 0,
"rate_limit": 0
},
"InEscMenu": {
"desc": "在Esc菜单内",
"recognition": {
"type": "OCR",
"param": {
"roi": [
1052,
161,
59,
18
],
"expected": [
"鉴别等级"
],
"threshold": 0.8
}
},
"pre_delay": 0,
"post_delay": 0,
"rate_limit": 0
},
"EmptyNode": {
"desc": "空节点，无任何操作和识别，仅用于流程跳转",
"pre_delay": 0,
"post_delay": 0,
"rate_limit": 0
},
"StopNode": {
"desc": "流程结束节点，无任何操作和识别，仅用于流程结束",
"pre_delay": 0,
"action": "StopTask",
"post_delay": 0,
"rate_limit": 0
}
}
18 changes: 18 additions & 0 deletions assets/resource/base/pipeline/MouseMoveReset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"MouseMoveReset": {
"desc": "重置鼠标",
"pre_delay": 0,
"action": "TouchMove",
"target": [
0,
0,
1,
1
],
"anchor": {
"MouseMoveResetAnchor": ""
},
"post_delay": 0,
"rate_limit": 0
}
}
169 changes: 154 additions & 15 deletions assets/resource/base/pipeline/auto_withdraw_money.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,13 @@
46
],
"template": [
"auto_withdraw_money/coffee.png"
]
"auto_withdraw_money/cafe.png"
],
"threshold": 0.8
}
},
"action": {
"type": "Click",
"param": {
"target": [
515,
461,
44,
43
]
}
"type": "Click"
},
"next": [
"提取收益"
Expand All @@ -55,7 +48,8 @@
],
"template": [
"auto_withdraw_money/withdraw.png"
]
],
"threshold": 0.8
}
},
"action": {
Expand All @@ -76,8 +70,9 @@
44
],
"template": [
"auto_withdraw_money/confirm.png"
]
"auto_withdraw_money/confirm_pinkwithblack.png"
],
"threshold": 0.8
}
},
"action": {
Expand All @@ -99,7 +94,142 @@
],
"template": [
"auto_withdraw_money/close.png"
]
],
"threshold": 0.8
}
},
"action": {
"type": "Click"
},
"next": [
"点击补货"
],
"post_delay": 50
},
"点击补货":{
"recognition": {
"type": "TemplateMatch",
"param": {
"roi": [
177,
393,
42,
22
],
"template": [
"auto_withdraw_money/replenish_cafe.png"
],
"threshold": 0.8
}
},
"action": {
"type": "Click"
},
"next": [
"选择24小时"
]
},
"选择24小时":{
"recognition": {
"type": "TemplateMatch",
"param": {
"roi": [
404,
553,
59,
20
],
"template": [
"auto_withdraw_money/24h_black.png",
"auto_withdraw_money/24h_white.png"
],
"threshold": 0.8
}
},
"action": {
"type": "Click"
},
"post_delay": 500,
"next": [
"确认补货"
]
},
"确认补货":{
"recognition": {
"type": "TemplateMatch",
"param": {
"roi": [
813,
544,
201,
44
],
"template": [
"auto_withdraw_money/replenish_list.png"
],
"threshold": 0.8
}
},
"action": {
"type": "Click"
},
"next": [
"库存已满",
"送货上门"
]
},
"库存已满":{
"recognition": {
"type": "TemplateMatch",
"param": {
"roi": [506,344,265,34],
"template": [
"auto_withdraw_money/InventoryFull.png"
],
"threshold": 0.8
}
},
"next": [
"Esc"
]
},
"送货上门": {
"recognition": {
"type": "TemplateMatch",
"param": {
"roi": [
657,
534,
203,
45
],
"template": [
"auto_withdraw_money/delivery.png"
],
"threshold": 0.8
}
},
"action": {
"type": "Click"
},
"next": [
"确认送货"
]
},
"确认送货": {
"recognition": {
"type": "TemplateMatch",
"param": {
"roi": [
655,
450,
238,
49
],
"template": [
"auto_withdraw_money/confirm_white.png"
],
"threshold": 0.8
}
},
"action": {
Expand All @@ -121,4 +251,13 @@
"repeat": 2,
"repeat_delay": 100
},
"WithdrawMoneyExit": {
"desc": "提取收益任务出口",
"pre_delay": 0,
"post_delay": 0,
"rate_limit": 0,
"next": [
"__ScenePrivateBackToWorldAny"
]
}
}
Loading