From e1b28ea2ef9d8392cd207fcfc2ad586e1c96253b Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Fri, 28 Oct 2022 16:29:35 +0800 Subject: [PATCH] style: format --- resource/global/YoStarJP/resource/tasks.json | 2 +- resource/roguelike_copilot.json | 19 ++++++++++++++---- .../Resource/RoguelikeCopilotConfiger.cpp | 2 +- .../Plugin/RoguelikeRecruitTaskPlugin.cpp | 2 +- .../Task/Sub/InfrastReceptionTask.cpp | 2 +- src/MeoAssistant/Utils/AsstBattleDef.h | 20 ++++++++----------- src/MeoAssistant/Utils/AsstTypes.h | 2 +- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/resource/global/YoStarJP/resource/tasks.json b/resource/global/YoStarJP/resource/tasks.json index 6613543ef7..1140b7f01b 100644 --- a/resource/global/YoStarJP/resource/tasks.json +++ b/resource/global/YoStarJP/resource/tasks.json @@ -102,7 +102,7 @@ "Home@ReturnTo" ] }, -"StageDrops-Quantity": { + "StageDrops-Quantity": { "template": "empty.png", "templThreshold": 3, "templThreshold_Doc": "这里用来作为字间距阈值", diff --git a/resource/roguelike_copilot.json b/resource/roguelike_copilot.json index 850b984d56..5c6211a28d 100644 --- a/resource/roguelike_copilot.json +++ b/resource/roguelike_copilot.json @@ -52,7 +52,10 @@ 1 ], "role_Doc": "填入的职业适用强制方向", - "role": [ "warrior", "pioneer" ], + "role": [ + "warrior", + "pioneer" + ], "direction": "up" }, { @@ -60,7 +63,9 @@ 3, 1 ], - "role": [ "sniper" ], + "role": [ + "sniper" + ], "direction": "left" } ] @@ -688,7 +693,10 @@ 4, 4 ], - "role": [ "warrior", "pioneer" ], + "role": [ + "warrior", + "pioneer" + ], "direction": "left" }, { @@ -696,7 +704,10 @@ 3, 4 ], - "role": [ "warrior", "pioneer" ], + "role": [ + "warrior", + "pioneer" + ], "direction": "right" } ] diff --git a/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp b/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp index d25c2d1fd4..d8a454ede1 100644 --- a/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp +++ b/src/MeoAssistant/Resource/RoguelikeCopilotConfiger.cpp @@ -81,7 +81,7 @@ bool asst::RoguelikeCopilotConfiger::parse(const json::value& json) BattleRole::Warrior, BattleRole::Pioneer, BattleRole::Medic, BattleRole::Tank, BattleRole::Sniper, BattleRole::Caster, BattleRole::Support, BattleRole::Special, BattleRole::Drone, }; - + auto to_lower = [](char c) -> char { return static_cast(std::tolower(c)); }; if (auto opt = stage_info.find("role_order")) { const auto& raw_roles = opt.value(); diff --git a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp index b63647fc06..6cf3898def 100644 --- a/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp +++ b/src/MeoAssistant/Task/Plugin/RoguelikeRecruitTaskPlugin.cpp @@ -3,8 +3,8 @@ #include "../Sub/ProcessTask.h" #include "Controller.h" #include "ImageAnalyzer/RoguelikeRecruitImageAnalyzer.h" -#include "Resource/RoguelikeRecruitConfiger.h" #include "Resource/BattleDataConfiger.h" +#include "Resource/RoguelikeRecruitConfiger.h" #include "RuntimeStatus.h" #include "TaskData.h" #include "Utils/Logger.hpp" diff --git a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp index 8eaa714032..3492c6d273 100644 --- a/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp +++ b/src/MeoAssistant/Task/Sub/InfrastReceptionTask.cpp @@ -15,7 +15,7 @@ bool asst::InfrastReceptionTask::_run() m_all_available_opers.clear(); swipe_to_the_right_of_main_ui(); - if (!enter_facility()){ + if (!enter_facility()) { return false; } click_bottom_left_tab(); diff --git a/src/MeoAssistant/Utils/AsstBattleDef.h b/src/MeoAssistant/Utils/AsstBattleDef.h index c1dd176e0e..c80dfde589 100644 --- a/src/MeoAssistant/Utils/AsstBattleDef.h +++ b/src/MeoAssistant/Utils/AsstBattleDef.h @@ -130,29 +130,25 @@ namespace asst } return BattleRole::Unknown; } -} +} // namespace asst namespace std { inline std::string to_string(const asst::BattleRole& role) { static const std::unordered_map RoleToName = { - { asst::BattleRole::Warrior, "Warrior" }, - { asst::BattleRole::Pioneer, "Pioneer" }, - { asst::BattleRole::Medic, "Medic" }, - { asst::BattleRole::Tank, "Tank" }, - { asst::BattleRole::Sniper, "Sniper" }, - { asst::BattleRole::Caster, "Caster" }, - { asst::BattleRole::Support, "Support" }, - { asst::BattleRole::Special, "Special" }, - { asst::BattleRole::Drone, "Drone" }, - { asst::BattleRole::Unknown, "Unknown" } + { asst::BattleRole::Warrior, "Warrior" }, { asst::BattleRole::Pioneer, "Pioneer" }, + { asst::BattleRole::Medic, "Medic" }, { asst::BattleRole::Tank, "Tank" }, + { asst::BattleRole::Sniper, "Sniper" }, { asst::BattleRole::Caster, "Caster" }, + { asst::BattleRole::Support, "Support" }, { asst::BattleRole::Special, "Special" }, + { asst::BattleRole::Drone, "Drone" }, { asst::BattleRole::Unknown, "Unknown" } }; return RoleToName.at(role); } } -namespace asst { +namespace asst +{ struct BattleRealTimeOper { int cost = 0; diff --git a/src/MeoAssistant/Utils/AsstTypes.h b/src/MeoAssistant/Utils/AsstTypes.h index 81d238e96c..ef0dfdf8d8 100644 --- a/src/MeoAssistant/Utils/AsstTypes.h +++ b/src/MeoAssistant/Utils/AsstTypes.h @@ -328,7 +328,7 @@ namespace asst } return "Invalid"; } -} +} // namespace asst namespace asst {