diff --git a/src/MaaCore/Task/Interface/ParadoxCopilotTask.cpp b/src/MaaCore/Task/Interface/ParadoxCopilotTask.cpp index b9c93999f9..43d1c82bf1 100644 --- a/src/MaaCore/Task/Interface/ParadoxCopilotTask.cpp +++ b/src/MaaCore/Task/Interface/ParadoxCopilotTask.cpp @@ -55,7 +55,7 @@ bool asst::ParadoxCopilotTask::set_params(const json::value& params) m_battle_task_ptr->set_wait_until_end(true); m_subtasks.reserve(batch_opt->size() * 4); for (const auto& item : *batch_opt) { - m_paradox_task_ptr->add_oper(item); + m_paradox_task_ptr->add_file(item); m_subtasks.emplace_back(m_paradox_task_ptr); m_subtasks.emplace_back(m_start_task_ptr); m_subtasks.emplace_back(m_battle_task_ptr); diff --git a/src/MaaCore/Task/Miscellaneous/ParadoxRecognitionTask.cpp b/src/MaaCore/Task/Miscellaneous/ParadoxRecognitionTask.cpp index 75726eea44..395b490805 100644 --- a/src/MaaCore/Task/Miscellaneous/ParadoxRecognitionTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/ParadoxRecognitionTask.cpp @@ -10,12 +10,12 @@ bool asst::ParadoxRecognitionTask::_run() { LogTraceFunction; - if (m_paradox_opers.empty()) { + if (m_paradox_files.empty()) { LogError << __FUNCTION__ << "no paradox oper set"; return false; } - const auto& path = utils::path(m_paradox_opers.front()); + const auto& path = utils::path(m_paradox_files.front()); std::string file_name; if (!Copilot.load(path)) { Log.error("CopilotConfig parse failed"); @@ -35,7 +35,7 @@ bool asst::ParadoxRecognitionTask::_run() m_navigate_name = standardize_name(stage_name); LogInfo << __FUNCTION__ << "navigate name:" << m_navigate_name; - m_paradox_opers.erase(m_paradox_opers.begin()); + m_paradox_files.erase(m_paradox_files.begin()); const auto& all_oper_names = BattleData.get_all_chars(); const auto& it = std::find_if(all_oper_names.begin(), all_oper_names.end(), [&](const auto& pair) { @@ -91,9 +91,9 @@ void asst::ParadoxRecognitionTask::enter_paradox(const int skill_num, const int } } -void asst::ParadoxRecognitionTask::add_oper(const std::string& navigate_name) +void asst::ParadoxRecognitionTask::add_file(const std::string& navigate_name) { - m_paradox_opers.emplace_back(navigate_name); + m_paradox_files.emplace_back(navigate_name); } void asst::ParadoxRecognitionTask::swipe_page() const diff --git a/src/MaaCore/Task/Miscellaneous/ParadoxRecognitionTask.h b/src/MaaCore/Task/Miscellaneous/ParadoxRecognitionTask.h index 819d309f75..bab0449ff4 100644 --- a/src/MaaCore/Task/Miscellaneous/ParadoxRecognitionTask.h +++ b/src/MaaCore/Task/Miscellaneous/ParadoxRecognitionTask.h @@ -25,7 +25,7 @@ private: public: using AbstractTask::AbstractTask; virtual ~ParadoxRecognitionTask() override = default; - void add_oper(const std::string& navigate_name); + void add_file(const std::string& navigate_name); void set_battle_task_ptr(const std::shared_ptr& ptr) { m_battle_task_ptr = ptr; } @@ -40,7 +40,7 @@ private: static std::string standardize_name(const std::string& navigate_name); void enter_paradox(int skill_num, int rarity) const; // 进悖论模拟 - std::vector m_paradox_opers; + std::vector m_paradox_files; OperName m_oper_name {}; std::string m_navigate_name; asst::Rect m_navigate_rect;