Skip to content

Commit 37b9e19

Browse files
committed
Merge branch 'main' into refactor/term
2 parents c8fe954 + eaf6a60 commit 37b9e19

File tree

4 files changed

+9
-21
lines changed

4 files changed

+9
-21
lines changed

docs/en_us/1.1-QuickStarted.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,8 @@ If needed, you can also fine-tune the official pre-trained models of PaddleOCR y
162162

163163
## Debug
164164

165-
There are currently two ways: [MaaDebugger](https://github.com/MaaXYZ/MaaDebugger) and [VSCode plugin](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support).
166-
167-
### MaaDebugger
168-
165+
- Use [MaaDebugger](https://github.com/MaaXYZ/MaaDebugger).
166+
- Use [VSCode plugin](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support).
169167
- If you use MaaPiCli, the `config/maa_option.json` file will be generated in the same directory, including:
170168

171169
- `logging`: Save the log and generate `debug/maa.log`. Default true.
@@ -176,13 +174,9 @@ There are currently two ways: [MaaDebugger](https://github.com/MaaXYZ/MaaDebugge
176174

177175
- If you integrate it yourself, you can enable debugging options through the `Toolkit.init_option` / `MaaToolkitConfigInitOption` interface. The generated json file is the same as above.
178176

179-
### VSCode Plugin
180-
181-
Compared to MaaDebugger, which focuses on debugging, the current VSCode plugin also has many functions such as screenshots and code completion. The specific content can be explored through the [official website](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) and actual experience.
182-
183177
## Run
184178

185-
You can integrate MaaFramework using MaaPiCli (Generic CLI) or by writing integration code yourself.
179+
You can integrate MaaFramework using Generic CLI (MaaPiCli), third-party Generic GUI (MFAWPF, etc) or by writing integration code yourself.
186180

187181
### Using MaaPiCli
188182

docs/zh_cn/1.1-快速开始.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,9 @@ my_resource
162162

163163
## 调试
164164

165-
目前有两种方式:[MaaDebugger](https://github.com/MaaXYZ/MaaDebugger) 以及 [VSCode 插件](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support)
166-
167-
### MaaDebugger
168-
169-
- 若使用 MaaPiCli ,会在同目录下生成 `config/maa_option.json` 文件,其中:
165+
- 使用 [MaaDebugger](https://github.com/MaaXYZ/MaaDebugger)
166+
- 使用 [VSCode 插件](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support)
167+
- 使用 MaaPiCli ,会在同目录下生成 `config/maa_option.json` 文件,其中:
170168

171169
- `logging`: 保存日志,会生成 `debug/maa.log`。默认 true 。
172170
- `recording`: 保存录像功能,会保存运行期间所有的截图及操作数据,可使用 `DbgController` 进行复现调试。默认 false 。
@@ -176,13 +174,9 @@ my_resource
176174

177175
- 若自行集成,可通过 `Toolkit.init_option` / `MaaToolkitConfigInitOption` 接口开启调试选项。生成的 json 文件同上。
178176

179-
### VSCode 插件
180-
181-
相比专注于调试的 MaaDebugger,目前 VSCode 插件还有截图、代码补全等多种功能,具体内容可通过 [官网](https://marketplace.visualstudio.com/items?itemName=nekosu.maa-support) 和实际体验探索。
182-
183177
## 运行
184178

185-
使用 MaaPiCli(通用 CLI)或者 自行编写集成代码
179+
使用 通用 CLI(MaaPiCli)、第三方通用 GUI(例如 MFAWPF 等)或者 自行编写集成代码
186180

187181
### 使用 MaaPiCli
188182

source/MaaFramework/Task/Component/Recognizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ RecoResult Recognizer::custom_recognize(const MAA_VISION_NS::CustomRecognitionPa
329329
.draws = std::move(analyzer).draws() };
330330
}
331331

332-
cv::Rect Recognizer::get_roi(const MAA_VISION_NS::Target roi)
332+
cv::Rect Recognizer::get_roi(const MAA_VISION_NS::Target& roi)
333333
{
334334
if (!tasker_) {
335335
LogError << "tasker is null";

source/MaaFramework/Task/Component/Recognizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Recognizer
3333
RecoResult nn_detect(const MAA_VISION_NS::NeuralNetworkDetectorParam& param, const std::string& name);
3434
RecoResult custom_recognize(const MAA_VISION_NS::CustomRecognitionParam& param, const std::string& name);
3535

36-
cv::Rect get_roi(const MAA_VISION_NS::Target roi);
36+
cv::Rect get_roi(const MAA_VISION_NS::Target& roi);
3737
void save_draws(const std::string& node_name, const RecoResult& result) const;
3838
void show_hit_draw(const cv::Rect& box, const std::string& node_name, MaaRecoId uid) const;
3939

0 commit comments

Comments
 (0)