Skip to content

Commit efccc87

Browse files
EeeMaoYEeeMaoY
authored
Merge branch 'dev' into daily
2 parents 15a7523 + 1e6cacd commit efccc87

11 files changed

Lines changed: 324 additions & 151 deletions

File tree

‎.github/ISSUE_TEMPLATE/cn-bug-report.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ body:
99
description: |
1010
请确认自己完成了要求之后再进行勾选
1111
options:
12+
- label: 我未确认下列内容，仅仅是点了确认
13+
required: false
1214
- label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决
1315
required: true
1416
- label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
@@ -29,24 +31,24 @@ body:
2931
attributes:
3032
label: Version
3133
description: >-
32-
请提供 MXX 版本
34+
请提供 MaaNTE 版本
3335
placeholder: |
34-
MXX Version:
36+
MaaNTE Version:
3537
validations:
3638
required: true
3739
- type: textarea
3840
id: logs
3941
attributes:
4042
label: 日志和配置文件
4143
description: |
42-
**请在关闭 MXX 后，上传以下 3 个文件：**
44+
**请在关闭 MaaNTE 后，上传以下 3 个文件：**
4345
1. `debug` 文件夹中的 `maa.log` `maa.bak.log` 日志文件，并说明问题出现的大致时间点
4446
2. `config` 文件夹中的 `maa_pi_config.json`(MaaPiCli) 配置文件
4547
4648
如果你在使用 MacBook，请点击屏幕左上角的“文件”，点击“打开日志文件夹”
4749
**请直接将完整的文件拖拽进来，而非自己裁切或复制的片段；若文件体积过大可压缩后再上传**
4850
placeholder: |
49-
请确认上传文件前已关闭 MXX
51+
请确认上传文件前已关闭 MaaNTE
5052
validations:
5153
required: true
5254
- type: textarea
@@ -66,8 +68,8 @@ body:
6668
description: |
6769
`debug` 目录下按功能分类的文件夹内，有一些自动截图的错误图片，若有相关的，请一并打包上传
6870
69-
可上传屏幕截图或录制以帮助解释你的问题，包括但不限于 MXX 软件截图、游戏画面截图、
70-
MXX debug 截图（`debug/vision` 路径图片，在修改 `config/maa_option.json` 中 `save_draw` 为 `true` 后再次运行 MXX 获取）
71+
可上传屏幕截图或录制以帮助解释你的问题，包括但不限于 MaaNTE 软件截图、游戏画面截图、
72+
MaaNTE debug 截图（`debug/vision` 路径图片，在修改 `config/maa_option.json` 中 `save_draw` 为 `true` 后再次运行 MaaNTE 获取）
7173
若是**识别相关问题**，请尽可能提供模拟器自带的截图工具截取的无遮挡的**原图**（或通过 adb 截取原图）
7274
用其他的工具（如QQ/微信）截取的图片包含窗口边框且长宽比、分辨率不固定，不利于我们排除bug
7375
若文件体积过大可压缩后再上传

‎.github/ISSUE_TEMPLATE/cn-feature-request.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ body:
77
attributes:
88
label: 在提问之前...
99
options:
10+
- label: 我未确认下列内容，仅仅是点了确认
11+
required: false
1012
- label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等
1113
required: true
1214
- label: 我基本确定这是一个新功能/建议，而不是遇到了 Bug（不确定的话请附上日志）

‎.github/ISSUE_TEMPLATE/en-bug-report.yaml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ body:
1111
description: |
1212
Please ensure that you have completed the requirements before checking the box.
1313
options:
14+
- label: >-
15+
I did not confirm the following content; I simply clicked "confirm."
16+
required: false
1417
- label: >-
1518
I understand that Issues are for feedback and problem solving,
1619
not trolling the comments section, and will provide as
@@ -43,25 +46,25 @@ body:
4346
attributes:
4447
label: Version
4548
description: >-
46-
Please provide the MXX version.
49+
Please provide the MaaNTE version.
4750
placeholder: |
48-
MXX Version:
51+
MaaNTE Version:
4952
validations:
5053
required: true
5154
- type: textarea
5255
id: logs
5356
attributes:
5457
label: Log and config files
5558
description: >-
56-
**After closing MXX, upload the following 3 files:**
59+
**After closing MaaNTE, upload the following 3 files:**
5760
1. The `maa.log` and `maa.bak.log` log file in the `debug` folder, and indicate the approximate point in time when the problem occurred.
5861
2. The `maa_pi_config.json`(MaaPiCli) config file in the `config` folder
5962
6063
If you are using MacBook, please click the "File" option in the top-left corner of the screen, then click "Open Log Folder".
6164
**Please drag and drop the full file in, not your own cuttings or copies;**
6265
**compress it before uploading if too large.**
6366
placeholder: |
64-
Please confirm that MXX is not running before uploading files.
67+
Please confirm that MaaNTE is not running before uploading files.
6568
validations:
6669
required: true
6770
- type: textarea
@@ -84,9 +87,9 @@ body:
8487
If related to this issue, please upload them together.
8588
8689
If available, upload screenshots and recordings to help explain your problem,
87-
including but not limited to screenshots of MXX software,
88-
screenshots of game screens, MXX debug screenshots (`debug/vision` path pictures,
89-
after modifying `save_draw` in `config/maa_option.json` to `true`, run MXX again to obtain)
90+
including but not limited to screenshots of MaaNTE software,
91+
screenshots of game screens, MaaNTE debug screenshots (`debug/vision` path pictures,
92+
after modifying `save_draw` in `config/maa_option.json` to `true`, run MaaNTE again to obtain)
9093
9194
If the problem is **recognition related**, please help by providing
9295
the **original image** taken by the emulator's own screenshot tool

‎.github/ISSUE_TEMPLATE/en-feature-request.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ body:
77
attributes:
88
label: Before raising the issue...
99
options:
10+
- label: I did not confirm the following content; I simply clicked "confirm."
11+
required: false
1012
- label: I filled in a short, clear title so that developers could quickly identify the general problem when going through the issue list. Instead of "Some suggestions", "Stuck", etc.
1113
required: true
1214
- label: I'm probably sure this is a new feature/suggestion and not a bug encountered (please attach logs if you're not sure)

‎.github/workflows/install.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
5959
# 检查是否为预发布版本
6060
is_prerelease=false
61-
if [[ $tag =~ .*alpha.* || $tag =~ .*beta.* || $tag =~ .*rc.* || $tag =~ .*dev.* || $tag =~ .*-ci.* ]]; then
61+
if [[ $tag =~ .*alpha.* || $tag =~ .*beta.* || $tag =~ .*rc.* || $tag =~ .*dev.* || $tag =~ .*-ci.* || $tag =~ .*preview.* ]]; then
6262
is_prerelease=true
6363
echo "This is a pre-release version"
6464
fi

‎README.md‎

Lines changed: 76 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,46 @@
1-
<!-- markdownlint-disable MD033 MD041 -->
2-
<p align="center">
3-
<img alt="LOGO" src="./assets/logo.png" width="256" height="256" />
4-
</p>
5-
1+
<!-- markdownlint-disable MD028 MD029 MD033 MD041 -->
62
<div align="center">
7-
8-
[English](docs/README_en.md)
3+
<img alt="LOGO" src="./assets/logo.png" width="256" height="256" />
94

105
# MaaNTE
116

12-
😊MAA异环小助手😊
7+
<p align="center">
8+
MAA异环小助手
9+
<br/>
10+
<a href="docs/README_en.md">English</a> | <a href="https://github.com/1bananachicken/MaaNTE/issues">报告 Bug</a>
11+
</p>
12+
13+
<p align="center">
14+
<img src="https://img.shields.io/badge/Platform-Windows-0078D7?style=flat-square&logo=Windows" alt="Platform" />
15+
<img src="https://img.shields.io/badge/Language-Python%20%2F%20PipeLine-blue?style=flat-square&logo=Python" alt="Language" />
16+
<img alt="license" src="https://img.shields.io/github/license/1bananachicken/MaaNTE?style=flat-square">
17+
<br>
18+
<a href="https://maafw.com/" target="_blank"><img alt="website" src="https://raw.githubusercontent.com/MaaXYZ/MaaFramework/refs/heads/main/docs/static/maafw.svg"></a>
19+
<a href="https://mirrorchyan.com/zh/projects?rid=MaaNTE" target="_blank"><img alt="mirrorc" src="https://raw.githubusercontent.com/MaaXYZ/MaaFramework/refs/heads/main/docs/static/mirrorc-zh.svg"></a>
20+
<br/>
21+
<img alt="commit" src="https://img.shields.io/github/commit-activity/m/1bananachicken/MaaNTE?color=%23ff69b4">
22+
<img src="https://img.shields.io/github/stars/1bananachicken/MaaNTE?style=flat-square&logo=github&color=darkgreen" alt="Stars" />
23+
</p>
1324

1425
由 [MaaFramework](https://github.com/MaaXYZ/MaaFramework) 强力驱动！
1526

16-
本项目还处于早期开发阶段，欢迎提交PR和Issue
27+
</div>
1728

18-
QQ交流1群: 1103323319
29+
> [!Tip]
30+
>
31+
> 本项目还处于早期开发阶段，欢迎提交PR和Issue
1932
20-
若1群已满请加2群: 1101147419
33+
> [!Tip]
34+
>
35+
> 官方 B 站账号: [MaaNTE-Official](https://space.bilibili.com/3546893080594665)
36+
>
37+
> QQ交流1群: 1103323319
38+
>
39+
> 若1群已满请加2群: 1101147419
2140
22-
</div>
41+
> [!Caution]
42+
>
43+
> 近期出现大量账号二次分发本软件，甚至冒充官方账号。通过非官方途径获取的软件可能**含有病毒**，并且一般不是最新的版本，请注意甄别。
2344
2445
## ✨ 功能一览
2546

@@ -32,59 +53,77 @@ QQ交流1群: 1103323319
3253
- 📦 自动补货
3354

3455
## ❓常见问题
35-
### 🤔找不到怎么启动？
36-
- 普通用户请下载release版本，有开发需求再clone仓库
37-
### 🤔钓鱼不工作怎么办？
38-
- 是否以管理员身份运行
39-
- 游戏分辨率是否调整到1280*720
40-
- 是否勾选了自动钓鱼
41-
- 不要把程序放在中文路径下
42-
- 关闭杀毒软件
43-
### 🤔右下角弹窗提示不支持Mirror酱？
44-
这是自动更新没有配置，不影响，不用管
4556

46-
47-
## ❓常见问题
4857
### 🤔找不到怎么启动？
58+
4959
- 普通用户请下载release版本，有开发需求再clone仓库
60+
5061
### 🤔钓鱼不工作怎么办？
62+
5163
- 是否以管理员身份运行
5264
- 游戏分辨率是否调整到1280*720
5365
- 是否勾选了自动钓鱼
5466
- 不要把程序放在中文路径下
5567
- 关闭杀毒软件
56-
### 🤔右下角弹窗提示不支持Mirror酱？
57-
这是自动更新没有配置，不影响，不用管
58-
5968

6069
## 💡注意事项
70+
6171
游戏需要运行在1280x720分辨率，窗口化，钓鱼新算法支持120帧运行
6272

63-
自动做咖啡需要设置鼠标输入方式 Seize ，会出现抢占鼠标的情况（正在测试非抢占鼠标的方法，将先在测试版发布）
73+
自动做咖啡需要设置鼠标输入方式 `Seize` ，会出现抢占鼠标的情况（正在测试非抢占鼠标的方法，将先在测试版发布）
6474

6575
## 💻开发指南
76+
77+
<details><summary>点击展开</summary>
78+
79+
### 快速开始
80+
81+
0. 配置环境
82+
83+
- 安装 python>=3.11
84+
- 建议使用vscode作为IDE进行开发，并安装 [vscode插件“maa-support”](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) 进行调试
85+
6686
1. Fork项目
87+
6788
- 点击 `Fork`，继续点击 `Create Fork`
89+
6890
2. 克隆自己 fork 的项目到本地，并拉取子模块
91+
6992
```bash
7093
git clone --recursive https://github.com/<你的用户名>/MaaNTE.git
7194
```
95+
7296
3. 下载MaaFramework的 [release包](https://github.com/MaaXYZ/MaaFramework/releases)，解压到 `deps` 文件夹中
73-
4. 配置环境
74-
- 安装 python>=3.11
75-
- 建议使用vscode作为IDE进行开发
76-
- 强烈建议安装 [vscode插件](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) 进行调试
77-
5. 提交PR
78-
- 新功能开发请提交到dev分支
97+
98+
4. 提交PR
99+
100+
- 新功能开发请提交到dev分支
79101

80102
更多开发文档可以参考 [M9A文档站](https://1999.fan/zh_cn/develop/development.html)
81103

104+
</details>
105+
82106
## ☕鸣谢
83107

84-
### 开源库
108+
### 开源项目
109+
85110
- [MaaFramework](https://github.com/MaaXYZ/MaaFramework)
86111
基于图像识别的自动化黑盒测试框架
112+
- [MaaAssistantArknights](https://github.com/MaaAssistantArknights/MaaAssistantArknights)
113+
《明日方舟》小助手，全日常一键长草！
114+
- [MaaEnd](https://github.com/MaaEnd/MaaEnd)
115+
基于视觉 AI 的「明日方舟：终末地」自动化工具
116+
- [M9A](https://github.com/MAA1999/M9A)
117+
重返未来：1999 小助手
87118
- [MFAAvalonia](https://github.com/SweetSmellFox/MFAAvalonia)
88119
基于 Avalonia UI 构建的 MaaFramework 通用 GUI 解决方案
89-
- [M9A](https://github.com/MAA1999/M9A)
90-
代码以及文档参考
120+
121+
### ❤️贡献/参与者
122+
123+
感谢全部参与到测试与开发中的开发者(´▽`ʃ♡ƪ)
124+
125+
[![Contributors](https://contributors-img.web.app/image?repo=1bananachicken/MaaNTE&max=105&columns=15)](https://github.com/1bananachicken/MaaNTE/graphs/contributors)
126+
127+
## 广告
128+
129+
如果觉得软件对你有帮助，帮忙点个 Star 吧！~（网页最上方右上角的小星星），这就是对我们最大的支持了！

‎agent/custom/action/auto_buy_fish_bait.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
6868
img = get_image(controller)
6969
found_bait_success, _, _, _ = match_template_in_region(img, find_bait_success_region, self.find_bait_success_template, match_threshold)
7070
if found_bait_success:
71-
img = get_image(controller)
7271
time.sleep(0.5)
7372
break
7473
else:
@@ -82,12 +81,14 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
8281

8382
while True:
8483
img = get_image(controller)
85-
found_select_max, _, _, _ = match_template_in_region(img, select_max_region, self.select_max_template, match_threshold)
84+
found_select_max, prob, _, _ = match_template_in_region(img, select_max_region, self.select_max_template, match_threshold)
85+
print(f"Looking for select max option, match probability: {prob:.2f}")
8686
if found_select_max:
87-
for _ in range(3):
87+
print("Select max option found, clicking...")
88+
for _ in range(5):
8889
click_rect(controller, select_max_region)
8990
time.sleep(0.1)
90-
time.sleep(0.5)
91+
time.sleep(1)
9192
break
9293
else:
9394
print("Select max option not found, retrying...")
@@ -97,6 +98,7 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
9798
img = get_image(controller)
9899
found_buy, _, _, _ = match_template_in_region(img, buy_region, self.buy_template, match_threshold)
99100
if found_buy:
101+
print("Buy button found, clicking...")
100102
for _ in range(3):
101103
click_rect(controller, buy_region)
102104
time.sleep(0.1)
@@ -110,6 +112,7 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
110112
img = get_image(controller)
111113
found_buy_confirm, _, _, _ = match_template_in_region(img, buy_confirm_region, self.buy_confirm_template, match_threshold)
112114
if found_buy_confirm:
115+
print("Buy confirm button found, clicking...")
113116
for _ in range(3):
114117
click_rect(controller, buy_confirm_region)
115118
time.sleep(0.1)
@@ -123,6 +126,7 @@ def run(self, context: Context, argv: CustomAction.RunArg) -> CustomAction.RunRe
123126
img = get_image(controller)
124127
found_buy_success, _, _, _ = match_template_in_region(img, buy_success_region, self.buy_success_template, match_threshold)
125128
if found_buy_success:
129+
print("Buy success.")
126130
controller.post_click_key(KEY_ESC).wait()
127131
time.sleep(0.5)
128132
controller.post_click_key(KEY_ESC).wait()

0 commit comments

Comments
 (0)