From 8f7a68b37bbdb5f83c89694ea725db3fc927154d Mon Sep 17 00:00:00 2001 From: Mccree Lee Date: Mon, 29 Jul 2024 09:43:48 +0800 Subject: [PATCH] feat: 0.1.0 --- .../ViewModels/Pages/GameSettingsViewModel.cs | 7 +++++ Hollow/Views/Pages/GameSettings.axaml | 21 ++----------- build.ps1 | 30 +++++++++---------- 3 files changed, 25 insertions(+), 33 deletions(-) diff --git a/Hollow/ViewModels/Pages/GameSettingsViewModel.cs b/Hollow/ViewModels/Pages/GameSettingsViewModel.cs index d413f61..f869bce 100644 --- a/Hollow/ViewModels/Pages/GameSettingsViewModel.cs +++ b/Hollow/ViewModels/Pages/GameSettingsViewModel.cs @@ -21,6 +21,7 @@ public partial class GameSettingsViewModel : ViewModelBase, IViewModelBase [ObservableProperty] private bool _isGameDirectoryValid; + [RelayCommand] private void SettingsChanged() => IsSettingsChanged = true; @@ -53,10 +54,16 @@ private bool ValidateSettings() [ObservableProperty] private string _screenResolutionWidth = ""; + partial void OnScreenResolutionWidthChanged(string value) => SettingsChanged(); + [ObservableProperty] private string _screenResolutionHeight = ""; + partial void OnScreenResolutionHeightChanged(string value) => SettingsChanged(); + [ObservableProperty] private bool _isFullScreen; + partial void OnIsFullScreenChanged(bool value) => SettingsChanged(); + private readonly IGameService _gameService; private readonly IConfigurationService _configurationService; diff --git a/Hollow/Views/Pages/GameSettings.axaml b/Hollow/Views/Pages/GameSettings.axaml index 4ce2845..8595c04 100644 --- a/Hollow/Views/Pages/GameSettings.axaml +++ b/Hollow/Views/Pages/GameSettings.axaml @@ -22,13 +22,7 @@ Name="ScreenResolutionWidthTextBox" Text="{Binding ScreenResolutionWidth, Mode=TwoWay}" Watermark="{I18N {x:Static languages:LangKeys.GameSettings_Screen_ResolutionWidth}}" - Width="100"> - - - - - - + Width="100" /> - - - - - - + Width="100" /> - + diff --git a/build.ps1 b/build.ps1 index a0f3c6c..496b94b 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,5 +1,5 @@ param( - [string] $Version = "0.0.5.0" + [string] $Version = "0.1.0.0" ) $ErrorActionPreference = "Stop"; @@ -10,31 +10,31 @@ cargo build --manifest-path .\hollow-launcher\Cargo.toml -r Write-Output "Start building withRuntime..."; -dotnet publish Hollow.Windows/Hollow.Windows.csproj -o "build/$Version/withRuntime/hollow_app" -r win-x64 -p:SelfContained=true -p:AssemblyVersion=$Version -p:Configuration=Release; +dotnet publish Hollow.Windows/Hollow.Windows.csproj -o "build/$Version/Hollow_withRuntime/hollow_app" -r win-x64 -p:SelfContained=true -p:AssemblyVersion=$Version -p:Configuration=Release; Write-Output "Removing unused files of withRuntime..."; -Remove-Item -Path ./build/$Version/withRuntime/hollow_app/Microsoft.Web.WebView2.Core.xml -Remove-Item -Path ./build/$Version/withRuntime/hollow_app/Microsoft.Web.WebView2.WinForms.dll -Remove-Item -Path ./build/$Version/withRuntime/hollow_app/Microsoft.Web.WebView2.WinForms.xml -Remove-Item -Path ./build/$Version/withRuntime/hollow_app/Microsoft.Web.WebView2.Wpf.dll -Remove-Item -Path ./build/$Version/withRuntime/hollow_app/Microsoft.Web.WebView2.Wpf.xml +Remove-Item -Path ./build/$Version/Hollow_withRuntime/hollow_app/Microsoft.Web.WebView2.Core.xml +Remove-Item -Path ./build/$Version/Hollow_withRuntime/hollow_app/Microsoft.Web.WebView2.WinForms.dll +Remove-Item -Path ./build/$Version/Hollow_withRuntime/hollow_app/Microsoft.Web.WebView2.WinForms.xml +Remove-Item -Path ./build/$Version/Hollow_withRuntime/hollow_app/Microsoft.Web.WebView2.Wpf.dll +Remove-Item -Path ./build/$Version/Hollow_withRuntime/hollow_app/Microsoft.Web.WebView2.Wpf.xml -Copy-Item -Path ".\hollow-launcher\target\release\Hollow.exe" -Destination ".\build\$Version\withRuntime\Hollow.exe" +Copy-Item -Path ".\hollow-launcher\target\release\Hollow.exe" -Destination ".\build\$Version\Hollow_withRuntime\Hollow.exe" Write-Output "Start building withoutRuntime..."; -dotnet publish Hollow.Windows/Hollow.Windows.csproj -o "build/$Version/withoutRuntime/hollow_app" -r win-x64 -p:SelfContained=false -p:AssemblyVersion=$Version -p:Configuration=Release; +dotnet publish Hollow.Windows/Hollow.Windows.csproj -o "build/$Version/Hollow_withoutRuntime/hollow_app" -r win-x64 -p:SelfContained=false -p:AssemblyVersion=$Version -p:Configuration=Release; Write-Output "Removing unused files of withoutRuntime..."; -Remove-Item -Path ./build/$Version/withoutRuntime/hollow_app/Microsoft.Web.WebView2.Core.xml -Remove-Item -Path ./build/$Version/withoutRuntime/hollow_app/Microsoft.Web.WebView2.WinForms.dll -Remove-Item -Path ./build/$Version/withoutRuntime/hollow_app/Microsoft.Web.WebView2.WinForms.xml -Remove-Item -Path ./build/$Version/withoutRuntime/hollow_app/Microsoft.Web.WebView2.Wpf.dll -Remove-Item -Path ./build/$Version/withoutRuntime/hollow_app/Microsoft.Web.WebView2.Wpf.xml +Remove-Item -Path ./build/$Version/Hollow_withoutRuntime/hollow_app/Microsoft.Web.WebView2.Core.xml +Remove-Item -Path ./build/$Version/Hollow_withoutRuntime/hollow_app/Microsoft.Web.WebView2.WinForms.dll +Remove-Item -Path ./build/$Version/Hollow_withoutRuntime/hollow_app/Microsoft.Web.WebView2.WinForms.xml +Remove-Item -Path ./build/$Version/Hollow_withoutRuntime/hollow_app/Microsoft.Web.WebView2.Wpf.dll +Remove-Item -Path ./build/$Version/Hollow_withoutRuntime/hollow_app/Microsoft.Web.WebView2.Wpf.xml -Copy-Item -Path ".\hollow-launcher\target\release\Hollow.exe" -Destination ".\build\$Version\withoutRuntime\Hollow.exe" +Copy-Item -Path ".\hollow-launcher\target\release\Hollow.exe" -Destination ".\build\$Version\Hollow_withoutRuntime\Hollow.exe" Write-Output "Build Finished";