From 328153c11bbbc715fb0730bea77f02ecc5b8031e Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Sun, 27 Apr 2025 03:17:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E7=83=AD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Config/ResourceLoader.cpp | 5 +++++ src/MaaCore/Config/TaskData.cpp | 1 + 2 files changed, 6 insertions(+) diff --git a/src/MaaCore/Config/ResourceLoader.cpp b/src/MaaCore/Config/ResourceLoader.cpp index eb30862022..a4628ad149 100644 --- a/src/MaaCore/Config/ResourceLoader.cpp +++ b/src/MaaCore/Config/ResourceLoader.cpp @@ -167,6 +167,11 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path) // 重要的资源,实时加载(图片还是惰性的) LoadResourceWithTemplAndCheckRet(TaskData, "tasks"_p, "template"_p); + // 热更是旧格式,现在这个实现很屎,但是可以利用一下屎 + if (m_loaded) { + LoadResourceWithTemplAndCheckRet(TaskData, "tasks.json"_p, "template"_p); + } + // 下面这几个资源都是会带OTA功能的,路径不能动 LoadResourceWithTemplAndCheckRet(InfrastConfig, "infrast.json"_p, "template"_p / "infrast"_p); LoadResourceWithTemplAndCheckRet(ItemConfig, "item_index.json"_p, "template"_p / "items"_p); diff --git a/src/MaaCore/Config/TaskData.cpp b/src/MaaCore/Config/TaskData.cpp index d4422be4ea..c91b9ff9e1 100644 --- a/src/MaaCore/Config/TaskData.cpp +++ b/src/MaaCore/Config/TaskData.cpp @@ -225,6 +225,7 @@ bool asst::TaskData::load(const std::filesystem::path& path) json::value merged = json::object(); if (is_regular_file(path)) { + Log.debug("TaskData::load", "Loading json file:", path); auto ret = json::open(path, true); if (!ret) { Log.error("TaskData::load", "Json open failed:", path);