From 0b1bb2f6c7a7605416013d544d50ab4591340ccd Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Mon, 31 Jul 2023 11:32:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=BB=E7=9B=AE=E5=BD=95=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=20DEBUG.txt=20=E6=97=B6=E6=AF=8F=E6=AC=A1=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E4=BB=BB=E5=8A=A1=E9=83=BD=E9=87=8D=E6=96=B0=E8=A7=A3?= =?UTF-8?q?=E6=9E=90tasks.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Config/TaskData.cpp | 6 ++++++ src/MaaWpfGui/Main/AsstProxy.cs | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/MaaCore/Config/TaskData.cpp b/src/MaaCore/Config/TaskData.cpp index 2bd032154e..38cda2ad8f 100644 --- a/src/MaaCore/Config/TaskData.cpp +++ b/src/MaaCore/Config/TaskData.cpp @@ -51,10 +51,16 @@ std::shared_ptr asst::TaskData::get(std::string_view name) return expand_task(name, get_raw(name)).value_or(nullptr); } +const bool forcedReloadResource = std::ifstream("DEBUG").good() || std::ifstream("DEBUG.txt").good(); + bool asst::TaskData::parse(const json::value& json) { LogTraceFunction; + if (forcedReloadResource) { + m_all_tasks_info.clear(); + } + const auto& json_obj = json.as_object(); { diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 97bca91df0..e0c0452cbe 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1121,6 +1121,8 @@ namespace MaaWpfGui.Main return AsstSetInstanceOption(_handle, (AsstInstanceOptionKey)key, value); } + private static readonly bool ForcedReloadResource = File.Exists("DEBUG") || File.Exists("DEBUG.txt"); + /// /// 连接模拟器。 /// @@ -1144,6 +1146,21 @@ namespace MaaWpfGui.Main if (connected && connectedAdb == Instances.SettingsViewModel.AdbPath && connectedAddress == Instances.SettingsViewModel.ConnectAddress) { + if (ForcedReloadResource) + { + if (!LoadResource()) + { + error = "Load Resource Failed"; + return false; + } + + Execute.OnUIThread(() => + { + using var toast = new ToastNotification("Auto Reload"); + toast.Show(); + }); + } + return true; }