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

fix: 修复 reduce_other_times 不能正常工作的问题

Browse Source 
perf: 优化回调处理

Co-authored-by: MistEO <mistereo@hotmail.com>
This commit is contained in:
zzyyyl
2022-10-13 14:21:25 +08:00
parent 7eb1a55b8c
commit 4da88f326a
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/MeoAssistant/Task/Sub/AbstractTask.cpp
View File

@@ -165,6 +165,14 @@ bool asst::AbstractTask::need_exit() const
void asst::AbstractTask::callback(AsstMsg msg, const json::value& detail)
{
json::value proced_detail = detail;
// TODO 屎山: task 字段需要忽略 @ 和前面的字符，否则回调大改
if (std::string task = detail.get("details", "task", std::string()); !task.empty()) {
if (size_t pos = task.rfind('@'); pos != std::string::npos) {
proced_detail["details"]["task"] = task.substr(pos + 1);
}
}
for (const TaskPluginPtr& plugin : m_plugins) {
plugin->set_exit_flag(m_exit_flag);
plugin->set_ctrler(m_ctrler);
@@ -172,7 +180,7 @@ void asst::AbstractTask::callback(AsstMsg msg, const json::value& detail)
plugin->set_status(m_status);
plugin->set_task_ptr(this);
if (!plugin->verify(msg, detail)) {
if (!plugin->verify(msg, proced_detail)) {
continue;
}
@@ -183,7 +191,7 @@ void asst::AbstractTask::callback(AsstMsg msg, const json::value& detail)
}
}
if (m_callback) {
m_callback(msg, detail, m_callback_arg);
m_callback(msg, proced_detail, m_callback_arg);
}
}

2
src/MeoAssistant/Task/Sub/AbstractTask.h
View File

@@ -40,8 +40,8 @@ namespace asst
virtual AbstractTask& set_task_id(int task_id) noexcept;
template <typename PluginType>
std::shared_ptr<PluginType> register_plugin()
requires std::derived_from<PluginType, AbstractTaskPlugin> // Plugin must inherit AbstractTaskPlugin
std::shared_ptr<PluginType> register_plugin()
{
auto plugin = std::make_shared<PluginType>(m_callback, m_callback_arg, m_task_chain);
m_plugins.emplace(plugin);

2
src/MeoAssistant/TaskData.h
View File

@@ -61,6 +61,8 @@ namespace asst
}
};
task_info_ptr->name = task_prefix + "@" + base_ptr->name;
generate_tasks(task_info_ptr->sub, base_ptr->sub);
generate_tasks(task_info_ptr->next, base_ptr->next);
generate_tasks(task_info_ptr->exceeded_next, base_ptr->exceeded_next);
generate_tasks(task_info_ptr->on_error_next, base_ptr->on_error_next);