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

fix: 修复肉鸽主题迁移导致的错误

Browse Source
This commit is contained in:
status102
2023-11-15 14:35:05 +08:00
parent f2789940d6
commit 960fe3d379
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/MaaCore/Task/Interface/RoguelikeTask.cpp
View File

@@ -76,12 +76,13 @@ bool asst::RoguelikeTask::set_params(const json::value& params)
LogTraceFunction;
std::string theme = params.get("theme", std::string(RoguelikeTheme::Phantom));
if (RoguelikeConfig::is_valid_theme(theme)) {
if (!RoguelikeConfig::is_valid_theme(theme)) {
m_roguelike_task_ptr->set_tasks({ "Stop" });
Log.error("Unknown roguelike theme", theme);
return false;
}
// 迁移完RoguelikeConfig后，这里可以去掉
if (status() == nullptr) {
m_roguelike_task_ptr->set_tasks({ "Stop" });
Log.error(__FUNCTION__, "status() is null");
@@ -89,7 +90,7 @@ bool asst::RoguelikeTask::set_params(const json::value& params)
}
auto mode = static_cast<RoguelikeMode>(params.get("mode", 0));
if (RoguelikeConfig::is_valid_mode(mode)) {
if (!RoguelikeConfig::is_valid_mode(mode)) {
m_roguelike_task_ptr->set_tasks({ "Stop" });
Log.error(__FUNCTION__, "| Unknown mode", static_cast<int>(mode));
return false;

2
src/MaaCore/Task/Roguelike/RoguelikeResetTaskPlugin.cpp
View File

@@ -29,7 +29,7 @@ bool asst::RoguelikeResetTaskPlugin::verify(AsstMsg msg, const json::value& deta
bool asst::RoguelikeResetTaskPlugin::_run()
{
// 改完全部肉鸽数据之后一起删掉！
// 迁移完RoguelikeConfig后，这里可以去掉
// 简单粗暴，后面如果多任务间有联动可能要改改
status()->clear_number();
status()->clear_str();