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

chore: 优化了点有的没的

Browse Source
This commit is contained in:
MistEO
2023-04-23 19:42:29 +08:00
parent 022545f5cb
commit def2daf295
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -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
{