diff --git a/README-en.md b/README-en.md index e5e5cde3c2..c74e496d33 100644 --- a/README-en.md +++ b/README-en.md @@ -75,9 +75,9 @@ Please refer to: [FAQ](docs/en/FAQ.md) ## Supports for overseas clients - Global(EN) Client - Supports basic features like Combat, Recruitment calculate, Visiting, Collocting, Auto Roguelike(beta), etc. See also [README](resource/global/YoStarEN/readme.md) + Supports basic features like Combat, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarEN/readme.md) - JP Client - Supports basic features like Combat, Recruitment calculate, Visiting, Collocting, Auto Recruiting, Auto Roguelike(beta), etc. See also [README](resource/global/YoStarJP/readme.md) + Supports basic features like Combat, Auto Recruiting, Visiting, Collocting, Auto Roguelike(beta), Recruitment calculate, etc. See also [README](resource/global/YoStarJP/readme.md) - KR Client Supports basic features like Combat, etc. See also [README](resource/global/YoStarKR/readme.md) - ZH_CHT Client diff --git a/README.md b/README.md index 1bd54efd5f..c171949e0a 100644 --- a/README.md +++ b/README.md @@ -86,13 +86,13 @@ MAA 的意思是 MAA Assistant Arknights ## 外服支持 - 国际服(美服) - 支持基本的刷理智、公招识别、访问好友、领取奖励功能,支持肉鸽功能(测试版本),请参考 [说明](resource/global/YoStarEN/readme.md) + 支持基本的刷理智、访问好友、领取奖励、自动肉鸽(测试版本)、公招识别,请参考 [说明](resource/global/YoStarEN/readme.md) - 日服 - 支持基本的刷理智、公招识别、访问好友、领取奖励,自动公招,支持肉鸽功能(测试版本),请参考 [说明](resource/global/YoStarJP/readme.md) + 支持基本的刷理智、自动公招、访问好友、领取奖励、自动肉鸽(测试版本)、公招识别,请参考 [说明](resource/global/YoStarJP/readme.md) - 韩服 支持基本的刷理智功能,请参考 [说明](resource/global/YoStarKR/readme.md) - 繁中服 - 支持基本的刷理智功能,请参考 [说明](resource/global/txwy/readme.md) + 支持基本的刷理智、自动公招、公招识别功能,请参考 [说明](resource/global/txwy/readme.md) 由于外服用户较少及项目人手不足的问题,外服目前都仅适配了基本的功能。若您有强需求,欢迎在 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更,~~或加入我们一起建设 MAA~~ diff --git a/resource/global/YoStarEN/readme.md b/resource/global/YoStarEN/readme.md index defd044834..be878dc765 100644 --- a/resource/global/YoStarEN/readme.md +++ b/resource/global/YoStarEN/readme.md @@ -9,10 +9,10 @@ - 刷理智(仅支持选择`当前关卡`) - 使用理智药恢复理智 - 使用源石恢复理智 -- 指定次数 -- 公招计算 +- 刷理智指定 - 访问好友 - 领取日常奖励 +- 公招计算 - 无限刷肉鸽(测试功能) ## Global (EN) @@ -25,7 +25,7 @@ Now supports: - Restore with potion - Restore with Originite - Set the max number of auto battles -- Recruitment calculate - Friends visit - Award collect +- Recruitment calculate - Auto Roguelike (beta) diff --git a/resource/global/YoStarJP/readme.md b/resource/global/YoStarJP/readme.md index 6e96d20e58..81478c8230 100644 --- a/resource/global/YoStarJP/readme.md +++ b/resource/global/YoStarJP/readme.md @@ -9,11 +9,11 @@ - 刷理智(仅支持选择`当前关卡`) - 使用理智药恢复理智 - 使用源石恢复理智 -- 指定次数 -- 公招计算 +- 刷理智指定次数 +- 自动公招 - 访问好友 - 领取日常奖励 -- 自动公招 +- 公招计算 - 无限刷肉鸽(测试功能) ## Japanese @@ -26,10 +26,10 @@ Now supports: - Restore with potion - Restore with Originite - Set the max number of auto battles -- Recruitment calculate +- Auto Recruiting - Friends visit - Award collect -- Auto Recruiting +- Recruitment calculate - Auto Roguelike (beta) ## 日本 @@ -42,8 +42,8 @@ Now supports: - ポーションで復元 - Originiteで復元 - 自動戦闘の最大数を設定します -- 採用計算 +- 自動採用 - 友達が訪問 - アワードコレクト -- 自動採用 +- 採用計算 - 自動ローグライク(ベータ版) diff --git a/resource/global/txwy/readme.md b/resource/global/txwy/readme.md index 7480cf66b4..6a64a43018 100644 --- a/resource/global/txwy/readme.md +++ b/resource/global/txwy/readme.md @@ -9,4 +9,6 @@ - 刷理智(仅支持选择`当前关卡`) - 使用理智药恢复理智 - 使用源石恢复理智 -- 指定次数 +- 刷理智指定次数 +- 自动公招 +- 公招识别 diff --git a/src/MeoAssistant/DebugTask.cpp b/src/MeoAssistant/DebugTask.cpp index 34e8cab6c0..de4db54ba8 100644 --- a/src/MeoAssistant/DebugTask.cpp +++ b/src/MeoAssistant/DebugTask.cpp @@ -3,7 +3,7 @@ //#include "RoguelikeSkillSelectionTaskPlugin.h" #include "StageDropsTaskPlugin.h" -#include "DepotImageAnalyzer.h" +#include "RoguelikeFormationImageAnalyzer.h" asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg) : PackageTask(callback, callback_arg, TaskType) @@ -15,7 +15,9 @@ asst::DebugTask::DebugTask(const AsstCallback& callback, void* callback_arg) bool asst::DebugTask::run() { - cv::Mat image = cv::imread("depot2.png"); - DepotImageAnalyzer analyzer(image); + cv::Mat image = cv::imread("err/2.png"); + cv::Mat resized; + cv::resize(image, resized, cv::Size(1280, 720), 0, 0, cv::INTER_AREA); + RoguelikeFormationImageAnalyzer analyzer(resized); return analyzer.analyze(); } diff --git a/tools/TestCaller/main.cpp b/tools/TestCaller/main.cpp index 4283a10372..3b04ef9823 100644 --- a/tools/TestCaller/main.cpp +++ b/tools/TestCaller/main.cpp @@ -39,13 +39,13 @@ int main([[maybe_unused]] int argc, char** argv) /* 详细参数可参考 docs / 集成文档.md */ - AsstAppendTask(ptr, "StartUp", nullptr); + //AsstAppendTask(ptr, "StartUp", nullptr); - AsstAppendTask(ptr, "Fight", R"( - { - "stage": "1-7" - } - )"); + //AsstAppendTask(ptr, "Fight", R"( + //{ + // "stage": "1-7" + //} + //)"); //AsstAppendTask(ptr, "Recruit", R"( //{ @@ -88,7 +88,7 @@ int main([[maybe_unused]] int argc, char** argv) //} //)"); - //AsstAppendTask(ptr, "Debug", nullptr); + AsstAppendTask(ptr, "Debug", nullptr); AsstStart(ptr);