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

refactor: 重构 Resource 类

Browse Source 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/1541
This commit is contained in:
MistEO
2022-09-04 00:27:54 +08:00
parent f85e0db429
commit 7c8bf92eb4
72 changed files with 376 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MeoAssistant/BattleFormationTask.cpp
View File

@@ -2,11 +2,13 @@
#include "AsstRanges.hpp"
#include "BattleDataConfiger.h"
#include "Controller.h"
#include "CopilotConfiger.h"
#include "Logger.hpp"
#include "OcrWithFlagTemplImageAnalyzer.h"
#include "ProcessTask.h"
#include "Resource.h"
#include "TaskData.h"
void asst::BattleFormationTask::set_stage_name(std::string name)
{
@@ -155,13 +157,13 @@ bool asst::BattleFormationTask::click_role_table(BattleRole role)
bool asst::BattleFormationTask::parse_formation()
{
if (!Resrc.copilot().contains_actions(m_stage_name)) {
if (!CopilotConfiger::get_instance().contains_actions(m_stage_name)) {
Log.error("Unknown stage name", m_stage_name);
return false;
}
const auto& group = Resrc.copilot().get_actions(m_stage_name).groups;
const auto& battle_data = Resrc.battle_data();
const auto& group = CopilotConfiger::get_instance().get_actions(m_stage_name).groups;
const auto& battle_data = BattleDataConfiger::get_instance();
json::value info = basic_info_with_what("BattleFormation");
auto& details = info["details"];