Skip to content

Commit

Permalink
Preview 1.80.8 Hotfix Release #475 from CollapseLauncher/main
Browse files Browse the repository at this point in the history
  • Loading branch information
bagusnl authored Jun 5, 2024
2 parents 6ff402c + c26903c commit 68bec12
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 36 deletions.
6 changes: 5 additions & 1 deletion CollapseLauncher/Classes/Helper/WindowUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -379,15 +379,19 @@ private static IntPtr WndProc(IntPtr hwnd, uint msg, UIntPtr wParam, IntPtr lPar
const int HTCLIENT = 1;
const int HTCAPTION = 2;
const int HTMINBUTTON = 8;
const int HTRIGHT = 11;
const int HTTOP = 12;
const int HTTOPRIGHT = 14;

var result = InvokeProp.CallWindowProc(OldWindowWndProcPtr, hwnd, msg, wParam, lParam);
return result switch
{
// Fix "Ghost Minimize Button" issue
HTMINBUTTON => HTCLIENT,
// Fix "Caption Resize" issue
HTRIGHT => HTCAPTION,
HTTOP => HTCAPTION,
HTTOPRIGHT => HTCAPTION,
_ => result
};
}
Expand Down Expand Up @@ -670,4 +674,4 @@ public static void ToggleToTray_AllWindow()

#endregion
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2255,27 +2255,6 @@ private void MoveFileToIngredientList(List<FilePropertiesRemote> assetIndex, str
fileInfo.MoveTo(outputPath, true);
LogWriteLine($"Moving from: {inputPath} to {outputPath}", LogType.Default, true);
}

// If it's not honkai, then return
if (!isHonkai) return;

// TODO: Make it automatic
// Move block file to ingredient path
string baseBlockPath = @"BH3_Data\StreamingAssets\Asb\pc\Blocks.xmf";
inputPath = Path.Combine(sourcePath, baseBlockPath);
outputPath = Path.Combine(targetPath, baseBlockPath);

// Sanity Check: If the block manifest (xmf) is still missing even after the process, then throw
fileInfo = new FileInfo(inputPath);
if (!fileInfo.Exists)
{
throw new AccessViolationException($"Block file: {inputPath} isn't found!");
}

// Move the block manifest (xmf) to the target directory
fileInfo.IsReadOnly = false;
fileInfo.MoveTo(outputPath, true);
LogWriteLine($"Moving from: {inputPath} to {outputPath}", LogType.Default, true);
}

private void TryUnassignReadOnlyFiles()
Expand Down
23 changes: 19 additions & 4 deletions CollapseLauncher/Classes/RepairManagement/Honkai/Check.cs
Original file line number Diff line number Diff line change
Expand Up @@ -308,15 +308,30 @@ private void RemoveSkippableAssets(List<FilePropertiesRemote> assetIndex)
if (_isOnlyRecoverMain) return;

List<FilePropertiesRemote> removableAssets = new List<FilePropertiesRemote>();
Span<Range> ranges = stackalloc Range[2];

// Iterate the skippable asset and do LINQ check
foreach (string skippableAsset in _skippableAssets)
{
// Try get the IEnumerable to iterate the asset
foreach (FilePropertiesRemote asset in assetIndex.Where(x => x.N.Contains(skippableAsset)))
// Try get the filename and the enum type
ReadOnlySpan<char> skippableNameSpan = skippableAsset.AsSpan();
_ = skippableNameSpan.Split(ranges, '$');
ReadOnlySpan<char> skippableName = skippableNameSpan[ranges[0]];
ReadOnlySpan<char> skippableType = skippableNameSpan[ranges[1]];

if (Enum.TryParse(skippableType, true, out FileType skippableFt))
{
// If there's any, then add it to removable assets list
removableAssets.Add(asset);
// Try get the IEnumerable to iterate the asset
foreach (FilePropertiesRemote asset in assetIndex)
{
// If the asset name and type is equal, then add as removable
if (asset.N.AsSpan().EndsWith(skippableName, StringComparison.OrdinalIgnoreCase)
&& skippableFt == asset.FT)
{
// If there's any, then add it to removable assets list
removableAssets.Add(asset);
}
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal partial class HonkaiRepair : ProgressBase<FilePropertiesRemote>, IRepai
#region Properties
private const ulong _assetIndexSignature = 0x657370616C6C6F43; // 657370616C6C6F43 is "Collapse"
private const string _assetBasePath = "BH3_Data/StreamingAssets/";
private readonly string[] _skippableAssets = new string[] { "CG_Temp.usm" };
private readonly string[] _skippableAssets = new string[] { "CG_Temp.usm$Generic", "BlockMeta.xmf$Generic", "Blocks.xmf$Generic" };
private HonkaiCache _cacheUtil { get; init; }
private string _assetBaseURL { get; set; }
private string _blockBaseURL { get => ConverterTool.CombineURLFromString(_assetBaseURL, $"StreamingAsb/{string.Join('_', _gameVersion.VersionArray)}/pc/HD"); }
Expand Down
2 changes: 1 addition & 1 deletion CollapseLauncher/CollapseLauncher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Authors>$(Company). neon-nyan, Cry0, bagusnl, shatyuka, gablm.</Authors>
<Copyright>Copyright 2022-2024 $(Company)</Copyright>
<!-- Versioning -->
<Version>1.80.7</Version>
<Version>1.80.8</Version>
<LangVersion>preview</LangVersion>
<!-- Target Settings -->
<Platforms>x64</Platforms>
Expand Down
2 changes: 1 addition & 1 deletion Hi3Helper.Core/Classes/Shared/Region/LauncherConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public static bool IsInstantRegionChange
{ "GameCategory", "Honkai Impact 3rd" },
{ "WindowSizeProfile", "Normal" },
{ "CurrentCDN", 0 },
{ "ShowRegionChangeWarning", true },
{ "ShowRegionChangeWarning", false },
#if !DISABLEDISCORD
{ "EnableDiscordRPC", false },
{ "EnableDiscordGameStatus", true },
Expand Down
18 changes: 14 additions & 4 deletions Hi3Helper.Core/Lang/fr_FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@
"NotifNoNewNotifs": "Aucune nouvelle notification",
"NotifClearAll": "Supprimer toutes les notifications",
"NavigationMenu": "Menu",
"NavigationUtilities": "Utilitaires"
"NavigationUtilities": "Utilitaires",
"Initializing": "Initialisation",
"LoadingLauncherMetadata": "Chargement des métadonnées du launcher",
"LoadingGameConfiguration": "Chargement de la configuration du jeu"
},

"_HomePage": {
Expand Down Expand Up @@ -220,7 +223,7 @@
"ListCol6": "CRC D.",
"ListCol7": "Statut",
"Status1": "Cliquez sur « Vérification rapide » ou « Vérification complète » pour vérifier les mises à jour des caches.",
"Status2": "Trying to determine \"{0}\" cache asset availability: {1}",
"Status2": "Tentative de détermination de la disponibilité de l'actif de cache « {0} » : {1}",
"CachesStatusHeader1": "État d'avancement",
"CachesStatusCancelled": "L'opération a été annulée !",
"CachesStatusFetchingType": "Récupération du type de Caches : {0}",
Expand Down Expand Up @@ -348,6 +351,7 @@
"CustomArgs_Footer3": "pour afficher d'autres paramètres.",

"GameBoost": "Augmenter la priorité du jeu [Expérimental]",
"MobileLayout": "Utiliser l'interface mobile",

"Advanced_Title": "Paramètres avancés",
"Advanced_Subtitle1": "L'équipe Collapse Launcher",
Expand All @@ -357,6 +361,7 @@
"Advanced_GLC_PreLaunch_Title": "Commandes pré-lancement",
"Advanced_GLC_PreLaunch_Subtitle": "Commandes à exécuter avant le lancement du jeu",
"Advanced_GLC_PreLaunch_Exit": "Forcer l'arrêt du processus lancé lorsque le jeu est fermé/arrêté",
"Advanced_GLC_PreLaunch_Delay": "Retarder le lancement du jeu (ms)",
"Advanced_GLC_PostExit_Title": "Commandes post-sortie",
"Advanced_GLC_PostExit_Subtitle": "Commandes à exécuter après la fermeture du jeu"
},
Expand Down Expand Up @@ -556,6 +561,7 @@
"Idle": "Inactif",
"Change": "Changer",
"Cancelled": "Annulé",
"FinishingUp": "Finalisation",
"Extracting": "Extraction",
"Converting": "Conversion",
"Patching": "Mise à jour",
Expand All @@ -570,6 +576,7 @@
"ApplyingPatch": "Application du correctif",
"Disabled": "Désactivé",
"Enabled": "Activé",
"UseAsDefault": "Utiliser par défaut",

"BuildChannelPreview": "Preview",
"BuildChannelStable": "Stable",
Expand All @@ -578,6 +585,7 @@
"CDNDescription_Cloudflare": "Un miroir du dépôt officiel (principal) hébergé dans le seau R2 de Cloudflare",
"CDNDescription_Bitbucket": "Un miroir du dépôt officiel (principal) hébergé sur Bitbucket",
"CDNDescription_GitLab": "Un miroir du dépôt officiel (principal) hébergé sur GitLab",
"CDNDescription_Coding": "Un miroir du dépôt officiel (principal) hébergé sur Coding",

"LocateExecutable": "Localiser le programme",
"OpenDownloadPage": "Ouvrir la page de téléchargement",
Expand Down Expand Up @@ -606,7 +614,7 @@
"LauncherNameBHI3L": "BetterHi3Launcher",
"LauncherNameSteam": "Steam",
"LauncherNameUnknown": "(Nom du launcher inconnu)",

"ImageCropperTitle": "Rogner l'image"
},

Expand Down Expand Up @@ -793,6 +801,8 @@
"LocateFolderSubtitle": "Choisissez l'emplacement pour déplacer le fichier/dossier vers le chemin cible.",
"ChoosePathTextBoxPlaceholder": "Choisir le chemin cible…",
"ChoosePathButton": "Choisir la cible",
"ChoosePathErrorTitle": "Une erreur est survenue !",
"ChoosePathErrorPathIdentical": "Le chemin de sortie choisi est situé à l’intérieur ou identique à l’emplacement actuel !\r\nVeuillez choisir un autre emplacement !",
"ChoosePathErrorPathUnselected": "Veuillez choisir la destination avant de continuer !",
"ChoosePathErrorPathNotExist": "Le chemin n'existe pas !",
"ChoosePathErrorPathNoPermission": "Vous n'avez pas la permission d'accéder à cet emplacement ! Veuillez choisir un autre emplacement !"
Expand Down Expand Up @@ -1001,7 +1011,7 @@

"Graphics_FPS": "Taux d'IPS",
"Graphics_FPS_Help": "Le mode 120 IPS est EXPÉRIMENTAL ! Veuillez faire preuve de prudence, car Honkai : Star Rail ne le prend pas officiellement en charge !",
"Graphics_FPS_Help2": "Définir la valeur de taux d'IPS sur 120 rendra le menu « Paramètres graphiques » du jeu inopérant.\r\nSi votre menu ne fonctionne plus dans le jeu, utilisez Collapse pour modifier les paramètres graphiques du jeu.",
"Graphics_FPS_Help2": "Définir la valeur de taux d'IPS à 120 n'entraîne plus le dysfonctionnement du menu en jeu, en revanche modifier la valeur de taux d'IPS à une valeur plus faible ne fonctionnera pas.\r\nSi vous utilisez l'option 120 IPS, utilisez Collapse pour modifier les paramètres graphiques du jeu.",
"Graphics_VSync": "VSync",
"Graphics_VSync_Help": "La VSync n'est pas disponible en mode 120 IPS",
"Graphics_RenderScale": "Échelle de rendu",
Expand Down
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
[![Qodana](https://github.com/CollapseLauncher/Collapse/actions/workflows/qodana-scan.yml/badge.svg)](https://github.com/CollapseLauncher/Collapse/actions/workflows/qodana-scan.yml)
[![Sync to Bitbucket](https://github.com/neon-nyan/CollapseLauncher-ReleaseRepo/actions/workflows/sync-to-bitbucket.yml/badge.svg)](https://github.com/neon-nyan/CollapseLauncher-ReleaseRepo/actions/workflows/sync-to-bitbucket.yml)
[![Upload to R2](https://github.com/neon-nyan/CollapseLauncher-ReleaseRepo/actions/workflows/upload-to-r2.yml/badge.svg)](https://github.com/neon-nyan/CollapseLauncher-ReleaseRepo/actions/workflows/upload-to-r2.yml)
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FCollapseLauncher%2FCollapse.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2FCollapseLauncher%2FCollapse?ref=badge_shield&issueType=license)
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FCollapseLauncher%2FCollapse.svg?type=shield&issueType=security)](https://app.fossa.com/projects/git%2Bgithub.com%2FCollapseLauncher%2FCollapse?ref=badge_shield&issueType=security)


[![Localization](https://img.shields.io/badge/Localization-Transifex-blue)](https://explore.transifex.com/collapse-launcher/collapse-mainapp/)
Expand Down Expand Up @@ -208,8 +210,8 @@ Not only that, this launcher also has some advanced features for **Genshin Impac
[<img src="https://user-images.githubusercontent.com/30566970/172445052-b0e62327-1d2e-4663-bc0f-af50c7f23615.svg" width="320"/>](https://github.com/CollapseLauncher/Collapse/releases/download/CL-v1.73.8/CL-1.73.8-stable_Installer.exe)
> **Note**: The version for this build is `1.73.8` (Released on: March 26th, 2024).
[<img src="https://user-images.githubusercontent.com/30566970/172445153-d098de0d-1236-4124-8e13-05000b374eb6.svg" width="320"/>](https://github.com/CollapseLauncher/Collapse/releases/download/CL-v1.80.1-pre/CL-1.80.1-preview_Installer.exe)
> **Note**: The version for this build is `1.80.1` (Released on: April 28th, 2024).
[<img src="https://user-images.githubusercontent.com/30566970/172445153-d098de0d-1236-4124-8e13-05000b374eb6.svg" width="320"/>](https://github.com/CollapseLauncher/Collapse/releases/download/CL-v1.80.7-pre/CL-1.80.7-preview_Installer.exe)
> **Note**: The version for this build is `1.80.7` (Released on: June 3rd, 2024).
To view all releases, [**click here**](https://github.com/neon-nyan/CollapseLauncher/releases).

Expand All @@ -232,6 +234,7 @@ To view all releases, [**click here**](https://github.com/neon-nyan/CollapseLaun
- Also read our [**Third Party Notices**](THIRD_PARTY_NOTICES.md) for license used by third party libraries that we use.

# Third-party repositories and libraries used in this project
**Disclaimer**: This project **IS NOT AFFILIATED** with [**miHoYo (miHoYo Co., Ltd.)**](https://www.mihoyo.com/) or [**HoYoverse (COGNOSPHERE PTE. LTD.)**](https://www.hoyoverse.com/en-us) by any means and is completely open-sourced. Any contributions are welcomed! 😃
- [**Windows UI Library**](https://github.com/microsoft/microsoft-ui-xaml) by Microsoft under [**MIT License**](https://github.com/microsoft/microsoft-ui-xaml/blob/main/LICENSE)
- [**Windows App SDK**](https://github.com/microsoft/WindowsAppSDK) by Microsoft under [**MIT License**](https://github.com/microsoft/WindowsAppSDK/blob/main/LICENSE)
- [**SharpHDiffPatch**](https://github.com/CollapseLauncher/SharpHDiffPatch.Core) by neon-nyan (original port of [**HPatchZ** by **housisong**](https://github.com/sisong/HDiffPatch)) under [**MIT License**](https://github.com/CollapseLauncher/SharpHDiffPatch.Core/blob/main/LICENSE)
Expand All @@ -254,7 +257,7 @@ To view all releases, [**click here**](https://github.com/neon-nyan/CollapseLaun
- [**SharpCompress**](https://github.com/adamhathcock/sharpcompress) by Adam Hathcock (adamhathcock) under [**MIT License**](https://github.com/adamhathcock/sharpcompress/blob/master/LICENSE.txt)
- [**UABT**](https://github.com/CollapseLauncher/UABT) by _unknown_

**Disclaimer**: This project **IS NOT AFFILIATED** with [**miHoYo (miHoYo Co., Ltd.)**](https://www.mihoyo.com/) or [**HoYoverse (COGNOSPHERE PTE. LTD.)**](https://www.hoyoverse.com/en-us) by any means and is completely open-sourced. Any contributions are welcomed! 😃
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FCollapseLauncher%2FCollapse.svg?type=large&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2FCollapseLauncher%2FCollapse?ref=badge_large&issueType=license)

# UI Design Overview
![](https://raw.githubusercontent.com/neon-nyan/CollapseLauncher-Page/main/images/UI%20Overview%20RC2.webp)
Expand Down

0 comments on commit 68bec12

Please sign in to comment.