chore: 添加一些日志

This commit is contained in:
MistEO
2023-05-01 02:55:20 +08:00
parent e9aa2b5550
commit afffc89d53
13 changed files with 75 additions and 12 deletions

View File

@@ -176,6 +176,7 @@ asst::Assistant::TaskId asst::Assistant::append_task(const std::string& type, co
auto ret = json::parse(params.empty() ? "{}" : params);
if (!ret) {
Log.error("json::parse failed");
return 0;
}
@@ -220,14 +221,17 @@ asst::Assistant::TaskId asst::Assistant::append_task(const std::string& type, co
bool params_ret = ptr->set_params(json);
if (!params_ret) {
Log.error(__FUNCTION__, "| invalid params:", params);
return 0;
}
std::unique_lock<std::mutex> lock(m_mutex);
++m_task_id;
ptr->set_task_id(m_task_id);
m_tasks_list.emplace_back(m_task_id, ptr);
return m_task_id;
int task_id = ++m_task_id;
ptr->set_task_id(task_id);
m_tasks_list.emplace_back(task_id, ptr);
Log.info(__FUNCTION__, "| task_id:", task_id);
return task_id;
}
bool asst::Assistant::set_task_params(TaskId task_id, const std::string& params)

View File

@@ -15,6 +15,8 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst)
m_battle_task_ptr(std::make_shared<BattleProcessTask>(callback, inst, TaskType)),
m_stop_task_ptr(std::make_shared<ProcessTask>(callback, inst, TaskType))
{
LogTraceFunction;
auto start_1_tp = std::make_shared<ProcessTask>(callback, inst, TaskType);
start_1_tp->set_tasks({ "BattleStartPre" }).set_retry_times(0).set_ignore_error(true);
m_subtasks.emplace_back(start_1_tp);
@@ -34,6 +36,8 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst)
bool asst::CopilotTask::set_params(const json::value& params)
{
LogTraceFunction;
if (m_running) {
return false;
}

View File

@@ -1,16 +1,33 @@
#include "CustomTask.h"
#include "Task/ProcessTask.h"
asst::CustomTask::CustomTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType) {}
#include "Utils/Logger.hpp"
asst::CustomTask::CustomTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType)
{
LogTraceFunction;
}
bool asst::CustomTask::set_params(const json::value& params)
{
std::vector<std::string> tasks {};
for (const auto& i : params.at("task_names").as_array()) {
tasks.emplace_back(i.as_string());
LogTraceFunction;
auto tasks_opt = params.find<json::array>("task_names");
if (!tasks_opt) {
Log.error("set_params failed, task_names not found");
return false;
}
std::vector<std::string> tasks;
for (const auto& t : *tasks_opt) {
if (!t.is_string()) {
Log.error("set_params failed, task is not string");
return false;
}
tasks.emplace_back(t.as_string());
}
auto custom_task_ptr = std::make_shared<ProcessTask>(m_callback, m_inst, TaskType);
custom_task_ptr->set_tasks(tasks);
m_subtasks.emplace_back(custom_task_ptr);
custom_task_ptr->set_tasks(std::move(tasks));
m_subtasks.emplace_back(std::move(custom_task_ptr));
return true;
}

View File

@@ -17,6 +17,8 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst)
m_stage_navigation_task_ptr(std::make_shared<StageNavigationTask>(m_callback, m_inst, TaskType)),
m_fight_task_ptr(std::make_shared<ProcessTask>(m_callback, m_inst, TaskType))
{
LogTraceFunction;
// 进入选关界面
// 对于指定关卡,就是主界面的“终端”点进去
// 对于当前/上次,就是点到 蓝色开始行动 为止。
@@ -52,6 +54,8 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst)
bool asst::FightTask::set_params(const json::value& params)
{
LogTraceFunction;
const std::string stage = params.get("stage", "");
const int medicine = params.get("medicine", 0);
const int expiring_medicine = params.get("expiring_medicine", 0);

View File

@@ -26,6 +26,8 @@ asst::InfrastTask::InfrastTask(const AsstCallback& callback, Assistant* inst)
m_office_task_ptr(std::make_shared<InfrastOfficeTask>(callback, inst, TaskType)),
m_dorm_task_ptr(std::make_shared<InfrastDormTask>(callback, inst, TaskType))
{
LogTraceFunction;
m_infrast_begin_task_ptr->set_tasks({ "InfrastBegin" }).set_ignore_error(true);
m_replenish_task_ptr = m_mfg_task_ptr->register_plugin<ReplenishOriginiumShardTaskPlugin>();
m_info_task_ptr->set_ignore_error(true);

View File

@@ -4,6 +4,8 @@
#include "Task/Miscellaneous/CreditShoppingTask.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
asst::MallTask::MallTask(const AsstCallback& callback, Assistant* inst)
: InterfaceTask(callback, inst, TaskType),
m_visit_task_ptr(std::make_shared<ProcessTask>(m_callback, m_inst, TaskType)),
@@ -13,6 +15,8 @@ asst::MallTask::MallTask(const AsstCallback& callback, Assistant* inst)
m_shopping_task_ptr(std::make_shared<CreditShoppingTask>(callback, inst, TaskType)),
m_shopping_force_task_ptr(std::make_shared<CreditShoppingTask>(callback, inst, TaskType))
{
LogTraceFunction;
m_visit_task_ptr->set_tasks({ "VisitBegin" });
m_mall_task_ptr->set_tasks({ "MallBegin" });
m_shopping_first_task_ptr->set_enable(false).set_retry_times(1);
@@ -29,6 +33,8 @@ asst::MallTask::MallTask(const AsstCallback& callback, Assistant* inst)
bool asst::MallTask::set_params(const json::value& params)
{
LogTraceFunction;
bool shopping = params.get("shopping", true);
if (shopping) {

View File

@@ -13,12 +13,16 @@ asst::ReclamationTask::ReclamationTask(const AsstCallback& callback, Assistant*
: InterfaceTask(callback, inst, TaskType),
m_reclamation_task_ptr(std::make_shared<ReclamationControlTask>(callback, inst, TaskType))
{
LogTraceFunction;
m_reclamation_task_ptr->register_plugin<ReclamationConclusionReportPlugin>();
m_subtasks.emplace_back(m_reclamation_task_ptr);
}
bool asst::ReclamationTask::set_params(const json::value& params)
{
LogTraceFunction;
// 0 - 刷分与建造点,进入战斗直接退出
// 1 - 刷赤金,联络员买水后基地锻造
int mode = params.get("mode", 0);

View File

@@ -2,16 +2,21 @@
#include "Task/Miscellaneous/AutoRecruitTask.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
asst::RecruitTask::RecruitTask(const AsstCallback& callback, Assistant* inst)
: InterfaceTask(callback, inst, TaskType),
m_auto_recruit_task_ptr(std::make_shared<AutoRecruitTask>(callback, inst, TaskType))
{
LogTraceFunction;
m_subtasks.emplace_back(m_auto_recruit_task_ptr)->set_retry_times(5);
}
bool asst::RecruitTask::set_params(const json::value& params)
{
LogTraceFunction;
auto select_opt = params.find<json::array>("select");
auto confirm_opt = params.find<json::array>("confirm");
if (!select_opt || !confirm_opt) {

View File

@@ -19,6 +19,8 @@ asst::RoguelikeTask::RoguelikeTask(const AsstCallback& callback, Assistant* inst
: InterfaceTask(callback, inst, TaskType),
m_roguelike_task_ptr(std::make_shared<ProcessTask>(callback, inst, TaskType))
{
LogTraceFunction;
m_roguelike_task_ptr->set_ignore_error(true);
m_roguelike_task_ptr->register_plugin<RoguelikeFormationTaskPlugin>();
m_roguelike_task_ptr->register_plugin<RoguelikeControlTaskPlugin>();
@@ -43,6 +45,8 @@ asst::RoguelikeTask::RoguelikeTask(const AsstCallback& callback, Assistant* inst
bool asst::RoguelikeTask::set_params(const json::value& params)
{
LogTraceFunction;
std::string theme = params.get("theme", std::string(RoguelikePhantomThemeName));
if (theme != RoguelikePhantomThemeName && theme != RoguelikeMizukiThemeName) {
Log.error("Unknown roguelike theme", theme);

View File

@@ -15,6 +15,8 @@ asst::SSSCopilotTask::SSSCopilotTask(const AsstCallback& callback, Assistant* in
m_formation_task_ptr(std::make_shared<BattleFormationTask>(callback, inst, TaskType)),
m_stage_task_ptr(std::make_shared<SSSStageManagerTask>(callback, inst, TaskType))
{
LogTraceFunction;
m_begin_task_ptr->set_tasks({ inst_string() + "@SSSBegin", "SSSStartFighting" })
.set_times_limit("SSSStartFighting", 0)
.set_ignore_error(false);
@@ -35,6 +37,8 @@ asst::SSSCopilotTask::SSSCopilotTask(const AsstCallback& callback, Assistant* in
bool asst::SSSCopilotTask::set_params(const json::value& params)
{
LogTraceFunction;
if (m_running) {
Log.error("SSSCopilotTask not support set_params when running");
return false;

View File

@@ -7,7 +7,9 @@
asst::SingleStepTask::SingleStepTask(const AsstCallback& callback, Assistant* inst)
: InterfaceTask(callback, inst, TaskType)
{}
{
LogTraceFunction;
}
bool asst::SingleStepTask::set_params(const json::value& params)
{

View File

@@ -4,12 +4,15 @@
#include "Config/GeneralConfig.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
asst::StartUpTask::StartUpTask(const AsstCallback& callback, Assistant* inst)
: InterfaceTask(callback, inst, TaskType),
m_start_game_task_ptr(std::make_shared<StartGameTaskPlugin>(m_callback, m_inst, TaskType)),
m_start_up_task_ptr(std::make_shared<ProcessTask>(m_callback, m_inst, TaskType))
{
LogTraceFunction;
m_start_up_task_ptr->set_tasks({ "StartUpBegin" })
.set_times_limit("ReturnTo", 0)
.set_task_delay(Config.get_options().task_delay * 2)
@@ -20,6 +23,8 @@ asst::StartUpTask::StartUpTask(const AsstCallback& callback, Assistant* inst)
bool asst::StartUpTask::set_params(const json::value& params)
{
LogTraceFunction;
m_start_game_task_ptr->set_client_type(params.get("client_type", std::string()))
.set_enable(params.get("start_game_enabled", false));
return true;

View File

@@ -7,7 +7,9 @@
asst::VideoRecognitionTask::VideoRecognitionTask(const AsstCallback& callback, Assistant* inst)
: InterfaceTask(callback, inst, TaskType)
{}
{
LogTraceFunction;
}
bool asst::VideoRecognitionTask::set_params(const json::value& params)
{