From 1d7c232bb43371713459c81b76f8cef6b6e45efd Mon Sep 17 00:00:00 2001 From: "waffle.lord" Date: Fri, 12 Jul 2024 15:21:43 -0400 Subject: [PATCH 1/4] fix core dll version parse --- project/SPT.Launcher.Base/Controllers/GameStarter.cs | 2 +- project/SPT.Launcher.Base/Models/SPT/SPTVersion.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/SPT.Launcher.Base/Controllers/GameStarter.cs b/project/SPT.Launcher.Base/Controllers/GameStarter.cs index 253450b..3c2e715 100644 --- a/project/SPT.Launcher.Base/Controllers/GameStarter.cs +++ b/project/SPT.Launcher.Base/Controllers/GameStarter.cs @@ -217,7 +217,7 @@ namespace SPT.Launcher { var serverVersion = new SPTVersion(ServerManager.GetVersion()); - var coreDllVersionInfo = FileVersionInfo.GetVersionInfo(Path.Combine($"{gamePath}/BepinEx/plugins/spt", "spt-core.dll")); + var coreDllVersionInfo = FileVersionInfo.GetVersionInfo(Path.Join(gamePath, @"\BepinEx\plugins\spt", "spt-core.dll")); var dllVersion = new SPTVersion(coreDllVersionInfo.FileVersion); LogManager.Instance.Info($"[LaunchGame] spt-core.dll version: {dllVersion}"); diff --git a/project/SPT.Launcher.Base/Models/SPT/SPTVersion.cs b/project/SPT.Launcher.Base/Models/SPT/SPTVersion.cs index ef7e45f..c0e842d 100644 --- a/project/SPT.Launcher.Base/Models/SPT/SPTVersion.cs +++ b/project/SPT.Launcher.Base/Models/SPT/SPTVersion.cs @@ -38,7 +38,7 @@ namespace SPT.Launcher.Models.SPT string[] splitVersion = SPTVersion.Split('.'); - if (splitVersion.Length == 3) + if (splitVersion.Length >= 3) { int.TryParse(splitVersion[0], out Major); int.TryParse(splitVersion[1], out Minor); From 6387edfb3de59128ee9b5801f8ee7c457a290812 Mon Sep 17 00:00:00 2001 From: "waffle.lord" Date: Fri, 12 Jul 2024 15:22:20 -0400 Subject: [PATCH 2/4] scale text in detailed profile --- .../CustomControls/DetailedProfileCard.axaml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/project/SPT.Launcher/CustomControls/DetailedProfileCard.axaml b/project/SPT.Launcher/CustomControls/DetailedProfileCard.axaml index 1545524..d3ea51e 100644 --- a/project/SPT.Launcher/CustomControls/DetailedProfileCard.axaml +++ b/project/SPT.Launcher/CustomControls/DetailedProfileCard.axaml @@ -6,7 +6,8 @@ xmlns:cvt="using:SPT.Launcher.Converters" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SPT.Launcher.CustomControls.DetailedProfileCard" - MinWidth="250" MinHeight="250" + MinWidth="250" MinHeight="300" + MaxWidth="250" MaxHeight="300" PointerEntered="InputElement_OnPointerEntered" PointerExited="InputElement_OnPointerExited" PointerPressed="InputElement_OnPointerPressed" @@ -26,22 +27,26 @@ - + -