diff --git a/.gitignore b/.gitignore
index 895085dcb6..13335857eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -442,3 +442,9 @@ enc_temp_folder/*
# Nuke
.nuke/temp/*
+
+# 引航者试炼地图，手动改的参数
+/resource/Arknights-Tile-Pos/act2bossrush_01-activities-act2bossrush-level_bossrush2_01.json
+/resource/Arknights-Tile-Pos/act2bossrush_02-activities-act2bossrush-level_bossrush2_02.json
+/resource/Arknights-Tile-Pos/act2bossrush_03-activities-act2bossrush-level_bossrush2_03.json
+/resource/Arknights-Tile-Pos/act2bossrush_04-activities-act2bossrush-level_bossrush2_04.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27561d101c..39315b5d26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,42 +1,29 @@
-## v4.11.0-alpha.2
+## v4.11.0-beta.2
-- 修复 基建 自动换班时，排序错误导致的干员冲突问题 @MistEO @ABA2396
+- 更新 `吾导先路` 活动关卡资源、导航 @MistEO @ABA2396
+- 优化 刷理智 主界面设置，更改为实时生效 @ABA2396
+- 修复 基建 宿舍复查识别错误 @MistEO
+- 修复 macOS GUI 编队错误 @hguandl
+- 修复 界面 托盘不显示的问题 @ABA2396
+- 迁移 文档 至官网 @ABA2396
-## v4.11.0-alpha.1
+### For overseas
+
+- Updated translation for YostarJP @wallsman
+
+
+## v4.11.0-beta.1
- 重构 生息演算，支持黑市 npc 对话，支持刷粗制赤金 @WLLEGit
- 新增 刷理智 吃 48 小时、60分钟 临期理智药功能 @bigqiao
-- 优化 基建 复核干员是否正确选择 @fearlessxjdx
+- 优化 基建 复核干员是否正确选择 @fearlessxjdx @MistEO @ABA2396
+- 优化 信用购物 默认选项 @sakuraxp
+- 优化 牛牛喝酒 彩蛋 @MistEO
+- 修复 战斗中 干员头像识别错误 @MistEO
- 修复 界面 崩溃问题 @ChingCdesu @ABA2396 @lhhxxxxx
+- 修复 界面 adb 自动检测错误 @lanhao34
+- 修复 界面 托盘不显示问题 @ChingCdesu
- 修复 `春分` 故事集 关卡上传企鹅错误 @MistEO
- 修复 抄作业 神秘代码无法使用的问题 @zzyyyl
- 修复 抄作业 干员名识别错误 @cenfusheng
- 迁移 文档 至[官网](https://maa.plus/docs/)，主仓库内不再更新 @ABA2396
-
-
-## v4.10.10
-
-- 更新 `春分` 故事集 游戏数据 @MistEO
-
-## v4.10.9-rc.1
-
-- 回滚 v4.10.8 版本 GUI 相关改动，后续修复后再次发布 @MistEO
-
-## v4.10.8-beta.1
-
-- 新增 界面 保存最近连接端口号 @ABA2396
-- 新增 界面 公招识别 三星设置 7:40 @ABA2396
-- 重构 界面 调用方式 @ChingCdesu
-- 优化 任务中途停止 等待时间 @ABA2396
-- 优化 保全派驻 上满核心后就不上工具人了 @MistEO
-- 修复 保全派驻 第三层掉落卡住的问题 @MistEO
-- 修复 检查更新 不应用代理设置的问题 @MistEO
-- 修复 基建 会客室 不领取线索的问题 @Sed66666
-- 修复 界面 刷理智 相关下拉选项错误 @ABA2396
-- 修复 肉鸽 关卡超时撤退时的崩溃问题 @HerrCai0907
-- 修复 检测 ADB 时的崩溃问题 @ABA2396
-- 更新 文档 @ABA2396
-
-For overseas
-
-- Added more template images for YostarJP @liuyifan-eric
diff --git a/README.md b/README.md
index 1d74c07406..9ab0562911 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
-[简体中文](README.md) | [繁體中文](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md) | [한국어](README_ko-KR.md)
+[简体中文](https://maa.plus/docs/) | [繁體中文](https://maa.plus/docs/zh-tw/) | [English](https://maa.plus/docs/en-us/) | [日本語](https://maa.plus/docs/ja-jp/) | [한국어](https://maa.plus/docs/ko-kr/)
MAA 的意思是 MAA Assistant Arknights
@@ -26,7 +26,7 @@ MAA 的意思是 MAA Assistant Arknights
基于图像识别技术，一键完成全部日常任务！
-绝赞更新中 ✿✿ヽ(°▽°)ノ✿
+绝赞更新中 ✿✿ヽ(°▽°)ノ✿
@@ -41,7 +41,7 @@ MAA 的意思是 MAA Assistant Arknights
- 仓库识别并支持导出至 [企鹅物流刷图规划器](https://penguin-stats.cn/planner), [明日方舟工具箱](https://arkn.lolicon.app/#/material), [ARK-NIGHTS 干员培养表](https://ark-nights.com/settings)
- 支持 C, Python, Java, Rust, Golang, Java HTTP, Rust HTTP 等多种接口，方便集成调用，自定义你的 MAA！
-话不多说，看图！
+话不多说，看图！
@@ -49,7 +49,7 @@ MAA 的意思是 MAA Assistant Arknights
## 下载地址
-[稳定版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/latest)
+[稳定版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/latest)
[开发版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
## 使用说明
@@ -76,16 +76,8 @@ MAA 的意思是 MAA Assistant Arknights
## 外服支持
-- 国际服（美服）
- 支持基本的刷理智、信用购物、访问好友、领取奖励、自动肉鸽（测试版本）、公招识别，请参考 [说明](resource/global/YoStarEN/readme.md)
-- 日服
- 支持基本的刷理智、自动基建、信用购物、自动公招、访问好友、领取奖励、自动肉鸽（测试版本）、公招识别，请参考 [说明](resource/global/YoStarJP/readme.md)
-- 韩服
- 支持基本的刷理智、信用购物、访问好友、领取奖励、自动肉鸽（测试版本）、公招识别，请参考 [说明](resource/global/YoStarKR/readme.md)
-- 繁中服
- 支持基本的刷理智、自动公招、自动肉鸽、领取日常、公招识别功能，请参考 [说明](resource/global/txwy/readme.md)
-
-由于外服用户较少及项目人手不足的问题，外服目前都仅适配了基本的功能。若您有强需求，欢迎在 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更，或加入我们一起建设 MAA！请参考 [外服适配教程](#外服适配)
+目前国际服（美服）、日服、韩服、繁中服的绝大部分功能均已支持。但由于外服用户较少及项目人手不足，很多功能并没有进行全面的测试，所以请自行体验。
+若您遇到了 Bug，或对某个功能有强需求，欢迎在 [Issues](https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues) 和 [讨论区](https://github.com/MaaAssistantArknights/MaaAssistantArknights/discussions) 催更；或加入我们一起建设 MAA！请参考 [外服适配教程](#外服适配)
## 主要关联项目
@@ -122,7 +114,7 @@ MAA 的意思是 MAA Assistant Arknights
- ~~公开招募数据：[明日方舟工具箱](https://www.bigfun.cn/tools/aktools/hr)~~
- 干员及基建数据：[PRTS明日方舟中文WIKI](http://prts.wiki/)
- 关卡数据：[企鹅物流数据统计](https://penguin-stats.cn/)
-- 游戏数据及資源：[明日方舟bot常用素材](https://github.com/yuanyan3060/Arknights-Bot-Resource)
+- 游戏数据及资源：[明日方舟bot常用素材](https://github.com/yuanyan3060/Arknights-Bot-Resource)
- 游戏数据：[《明日方舟》游戏数据](https://github.com/Kengxxiao/ArknightsGameData)
### 贡献/参与者
@@ -179,12 +171,12 @@ MAA 的意思是 MAA Assistant Arknights
## 广告
-用户交流 QQ 群：[MAA 使用 & 粥游交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html)
-用户交流 TG 群：[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1)
-自动战斗 JSON 作业分享：[prts.plus](https://prts.plus) 或 [抄作业.com](http://抄作业.com)
-Bilibili 直播间：[直播间](https://live.bilibili.com/2808861) 每晚直播敲代码，近期很长一段时间应该都是在写本软件~
-
-技术 & 吹水群（舟无关）：[内卷地狱！(QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2)
-开发者群：[QQ 群](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)
+用户交流 QQ 群：[MAA 使用 & 粥游交流 QQ 群](https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/index.html)
+用户交流 TG 群：[Telegram 群](https://t.me/+Mgc2Zngr-hs3ZjU1)
+自动战斗 JSON 作业分享：[prts.plus](https://prts.plus) 或 [抄作业.com](http://抄作业.com)
+Bilibili 直播间：[直播间](https://live.bilibili.com/2808861) 每晚直播敲代码，近期很长一段时间应该都是在写本软件~
+
+技术 & 吹水群（舟无关）：[内卷地狱！(QQ 群)](https://jq.qq.com/?_wv=1027&k=ypbzXcA2)
+开发者群：[QQ 群](https://jq.qq.com/?_wv=1027&k=JM9oCk3C)
如果觉得软件对你有帮助，帮忙点个 Star 吧！~（网页最上方右上角的小星星），这就是对我们最大的支持了！
diff --git a/README_en-US.md b/README_en-US.md
deleted file mode 100644
index b337db1fa2..0000000000
--- a/README_en-US.md
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-
-# MaaAssistantArknights
-
-
-
-
-
-
-
-
-
-
-
-[简体中文](README.md) | [繁體中文](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md) | [한국어](README_ko-KR.md)
-
-MAA means MAA Assistant Arknights
-
-An Arknights assistant
-
-Based on image recognition, helps you to complete daily quests efficiently!
-
-Development in progress ✿✿ヽ(°▽°)ノ✿
-
-
-
-
-
-# MaaAssistantArknights
-
-
-
-
-
-
-
-
-
-
-
-[简体中文](README.md) | [繁體中文](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md) | [한국어](README_ko-KR.md)
-
-MAAは、MAA Assistant Arknightsです。
-
-アークナイツゲームアシスタント
-
-画像認識技術に基づいて、ワンクリックですべてのデイリーリクエストを完了します！
-
-絶賛開発中 ✿✿ヽ(°▽°)ノ✿
-
-
-
-
-
-# MaaAssistantArknights
-
-
-
-
-
-
-
-
-
-
-
-[简体中文](README.md) | [繁體中文](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md) | [한국어](README_ko-KR.md)
-
-MAA는 MAA Assistant Arknights의 약자입니다
-
-명일방주 어시스턴트
-
-이미지 인식을 기반으로, 한 번의 클릭만으로 그날의 모든 작업을 끝내드립니다!
-
-개발 진행 중입니다 ✿✿ヽ(°▽°)ノ✿
-
-
-
-
-
-# MaaAssistantArknights
-
-
-
-
-
-
-
-
-
-
-
-[简体中文](README.md) | [繁體中文](README_zh-TW.md) | [English](README_en-US.md) | [日本語](README_ja-JP.md) | [한국어](README_ko-KR.md)
-
-MAA 的意思是 MAA Assistant Arknights
-
-一款明日方舟遊戲小助手
-
-基於圖像辨識技術，一鍵完成全部日常任務！
-
-絕讚更新中 ✿✿ヽ(°▽°)ノ✿
-
-
+#include
+#include
+#include
+#include
+
ASST_SUPPRESS_CV_WARNINGS_START
#include
ASST_SUPPRESS_CV_WARNINGS_END
@@ -16,36 +30,101 @@ bool asst::TilePack::load(const std::filesystem::path& path)
return false;
}
- std::vector tiles_array;
- for (const auto& entry : std::filesystem::directory_iterator(path)) {
- const auto& file_path = entry.path();
- if (file_path.extension() != ".json") {
- continue;
- }
- auto json_opt = json::open(file_path);
- if (!json_opt) {
- Log.error("Failed to open json file:", file_path);
- return false;
- }
- auto& json = json_opt.value();
- if (json.is_array()) {
- // 兼容上游仓库的 levels.json
- // 有些用户习惯于在游戏更新了但maa还没发版前，自己手动更新下 levels.json，可以提前用
- tiles_array.insert(tiles_array.end(), std::make_move_iterator(json.as_array().begin()),
- std::make_move_iterator(json.as_array().end()));
- }
- else if (json.is_object()) {
- tiles_array.emplace_back(std::move(*json_opt));
- }
- else {
- Log.error("Invalid json file:", file_path);
- return false;
+ std::list tiles_array;
+ std::queue> file_strings;
+
+ std::atomic_bool eoq = false;
+ std::mutex queue_mut;
+ std::condition_variable condvar;
+
+ using result_type = std::optional>;
+ std::vector> workers;
+
+ {
+ auto n_workers = std::max(1U, std::thread::hardware_concurrency());
+ workers.reserve(n_workers);
+ for (auto thi = 0U; thi < n_workers; ++thi) {
+ workers.emplace_back(std::async(std::launch::async, [&]() -> result_type {
+ std::list result;
+ while (true) {
+ std::unique_lock lk { queue_mut };
+ condvar.wait(lk, [&]() -> bool { return !file_strings.empty() || eoq.load(); });
+ if (file_strings.empty()) return result;
+
+ std::string buf {};
+ buf.swap(file_strings.front().second);
+ auto path = file_strings.front().first;
+ file_strings.pop();
+ lk.unlock();
+
+ auto json_opt = json::parse(buf);
+ if (!json_opt) {
+ Log.error("Unable to parse json file:", path);
+ eoq.store(true);
+ return std::nullopt;
+ }
+
+ auto& json = json_opt.value();
+ if (json.is_array()) {
+ // 兼容上游仓库的 levels.json
+ // 有些用户习惯于在游戏更新了但maa还没发版前，自己手动更新下 levels.json，可以提前用
+ result.insert(tiles_array.end(), std::make_move_iterator(json.as_array().begin()),
+ std::make_move_iterator(json.as_array().end()));
+ }
+ else if (json.is_object()) {
+ result.emplace_back(std::move(json));
+ }
+ else {
+ Log.error("Invalid json file:", path);
+ eoq.store(true);
+ return std::nullopt;
+ }
+ }
+ }));
}
}
+ for (const auto& entry : std::filesystem::directory_iterator(path)) {
+
+ if (eoq.load()) break; // this means parsing went wrong
+
+ const auto& file_path = entry.path();
+ if (file_path.extension() != ".json") continue;
+
+ const auto f_size = std::filesystem::file_size(file_path);
+ std::ifstream ifs(file_path, std::ios::in);
+ auto buf = std::string(f_size, '\0');
+ ifs.read(buf.data(), static_cast(buf.size()));
+ {
+ std::unique_lock lk(queue_mut);
+ file_strings.push(std::make_pair(file_path, std::move(buf)));
+ }
+ condvar.notify_one();
+ }
+
+ eoq.store(true);
+ condvar.notify_all();
+
+ auto result = std::transform_reduce(
+ workers.begin(), workers.end(), std::optional { std::list {} },
+ [](result_type lhs, result_type rhs) -> result_type {
+ if (!lhs || !rhs) return std::nullopt;
+ lhs->splice(lhs->end(), std::move(rhs).value());
+ return lhs;
+ },
+ [&](std::future& fut) -> result_type {
+ while (fut.wait_for(std::chrono::milliseconds(10)) == std::future_status::timeout)
+ condvar.notify_all(); // is this necessary?
+ return fut.get();
+ });
+
+ if (!result) return false;
+ Log.info("got", result->size(), "maps");
+
try {
+ // TODO: this move has no effect
m_tile_calculator =
- std::make_shared(WindowWidthDefault, WindowHeightDefault, std::move(tiles_array));
+ std::make_shared(WindowWidthDefault, WindowHeightDefault, std::move(result).value());
}
catch (const std::exception& e) {
Log.error("Tile create failed", e.what());
diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp
index fb265bb74b..7203c27f65 100644
--- a/src/MaaCore/Config/ResourceLoader.cpp
+++ b/src/MaaCore/Config/ResourceLoader.cpp
@@ -13,6 +13,7 @@
#include "Miscellaneous/RecruitConfig.h"
#include "Miscellaneous/StageDropsConfig.h"
#include "Miscellaneous/TilePack.h"
+#include "Miscellaneous/OcrConfig.h"
#include "Roguelike/RoguelikeCopilotConfig.h"
#include "Roguelike/RoguelikeRecruitConfig.h"
#include "Roguelike/RoguelikeShoppingConfig.h"
@@ -64,6 +65,7 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
LoadResourceAndCheckRet(RoguelikeRecruitConfig, "roguelike"_p / "recruitment.json"_p);
LoadResourceAndCheckRet(RoguelikeShoppingConfig, "roguelike"_p / "shopping.json"_p);
LoadResourceAndCheckRet(BattleDataConfig, "battle_data.json"_p);
+ LoadResourceAndCheckRet(OcrConfig, "ocr_config.json"_p);
/* load resource with json and template files*/
LoadResourceWithTemplAndCheckRet(TaskData, "tasks.json"_p, "template"_p);
diff --git a/src/MaaCore/Config/TaskData.cpp b/src/MaaCore/Config/TaskData.cpp
index 27bfd6fa35..863bab9394 100644
--- a/src/MaaCore/Config/TaskData.cpp
+++ b/src/MaaCore/Config/TaskData.cpp
@@ -44,7 +44,7 @@ std::shared_ptr asst::TaskData::get(std::string_view name)
return it->second;
}
- return expend_sharp_task(name, get_raw(name)).value_or(nullptr);
+ return expend_task(name, get_raw(name)).value_or(nullptr);
}
bool asst::TaskData::parse(const json::value& json)
@@ -142,7 +142,7 @@ bool asst::TaskData::parse(const json::value& json)
// 生成 # 型任务
for (const auto& [name, old_task] : m_raw_all_tasks_info) {
- expend_sharp_task(name, old_task);
+ expend_task(name, old_task);
}
}
@@ -197,97 +197,416 @@ bool asst::TaskData::parse(const json::value& json)
return true;
}
-std::optional asst::TaskData::expend_sharp_task(std::string_view name, taskptr_t old_task)
+// new_tasks 是目的任务列表
+// raw_tasks 是源任务表达式列表
+// task_name 是任务名
+// task_changed 记录 raw_tasks 在转换为 new_tasks 时是否发生变化
+// multi 表示是否允许重复
+bool asst::TaskData::explain_tasks(tasklist_t& new_tasks, const tasklist_t& raw_tasks, std::string_view task_name,
+ bool& task_changed, bool multi)
+{
+ std::unordered_set tasks_set; // 记录任务列表中已有的任务（内容元素与 new_tasks 基本一致）
+
+ using symbl_t = size_t;
+ [[maybe_unused]] constexpr symbl_t symbl_end = 0;
+ [[maybe_unused]] constexpr symbl_t symbl_lambda_task_sep = 1;
+ [[maybe_unused]] constexpr symbl_t symbl_lparen = 2;
+ [[maybe_unused]] constexpr symbl_t symbl_rparen = 3;
+ [[maybe_unused]] constexpr symbl_t symbl_lbrace = 4;
+ [[maybe_unused]] constexpr symbl_t symbl_rbrace = 5;
+ [[maybe_unused]] constexpr symbl_t symbl_at = 6;
+ [[maybe_unused]] constexpr symbl_t symbl_sharp = 7;
+ [[maybe_unused]] constexpr symbl_t symbl_mul = 8;
+ [[maybe_unused]] constexpr symbl_t symbl_add = 9;
+ [[maybe_unused]] constexpr symbl_t symbl_sub = 10;
+
+ [[maybe_unused]] constexpr symbl_t symbl_name_start = 11;
+
+ [[maybe_unused]] constexpr symbl_t symbl_name_sub = 11;
+ [[maybe_unused]] constexpr symbl_t symbl_name_next = 12;
+ [[maybe_unused]] constexpr symbl_t symbl_name_on_error_next = 13;
+ [[maybe_unused]] constexpr symbl_t symbl_name_exceeded_next = 14;
+ [[maybe_unused]] constexpr symbl_t symbl_name_reduce_other_times = 15;
+ [[maybe_unused]] constexpr symbl_t symbl_name_self = 16;
+ [[maybe_unused]] constexpr symbl_t symbl_name_back = 17;
+ [[maybe_unused]] constexpr symbl_t symbl_name_none = 18;
+
+ static const std::vector symbl_table = {
+ "__END__", // 0
+ ",", // 1
+ "(", // 2
+ ")", // 3
+ "{", // 4
+ "}", // 5
+ "@", // 6
+ "#", // 7
+ "*", // 8
+ "+", // 9
+ "^", // 10
+ "sub", // 11
+ "next", // 12
+ "on_error_next", // 13
+ "exceeded_next", // 14
+ "reduce_other_times", // 15
+ "self", // 16
+ "back", // 17
+ "none", // 18
+ };
+
+ auto is_symbl_name = [&](symbl_t x) { return x >= symbl_name_start; };
+ auto is_symbl_subtask_type = [&](symbl_t x) {
+ switch (x) {
+ case symbl_name_sub:
+ case symbl_name_next:
+ case symbl_name_on_error_next:
+ case symbl_name_exceeded_next:
+ case symbl_name_reduce_other_times:
+ return true;
+ default:
+ return false;
+ }
+ };
+ auto is_symbl_sharp_type = [&](symbl_t x) {
+ switch (x) {
+ case symbl_name_self:
+ case symbl_name_back:
+ case symbl_name_none:
+ return true;
+ default:
+ return is_symbl_subtask_type(x);
+ }
+ };
+
+ // perform_op 的结果不保证符合参数 multi 的要求
+ auto perform_op = [&](std::string_view task_expr, symbl_t op, tasklistptr_t x,
+ tasklistptr_t y) -> std::optional {
+ auto ret = std::make_shared();
+
+ switch (op) {
+ case symbl_add:
+ ranges::copy(*x, std::back_inserter(*ret));
+ ranges::copy(*y, std::back_inserter(*ret));
+ break;
+ case symbl_sub:
+ for (std::string_view sx : *x) {
+ bool flag = true;
+ for (std::string_view sy : *y) {
+ if (sx == sy) {
+ flag = false;
+ break;
+ }
+ }
+ if (flag) ret->emplace_back(sx);
+ }
+ break;
+ case symbl_mul: {
+ if (y->size() != 1) {
+ Log.error("There is more than one y:", *y, "while perform op", symbl_table[op], "in", task_expr,
+ "of task:", task_name);
+ return std::nullopt;
+ }
+ int times = 0;
+ try {
+ times = std::stoi(y->front());
+ }
+ catch (...) {
+ Log.error("y:", y->front(), "is not number while perform op", symbl_table[op], "in", task_expr,
+ "of task:", task_name);
+ return std::nullopt;
+ }
+ for (int i = 0; i < times; ++i) {
+ ranges::copy(*x, std::back_inserter(*ret));
+ }
+ break;
+ }
+ case symbl_at: {
+ if (y->empty()) { // A@#none = A
+ ranges::copy(*x, std::back_inserter(*ret));
+ }
+ else if (x->empty()) { // #none@A = A
+ ranges::copy(*y, std::back_inserter(*ret));
+ }
+ else { // (A+B)@(C+D) = A@C + A@D + B@C + B@D
+ ranges::for_each(
+ *x, [&](std::string_view s) { ranges::copy(append_prefix(*y, s), std::back_inserter(*ret)); });
+ }
+ break;
+ }
+ case symbl_sharp: {
+ if (y->empty()) {
+ Log.error("There is no sharp_type while perform op", symbl_table[op], "in", task_expr,
+ "of task:", task_name);
+ return std::nullopt;
+ }
+ for (std::string_view type : *y) {
+ if (!x || x->empty()) { // unary
+ x = std::make_shared(tasklist_t { "" });
+ }
+ for (const auto& task : *x) {
+ if (type == "self") {
+ ret->emplace_back(task_name);
+ continue;
+ }
+ if (type == "none") {
+ continue;
+ }
+ if (type == "back") {
+ // "A#back" === "A", "B@A#back" === "B@A", "#back" === null
+ if (!task.empty()) ret->emplace_back(task);
+ continue;
+ }
+ taskptr_t other_task_info_ptr = task.empty() ? default_task_info_ptr : get_raw(task);
+
+#define ASST_TASKDATA_PERFORM_OP_IF_BRANCH(t, m) \
+ else if (type == #t) \
+ { \
+ bool task_changed = false; \
+ if (!explain_tasks(*ret, other_task_info_ptr->t, task_name, task_changed, m)) { \
+ Log.error("Failed to explain task", task + "->" #t, "while perform op", symbl_table[op], "in", task_expr, \
+ "of task:", task_name); \
+ return std::nullopt; \
+ } \
+ }
+ if (other_task_info_ptr == nullptr) [[unlikely]] {
+ Log.error("Task", task, "not found while perform op", symbl_table[op], "in", task_expr,
+ "of task:", task_name);
+ return std::nullopt;
+ }
+ ASST_TASKDATA_PERFORM_OP_IF_BRANCH(next, false)
+ ASST_TASKDATA_PERFORM_OP_IF_BRANCH(sub, true)
+ ASST_TASKDATA_PERFORM_OP_IF_BRANCH(on_error_next, false)
+ ASST_TASKDATA_PERFORM_OP_IF_BRANCH(exceeded_next, false)
+ ASST_TASKDATA_PERFORM_OP_IF_BRANCH(reduce_other_times, true)
+ else [[unlikely]]
+ {
+ Log.error("Unknown symbol", type, "while perform op", symbl_table[op], "in", task_expr,
+ "of task:", task_name);
+ return std::nullopt;
+ }
+#undef ASST_TASKDATA_PERFORM_OP_IF_BRANCH
+ }
+ }
+
+ break;
+ }
+ default:
+ Log.error("Unknown op", symbl_table[op], "in", task_expr, "of task:", task_name);
+ return std::nullopt;
+ }
+ return ret;
+ };
+
+ for (std::string_view task_expr : raw_tasks) {
+ if (task_expr.empty() || (!multi && tasks_set.contains(task_expr))) {
+ task_changed = true;
+ continue;
+ }
+
+ std::vector symbols_table = symbl_table;
+
+ std::unordered_map symbols_id = {};
+ for (symbl_t i = 0; i != symbols_table.size(); ++i) {
+ symbols_id.emplace(symbols_table[i], i);
+ }
+
+ std::vector symbol_stream;
+ auto emplace_symbol_if_not_empty = [&](const auto l, const auto r) {
+ if (l < r) {
+ auto symbol = std::string(l, r);
+ if (!symbols_id.contains(symbol)) {
+ symbl_t id = symbols_table.size();
+ symbols_id.emplace(symbol, id);
+ symbols_table.emplace_back(symbol);
+ symbol_stream.emplace_back(id);
+ }
+ else {
+ symbol_stream.emplace_back(symbols_id[symbol]);
+ }
+ }
+ };
+
+ // 记号流分析
+ auto y_begin = task_expr.begin();
+ for (auto p = task_expr.begin(); p != task_expr.end(); ++p) {
+ switch (*p) {
+ case ' ':
+ case '\t':
+ case '\r':
+ case '\n':
+ emplace_symbol_if_not_empty(y_begin, p);
+ y_begin = p + 1;
+ break;
+ case ',':
+ case '(':
+ case ')':
+ case '{':
+ case '}':
+ case '#':
+ case '*':
+ case '+':
+ case '^':
+ task_changed = true;
+ [[fallthrough]];
+ case '@':
+ emplace_symbol_if_not_empty(y_begin, p);
+ y_begin = p + 1;
+ symbol_stream.emplace_back(symbols_id[std::string(1, *p)]);
+ break;
+ default:
+ break;
+ }
+ }
+ emplace_symbol_if_not_empty(y_begin, task_expr.end());
+ symbol_stream.emplace_back(symbl_end); // 结束符
+ // Log.debug(symbol_stream | views::transform([&](symbl_t id) { return symbols_table[id]; }));
+ // Log.debug(symbol_stream);
+
+ /*
+ $name = 至少一位的任务名
+ $numbers = 至少一位的数字
+
+ $subtask_type = sub
+ | next
+ | on_error_next
+ | exceeded_next
+ | reduce_other_times
+
+ $sharp_type = $subtask_type
+ | self
+ | back
+ | none
+
+ $subtask = $subtask_type ( $tasks )
+
+ $lambda_task = { $subtask , ... } // 推迟实现
+ | { $tasks } // 推迟实现；不写 subtask_type 默认为 sub
+
+ $parens = # $sharp_type
+ | $name
+ | $name $lambda_task // 推迟实现
+ | ( $tasks )
+
+ $top_tasks = $top_tasks @ $parens
+ | $top_tasks # $sharp_type
+ | $parens
+
+ $mul_tasks = $top_tasks * $numbers
+ | $top_tasks
+
+ $tasks = $mul_tasks + $tasks
+ | $mul_tasks ^ $tasks // 删除 $mul_tasks 中所有在 $tasks 中的任务
+ | $mul_tasks
+ */
+ // 记号流处理
+ auto cur = symbol_stream.cbegin();
+ using decode_func_t = std::function()>;
+ decode_func_t decode_name, decode_tasks, decode_multasks, decode_vtasks, decode_parens;
+ decode_name = [&]() -> std::optional {
+ if (*cur >= symbl_name_start) {
+ return std::make_shared(tasklist_t { symbols_table[*(cur++)] });
+ }
+ return std::nullopt;
+ };
+ decode_tasks = [&]() -> std::optional {
+ auto l = decode_multasks();
+ if (!l) return std::nullopt;
+ while (*cur == symbl_add || *cur == symbl_sub) {
+ symbl_t op = *(cur++);
+ auto r = decode_multasks();
+ if (!r) return std::nullopt;
+ l = perform_op(task_expr, op, *l, *r);
+ if (!l) return std::nullopt;
+ }
+ return l;
+ };
+ decode_multasks = [&]() -> std::optional {
+ auto l = decode_vtasks();
+ if (!l) return std::nullopt;
+ while (*cur == symbl_mul) {
+ symbl_t op = *(cur++);
+ auto r = decode_name();
+ if (!r) return std::nullopt;
+ l = perform_op(task_expr, op, *l, *r);
+ if (!l) return std::nullopt;
+ }
+ return l;
+ };
+ decode_vtasks = [&]() -> std::optional {
+ auto l = decode_parens();
+ if (!l) return std::nullopt;
+ while (*cur == symbl_at || *cur == symbl_sharp) {
+ symbl_t op = *(cur++);
+ auto r = decode_parens();
+ if (!r) return std::nullopt;
+ l = perform_op(task_expr, op, *l, *r);
+ if (!l) return std::nullopt;
+ }
+ return l;
+ };
+ decode_parens = [&]() -> std::optional {
+ if (*cur == symbl_lparen) {
+ ++cur;
+ auto l = decode_tasks();
+ if (!l) return std::nullopt;
+ if (*cur != symbl_rparen) [[unlikely]] {
+ Log.error("Invalid symbol", *cur, "at", cur - symbol_stream.cbegin(), "in", symbol_stream,
+ "(should be ')')");
+ return std::nullopt;
+ }
+ ++cur;
+ return l;
+ }
+ if (*cur == symbl_sharp) {
+ ++cur;
+ auto r = decode_name();
+ if (!r) return std::nullopt;
+ return perform_op(task_expr, symbl_sharp, nullptr, *r);
+ }
+ if (*cur >= symbl_name_start) {
+ return decode_name();
+ }
+ Log.error("Invalid symbol", *cur, "at", cur - symbol_stream.cbegin(), "in", symbol_stream);
+ return std::nullopt;
+ };
+ auto opt = decode_tasks();
+ if (!opt || (*cur != symbl_end && cur != symbol_stream.cend())) {
+ return false;
+ }
+
+ for (const auto& task : **opt) {
+ if (task.empty() || (!multi && tasks_set.contains(task))) {
+ task_changed = true;
+ continue;
+ }
+ new_tasks.emplace_back(task);
+ tasks_set.emplace(task_name_view(task));
+ }
+
+ tasks_set.emplace(task_name_view(task_expr));
+ }
+
+ return true;
+}
+
+std::optional asst::TaskData::expend_task(std::string_view name, taskptr_t old_task)
{
if (old_task == nullptr) [[unlikely]] {
return std::nullopt;
}
- bool task_changed = false;
- auto task_info = _generate_task_info(old_task);
- auto expend_sharp_task_list = [&](tasklist_t& new_task_list, const tasklist_t& task_list,
- std::string_view list_type) -> bool {
- new_task_list.clear();
- std::function generate_tasks;
- std::unordered_set tasks_set {};
- generate_tasks = [&](const tasklist_t& raw_tasks) {
- for (std::string_view task : raw_tasks) {
- if (task.empty()) {
- Log.error("Task", name, "has a empty", list_type);
- return false;
- }
- if (tasks_set.contains(task)) [[unlikely]] {
- task_changed = true;
- continue;
- }
- tasks_set.emplace(task_name_view(task));
-
- size_t pos = task.rfind('#');
- if (pos == std::string_view::npos) [[likely]] {
- new_task_list.emplace_back(task);
- continue;
- }
-#ifdef ASST_DEBUG
- if (pos == 0) [[unlikely]] {
- Log.trace("Task", name, "has a virtual", list_type, ":", (std::string("`") += task) += '`');
- }
-#endif // ASST_DEBUG
-
- task_changed = true;
- std::string_view type = task.substr(pos + 1);
- if (type == "self") {
- new_task_list.emplace_back(name);
- continue;
- }
- taskptr_t other_task_info_ptr = pos ? get_raw(task.substr(0, pos)) : default_task_info_ptr;
-#define ASST_TASKDATA_GENERATE_TASKS(t) \
- else if (type == #t) \
- { \
- if (!generate_tasks(other_task_info_ptr->t)) { \
- return false; \
- } \
+ auto task_info = _generate_task_info(old_task); // 复制一份
+ bool task_changed = false; // 任务列表是否发生变化
+#define ASST_TASKDATA_EXPEND_TASK_IF_BRANCH(type, m) \
+ task_info->type.clear(); \
+ if (!explain_tasks(task_info->type, old_task->type, name, task_changed, m)) [[unlikely]] { \
+ Log.error("Generate task_list", std::string(name) + "->" #type, "failed."); \
+ return std::nullopt; \
}
- if (other_task_info_ptr == nullptr) [[unlikely]] {
- Log.error("Task", task, "not found");
- return false;
- }
- else if (type == "back") {
- // "A#back" === "A", "B@A#back" === "B@A", "#back" === null
- if (pos) {
- new_task_list.emplace_back(task.substr(0, pos));
- }
- }
- ASST_TASKDATA_GENERATE_TASKS(next)
- ASST_TASKDATA_GENERATE_TASKS(sub)
- ASST_TASKDATA_GENERATE_TASKS(on_error_next)
- ASST_TASKDATA_GENERATE_TASKS(exceeded_next)
- ASST_TASKDATA_GENERATE_TASKS(reduce_other_times)
- else [[unlikely]]
- {
- Log.error("Unknown type", type, "in", task);
- return false;
- }
-#undef ASST_TASKDATA_GENERATE_TASKS
- }
-
- return true;
- };
- if (!generate_tasks(task_list)) [[unlikely]] {
- Log.error("Generate task_list", (std::string(name) += "->") += list_type, "failed.");
- return false;
- }
- return true;
- };
-
-#define ASST_TASKDATA_GENERATE_SHARP_TASK(type) \
- if (!expend_sharp_task_list(task_info->type, old_task->type, #type)) { \
- return std::nullopt; \
- }
- ASST_TASKDATA_GENERATE_SHARP_TASK(next);
- ASST_TASKDATA_GENERATE_SHARP_TASK(sub);
- ASST_TASKDATA_GENERATE_SHARP_TASK(exceeded_next);
- ASST_TASKDATA_GENERATE_SHARP_TASK(on_error_next);
- ASST_TASKDATA_GENERATE_SHARP_TASK(reduce_other_times);
-#undef ASST_TASKDATA_GENERATE_SHARP_TASK
+ ASST_TASKDATA_EXPEND_TASK_IF_BRANCH(next, false);
+ ASST_TASKDATA_EXPEND_TASK_IF_BRANCH(sub, true);
+ ASST_TASKDATA_EXPEND_TASK_IF_BRANCH(exceeded_next, false);
+ ASST_TASKDATA_EXPEND_TASK_IF_BRANCH(on_error_next, false);
+ ASST_TASKDATA_EXPEND_TASK_IF_BRANCH(reduce_other_times, true);
+#undef ASST_TASKDATA_EXPEND_TASK_IF_BRANCH
// tasks 个数超过上限时不再 emplace，返回临时值
constexpr size_t MAX_TASKS_SIZE = 65535;
@@ -397,6 +716,7 @@ asst::TaskData::taskptr_t asst::TaskData::generate_ocr_task_info([[maybe_unused]
ocr_task_info_ptr->full_match = task_json.get("fullMatch", default_ptr->full_match);
ocr_task_info_ptr->is_ascii = task_json.get("isAscii", default_ptr->is_ascii);
ocr_task_info_ptr->without_det = task_json.get("withoutDet", default_ptr->without_det);
+ ocr_task_info_ptr->replace_full = task_json.get("replaceFull", default_ptr->replace_full);
if (auto opt = task_json.find("ocrReplace")) {
for (const json::value& rep : opt.value()) {
ocr_task_info_ptr->replace_map.emplace(rep[0].as_string(), rep[1].as_string());
@@ -536,6 +856,7 @@ std::shared_ptr asst::TaskData::_default_ocr_task_info()
ocr_task_info_ptr->full_match = false;
ocr_task_info_ptr->is_ascii = false;
ocr_task_info_ptr->without_det = false;
+ ocr_task_info_ptr->replace_full = false;
return ocr_task_info_ptr;
}
@@ -578,7 +899,7 @@ bool asst::TaskData::syntax_check(const std::string& task_name, const json::valu
{
"action", "algorithm", "baseTask", "cache", "exceededNext", "fullMatch",
"hash", "isAscii", "maskRange", "maxTimes", "next", "ocrReplace",
- "onErrorNext", "postDelay", "preDelay", "rectMove", "reduceOtherTimes", "roi",
+ "onErrorNext", "postDelay", "preDelay", "rectMove", "reduceOtherTimes", "replaceFull", "roi",
"specialParams", "sub", "subErrorIgnored", "templThreshold", "template", "text",
"threshold", "withoutDet",
} },
@@ -593,7 +914,7 @@ bool asst::TaskData::syntax_check(const std::string& task_name, const json::valu
{
"action", "algorithm", "baseTask", "cache", "exceededNext",
"fullMatch", "isAscii", "maxTimes", "next", "ocrReplace",
- "onErrorNext", "postDelay", "preDelay", "rectMove", "reduceOtherTimes",
+ "onErrorNext", "postDelay", "preDelay", "rectMove", "reduceOtherTimes", "replaceFull",
"roi", "sub", "subErrorIgnored", "text", "withoutDet",
"specialParams"
} },
diff --git a/src/MaaCore/Config/TaskData.h b/src/MaaCore/Config/TaskData.h
index ebfc884f0d..424c5752ae 100644
--- a/src/MaaCore/Config/TaskData.h
+++ b/src/MaaCore/Config/TaskData.h
@@ -17,6 +17,7 @@ namespace asst
{
private:
using tasklist_t = std::vector;
+ using tasklistptr_t = std::shared_ptr;
using taskptr_t = std::shared_ptr;
std::shared_ptr _default_match_task_info();
@@ -141,7 +142,9 @@ namespace asst
{
return m_all_tasks_info.insert_or_assign(task_name_view(task_name), task_info_ptr);
}
- std::optional expend_sharp_task(std::string_view name, taskptr_t old_task);
+ bool explain_tasks(tasklist_t& new_tasks, const tasklist_t& raw_tasks, std::string_view name,
+ bool& task_changed, bool multi);
+ std::optional expend_task(std::string_view name, taskptr_t old_task);
#ifdef ASST_DEBUG
bool syntax_check(const std::string& task_name, const json::value& task_json);
#endif
diff --git a/src/MaaCore/Controller/Controller.cpp b/src/MaaCore/Controller/Controller.cpp
index a26326c62d..cd9cbedb17 100644
--- a/src/MaaCore/Controller/Controller.cpp
+++ b/src/MaaCore/Controller/Controller.cpp
@@ -797,7 +797,7 @@ bool asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int
const auto& opt = Config.get_options();
if (m_minitouch_enabled && m_minitouch_available) {
Log.trace(m_use_maa_touch ? "maatouch" : "minitouch", "swipe", p1, p2, duration, extra_swipe, slope_in,
- slope_out);
+ slope_out);
Minitoucher toucher(std::bind(&Controller::input_to_minitouch, this, std::placeholders::_1), m_minitouch_props);
toucher.down(x1, y1);
@@ -896,6 +896,11 @@ bool asst::Controller::support_swipe_with_pause() const noexcept
return m_minitouch_enabled && m_minitouch_available && m_swipe_with_pause_enabled && !m_adb.press_esc.empty();
}
+bool asst::Controller::support_precise_swipe() const noexcept
+{
+ return m_minitouch_enabled && m_minitouch_available;
+}
+
bool asst::Controller::connect(const std::string& adb_path, const std::string& address, const std::string& config)
{
LogTraceFunction;
@@ -1600,7 +1605,7 @@ std::optional asst::Controller::call_command_posix(const std::string& cmd,
if (client_socket < 0) {
Log.error("accept failed:", strerror(errno));
::kill(m_child, SIGKILL);
- ::waitpid(m_child, &exit_ret, 0);
+ ::waitpid(m_child, &exit_ret, 0);
return std::nullopt;
}
@@ -1621,7 +1626,8 @@ std::optional asst::Controller::call_command_posix(const std::string& cmd,
}
} while (::waitpid(m_child, &exit_ret, WNOHANG) == 0 && !check_timeout());
}
- ::waitpid(m_child, &exit_ret, 0); // if ::waitpid(m_child, &exit_ret, WNOHANG) == 0, repeat it will cause ECHILD, so not check the return value
+ ::waitpid(m_child, &exit_ret, 0); // if ::waitpid(m_child, &exit_ret, WNOHANG) == 0, repeat it will cause
+ // ECHILD, so not check the return value
}
else {
// failed to create child process
diff --git a/src/MaaCore/Controller/Controller.h b/src/MaaCore/Controller/Controller.h
index af56cf6fa8..2bd6872851 100644
--- a/src/MaaCore/Controller/Controller.h
+++ b/src/MaaCore/Controller/Controller.h
@@ -65,6 +65,7 @@ namespace asst
bool press_esc();
bool support_swipe_with_pause() const noexcept;
+ bool support_precise_swipe() const noexcept;
std::pair get_scale_size() const noexcept;
diff --git a/src/MaaCore/MaaCore.vcxproj b/src/MaaCore/MaaCore.vcxproj
index d5124c59df..f5eeac53ee 100644
--- a/src/MaaCore/MaaCore.vcxproj
+++ b/src/MaaCore/MaaCore.vcxproj
@@ -37,6 +37,7 @@
+
@@ -170,6 +171,7 @@
+
diff --git a/src/MaaCore/MaaCore.vcxproj.filters b/src/MaaCore/MaaCore.vcxproj.filters
index 06e7f213ec..a3ff708973 100644
--- a/src/MaaCore/MaaCore.vcxproj.filters
+++ b/src/MaaCore/MaaCore.vcxproj.filters
@@ -522,6 +522,9 @@
源文件\Controller\adb-lite
+
+ 源文件\Config\Miscellaneous
+
@@ -857,5 +860,8 @@
源文件\Controller\adb-lite
+
+ 源文件\Config\Miscellaneous
+
\ No newline at end of file
diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp
index b237001c81..c796c12282 100644
--- a/src/MaaCore/Task/BattleHelper.cpp
+++ b/src/MaaCore/Task/BattleHelper.cpp
@@ -191,7 +191,8 @@ bool asst::BattleHelper::update_deployment(bool init, const cv::Mat& reusable)
auto analyze = [&](OcrImageAnalyzer& name_analyzer) {
name_analyzer.set_image(name_image);
name_analyzer.set_task_info(oper_name_ocr_task_name());
- name_analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map);
+ name_analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map,
+ Task.get("CharsNameOcrReplace")->replace_full);
if (!name_analyzer.analyze()) {
return std::string();
}
diff --git a/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp b/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp
index cbcc765482..01fb3dc2e4 100644
--- a/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp
+++ b/src/MaaCore/Task/Fight/DrGrandetTaskPlugin.cpp
@@ -1,9 +1,9 @@
#include "DrGrandetTaskPlugin.h"
#include "Controller/Controller.h"
-#include "Vision/OcrImageAnalyzer.h"
#include "Config/TaskData.h"
#include "Utils/Logger.hpp"
+#include "Vision/OcrImageAnalyzer.h"
#include
diff --git a/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp b/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp
index 20af67e158..374cf0eeb8 100644
--- a/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp
+++ b/src/MaaCore/Task/Infrast/InfrastAbstractTask.cpp
@@ -6,15 +6,15 @@
#include "Common/AsstMsg.h"
#include "Controller/Controller.h"
+#include "Config/TaskData.h"
+#include "Task/ProcessTask.h"
+#include "Utils/Logger.hpp"
+#include "Utils/Ranges.hpp"
#include "Vision/Infrast/InfrastFacilityImageAnalyzer.h"
#include "Vision/Infrast/InfrastOperImageAnalyzer.h"
#include "Vision/MatchImageAnalyzer.h"
#include "Vision/OcrImageAnalyzer.h"
#include "Vision/OcrWithPreprocessImageAnalyzer.h"
-#include "Config/TaskData.h"
-#include "Task/ProcessTask.h"
-#include "Utils/Logger.hpp"
-#include "Utils/Ranges.hpp"
asst::InfrastAbstractTask::InfrastAbstractTask(const AsstCallback& callback, Assistant* inst,
std::string_view task_chain)
@@ -153,6 +153,9 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool is_dorm_order
if (!is_dorm_order) {
ProcessTask(*this, { "InfrastOperListTabSkillUnClicked", "Stop" }).run();
}
+ else {
+ ProcessTask(*this, { "InfrastOperListTabMoodDoubleClickWhenUnclicked" }).run();
+ }
if (max_num_of_opers() > 1) {
click_clear_button(); // 先排序后清空，加速干员变化不大时的选择速度
@@ -205,12 +208,13 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool is_dorm_order
// 然后滑动到最左边，清空一下，在走后面的识别+按序点击逻辑
if (is_dorm_order) {
ProcessTask(*this, { "InfrastOperListTabMoodDoubleClick" }).run();
+ sleep(200);
}
else {
ProcessTask(*this, { "InfrastOperListTabWorkStatusUnClicked" }).run();
}
- if (room_config.sort || room_config.autofill) {
+ if (swipe_times) {
swipe_to_the_left_of_operlist(swipe_times + 1);
swipe_times = 0;
}
@@ -224,14 +228,10 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool is_dorm_order
return false;
}
- if (!is_dorm_order) {
- if (swipe_times) swipe_to_the_left_of_operlist(swipe_times + 1);
- swipe_times = 0;
- if (!select_opers_review(origin_room_config)) {
- // 复核失败，说明current_room_config与OCR识别是不符的，current_room_config是无效信息，还原到用户原来的配置，重选
- current_room_config() = std::move(origin_room_config);
- return false;
- }
+ if (!is_dorm_order && !select_opers_review(origin_room_config)) {
+ // 复核失败，说明current_room_config与OCR识别是不符的，current_room_config是无效信息，还原到用户原来的配置，重选
+ current_room_config() = std::move(origin_room_config);
+ return false;
}
return true;
@@ -242,7 +242,8 @@ bool asst::InfrastAbstractTask::swipe_and_select_custom_opers(bool is_dorm_order
/// @param origin_room_config 期望的配置
/// @param num_of_opers_expect 期望选中的人数，空置则按names.size()判断
/// @return 是否符合期望
-bool asst::InfrastAbstractTask::select_opers_review(infrast::CustomRoomConfig const& origin_room_config, size_t num_of_opers_expect)
+bool asst::InfrastAbstractTask::select_opers_review(infrast::CustomRoomConfig const& origin_room_config,
+ size_t num_of_opers_expect)
{
LogTraceFunction;
// save_img("debug/");
@@ -250,29 +251,35 @@ bool asst::InfrastAbstractTask::select_opers_review(infrast::CustomRoomConfig co
const auto image = ctrler()->get_image();
InfrastOperImageAnalyzer oper_analyzer(image);
- oper_analyzer.set_to_be_calced(InfrastOperImageAnalyzer::ToBeCalced::Selected);
+ oper_analyzer.set_to_be_calced(InfrastOperImageAnalyzer::ToBeCalced::Selected |
+ InfrastOperImageAnalyzer::ToBeCalced::Doing);
if (!oper_analyzer.analyze()) {
Log.warn("No oper");
return false;
}
oper_analyzer.sort_by_loc();
const auto& oper_analyzer_res = oper_analyzer.get_result();
- size_t selected_count = ranges::count_if(oper_analyzer_res, [](const infrast::Oper& info) { return info.selected; });
- Log.info("selected_count,config.names.size,num_of_opers_expect = ", selected_count, ",", room_config.names.size(), ",", num_of_opers_expect);
+ size_t selected_count =
+ ranges::count_if(oper_analyzer_res, [](const infrast::Oper& info) { return info.selected; });
+ Log.info("selected_count,config.names.size,num_of_opers_expect = ", selected_count, ",", room_config.names.size(),
+ ",", num_of_opers_expect);
if (selected_count < num_of_opers_expect) {
Log.warn("select opers review fail: 选中干员数与期望不符");
return false;
}
+ if (facility_name() != "Dorm" && (!m_is_custom || room_config.names.empty() && room_config.candidates.empty())) {
+ return true;
+ }
if (selected_count < room_config.names.size()) {
Log.warn("select opers review fail: 存在自定义干员未选中");
return false;
}
- const auto& ocr_replace = Task.get("CharsNameOcrReplace")->replace_map;
+ const auto& ocr_replace = Task.get("CharsNameOcrReplace");
for (const auto& oper : oper_analyzer_res) {
OcrWithPreprocessImageAnalyzer name_analyzer;
- name_analyzer.set_replace(ocr_replace);
+ name_analyzer.set_replace(ocr_replace->replace_map, ocr_replace->replace_full);
name_analyzer.set_image(oper.name_img);
name_analyzer.set_expansion(0);
if (!name_analyzer.analyze()) {
@@ -286,9 +293,11 @@ bool asst::InfrastAbstractTask::select_opers_review(infrast::CustomRoomConfig co
if (auto iter = ranges::find(room_config.names, name); iter != room_config.names.end()) {
Log.info(name, "在\"operators\"中，且已选中");
room_config.names.erase(iter);
- } else { // 备选干员或自动选择，只要不选工作中的干员即可
+ }
+ else { // 备选干员或自动选择，只要不选工作中的干员即可
if (oper.doing == infrast::Doing::Working) {
- Log.warn("select opers review fail: 非自定义情况下，选了正在工作的干员");
+ Log.warn("选了工作中的干员:", name);
+ Log.warn("select opers review fail: 非自定义配置，却选了工作中的干员");
return false;
}
}
@@ -323,10 +332,10 @@ bool asst::InfrastAbstractTask::select_custom_opers(std::vector& pa
oper_analyzer.sort_by_loc();
partial_result.clear();
- const auto& ocr_replace = Task.get("CharsNameOcrReplace")->replace_map;
+ const auto& ocr_replace = Task.get("CharsNameOcrReplace");
for (const auto& oper : oper_analyzer.get_result()) {
OcrWithPreprocessImageAnalyzer name_analyzer;
- name_analyzer.set_replace(ocr_replace);
+ name_analyzer.set_replace(ocr_replace->replace_map, ocr_replace->replace_full);
name_analyzer.set_image(oper.name_img);
name_analyzer.set_expansion(0);
if (!name_analyzer.analyze()) {
@@ -378,12 +387,12 @@ void asst::InfrastAbstractTask::order_opers_selection(const std::vector("CharsNameOcrReplace")->replace_map;
+ const auto& ocr_replace = Task.get("CharsNameOcrReplace");
std::vector page_result;
for (const auto& oper : oper_analyzer.get_result()) {
OcrWithPreprocessImageAnalyzer name_analyzer;
- name_analyzer.set_replace(ocr_replace);
+ name_analyzer.set_replace(ocr_replace->replace_map, ocr_replace->replace_full);
name_analyzer.set_image(oper.name_img);
name_analyzer.set_expansion(0);
if (!name_analyzer.analyze()) {
@@ -403,7 +412,7 @@ void asst::InfrastAbstractTask::order_opers_selection(const std::vector& partial_result);
- bool select_opers_review(infrast::CustomRoomConfig const& origin_room_config, size_t num_of_opers_expect = 0); // 复核干员选择是否符合期望
+ bool select_opers_review(infrast::CustomRoomConfig const& origin_room_config,
+ size_t num_of_opers_expect = 0); // 复核干员选择是否符合期望
void order_opers_selection(const std::vector& names);
virtual void click_return_button() override;
diff --git a/src/MaaCore/Task/Infrast/InfrastDormTask.cpp b/src/MaaCore/Task/Infrast/InfrastDormTask.cpp
index 5f60654d25..2da5523891 100644
--- a/src/MaaCore/Task/Infrast/InfrastDormTask.cpp
+++ b/src/MaaCore/Task/Infrast/InfrastDormTask.cpp
@@ -3,13 +3,13 @@
#include
#include "Controller/Controller.h"
+#include "Config/TaskData.h"
+#include "Task/ProcessTask.h"
+#include "Utils/Logger.hpp"
#include "Vision/Infrast/InfrastOperImageAnalyzer.h"
#include "Vision/MatchImageAnalyzer.h"
#include "Vision/OcrImageAnalyzer.h"
#include "Vision/OcrWithPreprocessImageAnalyzer.h"
-#include "Config/TaskData.h"
-#include "Task/ProcessTask.h"
-#include "Utils/Logger.hpp"
asst::InfrastDormTask& asst::InfrastDormTask::set_notstationed_enabled(bool dorm_notstationed_enabled) noexcept
{
@@ -250,10 +250,17 @@ bool asst::InfrastDormTask::opers_choose(asst::infrast::CustomRoomConfig const&
}
}
+ ProcessTask(*this, { "InfrastOperListTabMoodClick", "InfrastOperListTabWorkStatusUnClicked" }).run();
if (swipe_times) swipe_to_the_left_of_operlist(swipe_times + 1);
swipe_times = 0;
- ProcessTask(*this, { "InfrastOperListTabMoodDoubleClick" }).run();
- if (!select_opers_review(origin_room_config, num_of_selected)) {
+ bool review = select_opers_review(origin_room_config, num_of_selected);
+ if (m_next_step == NextStep::RestDone || m_next_step == NextStep::Trust) {
+ click_sort_by_trust_button();
+ }
+ else {
+ ProcessTask(*this, { "InfrastOperListTabMoodClick" }).run();
+ }
+ if (!review) {
current_room_config() = origin_room_config;
return false;
}
diff --git a/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp b/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp
index 7e30ce1dd7..4f015174fe 100644
--- a/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp
+++ b/src/MaaCore/Task/Infrast/InfrastInfoTask.cpp
@@ -1,9 +1,9 @@
#include "InfrastInfoTask.h"
#include "Controller/Controller.h"
-#include "Vision/Infrast/InfrastFacilityImageAnalyzer.h"
#include "Status.h"
#include "Utils/Logger.hpp"
+#include "Vision/Infrast/InfrastFacilityImageAnalyzer.h"
bool asst::InfrastInfoTask::_run()
{
diff --git a/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp b/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp
index 0f26c012e5..0b812d73bf 100644
--- a/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp
+++ b/src/MaaCore/Task/Infrast/InfrastProductionTask.cpp
@@ -447,7 +447,8 @@ bool asst::InfrastProductionTask::optimal_calc()
}
else {
OcrWithPreprocessImageAnalyzer name_analyzer(find_iter->name_img);
- name_analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map);
+ name_analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map,
+ Task.get("CharsNameOcrReplace")->replace_full);
Log.trace("Analyze name filter");
if (!name_analyzer.analyze()) {
continue;
@@ -574,7 +575,8 @@ bool asst::InfrastProductionTask::opers_choose()
}
else {
OcrWithPreprocessImageAnalyzer name_analyzer(lhs.name_img);
- name_analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map);
+ name_analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map,
+ Task.get("CharsNameOcrReplace")->replace_full);
Log.trace("Analyze name filter");
if (!name_analyzer.analyze()) {
return false;
@@ -636,12 +638,10 @@ bool asst::InfrastProductionTask::opers_choose()
if (swipe_times) {
swipe_to_the_left_of_operlist(swipe_times + 1);
}
-
- ProcessTask(*this, { "InfrastOperListTabSkillUnClicked", "Stop" }).run(); // 点下排序，让已选干员排到最前面
- bool reviews = select_opers_review(current_room_config(), count);
- ProcessTask(*this, { "InfrastOperListTabWorkStatusUnClicked" }).run(); // 还原工作状态排序
-
- return reviews;
+ // 点两次排序，让已选干员排到最前面
+ ProcessTask(*this, { "InfrastOperListTabSkillUnClicked" }).run();
+ ProcessTask(*this, { "InfrastOperListTabWorkStatusUnClicked" }).run();
+ return select_opers_review(current_room_config(), count);
}
bool asst::InfrastProductionTask::use_drone()
diff --git a/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp b/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp
index bf29992c59..964b9fd99e 100644
--- a/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp
+++ b/src/MaaCore/Task/Infrast/InfrastReceptionTask.cpp
@@ -3,12 +3,12 @@
#include "Utils/Ranges.hpp"
#include "Controller/Controller.h"
-#include "Vision/Infrast/InfrastClueImageAnalyzer.h"
-#include "Vision/Infrast/InfrastClueVacancyImageAnalyzer.h"
-#include "Vision/MatchImageAnalyzer.h"
#include "Config/TaskData.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
+#include "Vision/Infrast/InfrastClueImageAnalyzer.h"
+#include "Vision/Infrast/InfrastClueVacancyImageAnalyzer.h"
+#include "Vision/MatchImageAnalyzer.h"
bool asst::InfrastReceptionTask::_run()
{
diff --git a/src/MaaCore/Task/Interface/AwardTask.cpp b/src/MaaCore/Task/Interface/AwardTask.cpp
index 99472678b3..02503f708f 100644
--- a/src/MaaCore/Task/Interface/AwardTask.cpp
+++ b/src/MaaCore/Task/Interface/AwardTask.cpp
@@ -4,8 +4,7 @@
#include "Task/ProcessTask.h"
-asst::AwardTask::AwardTask(const AsstCallback& callback, Assistant* inst)
- : InterfaceTask(callback, inst, TaskType)
+asst::AwardTask::AwardTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType)
{
auto award_task_ptr = std::make_shared(m_callback, m_inst, TaskType);
award_task_ptr->set_tasks({ "AwardBegin" });
diff --git a/src/MaaCore/Task/Interface/DepotTask.cpp b/src/MaaCore/Task/Interface/DepotTask.cpp
index 22a8f6fb2d..d47dae3ae6 100644
--- a/src/MaaCore/Task/Interface/DepotTask.cpp
+++ b/src/MaaCore/Task/Interface/DepotTask.cpp
@@ -3,8 +3,7 @@
#include "Task/Miscellaneous/DepotRecognitionTask.h"
#include "Task/ProcessTask.h"
-asst::DepotTask::DepotTask(const AsstCallback& callback, Assistant* inst)
- : InterfaceTask(callback, inst, TaskType)
+asst::DepotTask::DepotTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType)
{
auto enter_task = std::make_shared(m_callback, m_inst, TaskType);
enter_task->set_tasks({ "DepotBegin" }).set_ignore_error(true);
diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp
index aefcfa4f8f..d5bbc8b7b9 100644
--- a/src/MaaCore/Task/Interface/FightTask.cpp
+++ b/src/MaaCore/Task/Interface/FightTask.cpp
@@ -26,9 +26,9 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst)
.set_times_limit("MedicineConfirm", 0)
.set_times_limit("StoneConfirm", 0)
.set_times_limit("StageSNReturnFlag", 0)
- .set_times_limit("PRTS3", 0)
- .set_times_limit("PRTS", 0)
+ .set_times_limit("PRTS1", 0)
.set_times_limit("PRTS2", 0)
+ .set_times_limit("PRTS3", 0)
.set_times_limit("EndOfAction", 0)
.set_retry_times(5);
diff --git a/src/MaaCore/Task/Interface/ReclamationTask.cpp b/src/MaaCore/Task/Interface/ReclamationTask.cpp
index c7de688f38..45b914e0b4 100644
--- a/src/MaaCore/Task/Interface/ReclamationTask.cpp
+++ b/src/MaaCore/Task/Interface/ReclamationTask.cpp
@@ -9,7 +9,6 @@
#include "Task/Reclamation/ReclamationConclusionReportPlugin.h"
#include "Task/Reclamation/ReclamationControlTask.h"
-
asst::ReclamationTask::ReclamationTask(const AsstCallback& callback, Assistant* inst)
: InterfaceTask(callback, inst, TaskType),
m_reclamation_task_ptr(std::make_shared(callback, inst, TaskType))
diff --git a/src/MaaCore/Task/Interface/SingleStepTask.cpp b/src/MaaCore/Task/Interface/SingleStepTask.cpp
index cd5528f2ff..bc931ee3e7 100644
--- a/src/MaaCore/Task/Interface/SingleStepTask.cpp
+++ b/src/MaaCore/Task/Interface/SingleStepTask.cpp
@@ -12,7 +12,7 @@ asst::SingleStepTask::SingleStepTask(const AsstCallback& callback, Assistant* in
bool asst::SingleStepTask::set_params(const json::value& params)
{
LogTraceFunction;
-
+
std::string type = params.get("type", "");
std::string subtype = params.get("subtype", "");
auto details_opt = params.find("details");
@@ -39,7 +39,7 @@ bool asst::SingleStepTask::set_copilot_stage(const json::value& details)
bool asst::SingleStepTask::append_copllot_start()
{
LogTraceFunction;
-
+
auto start_2_tp = std::make_shared(m_callback, m_inst, TaskType);
start_2_tp->set_tasks({ "BattleStartAll" }).set_ignore_error(false);
m_subtasks.emplace_back(std::move(start_2_tp));
@@ -50,7 +50,7 @@ bool asst::SingleStepTask::append_copllot_start()
bool asst::SingleStepTask::append_copilot_action(const json::value& details)
{
LogTraceFunction;
-
+
auto task = std::make_shared(m_callback, m_inst, TaskType);
try {
diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp
index 8c7fd9f35b..b25e24313b 100644
--- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp
@@ -129,16 +129,16 @@ std::vector asst::BattleFormationTask::analyzer_opers()
{
auto formation_task_ptr = Task.get("BattleQuickFormationOCR");
auto image = ctrler()->get_image();
- auto& ocr_replace = Task.get("CharsNameOcrReplace")->replace_map;
+ const auto& ocr_replace = Task.get("CharsNameOcrReplace");
OcrWithFlagTemplImageAnalyzer name_analyzer(image);
name_analyzer.set_task_info("BattleQuickFormation-OperNameFlag", "BattleQuickFormationOCR");
- name_analyzer.set_replace(ocr_replace);
+ name_analyzer.set_replace(ocr_replace->replace_map, ocr_replace->replace_full);
name_analyzer.analyze();
OcrWithFlagTemplImageAnalyzer special_focus_analyzer(image);
special_focus_analyzer.set_task_info("BattleQuickFormation-OperNameFlag-SpecialFocus", "BattleQuickFormationOCR");
- special_focus_analyzer.set_replace(ocr_replace);
+ special_focus_analyzer.set_replace(ocr_replace->replace_map, ocr_replace->replace_full);
special_focus_analyzer.analyze();
auto opers_result = name_analyzer.get_result();
diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
index 7e23a8e1d3..3937e5dd23 100644
--- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
@@ -247,7 +247,7 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
if (image.empty()) {
image = ctrler()->get_image();
check_in_battle(image);
- }
+ }
};
auto do_strategy_and_update_image = [&]() {
do_strategic_action(image);
diff --git a/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp b/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp
index cd05090138..c5e183de50 100644
--- a/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/CreditShoppingTask.cpp
@@ -4,12 +4,12 @@
#include
#include "Controller/Controller.h"
-#include "Vision/MatchImageAnalyzer.h"
-#include "Vision/Miscellaneous/CreditShopImageAnalyzer.h"
-#include "Vision/OcrImageAnalyzer.h"
#include "Config/TaskData.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
+#include "Vision/MatchImageAnalyzer.h"
+#include "Vision/Miscellaneous/CreditShopImageAnalyzer.h"
+#include "Vision/OcrImageAnalyzer.h"
void asst::CreditShoppingTask::set_black_list(std::vector black_list)
{
diff --git a/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp b/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp
index d191198636..ff705f03cf 100644
--- a/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/DepotRecognitionTask.cpp
@@ -5,11 +5,11 @@
#include
#include "Controller/Controller.h"
-#include "Vision/Miscellaneous/DepotImageAnalyzer.h"
#include "Config/GeneralConfig.h"
#include "Config/TaskData.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
+#include "Vision/Miscellaneous/DepotImageAnalyzer.h"
bool asst::DepotRecognitionTask::_run()
{
diff --git a/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp b/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp
index 49d936cf52..bef93b21df 100644
--- a/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp
+++ b/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp
@@ -3,20 +3,19 @@
#include "Utils/NoWarningCV.h"
#include "Controller/Controller.h"
+#include "Config/TaskData.h"
+#include "ReclamationControlTask.h"
#include "Status.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
-#include "Vision/OcrImageAnalyzer.h"
#include "Vision/MatchImageAnalyzer.h"
#include "Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.h"
-#include "Config/TaskData.h"
-#include "ReclamationControlTask.h"
+#include "Vision/OcrImageAnalyzer.h"
using namespace asst;
-
asst::ReclamationBattlePlugin::ReclamationBattlePlugin(const AsstCallback& callback, Assistant* inst,
- std::string_view task_chain)
+ std::string_view task_chain)
: AbstractTaskPlugin(callback, inst, task_chain), BattleHelper(inst)
{}
@@ -42,7 +41,7 @@ bool asst::ReclamationBattlePlugin::_run()
return quit_action();
}
else if (m_battle_mode == ReclamationBattleMode::BuyWater) {
- sleep(1500); // 等待技能图标
+ sleep(1500); // 等待技能图标
bool result = buy_water();
quit_action();
return result;
@@ -84,7 +83,7 @@ bool asst::ReclamationBattlePlugin::quit_action()
// 出现Loading转一会儿就结算了，没结算还有error_next
OcrImageAnalyzer loadingAnalyzer(img);
- loadingAnalyzer.set_task_info("Loading");
+ loadingAnalyzer.set_task_info("LoadingText");
bool check3 = loadingAnalyzer.analyze();
Log.info(__FUNCTION__, "| click exit level check ", check1, check2, check3);
@@ -121,7 +120,8 @@ bool asst::ReclamationBattlePlugin::communicate_with(const std::string& npcName)
return false;
}
-bool asst::ReclamationBattlePlugin::communicate_with_aux(const std::string& npcName, std::function orderComp)
+bool asst::ReclamationBattlePlugin::communicate_with_aux(
+ const std::string& npcName, std::function orderComp)
{
auto image = ctrler()->get_image();
BattleSkillReadyImageAnalyzer skillReadyAnalyzer(image);
@@ -181,9 +181,9 @@ bool asst::ReclamationBattlePlugin::do_dialog_procedure(const std::vectorget_image();
@@ -196,7 +196,7 @@ bool asst::ReclamationBattlePlugin::do_dialog_procedure(const std::vector
#include "Controller/Controller.h"
+#include "Config/TaskData.h"
#include "Status.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
-#include "Vision/OcrImageAnalyzer.h"
#include "Vision/MatchImageAnalyzer.h"
-#include "Config/TaskData.h"
-
+#include "Vision/OcrImageAnalyzer.h"
bool asst::ReclamationConclusionReportPlugin::verify(AsstMsg msg, const json::value& details) const
{
@@ -42,10 +40,11 @@ bool asst::ReclamationConclusionReportPlugin::check_page_valid(const cv::Mat& im
return pageAnalyzer.analyze();
}
-void asst::ReclamationConclusionReportPlugin::analyze(const cv::Mat& image) {
+void asst::ReclamationConclusionReportPlugin::analyze(const cv::Mat& image)
+{
m_badges = analyze_badges(image);
m_construction_points = analyze_construction_points(image);
-
+
m_total_badges += (m_badges == -1 ? 0 : m_badges);
m_total_cons_points += (m_construction_points == -1 ? 0 : m_construction_points);
}
@@ -89,7 +88,8 @@ int asst::ReclamationConclusionReportPlugin::analyze_construction_points(const c
}
}
-void asst::ReclamationConclusionReportPlugin::info_callback() {
+void asst::ReclamationConclusionReportPlugin::info_callback()
+{
json::value info = basic_info_with_what("ReclamationReport");
json::value& details = info["details"];
details["badges"] = m_badges;
diff --git a/src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.h b/src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.h
index 2639a7a269..15548b5494 100644
--- a/src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.h
+++ b/src/MaaCore/Task/Reclamation/ReclamationConclusionReportPlugin.h
@@ -10,7 +10,6 @@
#include "Status.h"
#include "Utils/NoWarningCVMat.h"
-
namespace asst
{
class ProcessTask;
diff --git a/src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp b/src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp
index c4c205c5c1..a69ee50abb 100644
--- a/src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp
+++ b/src/MaaCore/Task/Reclamation/ReclamationControlTask.cpp
@@ -9,7 +9,7 @@
#include "ReclamationBattlePlugin.h"
-#define RunCheckSuccess(func, ...) \
+#define RunCheckSuccess(func, ...) \
do { \
if (!func(__VA_ARGS__)) return false; \
} while (false);
@@ -96,7 +96,7 @@ bool asst::ReclamationControlTask::run_smelt_gold_procedure()
for (int i = 0; i < 2; ++i)
swipe_right();
RunCheckSuccess(ProcessTask(*this, { "Reclamation@EnterSmeltGoldPage" }).run);
-
+
if (check_manufacture_status() != 1) return false;
while (!need_exit() && check_manufacture_status() == 1) {
smelt_gold_callback(++m_total_gold);
@@ -229,14 +229,16 @@ bool asst::ReclamationControlTask::swipe_left()
return ProcessTask(*this, { "Reclamation@CmdCenterSwipeLeft" }).run();
}
-void asst::ReclamationControlTask::procedure_start_callback(int times) {
+void asst::ReclamationControlTask::procedure_start_callback(int times)
+{
json::value info = basic_info_with_what("ReclamationProcedureStart");
json::value& details = info["details"];
details["times"] = times;
callback(AsstMsg::SubTaskExtraInfo, info);
}
-void asst::ReclamationControlTask::smelt_gold_callback(int times) {
+void asst::ReclamationControlTask::smelt_gold_callback(int times)
+{
json::value info = basic_info_with_what("ReclamationSmeltGold");
json::value& details = info["details"];
details["times"] = times;
diff --git a/src/MaaCore/Task/Reclamation/ReclamationControlTask.h b/src/MaaCore/Task/Reclamation/ReclamationControlTask.h
index 09e1a417a3..bedef05b05 100644
--- a/src/MaaCore/Task/Reclamation/ReclamationControlTask.h
+++ b/src/MaaCore/Task/Reclamation/ReclamationControlTask.h
@@ -22,35 +22,35 @@ namespace asst
bool run_giveup_upon_fight_procedure();
bool run_smelt_gold_procedure();
- bool navigate_to_reclamation_home(); // 导航至生息演算主界面
- bool give_up_last_algorithm_if(); // 如果有，放弃上次演算
- bool start_with_default_formation(); // 开始演算，至第一天
- bool skip_announce_report(); // 跳过每日公告
- bool start_action_enter(); // 区域交互确认
- bool battle_default_formation_start(); // 默认战斗编队并开始战斗
- bool level_complete_comfirm(); // 场景退出结算，至地图界面
- bool enter_next_day_if_useup(); // 如果决断点耗尽，进入下一天
- bool wait_between_day(); // 等待日期转换动画结束
- bool reset_scope(); // 重置地图大小
- bool enter_command_center(); // 进入侧边栏的命令中心
- bool do_manufacture(); // 点击制作按钮
+ bool navigate_to_reclamation_home(); // 导航至生息演算主界面
+ bool give_up_last_algorithm_if(); // 如果有，放弃上次演算
+ bool start_with_default_formation(); // 开始演算，至第一天
+ bool skip_announce_report(); // 跳过每日公告
+ bool start_action_enter(); // 区域交互确认
+ bool battle_default_formation_start(); // 默认战斗编队并开始战斗
+ bool level_complete_comfirm(); // 场景退出结算，至地图界面
+ bool enter_next_day_if_useup(); // 如果决断点耗尽，进入下一天
+ bool wait_between_day(); // 等待日期转换动画结束
+ bool reset_scope(); // 重置地图大小
+ bool enter_command_center(); // 进入侧边栏的命令中心
+ bool do_manufacture(); // 点击制作按钮
- bool check_next_day(); // 决断点消耗完进入下一天的标志
- bool check_emergency(); // 敌袭到达
- int check_manufacture_status(); // 制造界面是否材料充足，0不足，1充足，-1非建造页面
+ bool check_next_day(); // 决断点消耗完进入下一天的标志
+ bool check_emergency(); // 敌袭到达
+ int check_manufacture_status(); // 制造界面是否材料充足，0不足，1充足，-1非建造页面
- bool click_center_base(); // 点击中心基地图标
- bool click_corner_black_market(); // 点击左上角黑市图标
- bool click_any_zone(); // 点击奇遇外任意区
- bool click_black_market(); // 点击黑市
-
- bool swipe_right();
+ bool click_center_base(); // 点击中心基地图标
+ bool click_corner_black_market(); // 点击左上角黑市图标
+ bool click_any_zone(); // 点击奇遇外任意区
+ bool click_black_market(); // 点击黑市
+
+ bool swipe_right();
bool swipe_left();
-
+
void procedure_start_callback(int times);
void smelt_gold_callback(int times);
ReclamationTaskMode m_task_mode = ReclamationTaskMode::GiveupUponFight;
- int m_total_gold = 0; // 制作赤金的次数
+ int m_total_gold = 0; // 制作赤金的次数
};
}
diff --git a/src/MaaCore/Task/ReportDataTask.cpp b/src/MaaCore/Task/ReportDataTask.cpp
index b6167c8b4e..5c0efb6d5e 100644
--- a/src/MaaCore/Task/ReportDataTask.cpp
+++ b/src/MaaCore/Task/ReportDataTask.cpp
@@ -87,7 +87,7 @@ void asst::ReportDataTask::report_to_penguin()
constexpr int DefaultBackoff = 10 * 1000; // 10s
int backoff = DefaultBackoff;
-
+
auto penguin_success_cond = [](const http::Response& response) -> bool { return response.success(); };
auto penguin_retry_cond = [&](const http::Response& response) -> bool {
if (!response.status_code()) {
@@ -126,7 +126,7 @@ void asst::ReportDataTask::report_to_penguin()
}
Log.info("Re-report to penguin-stats.cn", Penguin_CN);
std::string new_cmd_format = utils::string_replace_all(cmd_format, Penguin_IO, Penguin_CN);
-
+
backoff = DefaultBackoff;
response = report(PenguinSubtaskName, new_cmd_format, penguin_success_cond, penguin_retry_cond);
@@ -202,6 +202,6 @@ asst::http::Response asst::ReportDataTask::escape_and_request(const std::string&
Log.info("request:\n" + cmd_line);
std::string response = utils::call_command(cmd_line);
Log.info("response:\n" + response);
-
+
return response;
}
diff --git a/src/MaaCore/Task/ReportDataTask.h b/src/MaaCore/Task/ReportDataTask.h
index bc57c9ebdd..27dedb3e79 100644
--- a/src/MaaCore/Task/ReportDataTask.h
+++ b/src/MaaCore/Task/ReportDataTask.h
@@ -41,7 +41,8 @@ namespace asst
void report_to_penguin();
void report_to_yituliu();
http::Response escape_and_request(const std::string& format);
- http::Response report(std::string_view subtask, const std::string& format,
+ http::Response report(
+ std::string_view subtask, const std::string& format,
HttpResponsePred success_cond = [](const http::Response& response) -> bool { return response.success(); },
HttpResponsePred retry_cond = [](const http::Response& response) -> bool {
return !response.status_code() || response.status_5xx();
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp
index cd1cf6ef62..a73eda1b7a 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp
@@ -1,12 +1,12 @@
#include "RoguelikeCustomStartTaskPlugin.h"
#include "Controller/Controller.h"
-#include "Vision/OcrImageAnalyzer.h"
#include "Config/Miscellaneous/BattleDataConfig.h"
#include "Config/TaskData.h"
#include "Status.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
+#include "Vision/OcrImageAnalyzer.h"
bool asst::RoguelikeCustomStartTaskPlugin::verify(AsstMsg msg, const json::value& details) const
{
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h
index 069dc59247..809e093166 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h
+++ b/src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.h
@@ -6,10 +6,10 @@ namespace asst
enum class RoguelikeCustomType
{
None,
- Squad, // 分队类型， like 指挥分队, 矛头分队, etc
- Roles, // 职业类型， like 先手必胜, 稳扎稳打, etc
- CoreChar, // 首选干员， 干员名
- UseSupport, // 使用助战
+ Squad, // 分队类型， like 指挥分队, 矛头分队, etc
+ Roles, // 职业类型， like 先手必胜, 稳扎稳打, etc
+ CoreChar, // 首选干员， 干员名
+ UseSupport, // 使用助战
UseNonfriendSupport // 可以使用非好友助战
// CoCoreChar, // 次选干员， 干员名
};
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp
index d0ebfcd22d..39eded2a39 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeFormationTaskPlugin.cpp
@@ -3,11 +3,11 @@
#include "Utils/Ranges.hpp"
#include "Controller/Controller.h"
-#include "Vision/Roguelike/RoguelikeFormationImageAnalyzer.h"
#include "Config/TaskData.h"
#include "Status.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
+#include "Vision/Roguelike/RoguelikeFormationImageAnalyzer.h"
bool asst::RoguelikeFormationTaskPlugin::verify(AsstMsg msg, const json::value& details) const
{
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
index 16b5cdc5d5..c1802f6deb 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
@@ -124,9 +124,11 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
const auto& oper_list = analyzer.get_result();
bool stop_swipe = false;
+ int max_oper_x = 0;
for (const auto& oper_info : oper_list) {
oper_names.emplace(oper_info.name);
+ max_oper_x = std::max(max_oper_x, oper_info.rect.x);
// 查询上次识别位置
const auto& rect_it = last_oper_rects.find(oper_info.name);
if (rect_it == last_oper_rects.cend()) {
@@ -251,7 +253,7 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
// 向右滑动
Log.trace(__FUNCTION__, "| Page", i, "oper count:", oper_count, "- continue swiping");
- slowly_swipe(false);
+ slowly_swipe(false, max_oper_x - 200);
sleep(Task.get("RoguelikeCustom-HijackCoChar")->post_delay);
}
@@ -329,7 +331,7 @@ bool asst::RoguelikeRecruitTaskPlugin::check_char(const std::string& char_name,
{
LogTraceFunction;
- constexpr int SwipeTimes = 5;
+ int SwipeTimes = Task.get("RoguelikeRecruitSwipeMaxTime")->max_times;
std::unordered_set pre_oper_names;
bool has_been_same = false;
int i = 0;
@@ -341,8 +343,10 @@ bool asst::RoguelikeRecruitTaskPlugin::check_char(const std::string& char_name,
RoguelikeRecruitImageAnalyzer analyzer(image);
// 只处理识别成功的情况，失败(无任何结果)时继续滑动
+ int max_oper_x = 700;
if (analyzer.analyze()) {
const auto& chars = analyzer.get_result();
+ max_oper_x = ranges::max(chars | views::transform([&](const auto& x) { return x.rect.x; }));
auto it = ranges::find_if(
chars, [&](const battle::roguelike::Recruitment& oper) -> bool { return oper.name == char_name; });
@@ -375,7 +379,7 @@ bool asst::RoguelikeRecruitTaskPlugin::check_char(const std::string& char_name,
slowly_swipe(true);
}
else {
- slowly_swipe(false);
+ slowly_swipe(false, max_oper_x - 200);
}
sleep(Task.get("RoguelikeCustom-HijackCoChar")->post_delay);
}
@@ -435,8 +439,7 @@ bool asst::RoguelikeRecruitTaskPlugin::check_support_char(const std::string& nam
if (satisfied_chars.size()) break;
}
- if (page != MaxPageCnt - 1)
- ProcessTask(*this, { "RoguelikeSupportSwipeRight" }).run();
+ if (page != MaxPageCnt - 1) ProcessTask(*this, { "RoguelikeSupportSwipeRight" }).run();
}
if (satisfied_chars.size()) break;
@@ -514,12 +517,23 @@ void asst::RoguelikeRecruitTaskPlugin::swipe_to_the_left_of_operlist(int loop_ti
ProcessTask(*this, { "SleepAfterOperListQuickSwipe" }).run();
}
-void asst::RoguelikeRecruitTaskPlugin::slowly_swipe(bool to_left)
+void asst::RoguelikeRecruitTaskPlugin::slowly_swipe(bool to_left, int swipe_dist)
{
- if (to_left) {
- ProcessTask(*this, { "RoguelikeRecruitOperListSlowlySwipeToTheLeft" }).run();
- }
- else {
- ProcessTask(*this, { "RoguelikeRecruitOperListSlowlySwipeToTheRight" }).run();
+ std::string swipe_task_name =
+ to_left ? "RoguelikeRecruitOperListSlowlySwipeToTheLeft" : "RoguelikeRecruitOperListSlowlySwipeToTheRight";
+ if (!ctrler()->support_precise_swipe()) { // 不能精准滑动时不使用 swipe_dist 参数
+ ProcessTask(*this, { swipe_task_name }).run();
+ return;
}
+
+ if (!to_left) swipe_dist = -swipe_dist;
+ auto swipe_task = Task.get(swipe_task_name);
+ const Rect& StartPoint = swipe_task->specific_rect;
+ ctrler()->swipe(StartPoint,
+ { StartPoint.x + swipe_dist - StartPoint.width, StartPoint.y, StartPoint.width, StartPoint.height },
+ swipe_task->special_params.empty() ? 0 : swipe_task->special_params.at(0),
+ (swipe_task->special_params.size() < 2) ? false : swipe_task->special_params.at(1),
+ (swipe_task->special_params.size() < 3) ? 1 : swipe_task->special_params.at(2),
+ (swipe_task->special_params.size() < 4) ? 1 : swipe_task->special_params.at(3));
+ sleep(swipe_task->post_delay);
}
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.h
index 83cd50b408..a60ff0ab5b 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.h
+++ b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.h
@@ -26,7 +26,7 @@ namespace asst
// 滑动到干员列表的最左侧
void swipe_to_the_left_of_operlist(int loop_times = 2);
// 缓慢向干员列表的左侧/右侧滑动
- void slowly_swipe(bool to_left);
+ void slowly_swipe(bool to_left, int swipe_dist = 500);
private:
bool check_support_char();
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp
index 840c34a47c..e9de0cf755 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeShoppingTaskPlugin.cpp
@@ -1,12 +1,12 @@
#include "RoguelikeShoppingTaskPlugin.h"
#include "Controller/Controller.h"
-#include "Vision/OcrWithFlagTemplImageAnalyzer.h"
#include "Config/Miscellaneous/BattleDataConfig.h"
#include "Config/Roguelike/RoguelikeShoppingConfig.h"
#include "Status.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
+#include "Vision/OcrWithFlagTemplImageAnalyzer.h"
bool asst::RoguelikeShoppingTaskPlugin::verify(AsstMsg msg, const json::value& details) const
{
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp
index b32b28338b..1d944f463a 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeSkillSelectionTaskPlugin.cpp
@@ -1,10 +1,10 @@
#include "RoguelikeSkillSelectionTaskPlugin.h"
#include "Controller/Controller.h"
-#include "Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.h"
#include "Config/Roguelike/RoguelikeRecruitConfig.h"
#include "Config/TaskData.h"
#include "Status.h"
+#include "Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.h"
#include "Utils/Logger.hpp"
diff --git a/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp b/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp
index 21d61763e1..833f7bc58b 100644
--- a/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp
+++ b/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp
@@ -7,7 +7,7 @@
bool asst::SingleStepBattleProcessTask::set_stage_name_cache(const std::string& stage_name)
{
LogTraceFunction;
-
+
if (!Tile.contains(stage_name)) {
Log.error("get stage info failed", stage_name);
return false;
diff --git a/src/MaaCore/Utils/Time.hpp b/src/MaaCore/Utils/Time.hpp
index e97803f502..ec56684bcc 100644
--- a/src/MaaCore/Utils/Time.hpp
+++ b/src/MaaCore/Utils/Time.hpp
@@ -34,8 +34,8 @@ namespace asst::utils
gettimeofday(&tv, nullptr);
time_t nowtime = tv.tv_sec;
struct tm* tm_info = localtime(&nowtime);
- strftime(buff, sizeof(buff), "%Y-%m-%d %H:%M:%S", tm_info);
- sprintf(buff, "%s.%03ld", buff, static_cast(tv.tv_usec / 1000));
+ auto offset = strftime(buff, sizeof(buff), "%Y-%m-%d %H:%M:%S", tm_info);
+ sprintf(buff + offset, ".%03ld", static_cast(tv.tv_usec / 1000));
#endif // END _WIN32
return buff;
}
diff --git a/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp
index 0f007360f9..160160b3c5 100644
--- a/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Infrast/InfrastClueVacancyImageAnalyzer.cpp
@@ -1,8 +1,8 @@
#include "InfrastClueVacancyImageAnalyzer.h"
-#include "Vision/MatchImageAnalyzer.h"
#include "Utils/Logger.hpp"
#include "Utils/NoWarningCV.h"
+#include "Vision/MatchImageAnalyzer.h"
bool asst::InfrastClueVacancyImageAnalyzer::analyze()
{
diff --git a/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp
index 60aa3993cf..a974dc30a2 100644
--- a/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Infrast/InfrastFacilityImageAnalyzer.cpp
@@ -2,9 +2,9 @@
#include "Utils/NoWarningCV.h"
-#include "Vision/MultiMatchImageAnalyzer.h"
#include "Config/TaskData.h"
#include "Utils/Logger.hpp"
+#include "Vision/MultiMatchImageAnalyzer.h"
bool asst::InfrastFacilityImageAnalyzer::analyze()
{
diff --git a/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp
index 063ab54e61..8fc2fb736e 100644
--- a/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Infrast/InfrastOperImageAnalyzer.cpp
@@ -3,12 +3,12 @@
#include "Utils/NoWarningCV.h"
#include "Utils/Ranges.hpp"
-#include "Vision/HashImageAnalyzer.h"
-#include "Vision/MatchImageAnalyzer.h"
-#include "InfrastSmileyImageAnalyzer.h"
#include "Config/Miscellaneous/InfrastConfig.h"
#include "Config/TaskData.h"
+#include "InfrastSmileyImageAnalyzer.h"
#include "Utils/Logger.hpp"
+#include "Vision/HashImageAnalyzer.h"
+#include "Vision/MatchImageAnalyzer.h"
bool asst::InfrastOperImageAnalyzer::analyze()
{
diff --git a/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp b/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp
index e2fbabb0a9..75f8acf0b2 100644
--- a/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Infrast/InfrastSmileyImageAnalyzer.cpp
@@ -2,8 +2,8 @@
#include "Utils/NoWarningCV.h"
-#include "Vision/MultiMatchImageAnalyzer.h"
#include "Utils/StringMisc.hpp"
+#include "Vision/MultiMatchImageAnalyzer.h"
bool asst::InfrastSmileyImageAnalyzer::analyze()
{
diff --git a/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp
index e067d77b04..510d947830 100644
--- a/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp
@@ -60,7 +60,7 @@ bool asst::BattleSkillReadyImageAnalyzer::analyze()
if (iter.score > value) {
iter.rect = rect;
iter.score = value;
- }
+ }
need_push = false;
break;
}
diff --git a/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp
index 13282acc61..291649fb1c 100644
--- a/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Miscellaneous/CreditShopImageAnalyzer.cpp
@@ -5,15 +5,15 @@
#include "Utils/NoWarningCV.h"
#include "Config/TaskData.h"
+#include "Utils/Logger.hpp"
#include "Vision/MatchImageAnalyzer.h"
#include "Vision/MultiMatchImageAnalyzer.h"
#include "Vision/OcrImageAnalyzer.h"
-#include "Utils/Logger.hpp"
void asst::CreditShopImageAnalyzer::set_black_list(std::vector black_list)
{
Log.info(__FUNCTION__, black_list);
-
+
m_shopping_list = std::move(black_list);
m_is_white_list = false;
}
@@ -21,7 +21,7 @@ void asst::CreditShopImageAnalyzer::set_black_list(std::vector blac
void asst::CreditShopImageAnalyzer::set_white_list(std::vector black_list)
{
Log.info(__FUNCTION__, black_list);
-
+
m_shopping_list = std::move(black_list);
m_is_white_list = true;
}
@@ -67,7 +67,7 @@ bool asst::CreditShopImageAnalyzer::commodities_analyze()
bool asst::CreditShopImageAnalyzer::whether_to_buy_analyze()
{
Log.info(__FUNCTION__, m_shopping_list, "mode", m_is_white_list);
-
+
const auto product_name_task_ptr = Task.get("CreditShop-ProductName");
for (const Rect& commodity : m_commodities) {
@@ -104,7 +104,7 @@ bool asst::CreditShopImageAnalyzer::whether_to_buy_analyze()
ranges::sort(m_need_to_buy, std::less {},
[&](const auto& pair) { return ranges::find(m_shopping_list, pair.second); });
}
-
+
return !m_need_to_buy.empty();
}
diff --git a/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp b/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp
index ad9e260d06..4ebbc7aa75 100644
--- a/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Miscellaneous/RecruitImageAnalyzer.cpp
@@ -1,10 +1,10 @@
#include "RecruitImageAnalyzer.h"
+#include "Config/Miscellaneous/RecruitConfig.h"
+#include "Config/TaskData.h"
#include "Vision/MatchImageAnalyzer.h"
#include "Vision/MultiMatchImageAnalyzer.h"
#include "Vision/OcrImageAnalyzer.h"
-#include "Config/Miscellaneous/RecruitConfig.h"
-#include "Config/TaskData.h"
bool asst::RecruitImageAnalyzer::analyze()
{
diff --git a/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.h b/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.h
index 4c8640c467..962c17cc0c 100644
--- a/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.h
+++ b/src/MaaCore/Vision/Miscellaneous/StageDropsImageAnalyzer.h
@@ -1,6 +1,6 @@
#pragma once
-#include "Vision/AbstractImageAnalyzer.h"
#include "Config/Miscellaneous/StageDropsConfig.h"
+#include "Vision/AbstractImageAnalyzer.h"
#include
@@ -31,7 +31,8 @@ namespace asst
int match_quantity(const Rect& roi, const std::string& item, bool use_word_model = false);
std::optional match_quantity_string(const Rect& roi, bool use_word_model = false);
- std::optional match_quantity_string(const Rect& roi, const std::string& item, bool use_word_model = false);
+ std::optional match_quantity_string(const Rect& roi, const std::string& item,
+ bool use_word_model = false);
StageDropType match_droptype(const Rect& roi);
std::string match_item(const Rect& roi, StageDropType type, int index, int size);
diff --git a/src/MaaCore/Vision/OcrImageAnalyzer.cpp b/src/MaaCore/Vision/OcrImageAnalyzer.cpp
index dbb9f439d7..d2ed3a42ba 100644
--- a/src/MaaCore/Vision/OcrImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/OcrImageAnalyzer.cpp
@@ -4,6 +4,7 @@
#include
#include "Config/Miscellaneous/OcrPack.h"
+#include "Config/Miscellaneous/OcrConfig.h"
#include "Config/TaskData.h"
#include "Utils/Logger.hpp"
@@ -15,14 +16,32 @@ bool asst::OcrImageAnalyzer::analyze()
std::vector preds_vec;
+ preds_vec.emplace_back([](TextRect& tr) -> bool {
+ tr.text = OcrConfig::get_instance().process_equivalence_class(tr.text);
+ return true;
+ });
+
if (!m_replace.empty()) {
- TextRectProc text_replace = [&](TextRect& tr) -> bool {
- for (const auto& [regex, new_str] : m_replace) {
- tr.text = std::regex_replace(tr.text, std::regex(regex), new_str);
- }
- return true;
- };
- preds_vec.emplace_back(text_replace);
+ if (m_replace_full) {
+ TextRectProc text_replace = [&](TextRect& tr) -> bool {
+ for (const auto& [regex, new_str] : m_replace) {
+ if (std::regex_search(tr.text, std::regex(regex))) {
+ tr.text = new_str;
+ }
+ }
+ return true;
+ };
+ preds_vec.emplace_back(text_replace);
+ }
+ else {
+ TextRectProc text_replace = [&](TextRect& tr) -> bool {
+ for (const auto& [regex, new_str] : m_replace) {
+ tr.text = std::regex_replace(tr.text, std::regex(regex), new_str);
+ }
+ return true;
+ };
+ preds_vec.emplace_back(text_replace);
+ }
}
if (!m_required.empty()) {
@@ -93,19 +112,26 @@ void asst::OcrImageAnalyzer::set_use_cache(bool is_use) noexcept
void asst::OcrImageAnalyzer::set_required(std::vector required) noexcept
{
+ ranges::for_each(required, [](std::string& str) { str = OcrConfig::get_instance().process_equivalence_class(str); });
m_required = std::move(required);
}
-void asst::OcrImageAnalyzer::set_replace(std::unordered_map replace) noexcept
+void asst::OcrImageAnalyzer::set_replace(const std::unordered_map& replace, bool replace_full) noexcept
{
- m_replace = std::move(replace);
+ m_replace = {};
+ for (auto&& [key, val] : replace) {
+ auto new_key = OcrConfig::get_instance().process_equivalence_class(key);
+ // do not create new_val as val is user-provided, and can avoid issues like 夕 and katakana タ
+ m_replace.emplace(std::move(new_key), val);
+ }
+ m_replace_full = replace_full;
}
void asst::OcrImageAnalyzer::set_task_info(OcrTaskInfo task_info) noexcept
{
- m_required = std::move(task_info.text);
+ set_required(std::move(task_info.text));
m_full_match = task_info.full_match;
- m_replace = std::move(task_info.replace_map);
+ set_replace(task_info.replace_map, task_info.replace_full);
m_use_cache = task_info.cache;
m_use_char_model = task_info.is_ascii;
diff --git a/src/MaaCore/Vision/OcrImageAnalyzer.h b/src/MaaCore/Vision/OcrImageAnalyzer.h
index ad817a3093..93a00e3bdd 100644
--- a/src/MaaCore/Vision/OcrImageAnalyzer.h
+++ b/src/MaaCore/Vision/OcrImageAnalyzer.h
@@ -25,7 +25,7 @@ namespace asst
virtual void sort_result_by_required(); // 按传入的需求数组排序，传入的在前面结果接在前面
void set_required(std::vector required) noexcept;
- void set_replace(std::unordered_map replace) noexcept;
+ void set_replace(const std::unordered_map& replace, bool replace_full = false) noexcept;
virtual void set_task_info(std::shared_ptr task_ptr);
virtual void set_task_info(const std::string& task_name);
@@ -45,6 +45,7 @@ namespace asst
std::vector m_required;
bool m_full_match = false;
std::unordered_map m_replace;
+ bool m_replace_full = false;
TextRectProc m_pred = nullptr;
bool m_without_det = false;
bool m_use_cache = false;
diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp
index 902a0d77ff..d3e16dfe69 100644
--- a/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Roguelike/RoguelikeFormationImageAnalyzer.cpp
@@ -2,9 +2,9 @@
#include "Utils/NoWarningCV.h"
-#include "Vision/MultiMatchImageAnalyzer.h"
#include "Config/TaskData.h"
#include "Utils/Logger.hpp"
+#include "Vision/MultiMatchImageAnalyzer.h"
bool asst::RoguelikeFormationImageAnalyzer::analyze()
{
diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp
index d299ca5d2c..ccb6cf68af 100644
--- a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitImageAnalyzer.cpp
@@ -12,7 +12,8 @@ bool asst::RoguelikeRecruitImageAnalyzer::analyze()
OcrWithFlagTemplImageAnalyzer analyzer(m_image);
analyzer.set_task_info("RoguelikeRecruitOcrFlag", "RoguelikeRecruitOcr");
- analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map);
+ analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map,
+ Task.get("CharsNameOcrReplace")->replace_full);
analyzer.set_threshold(Task.get("RoguelikeRecruitOcr")->specific_rect.x);
if (!analyzer.analyze()) {
diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp
index c7b7ce9646..f908a7b41b 100644
--- a/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp
+++ b/src/MaaCore/Vision/Roguelike/RoguelikeRecruitSupportAnalyzer.cpp
@@ -32,6 +32,8 @@ bool asst::RoguelikeRecruitSupportAnalyzer::analyze()
OcrImageAnalyzer analyzer(m_image);
analyzer.set_roi(Task.get("RoguelikeRecruitSupportOcr")->roi);
analyzer.set_required(m_required);
+ analyzer.set_replace(Task.get("CharsNameOcrReplace")->replace_map,
+ Task.get("CharsNameOcrReplace")->replace_full);
if (!analyzer.analyze()) return false;
const auto& char_name_rects = analyzer.get_result();
@@ -91,24 +93,35 @@ bool asst::RoguelikeRecruitSupportAnalyzer::analyze()
else if (m_mode == battle::roguelike::SupportAnalyzeMode::RefreshSupportBtn) {
// 识别“更新助战列表”
OcrImageAnalyzer analyzer(m_image);
- const auto& task = Task.get("RoguelikeRefreshSupportBtnOcr");
- analyzer.set_roi(task->roi);
- if (!analyzer.analyze()) return false;
+
+ // 未处在冷却时间
+ analyzer.set_task_info("RoguelikeRefreshSupportBtnOcr");
+ if (analyzer.analyze()) {
+ m_refresh_result = { analyzer.get_result().front().rect, false, 0 };
+ return true;
+ }
+
+ // 刷新冷却中
+ analyzer.set_required({});
+ analyzer.set_replace({ { "：", ":" } });
+ if (!analyzer.analyze()) {
+ Log.info(__FUNCTION__, "| RefreshSupportBtn analyse failed");
+ return false;
+ }
const auto& results = analyzer.get_result();
for (const auto& result : results) {
Log.info(__FUNCTION__, "| RefreshSupportBtn parse `", result.text, "`", result.score);
- if (std::count(task->text.begin(), task->text.end(), result.text)) {
- m_refresh_result = { result.rect, false, 0 };
- return true;
- }
- else if (std::regex_match(result.text, std::regex("[0-9]{2}:[0-9]{2}:[0-9]{2}"))) {
- const auto& hour = std::atoi(result.text.substr(2).c_str());
- const auto& min = std::atoi(result.text.substr(3, 2).c_str());
- const auto& sec = std::atoi(result.text.substr(7, 2).c_str());
+ std::smatch match_results;
+ if (std::regex_search(result.text, match_results, std::regex("[0-9]{2}:[0-9]{2}:[0-9]{2}"))) {
+ const auto& match_str = match_results[0].str();
+ const auto& hour = std::atoi(match_str.substr(2).c_str());
+ const auto& min = std::atoi(match_str.substr(3, 2).c_str());
+ const auto& sec = std::atoi(match_str.substr(7, 2).c_str());
m_refresh_result = { result.rect, true, 3600 * hour + 60 * min + sec };
return true;
}
}
+ Log.info(__FUNCTION__, "| RefreshSupportBtn failed: no matched reusults");
return false;
}
diff --git a/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp
index 5c8a7730af..906463ea1e 100644
--- a/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Roguelike/RoguelikeSkillSelectionImageAnalyzer.cpp
@@ -2,13 +2,13 @@
#include "Utils/NoWarningCV.h"
-#include "Vision/MatchImageAnalyzer.h"
-#include "Vision/MultiMatchImageAnalyzer.h"
-#include "Vision/OcrWithPreprocessImageAnalyzer.h"
#include "Config/Roguelike/RoguelikeRecruitConfig.h"
#include "Config/TaskData.h"
#include "Utils/Logger.hpp"
#include "Utils/StringMisc.hpp"
+#include "Vision/MatchImageAnalyzer.h"
+#include "Vision/MultiMatchImageAnalyzer.h"
+#include "Vision/OcrWithPreprocessImageAnalyzer.h"
bool asst::RoguelikeSkillSelectionImageAnalyzer::analyze()
{
@@ -54,7 +54,8 @@ std::string asst::RoguelikeSkillSelectionImageAnalyzer::name_analyze(const Rect&
analyzer.set_task_info(name_task_ptr);
analyzer.set_image(m_image);
analyzer.set_roi(roi.move(name_task_ptr->roi));
- analyzer.set_replace(std::dynamic_pointer_cast(Task.get("CharsNameOcrReplace"))->replace_map);
+ analyzer.set_replace(std::dynamic_pointer_cast(Task.get("CharsNameOcrReplace"))->replace_map,
+ std::dynamic_pointer_cast(Task.get("CharsNameOcrReplace"))->replace_full);
if (!analyzer.analyze()) {
return {};
diff --git a/src/MaaWpfGui/Helper/Localization.cs b/src/MaaWpfGui/Helper/Localization.cs
index c83ace6aa7..584685f874 100644
--- a/src/MaaWpfGui/Helper/Localization.cs
+++ b/src/MaaWpfGui/Helper/Localization.cs
@@ -107,7 +107,7 @@ namespace MaaWpfGui
};
if (dictionary.Contains(key))
{
- return dictionary[key].ToString();
+ return Regex.Unescape(dictionary[key].ToString());
}
}
diff --git a/src/MaaWpfGui/Helper/MaaUrls.cs b/src/MaaWpfGui/Helper/MaaUrls.cs
index 8328505632..ff0bd1d153 100644
--- a/src/MaaWpfGui/Helper/MaaUrls.cs
+++ b/src/MaaWpfGui/Helper/MaaUrls.cs
@@ -38,11 +38,11 @@ namespace MaaWpfGui
private static readonly Dictionary _helpUrl = new Dictionary
{
- { "zh-cn", "1.2-常见问题.md" },
- { "en-us", "en-us/1.2-FAQ.md" },
- { "ja-jp", "ja-jp/1.2-よくある質問.md" },
- { "ko-kr", "ko-kr/1.2-FAQ.md" },
- { "zh-tw", "zh-tw/1.2-常見問題.md" },
+ { "zh-cn", "1.2-常见问题.html" },
+ { "en-us", "en-us/1.2-FAQ.html" },
+ { "ja-jp", "ja-jp/1.2-よくある質問.html" },
+ { "ko-kr", "ko-kr/1.2-FAQ.html" },
+ { "zh-tw", "zh-tw/1.2-常見問題.html" },
{ "pallas", "KeepDrinking" },
};
diff --git a/src/MaaWpfGui/Helper/MainWindowManager.cs b/src/MaaWpfGui/Helper/MainWindowManager.cs
index 859aeec4d4..1c93232f13 100644
--- a/src/MaaWpfGui/Helper/MainWindowManager.cs
+++ b/src/MaaWpfGui/Helper/MainWindowManager.cs
@@ -35,6 +35,9 @@ namespace MaaWpfGui
public MainWindowManager()
{
MainWindow.StateChanged += MainWindow_StateChanged;
+
+ bool minimizeToTray = Convert.ToBoolean(ViewStatusStorage.Get("GUI.MinimizeToTray", bool.FalseString));
+ SetMinimizeToTaskbar(minimizeToTray);
}
///
diff --git a/src/MaaWpfGui/Helper/StageManager.cs b/src/MaaWpfGui/Helper/StageManager.cs
index c96ca4cd72..ea742d71e6 100644
--- a/src/MaaWpfGui/Helper/StageManager.cs
+++ b/src/MaaWpfGui/Helper/StageManager.cs
@@ -38,7 +38,6 @@ namespace MaaWpfGui
// model references
private readonly TaskQueueViewModel _taskQueueViewModel;
- private readonly SettingsViewModel _settingsViewModel;
// datas
private Dictionary _stages;
@@ -50,7 +49,6 @@ namespace MaaWpfGui
public StageManager(IContainer container)
{
_taskQueueViewModel = container.Get();
- _settingsViewModel = container.Get();
UpdateStage(false);
Execute.OnUIThread(async () =>
@@ -68,7 +66,7 @@ namespace MaaWpfGui
});
}
- private void UpdateStage(bool fromWeb)
+ public void UpdateStage(bool fromWeb)
{
var tempStage = new Dictionary
{
@@ -90,7 +88,7 @@ namespace MaaWpfGui
"yyyy/MM/dd HH:mm:ss",
CultureInfo.InvariantCulture).AddHours(-Convert.ToInt32(keyValuePairs?["TimeZone"].ToString() ?? "0"));
- var clientType = _settingsViewModel.ClientType;
+ var clientType = ViewStatusStorage.Get("Start.ClientType", string.Empty);
// 官服和B服使用同样的资源
if (clientType == "Bilibili" || clientType == string.Empty)
@@ -117,7 +115,7 @@ namespace MaaWpfGui
bool isDebugVersion = Marshal.PtrToStringAnsi(AsstGetVersion()) == "DEBUG VERSION";
bool curParsed = !isDebugVersion ?
SemVersion.TryParse(Marshal.PtrToStringAnsi(AsstGetVersion()), SemVersionStyles.AllowLowerV, out var curVersionObj) :
- SemVersion.TryParse("4.10.7", SemVersionStyles.AllowLowerV, out curVersionObj);
+ SemVersion.TryParse("4.11.7", SemVersionStyles.AllowLowerV, out curVersionObj);
bool minimumRequiredPared = SemVersion.TryParse(stageObj?["MinimumRequired"]?.ToString() ?? string.Empty, SemVersionStyles.AllowLowerV, out var minimumRequiredObj);
var stageInfo = new StageInfo();
diff --git a/src/MaaWpfGui/Main/CopilotViewModel.cs b/src/MaaWpfGui/Main/CopilotViewModel.cs
index a879c6b45b..249842a18c 100644
--- a/src/MaaWpfGui/Main/CopilotViewModel.cs
+++ b/src/MaaWpfGui/Main/CopilotViewModel.cs
@@ -59,14 +59,7 @@ namespace MaaWpfGui
_windowManager = windowManager;
DisplayName = Localization.GetString("Copilot");
LogItemViewModels = new ObservableCollection();
- AddLog(
- Localization.GetString("CopilotTip") + "\n\n" +
- /* Localization.GetString("CopilotTip1") + "\n\n" + */
- "1. " + Localization.GetString("CopilotTip2") + "\n\n" +
- "2. " + Localization.GetString("CopilotTip3") + "\n\n" +
- "3. " + Localization.GetString("CopilotTip4"),
- /* Localization.GetString("CopilotTip5"),*/
- UILogColor.Message);
+ AddLog(Localization.GetString("CopilotTip"), UILogColor.Message);
}
protected override void OnInitialActivate()
@@ -351,14 +344,7 @@ namespace MaaWpfGui
File.WriteAllText(TempCopilotFile, json.ToString());
}
- AddLog(
- "\n\n" +
- Localization.GetString("CopilotTip") + "\n\n" +
- Localization.GetString("CopilotTip1") + "\n\n" +
- Localization.GetString("CopilotTip2") + "\n\n" +
- Localization.GetString("CopilotTip3") + "\n\n" +
- Localization.GetString("CopilotTip4"));
- /* Localization.GetString("CopilotTip5"));*/
+ AddLog(Localization.GetString("CopilotTip"));
}
catch (Exception)
{
diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs
index 2bda5266d5..e7db683119 100644
--- a/src/MaaWpfGui/Main/SettingsViewModel.cs
+++ b/src/MaaWpfGui/Main/SettingsViewModel.cs
@@ -134,13 +134,6 @@ namespace MaaWpfGui
_asstProxy = _container.Get();
_versionUpdateViewModel = _container.Get();
- _mainWindowManager.SetMinimizeToTaskbar(MinimizeToTray);
-
- if (LoadGUIParameters && SaveGUIParametersOnClosing)
- {
- Application.Current.MainWindow.Closing += SaveGUIParameters;
- }
-
var addressListJson = ViewStatusStorage.Get("Connect.AddressHistory", string.Empty);
if (!string.IsNullOrEmpty(addressListJson))
{
@@ -2240,7 +2233,7 @@ namespace MaaWpfGui
}
}
- private void SaveGUIParameters(object sender, EventArgs e)
+ public void SaveGUIParameters(object sender, EventArgs e)
{
SaveGUIParameters();
}
@@ -2448,6 +2441,10 @@ namespace MaaWpfGui
System.Windows.Forms.MessageBoxManager.Yes = FormatText("{0}({1})", "Ok");
System.Windows.Forms.MessageBoxManager.No = FormatText("{0}({1})", "ManualRestart");
System.Windows.Forms.MessageBoxManager.Register();
+ Window mainWindow = Application.Current.MainWindow;
+ mainWindow.Show();
+ mainWindow.WindowState = mainWindow.WindowState = WindowState.Normal;
+ mainWindow.Activate();
var result = MessageBox.Show(
FormatText("{0}\n{1}", "LanguageChangedTip"),
FormatText("{0}({1})", "Tip"),
diff --git a/src/MaaWpfGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
index 782faf4e2e..641a917f71 100644
--- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
@@ -125,6 +125,11 @@ namespace MaaWpfGui
LogItemViewModels = new ObservableCollection();
InitializeItems();
InitTimer();
+
+ if (_settingsViewModel.LoadGUIParameters && _settingsViewModel.SaveGUIParametersOnClosing)
+ {
+ Application.Current.MainWindow.Closing += _settingsViewModel.SaveGUIParameters;
+ }
}
/*
@@ -157,8 +162,12 @@ namespace MaaWpfGui
{
if (NeedToUpdateDatePrompt())
{
- UpdateDatePrompt();
- UpdateStageList(false);
+ Execute.OnUIThread(() =>
+ {
+ _stageManager.UpdateStage(true);
+ UpdateDatePrompt();
+ UpdateStageList(false);
+ });
}
refreshCustomInfrastPlanIndexByPeriod();
@@ -990,32 +999,25 @@ namespace MaaWpfGui
{
emulator = Process.GetProcessById(pid);
emulator.CloseMainWindow();
+ if (!emulator.WaitForExit(5000))
+ {
+ emulator.Kill();
+ emulator.WaitForExit(5000);
+ }
+ else
+ {
+ // 尽管已经成功 CloseMainWindow()，再次尝试 killEmulator()
+ // Refer to https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1878
+ KillEmulator();
+
+ // 已经成功 CloseMainWindow()，所以不管 killEmulator() 的结果如何，都返回 true
+ return true;
+ }
}
catch
{
break;
}
-
- if (emulator.HasExited)
- {
- break;
- }
-
- try
- {
- emulator.Kill();
- }
- catch
- {
- break;
- }
-
- // 尽管已经成功 CloseMainWindow()，再次尝试 killEmulator()
- // Refer to https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/1878
- KillEmulator();
-
- // 已经成功 CloseMainWindow()，所以不管 killEmulator() 的结果如何，都返回 true
- return true;
}
while (false);
@@ -1100,6 +1102,10 @@ namespace MaaWpfGui
{
return false;
}
+ finally
+ {
+ checkCmd.Close();
+ }
return true;
}
@@ -1468,6 +1474,11 @@ namespace MaaWpfGui
get => _stage1;
set
{
+ if (_stage1 == value)
+ {
+ return;
+ }
+
if (CustomStageCode)
{
value = ToUpperAndCheckStage(value);
@@ -1555,16 +1566,16 @@ namespace MaaWpfGui
{
get
{
- if (!IsStageOpen(_remainingSanityStage))
- {
- return string.Empty;
- }
-
return _remainingSanityStage;
}
set
{
+ if (_remainingSanityStage == value)
+ {
+ return;
+ }
+
if (CustomStageCode)
{
value = ToUpperAndCheckStage(value);
@@ -1832,17 +1843,15 @@ namespace MaaWpfGui
get => _medicineNumber;
set
{
- if (string.IsNullOrEmpty(value))
+ if (_medicineNumber == value)
{
- value = "0";
- }
-
- if (value == "0")
- {
- UseStone = false;
+ return;
}
SetAndNotify(ref _medicineNumber, value);
+
+ // If the amount of medicine is 0, the stone is not used.
+ UseStone = UseStone;
SetFightParams();
ViewStatusStorage.Set("MainFunction.UseMedicine.Quantity", MedicineNumber);
}
@@ -1858,7 +1867,8 @@ namespace MaaWpfGui
get => _useStone;
set
{
- if (MedicineNumber == "0")
+ // If the amount of medicine is 0, the stone is not used.
+ if (!int.TryParse(MedicineNumber, out int result) || result == 0)
{
value = false;
}
@@ -1883,9 +1893,9 @@ namespace MaaWpfGui
get => _stoneNumber;
set
{
- if (string.IsNullOrEmpty(value))
+ if (_stoneNumber == value)
{
- value = "0";
+ return;
}
SetAndNotify(ref _stoneNumber, value);
@@ -1919,9 +1929,9 @@ namespace MaaWpfGui
get => _maxTimes;
set
{
- if (string.IsNullOrEmpty(value))
+ if (MaxTimes == value)
{
- value = "0";
+ return;
}
SetAndNotify(ref _maxTimes, value);
@@ -1953,6 +1963,26 @@ namespace MaaWpfGui
///
public List AllDrops { get; set; } = new List();
+ ///
+ /// 关卡不可掉落的材料
+ ///
+ private static readonly HashSet excludedValues = new HashSet()
+ {
+ "3213", "3223", "3233", "3243", // 双芯片
+ "3253", "3263", "3273", "3283",
+ "7001", "7002", "7003", "7004", // 许可/凭证
+ "4004", "4005",
+ "3105", "3131", "3132", "3233", // 龙骨/加固建材
+ "6001", // 演习券
+ "3141", "4002", // 源石
+ "32001", // 芯片助剂
+ "30115", // 聚合剂
+ "30125", // 双极纳米片
+ "30135", // D32钢
+ "30145", // 晶体电子单元
+ "30155", // 烧结核凝晶
+ };
+
private void InitDrops()
{
var reader = Utils.GetItemList();
@@ -1967,26 +1997,11 @@ namespace MaaWpfGui
}
var dis = item.Value["name"].ToString();
-#pragma warning disable SA1009 // Closing parenthesis should be spaced correctly
- if (
- val.Equals("3213") || val.Equals("3223") || val.Equals("3233") || val.Equals("3243") // 双芯片
- || val.Equals("3253") || val.Equals("3263") || val.Equals("3273") || val.Equals("3283")
- || val.Equals("7001") || val.Equals("7002") || val.Equals("7003") || val.Equals("7004") // 许可/凭证
- || val.Equals("4004") || val.Equals("4005")
- || val.Equals("3105") || val.Equals("3131") || val.Equals("3132") || val.Equals("3233") // 龙骨/加固建材
- || val.Equals("6001") // 演习券
- || val.Equals("3141") || val.Equals("4002") // 源石
- || val.Equals("32001") // 芯片助剂
- || val.Equals("30115") // 聚合剂
- || val.Equals("30125") // 双极纳米片
- || val.Equals("30135") // D32钢
- || val.Equals("30145") // 晶体电子单元
- || val.Equals("30155") // 烧结核凝晶
- )
+
+ if (excludedValues.Contains(val))
{
continue;
}
-#pragma warning restore SA1009
AllDrops.Add(new CombData { Display = dis, Value = val });
}
@@ -2065,11 +2080,6 @@ namespace MaaWpfGui
get => _dropsQuantity;
set
{
- if (string.IsNullOrEmpty(value))
- {
- value = "0";
- }
-
SetAndNotify(ref _dropsQuantity, value);
SetFightParams();
ViewStatusStorage.Set("MainFunction.Drops.Quantity", DropsQuantity);
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index cc32a70553..61351969e4 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -376,12 +376,14 @@
Video Link
- Tips：
- Please set the emulator and game to 60 FPS at least.
- Please use this function only when "Start" is visible in game.
- You need turn off the "Auto squad" if using friend support unit, then start with your support unit selected.
- For Paradox Simulation, you need to turn off "Auto squad" and select the skill before, then start in game "start" screen.
- "Auto squad" can not identify the "special focus" crew members temporarily, please cancel the special attention or manual formation if necessary.
+
+ Tips：\n\n
+ 1. Please use this function only when "Start" is visible in game.\n\n
+ 2. You need turn off the "Auto squad" if using friend support unit, then start with your support unit selected.\n\n
+ 3. For Paradox Simulation, you need to turn off "Auto squad" and select the skill before, then start in game "start" screen.\n\n
+ 4. For SSS, There are two built-in files under the resource/copilot folder.\n
+ Please start on the "Start Deployment" screen after manual formation (can be used with "Loop times")
+
Failed to read file!
No corresponding file found!
@@ -513,4 +515,10 @@
I must not drink, drink so much next time...
Hello World!
+
+
+ OK!
+ Version Updated
+ Version:
+
\ No newline at end of file
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index ff0de28b2f..e4a8dd42b9 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -6,8 +6,9 @@
xmlns:uri="clr-namespace:System;assembly=System.Runtime">
設定
+ 対象クライアント
基地設定
- ローグ設定
+ 統合戦略設定
公開求人設定
FP設定
戦闘設定
@@ -37,15 +38,21 @@
製造所-源石の欠片
製造所-中級SoC
宿舎の空き位置で信頼を上げる
- 作業中のオペレーターを宿舎に移動しない
-
- 源石の欠片は自動で補充する
- カスタムされた基地構成を有効にする（Alpha）
+ 作業中の人員を宿舎に移動しない（例:訓練所でのアイリーニなど）
+ 源石の欠片を自動で補充
+ カスタムされた基地構成を有効にする（ベータ）
+ 標準設定
+ ユーザー定義
+ 153 3周/日
+ 243 3周/日
+ 243 4周/日
+ 252 3周/日
+ 333 3周/日
基地構成ファイルの指定
基地構成ファイルのパースエラー！
基地構成ファイルの設定：
基地計画
- Auto save for next plan
+ 次の計画を自動保存
一般モード
一般モード（ブロックされた例外出力）
@@ -54,26 +61,28 @@
LDPlayer
NoxPlayer
MEmu
- WSA 古いバージョン
+ 古いバージョンのWSA
+ MaaTouch
互換モード
体力が設定した%以下になれば宿舎へ移動する
カスタムシフトが有効な場合、この項目は自動入力された部屋に対してのみ有効です。
- 経験値を取得する、できるだけクリアする
- 源石錐を集めて、2階に到着後止める
+ 経験値を取得し、できるだけクリア
+ 源石錐の収集、2階到着後終了
最初の分隊
最初の職業
最初のオペレーター（一人だけ、中国名のみを入力可能）
一人のオペレーターの中国名のみをサポートします。入力されていない場合はデフォルトになります。
- 開幕戦の幹部は助戦を使った
- フレンド以外のアシストを使用できます
+ "最初のオペレーター"をサポートから選択
+ フレンド以外のサポートの使用を許可
+ 統合戦略/保全駐在でポーズトリックを使用します（ベータ機能のため非推奨です）
+ 軽量Adbを使用(実験機能)
デフォルト
（ミヅキ）心胜于物分队
（ミヅキ）物尽其用分队
（ミヅキ）以人为本分队
-
指揮分隊
集団分隊
支援分隊
@@ -91,6 +100,11 @@
前線支援
自由自在
+ 演算结束
+ 繁荣证章
+ 建造点数
+ 锻造赤金
+
選ばない
CN-公式
Bilibili
@@ -105,11 +119,10 @@
ADBプログラム
エミュレータのエラー検出
管理者権限でこのアプリを開くか
手動で接続設定を行ってください
+ ADB検出エラー
このソフトウェアを開くには管理者権限を使用するか
手動で接続を設定してください。
エミュレータが検出されない
管理者権限でこのアプリを開くか
手動で接続設定を行ってください
複数のシミュレータが検出されたため
不要なエミュレータを閉じるか
手動で接続設定を行ってください
- すでに最新版です～
-
言語を切り替える
言語
言語設定が変更されました、今すぐMAAを再起動して言語設定を適用しますか？
@@ -130,10 +143,38 @@
安定版
ベータ版
内部テスト版
+ Update version
aria2を使う
- 更新版
アップデートを確認する
+ 新しいバージョンが見つかりました
+ バックグラウンドでダウンロードを行います・・・
+ バージョン:
+ 内容:
+ Webサイトで確認
+
+ アップデートパッケージが見つかりました
+ 解凍中です、お待ち下さい・・・
+
+ パッケージが壊れています
+ ファイル名:
+ 消去しました。
+
+ 最新版をインストール済みです。
+ アップデートパッケージを見つけるのに失敗しました
+ ネットワークの接続状況とプロクシの設定を確認してください。
+ リリースノートの取得に失敗しました。
+ 新しいバージョンの準備中です。時間をおいてからもう一度実行してください。
+
+ アップデートパッケージのダウンロードを準備中です・・・
+ アップデートパッケージのダウンロードに失敗しました
+ ZIPファイルを手動でダウンロードし、ディレクトリに配置してください。
+ アップデートパッケージのダウンロードが完了しました
+ MAAをすぐにアップグレードしますか？(処理を再開)
+
+ 新バージョンが見つかりましたが、アップデートパッケージがありません
+ アップデートするには、手動でフルパッケージをダウンロードしてください。
+
タイマー
スタートアップ
@@ -144,6 +185,11 @@
エミュレータを待つ時間（秒）
エミュレータパス
選択
+ ADB強制置き換え
+ タッチモード
+ Minitouch (標準)
+ MaaTouch (実験機能)
+ Adb Input (互換性)
追加コマンド
主題
@@ -174,9 +220,9 @@
最小化した際にトレイに表示
重要な通知をポップアップする
代替ステージを選択可能にする
- 残留理性の使用
- メインクエストクリア後に指定されたレベルをスワイプしても、自動的に理性を取り戻さなくなった
-
+ 余剰理性の使用
+ メインタスク終了後に指定されたレベルを選択しても、自動的に理性を回復しません
+ 48時間以内に期限が切れる理性剤を無制限に使用
当日開放されないステージを隠す
スタート画面に表示する便利ボタン
ステージ名を入力する
@@ -191,7 +237,6 @@
接続構成
adb再接続失敗時にエミュレータを自動で再起動
再接続に20回失敗した後、エミュレータを再起動してみてください，バックグラウンドのタイムドタスクを使用し、終了時にエミュレータを終了させるタスクを設定する場合は、必ずチェックを入れること
- ADBの強制置き換え
@@ -205,6 +250,7 @@
FP獲得と交換
報酬受取
自動ローグ
+ 生息演算（大陸版）
全て選択
逆選択
@@ -242,6 +288,10 @@
イベントは未公開か既に終了
+ 未サポートステージ
+ バージョンを上げてください
+ 公開日まで:
+ 1日以内
1-7
龍門幣-6(CE-6)
@@ -282,9 +332,8 @@
エミュレータ接続中……
タスクが選択されていません
動作中……
- 動作停止中……
もし全てでスタックする場合は、設定 - 接続設定 - ADBの強制置き換え、もしくは 互換性 タッチモード をチェックしてください。
-
+ 動作停止中……
動作停止
不明なエラーが発生しました
設定に成功しました
@@ -294,6 +343,7 @@
完了しました。シャットダウンしようとしています。キャンセルしますか？
ヒント
完了しました。休止状態にしようとしています。
+ 殲滅戦に失敗、代替ステージを使用しますが、一部の戦闘設定が有効ではありません
@@ -329,7 +379,7 @@
攻略ファイルはマウスで直接ドラッグして取り込むことがきます(oﾟvﾟ)ノ
自動編成
自動編成では、一時的に「戦術要員」オペレーターを認識できません
- LoopTimes
+ ループ回数
開始
@@ -338,12 +388,14 @@
- ヒント：
- エミュレータとゲーム内設定のフレームレートを60fps以上に設定してください；
- 「行動開始」ボタンのあるインターフェースでこの機能を使用してください；
- サポートを使うときは、「自動編成」をオフにし、手動でオペレーターを選択してから始めましょう；
- 逆理演算の場合は、「自動編成」をオフにする必要があり、スキルを選択した後、「演算開始」ボタンのインターフェースから開始する必要があります；
- 「自動編成」では、一時的に「戦術要員」オペレーターを認識できません。必要に応じて、戦術要員をキャンセルまたは手動に編成してください。
+
+ ヒント：\n\n
+ 1. 「行動開始」ボタンのあるインターフェースでこの機能を使用してください；\n\n
+ 2. サポートを使うときは、「自動編成」をオフにし、手動でオペレーターを選択してから始めましょう；\n\n
+ 3. 逆理演算の場合は、「自動編成」をオフにする必要があり、スキルを選択した後、「演算開始」ボタンのインターフェースから開始する必要があります；\n\n
+ 4. For SSS, There are two built-in files under the resource/copilot folder.\n
+ Please start on the "Start Deployment" screen after manual formation (can be used with "Loop times")
+
ファイルの読み取りに失敗しました！
対応する攻略ファイルが見つかりません！
@@ -400,6 +452,7 @@
ゲームがクラッシュ。再起動を行います
回線が落ちました。再接続を行います
ゲームクリア、おめでとうございます！
+ ゲームクリア、おめでとうございます！
ステージ：怪しい旅商人
ステージ：安全な片隅
ステージ：思わぬ遭遇
@@ -440,6 +493,7 @@
Copilot Map and Coordinate
Custom Base Json Generator
QQグループ
+ QQ channel
Telegram
よくある質問
フィードバック
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index d575b6bdb0..2cd129797c 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -277,7 +277,7 @@
최근 작전-->
현재/최근
이벤트가 닫혀 있습니다
- 남은 개방일 수:
+ 남은 개방일 수:
1일 미만
1-7
CE-6 (용문폐)
@@ -367,12 +367,14 @@
비디오 링크
- 팁:
- 에뮬레이터와 게임의 프레임 레이트를 60FPS 이상으로 설정하세요.
- '작전 개시' 버튼이 있는 화면에서 이 기능을 사용하세요.
- 친구의 오퍼레이터를 사용하는 경우에는 '자동 편성'을 선택하지 말고 수동으로 오퍼레이터를 선택하고 시작하세요.
- 패러독스 시뮬레이션의 경우에는 '자동 편성'을 선택하지 말고, 스킬을 선택하고 '시뮬레이션 시작' 버튼이 있는 화면에 시작하세요.
- 자동 편성은 '선호' 오퍼레이터를 인식할 수 없습니다. 필요한 경우 선호 오퍼레이터 표시를 취소하고 수동으로 편성할 수 있습니다.
+
+
+ 팁:\n\n1. '작전 개시' 버튼이 있는 화면에서 이 기능을 사용하세요.\n\n
+ 2. 친구의 오퍼레이터를 사용하는 경우에는 '자동 편성'을 선택하지 말고 수동으로 오퍼레이터를 선택하고 시작하세요.\n\n
+ 3. 패러독스 시뮬레이션의 경우에는 '자동 편성'을 선택하지 말고, 스킬을 선택하고 '시뮬레이션 시작' 버튼이 있는 화면에 시작하세요.\n\n
+ 4. For SSS, There are two built-in files under the resource/copilot folder.\n
+ Please start on the "Start Deployment" screen after manual formation (can be used with "Loop times")
+
파일을 읽지 못했습니다!
해당 파일을 찾을 수 없습니다!
@@ -424,7 +426,7 @@
회
이성 회복 아이템을 사용했습니다
순오리지늄을 사용했습니다
- PRTS 오류
+ PRTS 오류
태그가 새로 고쳐졌습니다.
모집 확정
요구 오퍼레이터 충돌
@@ -504,4 +506,4 @@
다, 다음엔 적당히 마셔야지……
Hello World!
-
+
\ No newline at end of file
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 3f6e4a0fde..158dd4010a 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -378,12 +378,14 @@
视频链接
- 小提示：
- 请将模拟器及游戏帧率设置到 60 帧或更高；
- 请在有“开始行动”按钮的界面再使用本功能；
- 使用好友助战可以关闭“自动编队”，手动选择干员后开始；
- 模拟悖论需要关闭“自动编队”，并选好技能后处于“开始模拟”按钮的界面再开始；
- “自动编队”暂时无法识别“特别关注”的干员，如有需求请取消特别关注或手动编队；
+
+ 小提示：\n\n
+ 1. 请在有“开始行动”按钮的界面再使用本功能；\n\n
+ 2. 使用好友助战可以关闭“自动编队”，手动选择干员后开始；\n\n
+ 3. 模拟悖论需要关闭“自动编队”，并选好技能后处于“开始模拟”按钮的界面再开始；\n\n
+ 4. 保全派驻 在 resource/copilot 文件夹下内置了两份作业。\n
+ 请手动编队后在“开始部署”界面开始（可配合“循环次数”使用）
+
读取文件失败！
未找到对应作业！
@@ -471,11 +473,11 @@
开始编队
选择干员：
当前步骤：{0} {1}
- 不支持的关卡，请更新 MAA 软件版本！
-不支持的关卡，请更新 MAA 软件版本！
-不支持的关卡，请更新 MAA 软件版本！
-
-若提示已是最新版本，请尝试检查开发版或内测版。
+
+ 不支持的关卡，请更新 MAA 软件版本！\n
+ 不支持的关卡，请更新 MAA 软件版本！\n
+ 不支持的关卡，请更新 MAA 软件版本！\n\n
+ 若提示已是最新版本，请尝试检查开发版或内测版。
识别结果：
连接失败
@@ -520,4 +522,10 @@
下次不能喝、喝这么多了......
Hello World!
+
+
+ 好的！
+ 版本已更新
+ 已更新：
+
\ No newline at end of file
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index d32e8dd60f..6d95ffc4e9 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -321,12 +321,14 @@
影片連結
- 小提示：
- 請將模擬器及遊戲影格率設定為 60 張或更高；
- 請在有“開始行動”按鈕的介面再使用本功能；
- 使用好友助戰可以關閉“自動編隊”，手動選擇幹員後開始；
- 模擬悖論需要關閉“自動編隊”，並選好技能後處於“開始模擬”按鈕的介面再開始；
- “自動編隊”暫時無法辨識“特別關注”的幹員，如有需求請取消特別關注或手動編隊；
+
+ 小提示：\n\n
+ 1. 請在有“開始行動”按鈕的介面再使用本功能；\n\n
+ 2. 使用好友助戰可以關閉“自動編隊”，手動選擇幹員後開始；\n\n
+ 3. 模擬悖論需要關閉“自動編隊”，並選好技能後處於“開始模擬”按鈕的介面再開始；\n\n
+ 4. 保全派駐 在 resource/copilot 文件夾下內置了兩份作業。\n
+ 請手動編隊後在“開始部署”界面開始（可配合“循環次數”使用）
+
讀取檔案失敗！
未找到對應作業！
diff --git a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
index 60409eb503..e1c3100ca9 100644
--- a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
@@ -57,8 +57,9 @@
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
InputMethod.IsInputMethodEnabled="False"
+ LostFocus="FightSettingsTextBoxLostFocus"
PreviewTextInput="TextBox_RestrictInputInt"
- Text="{Binding MedicineNumber}" />
+ Text="{Binding MedicineNumber, UpdateSourceTrigger=PropertyChanged}" />
+ Text="{Binding StoneNumber, UpdateSourceTrigger=PropertyChanged}" />
+ Text="{Binding MaxTimes, UpdateSourceTrigger=PropertyChanged}" />
@@ -125,8 +128,9 @@
HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"
InputMethod.IsInputMethodEnabled="False"
+ LostFocus="FightSettingsTextBoxLostFocus"
PreviewTextInput="TextBox_RestrictInputInt"
- Text="{Binding DropsQuantity}"
+ Text="{Binding DropsQuantity, UpdateSourceTrigger=PropertyChanged}"
Visibility="{c:Binding IsSpecifiedDrops}" />
@@ -195,7 +199,7 @@
Padding="6,0,0,0"
VerticalContentAlignment="Center"
IsHitTestVisible="{c:Binding !FightTaskRunning}"
- Text="{Binding Stage1}"
+ Text="{Binding Stage1, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{DynamicResource CustomStageCodeTip}"
Visibility="{c:Binding CustomStageCode}" />
diff --git a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml.cs b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml.cs
index e14b0afea1..8d15e75916 100644
--- a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml.cs
+++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml.cs
@@ -12,6 +12,7 @@
//
using System.Text.RegularExpressions;
+using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@@ -36,5 +37,14 @@ namespace MaaWpfGui
Regex regex = new Regex("[^0-9]+");
e.Handled = regex.IsMatch(e.Text);
}
+
+ private void FightSettingsTextBoxLostFocus(object sender, RoutedEventArgs e)
+ {
+ TextBox textBox = sender as TextBox;
+ if (string.IsNullOrEmpty(textBox.Text))
+ {
+ textBox.Text = "0";
+ }
+ }
}
}
diff --git a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
index e417ce3f2a..a1587e566d 100644
--- a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
@@ -2,6 +2,7 @@
x:Class="MaaWpfGui.GameClientUserControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dd="urn:gong-wpf-dragdrop"
xmlns:local="clr-namespace:MaaWpfGui"
@@ -31,5 +32,9 @@
ItemsSource="{Binding ClientTypeList}"
SelectedValue="{Binding ClientType}"
SelectedValuePath="Value" />
+
\ No newline at end of file
diff --git a/src/MaaWpfGui/Views/VersionUpdateView.xaml b/src/MaaWpfGui/Views/VersionUpdateView.xaml
index bbd5052e58..ac1532a6a0 100644
--- a/src/MaaWpfGui/Views/VersionUpdateView.xaml
+++ b/src/MaaWpfGui/Views/VersionUpdateView.xaml
@@ -8,7 +8,7 @@
xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
xmlns:s="https://github.com/canton7/Stylet"
xmlns:vm="clr-namespace:MaaWpfGui"
- Title="版本已更新"
+ Title="{DynamicResource VersionUpdated}"
Width="600"
Height="500"
d:DataContext="{d:DesignInstance {x:Type vm:VersionUpdateViewModel}}"
@@ -28,7 +28,7 @@
Margin="0,20"
FontSize="24"
Style="{StaticResource TextBlockDefaultBold}"
- Text="已更新："
+ Text="{DynamicResource VersionUpdatedTo}"
TextWrapping="Wrap" />
+ Content="{DynamicResource UpdateNotificationOK}" />
\ No newline at end of file
diff --git a/src/Python/asst/emulator.py b/src/Python/asst/emulator.py
new file mode 100644
index 0000000000..64df006e30
--- /dev/null
+++ b/src/Python/asst/emulator.py
@@ -0,0 +1,33 @@
+import time
+import subprocess
+
+class Bluestacks:
+ @staticmethod
+ def get_hyperv_port(conf_path=r"C:\ProgramData\BlueStacks_nxt\bluestacks.conf", instance_name="Pie64") -> int:
+ """ 获取Hyper-v版蓝叠的adb port
+
+ :param conf_path: bluestacks.conf 的路径+文件名
+ :param instance_name: 多开的名称，在bluestacks.conf中以类似bst.instance..status.adb_port的形式出现，如Nougat64，Pie64，Pie64_1等
+ :return: adb端口
+ """
+ with open(conf_path) as f:
+ configs = dict(list(map(lambda line: line.replace('\n', '').split('='), f.readlines())))
+ return int(configs[f'bst.instance.{instance_name}.status.adb_port'].replace('"', ""))
+
+ @staticmethod
+ def launch_emulator_win(emulator_path=r'C:\Program Files\BlueStacks_nxt\HD-Player.exe', post_delay=30, arg_instance=None):
+ """ 启动模拟器
+ 如需管理员权限启动模拟器则以管理员权限执行Python脚本
+
+ :param emulator_path: 模拟器可执行文件路径+文件名
+ :param post_delay: 启动后的等待时间(s)
+ :param arg_instance: 多开实例名，获取方式见get_hyperv_port注释。默认则置空。
+ :return: 模拟器进程
+ """
+ args = [emulator_path]
+ if arg_instance:
+ args += ["--instance", arg_instance]
+ emulator_proc = subprocess.Popen(args)
+ time.sleep(post_delay)
+ return emulator_proc
+
\ No newline at end of file
diff --git a/src/Python/sample.py b/src/Python/sample.py
index 49a69aa1d1..3fb4257bb8 100644
--- a/src/Python/sample.py
+++ b/src/Python/sample.py
@@ -5,6 +5,7 @@ import time
from asst.asst import Asst
from asst.utils import Message, Version
from asst.updater import Updater
+from asst.emulator import Bluestacks
@Asst.CallBackType
@@ -37,6 +38,12 @@ if __name__ == "__main__":
# 暂停下干员
# asst.set_instance_option(InstanceOptionType.deployment_with_pause, '1')
+ # 启动模拟器。例如启动蓝叠模拟器的多开Pie64_1，并等待30s
+ # Bluestacks.launch_emulator_win(r'C:\Program Files\BlueStacks_nxt\HD-Player.exe', 30, "Pie64_1")
+
+ # 获取Hyper-v蓝叠的adb port
+ # port = Bluestacks.get_hyperv_port(r"C:\ProgramData\BlueStacks_nxt\bluestacks.conf", "Pie64_1")
+
# 请自行配置 adb 环境变量，或修改为 adb 可执行程序的路径
if asst.connect('adb.exe', '127.0.0.1:5555'):
print('连接成功')
diff --git a/tools/ImageCoordinate/.gitignore b/tools/ImageCoordinate/.gitignore
new file mode 100644
index 0000000000..8b036e0a53
--- /dev/null
+++ b/tools/ImageCoordinate/.gitignore
@@ -0,0 +1,6 @@
+*.png
+*.jpg
+
+!coordinate.py
+!drag_here_win.bat
+!.gitignore
\ No newline at end of file
diff --git a/tools/ImageCoordinate/coordinate.py b/tools/ImageCoordinate/coordinate.py
new file mode 100644
index 0000000000..d52bc6fe63
--- /dev/null
+++ b/tools/ImageCoordinate/coordinate.py
@@ -0,0 +1,149 @@
+from PIL import Image, ImageTk
+import tkinter as tk
+from tkinter import simpledialog
+import argparse
+
+img = ""
+
+# Whether the previous rectangles will be cleared when creating a new one
+KEEP_RECT = True
+
+class ImageRectSelector:
+ def __init__(self, image_path):
+ # Load the image using PIL
+ self.image = Image.open(image_path)
+
+ # Create a Tkinter window
+ self.root = tk.Tk()
+
+ # Create a Tkinter-compatible photo image, which can be used with the Canvas widget
+ self.tk_image = ImageTk.PhotoImage(self.image)
+
+ # Create a Canvas widget and display the photo image on it
+ self.canvas = tk.Canvas(
+ self.root, width=self.image.width, height=self.image.height)
+ self.canvas.pack()
+ self.canvas_image = self.canvas.create_image(
+ 0, 0, anchor=tk.NW, image=self.tk_image)
+
+ # Bind the mouse event handlers to the Canvas widget
+ self.canvas.bind("", self.on_mouse_down)
+ self.canvas.bind("", self.on_mouse_drag)
+ self.canvas.bind("", self.on_mouse_up)
+
+ # Bind the keyboard event handler to the root window
+ self.root.bind("", self.on_key)
+
+ # Set the flag so the program loops in run()
+ self.is_quit = False
+
+ # Initialize the rectangle coordinates
+ self.rect_start_x, self.rect_start_y = None, None
+ self.rect_end_x, self.rect_end_y = None, None
+
+ def draw_rectangle(self, tags="rect"):
+ # Erase previous temporary rectangles
+ self.canvas.delete("tmp")
+
+ # Erase the previous rectangles if KEEP_RECT is set to False
+ if not KEEP_RECT:
+ self.canvas.delete("rect")
+
+ # Draw the rectangle with the given tags
+ self.canvas.create_rectangle(self.rect_start_x, self.rect_start_y, self.rect_end_x, self.rect_end_y,
+ outline='red', tags=tags)
+
+ def on_mouse_down(self, event):
+ self.rect_start_x, self.rect_start_y = event.x, event.y
+
+ def on_mouse_drag(self, event):
+ # Draw the new temporary rectangle on the canvas
+ self.rect_end_x, self.rect_end_y = event.x, event.y
+ self.draw_rectangle("tmp")
+
+ def on_mouse_up(self, event):
+ # Draw the new rectangle on the canvas
+ self.rect_end_x, self.rect_end_y = event.x, event.y
+ self.draw_rectangle()
+
+ # Update the PhotoImage with the drawn rectangle
+ # self.image.paste(self.canvas_image, mask=self.canvas_image)
+
+ # Print the rectangle coordinates
+ print(f"({self.rect_start_x}, {self.rect_start_y}), ({self.rect_end_x - self.rect_start_x}, {self.rect_end_y - self.rect_start_y})")
+
+ def on_key(self, event):
+ # Handle the 'q' key to quit the program
+ if event.char == "q":
+ self.is_quit = True
+ self.root.quit()
+
+ # Handle the 'c' key to clear all rectangles
+ elif event.char == "c":
+ self.canvas.delete("rect")
+ self.canvas.delete("tmp")
+
+ # Handle the 'i' key to take an input and draw the corresponding rectangle
+ elif event.char == "i":
+ self.prompt_rect_coords()
+ self.draw_rectangle()
+
+ def prompt_rect_coords(self):
+ # Prompt the user to enter the rectangle coordinates
+ # x, y, w, h = input(
+ # "Enter the rectangle coordinates (x y w h): ").replace(',', ' ').split()
+ # x, y, w, h = map(int, (x, y, w, h))
+ coords_str = simpledialog.askstring(
+ "Input", "Enter rectangle coordinates (x1 y1 x2 y2):")
+ x, y, w, h = map(int, coords_str.replace(',', ' ').split())
+
+ # Set the rectangle coordinates
+ self.rect_start_x, self.rect_start_y = x, y
+ self.rect_end_x, self.rect_end_y = x + w, y + h
+
+ def run(self):
+ # Start the Tkinter event loop and periodically check for user input
+ while not self.is_quit:
+ self.root.update_idletasks()
+ self.root.update()
+ self.root.after(10) # wait 10 ms between event loop iterations
+
+if __name__ == "__main__":
+ import os
+
+ # get the path of the current file
+ current_file_path = os.path.abspath(__file__)
+
+ # get the directory containing the current file
+ current_dir_path = os.path.dirname(current_file_path)
+
+ # set the current working directory to the directory containing the current file
+ os.chdir(current_dir_path)
+
+ # Define command-line arguments
+ parser = argparse.ArgumentParser(
+ description='Select a rectangle on an image.')
+
+ parser.add_argument('image_path', type=str,
+ nargs='?',
+ help='Path to the input image file.')
+
+ # Parse command-line arguments
+ args = parser.parse_args()
+
+ # Handle image path in different situations
+ if args.image_path:
+ image_path = args.image_path
+ elif img:
+ image_path = img
+ else:
+ image_path = input("Enter path to image file: ")
+
+ # Print the prompt
+ print("drag to select and see coordinates, q to quit, c to clean, i to input coordinates")
+
+ # Create an ImageRectSelector instance with the image path
+ selector = ImageRectSelector(image_path)
+
+ # Run the selector
+ selector.run()
diff --git a/tools/ImageCoordinate/drag_here_win.bat b/tools/ImageCoordinate/drag_here_win.bat
new file mode 100644
index 0000000000..0ac1d4b188
--- /dev/null
+++ b/tools/ImageCoordinate/drag_here_win.bat
@@ -0,0 +1,2 @@
+python coordinate.py %*
+pause
\ No newline at end of file
diff --git a/tools/OverseasClients/FindMissingTemplates.py b/tools/OverseasClients/FindMissingTemplates.py
index 35042eb30a..904ae435fb 100644
--- a/tools/OverseasClients/FindMissingTemplates.py
+++ b/tools/OverseasClients/FindMissingTemplates.py
@@ -36,8 +36,7 @@ ignore_list_file_name = "ignore_list_of_templates.txt"
regex_ignore_list = [
"Mizuki",
"SSS",
- "Reclamation",
- "Rogue"
+ "Reclamation"
]
server_list = [
diff --git a/tools/OverseasClients/ignore_list_of_templates.txt b/tools/OverseasClients/ignore_list_of_templates.txt
index a0559ec1ee..f888df8161 100644
--- a/tools/OverseasClients/ignore_list_of_templates.txt
+++ b/tools/OverseasClients/ignore_list_of_templates.txt
@@ -72,6 +72,21 @@ OfflineConfirm.png
OperLockedMfg.png
OperLockedTrade.png
OperSelected.png
+Phantom@Roguelike@CloseCollection.png
+Phantom@Roguelike@GamePassSkip1Confirm.png
+Phantom@Roguelike@InitalDrop.png
+Phantom@Roguelike@LastRewardRand.png
+Phantom@Roguelike@MissionFailedFlag.png
+Phantom@Roguelike@StageBoons.png
+Phantom@Roguelike@StageCambatDps.png
+Phantom@Roguelike@StageDreadfulFoe.png
+Phantom@Roguelike@StageEmergencyDps.png
+Phantom@Roguelike@StageEncounter.png
+Phantom@Roguelike@StageEncounterOptionFree.png
+Phantom@Roguelike@StageEncounterOptionLeave.png
+Phantom@Roguelike@StageEncounterSpecialClose.png
+Phantom@Roguelike@StageSafeHouse.png
+Phantom@Roguelike@StageTrader.png
PopupCancel.png
PopupConfirm.png
RecruitConfirm.png
@@ -81,6 +96,28 @@ RecruitSkip.png
RecruitTimerDecrement.png
ReplenishToMaxConfirm.png
Return.png
+Roguelike@AbandonConfirm.png
+Roguelike@DialogSkipConfirm.png
+Roguelike@ExitThenAbandon.png
+Roguelike@GamePassTheEndConfirm.png
+Roguelike@GetDropLeaveConfirm.png
+Roguelike@IntegratedStrategies.png
+Roguelike@MissionCompletedFlag.png
+Roguelike@StageEncounterGiveUpRecruitConfirm.png
+Roguelike@StageTraderInvestSystemError.png
+Roguelike@TraderRandomShopping.png
+RoguelikeBattleExitBegin.png
+RoguelikeFormationOper.png
+RoguelikeQuickFormationClearAndReselect.png
+RoguelikeRecruitElite0.png
+RoguelikeRecruitElite1.png
+RoguelikeRecruitElite2.png
+RoguelikeRecruitOcrFlag.png
+RoguelikeRecruitSupportElite0.png
+RoguelikeRecruitSupportElite1.png
+RoguelikeRecruitSupportElite2.png
+RoguelikeSkillSelectionFlag.png
+RoguelikeSkillSelectionTeamFull.png
SendClueConfirm.png
SendClues.png
SkipThePreBattlePlotConfirm.png
- 
- 
-