diff --git a/src/MeoAssistant/BattleFormationTask.cpp b/src/MeoAssistant/BattleFormationTask.cpp index c28dbc7770..c17e4979fe 100644 --- a/src/MeoAssistant/BattleFormationTask.cpp +++ b/src/MeoAssistant/BattleFormationTask.cpp @@ -12,12 +12,12 @@ void asst::BattleFormationTask::set_stage_name(std::string name) bool asst::BattleFormationTask::_run() { - const auto& battle = Resrc.battle(); - if (!battle.contains_actions(m_stage_name)) { + const auto& copilot = Resrc.copilot(); + if (!copilot.contains_actions(m_stage_name)) { return false; } - m_groups = battle.get_actions(m_stage_name).groups; + m_groups = copilot.get_actions(m_stage_name).groups; if (m_groups.empty()) { return true; } diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp index bc3c784739..04bdfadfd8 100644 --- a/src/MeoAssistant/BattleProcessTask.cpp +++ b/src/MeoAssistant/BattleProcessTask.cpp @@ -49,13 +49,13 @@ bool asst::BattleProcessTask::get_stage_info() return false; } - const auto& battle = Resrc.battle(); - bool contains = battle.contains_actions(m_stage_name); + const auto& copilot = Resrc.copilot(); + bool contains = copilot.contains_actions(m_stage_name); if (!contains) { return false; } - m_actions_group = battle.get_actions(m_stage_name); + m_actions_group = copilot.get_actions(m_stage_name); return true; } diff --git a/src/MeoAssistant/BattleConfiger.cpp b/src/MeoAssistant/CopilotConfiger.cpp similarity index 98% rename from src/MeoAssistant/BattleConfiger.cpp rename to src/MeoAssistant/CopilotConfiger.cpp index aff46ce6a0..373a7a19ff 100644 --- a/src/MeoAssistant/BattleConfiger.cpp +++ b/src/MeoAssistant/CopilotConfiger.cpp @@ -1,10 +1,10 @@ -#include "BattleConfiger.h" +#include "CopilotConfiger.h" #include #include "Logger.hpp" -bool asst::BattleConfiger::parse(const json::value& json) +bool asst::CopilotConfiger::parse(const json::value& json) { std::string stage_name = json.at("stage_name").as_string(); diff --git a/src/MeoAssistant/BattleConfiger.h b/src/MeoAssistant/CopilotConfiger.h similarity index 85% rename from src/MeoAssistant/BattleConfiger.h rename to src/MeoAssistant/CopilotConfiger.h index ee5d95a0aa..9fa8bcede1 100644 --- a/src/MeoAssistant/BattleConfiger.h +++ b/src/MeoAssistant/CopilotConfiger.h @@ -4,10 +4,10 @@ namespace asst { - class BattleConfiger : public AbstractConfiger + class CopilotConfiger : public AbstractConfiger { public: - virtual ~BattleConfiger() = default; + virtual ~CopilotConfiger() = default; bool contains_actions(const std::string& stage_name) const noexcept { diff --git a/src/MeoAssistant/CopilotTask.cpp b/src/MeoAssistant/CopilotTask.cpp index 2c6fec256b..6c186b0504 100644 --- a/src/MeoAssistant/CopilotTask.cpp +++ b/src/MeoAssistant/CopilotTask.cpp @@ -6,37 +6,37 @@ #include "BattleFormationTask.h" asst::CopilotTask::CopilotTask(AsstCallback callback, void* callback_arg) - : PackageTask(callback, callback_arg, TaskType), - m_battle_task_ptr(std::make_shared(callback, callback_arg, TaskType)), - m_formation_task_ptr(std::make_shared(callback, callback_arg, TaskType)) + : PackageTask(callback, callback_arg, TaskType), + m_battle_task_ptr(std::make_shared(callback, callback_arg, TaskType)), + m_formation_task_ptr(std::make_shared(callback, callback_arg, TaskType)) { - m_subtasks.emplace_back(m_formation_task_ptr); + m_subtasks.emplace_back(m_formation_task_ptr); - auto start_task_ptr = std::make_shared(callback, callback_arg, TaskType); - start_task_ptr->set_tasks({ "BattleStartNormal", "BattleStartRaid", "BattleStartExercise" }); - m_subtasks.emplace_back(start_task_ptr); + auto start_task_ptr = std::make_shared(callback, callback_arg, TaskType); + start_task_ptr->set_tasks({ "BattleStartNormal", "BattleStartRaid", "BattleStartExercise" }); + m_subtasks.emplace_back(start_task_ptr); - m_subtasks.emplace_back(m_battle_task_ptr); + m_subtasks.emplace_back(m_battle_task_ptr); } bool asst::CopilotTask::set_params(const json::value& params) { - if (m_runned) { - return false; - } + if (m_runned) { + return false; + } - if (!params.contains("stage_name") || !params.at("stage_name").is_string()) { - return false; - } - std::string stage_name = params.at("stage_name").as_string(); + if (!params.contains("stage_name") || !params.at("stage_name").is_string()) { + return false; + } + std::string stage_name = params.at("stage_name").as_string(); - m_battle_task_ptr->set_stage_name(stage_name); - m_formation_task_ptr->set_stage_name(stage_name); + m_battle_task_ptr->set_stage_name(stage_name); + m_formation_task_ptr->set_stage_name(stage_name); - bool with_formation = params.get("formation", false); - m_formation_task_ptr->set_enable(with_formation); + bool with_formation = params.get("formation", false); + m_formation_task_ptr->set_enable(with_formation); - std::string filename = params.get("filename", std::string()); - // 文件名为空时,不加载资源,直接返回 true - return filename.empty() || Resrc.battle().load(filename); -} + std::string filename = params.get("filename", std::string()); + // 文件名为空时,不加载资源,直接返回 true + return filename.empty() || Resrc.copilot().load(filename); +} \ No newline at end of file diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index e5e76d65ed..36354b791c 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -25,7 +25,7 @@ - + @@ -98,7 +98,7 @@ - + diff --git a/src/MeoAssistant/MeoAssistant.vcxproj.filters b/src/MeoAssistant/MeoAssistant.vcxproj.filters index ced1b7644f..139ae2f820 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj.filters +++ b/src/MeoAssistant/MeoAssistant.vcxproj.filters @@ -303,7 +303,7 @@ 头文件\Task\Plugin - + 头文件\Resource @@ -518,7 +518,7 @@ 源文件\Task\Plugin - + 源文件\Resource diff --git a/src/MeoAssistant/Resource.cpp b/src/MeoAssistant/Resource.cpp index 36930524c9..8907b76093 100644 --- a/src/MeoAssistant/Resource.cpp +++ b/src/MeoAssistant/Resource.cpp @@ -20,7 +20,7 @@ bool asst::Resource::load(const std::string& dir) constexpr static const char* RecruitCfgFilename = "recruit.json"; constexpr static const char* ItemCfgFilename = "item_index.json"; constexpr static const char* InfrastCfgFilename = "infrast.json"; - constexpr static const char* BattleCfgDirname = "copilot"; + constexpr static const char* CopilotCfgDirname = "copilot"; constexpr static const char* OcrResourceFilename = "PaddleOCR"; constexpr static const char* PenguinResourceFilename = "penguin-stats-recognize"; constexpr static const char* TilesCalcResourceFilename = "Arknights-Tile-Pos"; @@ -78,11 +78,11 @@ bool asst::Resource::load(const std::string& dir) overload = true; } - for (const auto& entry : std::filesystem::directory_iterator(dir + BattleCfgDirname)) { + for (const auto& entry : std::filesystem::directory_iterator(dir + CopilotCfgDirname)) { if (entry.path().extension() != ".json") { continue; } - if (!m_battle_cfg_unique_ins.load(entry.path().u8string())) { + if (!m_copilot_cfg_unique_ins.load(entry.path().u8string())) { m_last_error = entry.path().u8string() + " Load failed"; return false; } diff --git a/src/MeoAssistant/Resource.h b/src/MeoAssistant/Resource.h index 3d5ef08baf..ccdd1f7c74 100644 --- a/src/MeoAssistant/Resource.h +++ b/src/MeoAssistant/Resource.h @@ -15,7 +15,7 @@ #include "TaskData.h" #include "TemplResource.h" #include "TilePack.h" -#include "BattleConfiger.h" +#include "CopilotConfiger.h" namespace asst { @@ -56,9 +56,9 @@ namespace asst { return m_infrast_cfg_unique_ins; } - BattleConfiger& battle() noexcept + CopilotConfiger& copilot() noexcept { - return m_battle_cfg_unique_ins; + return m_copilot_cfg_unique_ins; } OcrPack& ocr() noexcept { @@ -97,9 +97,9 @@ namespace asst { return m_infrast_cfg_unique_ins; } - const BattleConfiger& battle() const noexcept + const CopilotConfiger& copilot() const noexcept { - return m_battle_cfg_unique_ins; + return m_copilot_cfg_unique_ins; } const OcrPack& ocr() const noexcept { @@ -124,7 +124,7 @@ namespace asst GeneralConfiger m_general_cfg_unique_ins; RecruitConfiger m_recruit_cfg_unique_ins; CombatRecruitConfiger m_combatrecruit_cfg_unique_ins; - BattleConfiger m_battle_cfg_unique_ins; + CopilotConfiger m_copilot_cfg_unique_ins; ItemConfiger m_item_cfg_unique_ins; InfrastConfiger m_infrast_cfg_unique_ins; OcrPack m_ocr_pack_unique_ins;