From def2daf29540b7df7671cce948c368a7a5fdb2ff Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 23 Apr 2023 19:42:29 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BA=86=E7=82=B9?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=B2=A1=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Main/AsstProxy.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 928771e4f6..0e7fed3aca 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -209,10 +209,13 @@ namespace MaaWpfGui.Main } string mainRes = Directory.GetCurrentDirectory(); - string mainCache = Directory.GetCurrentDirectory() + "\\cache"; string globalResource = mainRes + "\\resource\\global\\" + _settingsViewModel.ClientType; + string mainCache = Directory.GetCurrentDirectory() + "\\cache"; string globalCache = mainCache + "\\resource\\global\\" + _settingsViewModel.ClientType; + string officialClientType = "Official"; + string bilibiliClientType = "Bilibili"; + bool LoadResIfExists(string path) { if (!Directory.Exists(path)) @@ -225,10 +228,10 @@ namespace MaaWpfGui.Main bool loaded = false; if (_settingsViewModel.ClientType == string.Empty - || _settingsViewModel.ClientType == "Official" || _settingsViewModel.ClientType == "Bilibili") + || _settingsViewModel.ClientType == officialClientType || _settingsViewModel.ClientType == bilibiliClientType) { // The resources of Official and Bilibili are the same - if (!ForcedReloadResource && !onlyReloadOTA && (_curResource == "Official" || _curResource == "Bilibili")) + if (!ForcedReloadResource && !onlyReloadOTA && (_curResource == officialClientType || _curResource == bilibiliClientType)) { return true; } @@ -241,7 +244,7 @@ namespace MaaWpfGui.Main // Load the cached incremental resources loaded = loaded && LoadResIfExists(mainCache); } - else if (_curResource == "Official" || _curResource == "Bilibili") + else if (_curResource == officialClientType || _curResource == bilibiliClientType) { // Load basic resources for CN client first // Then load global incremental resources @@ -285,7 +288,7 @@ namespace MaaWpfGui.Main if (_settingsViewModel.ClientType == string.Empty) { - _curResource = "Official"; + _curResource = officialClientType; } else {