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

feat: Suppots ALL client like EN, JP, KR, ZH_TW, Suppots basic function of JP client

Browse Source
This commit is contained in:
MistEO
2022-07-05 01:12:32 +08:00
parent 4e255bfd4d
commit 4de09dd67a
38 changed files with 16675 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/MeoAsstGui/Helper/AsstProxy.cs
View File

@@ -93,36 +93,58 @@ namespace MeoAsstGui
}
}
private string _curResource = "";
private string _curResource = "_Unloaded";
public bool LoadGlobalResource()
{
bool loaded = true;
var settingsModel = _container.Get<SettingsViewModel>();
if (_curResource.Length == 0
&& settingsModel.ClientType == "YoStarEN"
&& _curResource != settingsModel.ClientType)
if (settingsModel.ClientType == _curResource)
{
loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory() + "\\resource\\global\\YoStarEN");
_curResource = "YoStarEN";
return true;
}
// 这种是手贱看国际服点了一下，又点回官服的
else if (_curResource.Length != 0
&& (settingsModel.ClientType == "Official" || settingsModel.ClientType == "Bilibili" || settingsModel.ClientType == String.Empty))
bool loaded = true;
if (settingsModel.ClientType == String.Empty
|| settingsModel.ClientType == "Official" || settingsModel.ClientType == "Bilibili")
{
// The resources of Official and Bilibili are the same
if (_curResource == "Official" || _curResource == "Bilibili")
{
return true;
}
loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory());
_curResource = "";
}
else if (_curResource == "Official" || _curResource == "Bilibili")
{
// Load basic resources for CN client first
// Then load global incremental resources
loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory() + "\\resource\\global\\" + settingsModel.ClientType);
}
else
{
// Load basic resources for CN client first
// Then load global incremental resources
loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory())
&& AsstLoadResource(System.IO.Directory.GetCurrentDirectory() + "\\resource\\global\\" + settingsModel.ClientType);
}
if (loaded)
{
if (settingsModel.ClientType == String.Empty)
{
_curResource = "Official";
}
else
{
_curResource = settingsModel.ClientType;
}
}
return loaded;
}
public void Init()
{
// basic resource for CN client
bool loaded = AsstLoadResource(System.IO.Directory.GetCurrentDirectory());
_curResource = "";
loaded = LoadGlobalResource();
bool loaded = LoadGlobalResource();
_handle = AsstCreateEx(_callback, IntPtr.Zero);

2
src/MeoAsstGui/ViewModels/RootViewModel.cs
View File

@@ -32,8 +32,8 @@ namespace MeoAsstGui
{
_trayIcon = new TrayIcon();
CheckAndUpdateNow();
InitProxy();
InitViewModels();
InitProxy();
ShowUpdateOrDownload();
}

5
src/MeoAsstGui/ViewModels/SettingsViewModel.cs
View File

@@ -143,7 +143,10 @@ namespace MeoAsstGui
new CombData { Display = "不选择", Value = "" },
new CombData { Display = "官服", Value = "Official" },
new CombData { Display = "Bilibili服", Value = "Bilibili" },
new CombData { Display = "悠星国际服 (YoStarEN)", Value = "YoStarEN" }
new CombData { Display = "国际服 (YoStarEN)", Value = "YoStarEN" },
new CombData { Display = "日服 (YoStarJP)", Value = "YoStarJP" },
new CombData { Display = "韩服 (YoStarKR)", Value = "YoStarKR" },
new CombData { Display = "繁中服 (txwy)", Value = "txwy" }
};
}