From b5d825845ba99f05f3501c9e6ace8a3589dc672d Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Tue, 13 May 2025 00:02:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=8D=E9=93=B2=E4=B8=80=E5=B1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaCore/Config/ResourceLoader.cpp    | 10 +++++++++-
 src/MaaCore/Task/Interface/FightTask.cpp |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp
index eb30862022..7453b53e74 100644
--- a/src/MaaCore/Config/ResourceLoader.cpp
+++ b/src/MaaCore/Config/ResourceLoader.cpp
@@ -165,7 +165,15 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
     LoadCacheWithoutRet(AvatarCacheManager, "avatars"_p);
 
     // 重要的资源，实时加载（图片还是惰性的）
-    LoadResourceWithTemplAndCheckRet(TaskData, "tasks"_p, "template"_p);
+    if (std::filesystem::is_directory(path / "tasks"_p)) {
+        LoadResourceWithTemplAndCheckRet(TaskData, "tasks"_p, "template"_p);
+    }
+    else if (std::filesystem::is_regular_file(path / "tasks.json"_p)) {
+        Log.warn("================  DEPRECATED  ================");
+        Log.warn(__FUNCTION__, "resource/tasks.json has been deprecated since");
+        Log.warn("================  DEPRECATED  ================");
+        LoadResourceWithTemplAndCheckRet(TaskData, "tasks.json"_p, "template"_p);
+    } // v5.16.4
 
     // 下面这几个资源都是会带OTA功能的，路径不能动
     LoadResourceWithTemplAndCheckRet(InfrastConfig, "infrast.json"_p, "template"_p / "infrast"_p);
diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp
index f53ecdb688..7bdd5f5daf 100644
--- a/src/MaaCore/Task/Interface/FightTask.cpp
+++ b/src/MaaCore/Task/Interface/FightTask.cpp
@@ -76,7 +76,7 @@ bool asst::FightTask::set_params(const json::value& params)
         Log.warn("series = 1000, 已弃用");
         Log.warn("================  DEPRECATED  ================");
         m_fight_times_prt->set_series(0);
-    }
+    } // v5.16.0
     else if (series < -1 || series > 6) {
         Log.error("Invalid series");
         return false;