Preview 1.72.12 Release (#348)

CollapseLauncher · Dec 24, 2023 · af058a3 · af058a3
2 parents 8b044d5 + 40b1b6b
commit af058a3
Show file tree

Hide file tree

Showing 25 changed files with 841 additions and 253 deletions.
diff --git a/CollapseLauncher/Assets/Presets/CommunityTools.json b/CollapseLauncher/Assets/Presets/CommunityTools.json
@@ -192,6 +192,12 @@
                 "IconGlyph": "",
                 "Text": "Guides by KQM",
                 "URL": "https://hsr.keqingmains.com"
+            },
+            {
+                "IconFontFamily": "ms-appx:///Assets/Fonts/FontAwesomeSolid6.otf#Font Awesome 6 Free Solid",
+                "IconGlyph": "\uE0BB",
+                "Text": "Pokke's Library",
+                "URL": "https://pokkelibrary.com/"
             }
         ]
     }

diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/BaseClass/ImportExportBase.cs
diff --git a/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs b/CollapseLauncher/Classes/GameManagement/GameSettings/Genshin/RegistryClass/GeneralData.cs
@@ -284,31 +284,32 @@ internal class GeneralData
         /// </summary>
         public bool disableTeamPageBackgroundSwitch { get; set; } = false;
 
-        public bool mtrCached { get; set; } = true;
-        public bool mtrIsOpen { get; set; } = true;
-        public int mtrMaxTTL { get; set; } = 32;
-        public int mtrTimeOut { get; set; } = 5000;
-        public int mtrTraceCount { get; set; } = 5;
-        public int mtrAbortTimeOutCount { get; set; } = 3;
-        public int mtrAutoTraceInterval { get; set; } = 3600;
-        public int mtrTraceCDEachReason { get; set; } = 600;
-        public int mtrTimeInterval { get; set; } = 1000;
-        public List<object> mtrBanReasons { get; set; }
-        public List<string> _customDataKeyList { get; set; }
-        public List<string> _customDataValueList { get; set; }
-        public List<int> _serializedCodeSwitches { get; set; }
-        public bool urlCheckCached { get; set; } = false;
-        public bool urlCheckIsOpen { get; set; } = true;
-        public bool urlCheckAllIP { get; set; } = false;
-        public int urlCheckTimeOut { get; set; } = 5000;
-        public int urlCheckSueecssTraceCount { get; set; } = 5;
-        public int urlCheckErrorTraceCount { get; set; } = 30;
-        public int urlCheckAbortTimeOutCount { get; set; } = 3;
-        public int urlCheckTimeInterval { get; set; } = 1000;
-        public int urlCheckCDEachReason { get; set; } = 600;
-        public List<object> urlCheckBanReasons { get; set; }
-        public bool mtrUseOldWinVersion { get; set; } = false;
-        public string greyTestDeviceUniqueId { get; set; } = "";
+        public bool         disableHttpDns            { get; set; } = false;
+        public bool         mtrCached                 { get; set; } = false;
+        public bool         mtrIsOpen                 { get; set; } = true;
+        public int          mtrMaxTTL                 { get; set; } = 32;
+        public int          mtrTimeOut                { get; set; } = 5000;
+        public int          mtrTraceCount             { get; set; } = 5;
+        public int          mtrAbortTimeOutCount      { get; set; } = 3;
+        public int          mtrAutoTraceInterval      { get; set; } = 3600;
+        public int          mtrTraceCDEachReason      { get; set; } = 600;
+        public int          mtrTimeInterval           { get; set; } = 1000;
+        public List<object> mtrBanReasons             { get; set; }
+        public List<string> _customDataKeyList        { get; set; }
+        public List<string> _customDataValueList      { get; set; }
+        public List<int>    _serializedCodeSwitches   { get; set; }
+        public bool         urlCheckCached            { get; set; } = false;
+        public bool         urlCheckIsOpen            { get; set; } = false;
+        public bool         urlCheckAllIP             { get; set; } = false;
+        public int          urlCheckTimeOut           { get; set; } = 5000;
+        public int          urlCheckSueecssTraceCount { get; set; } = 5;
+        public int          urlCheckErrorTraceCount   { get; set; } = 30;
+        public int          urlCheckAbortTimeOutCount { get; set; } = 3;
+        public int          urlCheckTimeInterval      { get; set; } = 1000;
+        public int          urlCheckCDEachReason      { get; set; } = 600;
+        public List<object> urlCheckBanReasons        { get; set; }
+        public bool         mtrUseOldWinVersion       { get; set; } = false;
+        public string       greyTestDeviceUniqueId    { get; set; } = "";
 
         /// <summary>
         /// This controls if game audio should be disabled when main window is minimized. <br/>

diff --git a/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs b/CollapseLauncher/Classes/InstallManagement/BaseClass/InstallManagerBase.cs
@@ -539,6 +539,9 @@ await Task.Run(() =>
                             deleteList.MoveTo(Path.Combine(_gamePath, $"deletefiles_{Path.GetFileNameWithoutExtension(asset.PathOutput)}.txt"), true);
                         }
 
+                        // Make sure that the Stream is getting disposed first
+                        stream?.Dispose();
+
                         // If the _canDeleteZip flag is true, then delete the zip
                         if (_canDeleteZip)
                         {

diff --git a/CollapseLauncher/Classes/Interfaces/IGameSettings.cs b/CollapseLauncher/Classes/Interfaces/IGameSettings.cs
@@ -5,7 +5,7 @@ namespace CollapseLauncher.Interfaces
     internal interface IGameSettings
     {
         Exception ImportSettings();
-        Exception ExportSettings();
+        Exception ExportSettings(bool isCompressed = true);
         void ReloadSettings();
         void SaveSettings();
         IGameSettingsUniversal AsIGameSettingsUniversal();

diff --git a/CollapseLauncher/CollapseLauncher.csproj b/CollapseLauncher/CollapseLauncher.csproj
@@ -7,7 +7,7 @@
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<Configurations>Debug;Release;Publish</Configurations>
 		<!-- Versioning -->
-		<Version>1.72.11</Version>
+		<Version>1.72.12</Version>
 		<LangVersion>preview</LangVersion>
 		<!-- Target Settings -->
 		<Platforms>x64</Platforms>

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml.cs
@@ -1210,12 +1210,14 @@ private async void StartGame(object sender, RoutedEventArgs e)
                 proc.StartInfo.UseShellExecute = true;
                 proc.StartInfo.Arguments = GetLaunchArguments();
                 LogWriteLine($"Running game with parameters:\r\n{proc.StartInfo.Arguments}");
-                proc.StartInfo.WorkingDirectory = CurrentGameProperty._GameVersion.GamePreset.ZoneName == "Bilibili" ||
-                    (CurrentGameProperty._GameVersion.GameType == GameType.Genshin
-                    && GetAppConfigValue("ForceGIHDREnable").ToBool()) ?
-                        NormalizePath(GameDirPath) :
-                        Path.GetDirectoryName(NormalizePath(GameDirPath));
-                proc.StartInfo.Verb = "runas";
+                // proc.StartInfo.WorkingDirectory = CurrentGameProperty._GameVersion.GamePreset.ZoneName == "Bilibili" ||
+                //     (CurrentGameProperty._GameVersion.GameType == GameType.Genshin
+                //     && GetAppConfigValue("ForceGIHDREnable").ToBool()) ?
+                //         NormalizePath(GameDirPath) :
+                //         Path.GetDirectoryName(NormalizePath(GameDirPath));
+                proc.StartInfo.UseShellExecute  = false;
+                proc.StartInfo.WorkingDirectory = NormalizePath(GameDirPath);
+                proc.StartInfo.Verb             = "runas";
                 proc.Start();
 
                 WatchOutputLog = new CancellationTokenSource();
@@ -1449,7 +1451,7 @@ public async Task<bool> CheckMediaPackInstalled()
                 return true;
 
             LogWriteLine($"Media pack is not installed!\r\n\t" +
-                        $"If you encounter the 'cry_ware_unity' error, run this script as an administrator:\r\n\t\t" +
+                        $"If you encounter the 'cry_ware_unity' error, run this script as an administrator:\r\n\t" +
                         $"{Path.Combine(AppFolder, "Misc", "InstallMediaPack.cmd")}", LogType.Warning, true);
 
             // Skip dialog if user asked before

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs
@@ -185,6 +185,8 @@ private async void ChangeRelease(object sender, RoutedEventArgs e)
             switch (await Dialog_ChangeReleaseChannel(ChannelName, this))
             {
                 case ContentDialogResult.Primary:
+                    // Delete Metadata upon switching release
+                    Directory.Delete(AppGameConfigMetadataFolder, true);
                     LaunchUpdater(ChannelName);
                     break;
             }

diff --git a/Hi3Helper.Core/Lang/de_DE.json b/Hi3Helper.Core/Lang/de_DE.json
@@ -4,6 +4,21 @@
   "Author": "DasIschBims, kujou-kju",
 
   "_StartupPage": {
+    "SelectLang": "Select your language",
+    "SelectLangDesc": "Please select your language to start this launcher for the first time!",
+    "SelectWindowSize": "Select your preferred window size",
+    "SelectCDN": "Select your preferred CDN",
+    "CDNHelpTitle_1": "What is a CDN?",
+    "CDNHelpTitle_2": "short for ",
+    "CDNHelpTitle_3": "Content Delivery Network",
+    "CDNHelpTitle_4": "\u200b",
+    "CDNHelpDetail_1": "\u200b",
+    "CDNHelpDetail_2": "CDN",
+    "CDNHelpDetail_3": " is a system used to make launcher files available to a larger audience, quickly and efficiently.",
+    "CDNHelpDetail_4": "Collapse selects GitHub as the default provider.",
+    "CDNsAvailable": "CDNs available:",
+    "SplashArt_1": "The splash art is a property of",
+    "SplashArt_2": "miHoYo / HoYoverse",
     "ChooseFolderBtn": "Ordner auswählen",
     "ChooseFolderDialogCancel": "Abbrechen",
     "ChooseFolderDialogPrimary": "Ja, bitte!",