fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 优化部分情况下肉鸽技结算时技能增长未完全显示导致识别不正确

Browse Source
This commit is contained in:
status102
2023-11-17 22:02:17 +08:00
parent 801bf1b7f4
commit 0e81efa42f
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resource/tasks.json
View File

@@ -10580,7 +10580,7 @@
80,
80
],
"postDelay": 1000,
"postDelay": 3000,
"specialParamsDoc": [
"结算界面Part1等待加载完的延迟"
],

32
src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp
View File

@@ -2,6 +2,7 @@
#include "Config/TaskData.h"
#include "Controller/Controller.h"
#include "Utils/ImageIo.hpp"
#include "Vision/Matcher.h"
#include "Vision/RegionOCRer.h"
@@ -32,9 +33,8 @@ bool asst::RoguelikeSettlementTaskPlugin::_run()
json_msg["details"]["game_pass"] = m_game_pass;
sleep(task->special_params[0]);
if (m_game_pass) {
save_img(utils::path("achievement") / utils::path("roguelike"));
save_img(ctrler()->get_image(), utils::path("achievement") / utils::path("roguelike"), "Page1");
}
const static auto rect = Task.get("Roguelike@ClickToStartPoint")->specific_rect;
@@ -43,14 +43,14 @@ bool asst::RoguelikeSettlementTaskPlugin::_run()
if (!wait_for_whole_page()) {
Log.error(__FUNCTION__, "wait for whole page failed");
save_img(utils::path("debug") / utils::path("roguelike"));
save_img(ctrler()->get_image(), utils::path("debug") / utils::path("roguelike"), "Page2_Error");
return true;
}
sleep(task->post_delay);
auto image = ctrler()->get_image();
if (m_game_pass) {
save_img(utils::path("achievement") / utils::path("roguelike"));
save_img(image, utils::path("achievement") / utils::path("roguelike"), "Page2");
}
get_settlement_info(json_msg, image);
callback(AsstMsg::SubTaskExtraInfo, json_msg);
@@ -131,3 +131,27 @@ bool asst::RoguelikeSettlementTaskPlugin::wait_for_whole_page()
} while (!need_exit() && retry < 20);
return false;
}
void asst::RoguelikeSettlementTaskPlugin::save_img(const cv::Mat& image, const std::filesystem::path& relative_dir,
std::string name)
{
if (image.empty()) {
return;
}
std::string stem = utils::get_time_filestem();
if (true) {
// 第1次或每执行 debug.clean_files_freq(100) 次后执行清理
// 限制文件数量 debug.max_debug_file_num
if (m_save_file_cnt[relative_dir] == 0) {
filenum_ctrl(relative_dir, Config.get_options().debug.max_debug_file_num);
m_save_file_cnt[relative_dir] = 0;
}
m_save_file_cnt[relative_dir] =
(m_save_file_cnt[relative_dir] + 1) % Config.get_options().debug.clean_files_freq;
}
auto relative_path = relative_dir / (stem + "_" + name + ".png");
Log.trace("Save image", relative_path);
asst::imwrite(relative_path, image);
}

2
src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.h
View File

@@ -3,6 +3,7 @@
namespace asst
{
// 肉鸽结算图保存及统计
class RoguelikeSettlementTaskPlugin : public AbstractRoguelikeTaskPlugin
{
public:
@@ -14,6 +15,7 @@ namespace asst
virtual bool _run() override;
bool get_settlement_info(json::value& info, const cv::Mat& image);
bool wait_for_whole_page();
void save_img(const cv::Mat& image, const std::filesystem::path& path, std::string name);
mutable bool m_game_pass = false;
};