Skip to content

Commit

Permalink
Release 1.5.20230730.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@BuIlDaLiBlE
BuIlDaLiBlE committed Sep 5, 2023
1 parent bf38759 commit 8670809
Show file tree
Hide file tree
Showing 27 changed files with 274 additions and 255 deletions.
2 changes: 1 addition & 1 deletion App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace BetterHI3Launcher
{
public partial class App : Application
{
public static readonly LauncherVersion LocalLauncherVersion = new LauncherVersion("1.4.20230628.0");
public static readonly LauncherVersion LocalLauncherVersion = new LauncherVersion("1.5.20230730.0");
public static readonly string LauncherRootPath = AppDomain.CurrentDomain.BaseDirectory;
public static readonly string LocalLowPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}Low";
public static readonly string LauncherDataPath = Path.Combine(LocalLowPath, @"Bp\Better HI3 Launcher");
Expand Down
0 Assets/Images/Button.png → Assets/Images/Button_Dialog.png
View file
File renamed without changes
0 Assets/Images/Button_Disabled.png → Assets/Images/Button_Dialog_Disabled.png
View file
File renamed without changes
0 Assets/Images/Button_Pressed.png → Assets/Images/Button_Dialog_Pressed.png
View file
File renamed without changes
Binary file added Assets/Images/Button_Launch.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Launch_Disabled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Launch_Pressed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Options.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Options_Disabled.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Button_Options_Pressed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Images/GitHubREADME.webp
View file
Binary file not shown.
34 changes: 19 additions & 15 deletions BetterHI3Launcher.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,36 +205,40 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="Utility\Hi3Helper.Http\.gitattributes" />
<Content Include="Utility\Hi3Helper.Http\.gitignore" />
<Resource Include="Assets\Images\Icon.ico" />
<Resource Include="Assets\Images\Button.png" />
<Resource Include="Assets\Images\Button_Disabled.png" />
<Resource Include="Assets\Images\Button_Pressed.png" />
<Resource Include="Assets\Images\Button_Close.png" />
<Resource Include="Assets\Images\Button_Close_Pressed.png" />
<Resource Include="Assets\Images\Button_Close_Highlighted.png" />
<Resource Include="Assets\Images\BackgroundShadow.png" />
<Resource Include="Assets\Images\Button_Box_Close.png" />
<Resource Include="Assets\Images\Button_Box_Close_Highlighted.png" />
<Resource Include="Assets\Images\Button_Box_Close_Pressed.png" />
<Resource Include="Assets\Images\Button_Close.png" />
<Resource Include="Assets\Images\Button_Close_Pressed.png" />
<Resource Include="Assets\Images\Button_Close_Highlighted.png" />
<Resource Include="Assets\Images\Button_Dialog.png" />
<Resource Include="Assets\Images\Button_Dialog_Pressed.png" />
<Resource Include="Assets\Images\Button_Dialog_Disabled.png" />
<Resource Include="Assets\Images\Button_Launch.png" />
<Resource Include="Assets\Images\Button_Launch_Disabled.png" />
<Resource Include="Assets\Images\Button_Launch_Pressed.png" />
<Resource Include="Assets\Images\Button_Minimize.png" />
<Resource Include="Assets\Images\Button_Minimize_Highlighted.png" />
<Resource Include="Assets\Images\Button_Minimize_Pressed.png" />
<Resource Include="Assets\Images\Button_Options_Disabled.png" />
<Resource Include="Assets\Images\Button_Options_Pressed.png" />
<Resource Include="Assets\Images\Button_Options.png" />
<Resource Include="Assets\Images\Button_Pause.png" />
<Resource Include="Assets\Images\Button_Pause_Highlighted.png" />
<Resource Include="Assets\Images\Button_Pause_Pressed.png" />
<Resource Include="Assets\Images\Button_Preload.png" />
<Resource Include="Assets\Images\Button_Preload_Checkmark.png" />
<Resource Include="Assets\Images\Button_Preload_Circle.png" />
<Resource Include="Assets\Images\Button_Preload_Highlighted.png" />
<Resource Include="Assets\Images\Button_Preload_Pressed.png" />
<Resource Include="Assets\Images\Button_Preload_Pause.png" />
<Resource Include="Assets\Images\Button_Preload_Resume.png" />
<Resource Include="Assets\Images\Button_Pause.png" />
<Resource Include="Assets\Images\Button_Pause_Highlighted.png" />
<Resource Include="Assets\Images\Button_Pause_Pressed.png" />
<Resource Include="Assets\Images\Button_Resume.png" />
<Resource Include="Assets\Images\Button_Resume_Highlighted.png" />
<Resource Include="Assets\Images\Button_Resume_Pressed.png" />
<Resource Include="Assets\Images\BackgroundShadow.png" />
<Resource Include="Assets\Images\HoV_Dance.gif" />
<Resource Include="Assets\Images\Icon.ico" />
<Resource Include="Assets\Images\Window_Dialog.png" />
<Resource Include="Assets\Images\Checkbox_On.png" />
<Resource Include="Assets\Images\Checkbox_Off.png" />
Expand All @@ -252,14 +256,14 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Fody">
<Version>6.7.0</Version>
<Version>6.8.0</Version>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="ini-parser">
<Version>2.5.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.Platforms">
<Version>7.0.3</Version>
<Version>7.0.4</Version>
</PackageReference>
<PackageReference Include="NETStandard.Library">
<Version>2.0.3</Version>
Expand Down
12 changes: 6 additions & 6 deletions DialogWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
Title="DialogWindow" Width="1280" Height="730">
<Window.Resources>
<FontFamily x:Key="Font">/BetterHI3Launcher;component/Assets/Fonts/#FZLanTingHei-B-GBK</FontFamily>
<ImageBrush x:Key="Button" ImageSource="/Assets/Images/Button.png"/>
<ImageBrush x:Key="ButtonPressed" ImageSource="/Assets/Images/Button_Pressed.png"/>
<ImageBrush x:Key="ButtonDisabled" ImageSource="/Assets/Images/Button_Disabled.png"/>
<ImageBrush x:Key="ButtonDialog" ImageSource="/Assets/Images/Button_Dialog.png"/>
<ImageBrush x:Key="ButtonDialogPressed" ImageSource="/Assets/Images/Button_Dialog_Pressed.png"/>
<ImageBrush x:Key="ButtonDialogDisabled" ImageSource="/Assets/Images/Button_Dialog_Disabled.png"/>
<Style x:Key="FocusVisual">
<Setter Property="Control.Template">
<Setter.Value>
Expand All @@ -30,7 +30,7 @@
</Style>
<Style x:Key="ButtonStyle" TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource Button}"/>
<Setter Property="Background" Value="{StaticResource ButtonDialog}"/>
<Setter Property="BorderBrush" Value="{x:Null}"/>
<Setter Property="Foreground" Value="#313131"/>
<Setter Property="BorderThickness" Value="0"/>
Expand All @@ -50,10 +50,10 @@
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonPressed}"/>
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonDialogPressed}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonDisabled}"/>
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonDialogDisabled}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="#333333"/>
</Trigger>
</ControlTemplate.Triggers>
Expand Down
97 changes: 72 additions & 25 deletions MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@
<BitmapImage x:Key="PreloadCircle" UriSource="/Assets/Images/Button_Preload_Circle.png"/>
<BitmapImage x:Key="PreloadCheckmark" UriSource="/Assets/Images/Button_Preload_Checkmark.png"/>
<ImageBrush x:Key="BackgroundShadow" ImageSource="/Assets/Images/BackgroundShadow.png"/>
<ImageBrush x:Key="Button" ImageSource="/Assets/Images/Button.png"/>
<ImageBrush x:Key="ButtonPressed" ImageSource="/Assets/Images/Button_Pressed.png"/>
<ImageBrush x:Key="ButtonDisabled" ImageSource="/Assets/Images/Button_Disabled.png"/>
<ImageBrush x:Key="ButtonLaunch" ImageSource="/Assets/Images/Button_Launch.png"/>
<ImageBrush x:Key="ButtonLaunchPressed" ImageSource="/Assets/Images/Button_Launch_Pressed.png"/>
<ImageBrush x:Key="ButtonLaunchDisabled" ImageSource="/Assets/Images/Button_Launch_Disabled.png"/>
<ImageBrush x:Key="ButtonOptions" ImageSource="/Assets/Images/Button_Options.png"/>
<ImageBrush x:Key="ButtonOptionsPressed" ImageSource="/Assets/Images/Button_Options_Pressed.png"/>
<ImageBrush x:Key="ButtonOptionsDisabled" ImageSource="/Assets/Images/Button_Options_Disabled.png"/>
<ImageBrush x:Key="CloseButton" ImageSource="/Assets/Images/Button_Close.png"/>
<ImageBrush x:Key="CloseButtonPressed" ImageSource="/Assets/Images/Button_Close_Pressed.png"/>
<ImageBrush x:Key="CloseButtonHighlighted" ImageSource="/Assets/Images/Button_Close_Highlighted.png"/>
Expand Down Expand Up @@ -138,12 +141,43 @@
</Style>
<Style x:Key="LaunchButtonStyle" TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource Button}"/>
<Setter Property="Background" Value="{StaticResource ButtonLaunch}"/>
<Setter Property="Foreground" Value="#313131"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Bottom"/>
<Setter Property="Width" Value="187"/>
<Setter Property="Height" Value="46"/>
<Setter Property="FontFamily" Value="{DynamicResource Font}"/>
<Setter Property="FontSize" Value="24"/>
<Setter Property="UseLayoutRounding" Value="True"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonLaunchPressed}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonLaunchDisabled}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="#333333"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="OptionsButtonStyle" TargetType="{x:Type Button}">
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
<Setter Property="Background" Value="{StaticResource ButtonOptions}"/>
<Setter Property="Foreground" Value="#313131"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="HorizontalAlignment" Value="Right"/>
<Setter Property="VerticalAlignment" Value="Bottom"/>
<Setter Property="Width" Value="218"/>
<Setter Property="Width" Value="31"/>
<Setter Property="Height" Value="46"/>
<Setter Property="FontFamily" Value="{DynamicResource Font}"/>
<Setter Property="FontSize" Value="24"/>
Expand All @@ -156,10 +190,10 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsPressed" Value="True">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonPressed}"/>
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonOptionsPressed}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonDisabled}"/>
<Setter Property="Background" TargetName="border" Value="{StaticResource ButtonOptionsDisabled}"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="#333333"/>
</Trigger>
</ControlTemplate.Triggers>
Expand Down Expand Up @@ -515,10 +549,26 @@
<Grid Name="Grid" Width="1280" Height="730">
<Image Name="BackgroundImage" Stretch="Fill" Source="{DynamicResource BackgroundImage}"/>
<MediaElement Name="BackgroundMedia" IsMuted="True" Stretch="Fill" Focusable="False" ScrubbingEnabled="True" Visibility="Collapsed"/>
<Rectangle VerticalAlignment="Top" HorizontalAlignment="Right" Width="64" Height="32" Fill="#C8141414"/>
<Button Name="CloseButton" Style="{DynamicResource CloseButtonStyle}" Click="CloseButton_Click"/>
<Button Name="MinimizeButton" Style="{DynamicResource MinimizeButtonStyle}" Margin="0,0,32,0" Click="MinimizeButton_Click"/>
<StackPanel VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,57,0" MaxWidth="218">
<Grid Name="TitleBar" VerticalAlignment="Top">
<Rectangle Height="32" Fill="#D8141414"/>
<StackPanel Orientation="Horizontal">
<TextBlock Name="GameNameText" VerticalAlignment="Center" Margin="5" Foreground="#FFFFFF" FontFamily="Segoe UI" FontSize="15">
<TextBlock.Effect>
<DropShadowEffect ShadowDepth="0"/>
</TextBlock.Effect>
</TextBlock>
<TextBlock Name="GameVersionText" VerticalAlignment="Center" Foreground="#434343" FontFamily="Segoe UI" FontSize="15">
<TextBlock.Effect>
<DropShadowEffect ShadowDepth="0"/>
</TextBlock.Effect>
</TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<Button Name="MinimizeButton" Style="{DynamicResource MinimizeButtonStyle}" Click="MinimizeButton_Click"/>
<Button Name="CloseButton" Style="{DynamicResource CloseButtonStyle}" Click="CloseButton_Click"/>
</StackPanel>
</Grid>
<StackPanel VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,57,25" MaxWidth="218">
<TextBlock Name="ProgressText" HorizontalAlignment="Center" Margin="0,0,0,5" Foreground="White" FontFamily="{DynamicResource Font}" FontSize="12" TextAlignment="Center" TextWrapping="Wrap">
<TextBlock.Effect>
<DropShadowEffect ShadowDepth="0"/>
Expand Down Expand Up @@ -549,21 +599,18 @@
</TextBlock>
<ComboBox Name="MirrorDropdown" Width="120" Height="20" DropDownOpened="MirrorDropdown_Opened" SelectionChanged="MirrorDropdown_Changed">
<ComboBoxItem Content="HoYoverse"/>
<ComboBoxItem Content="Hi3Mirror"/>
<ComboBoxItem Content="Bp Network"/>
</ComboBox>
</StackPanel>
</StackPanel>
<Button Name="OptionsButton" Style="{DynamicResource LaunchButtonStyle}" Margin="0,0,0,13" Click="OptionsButton_Click" IsEnabled="False">
<Button.ContextMenu>
<ContextMenu Name="OptionsContextMenu"/>
</Button.ContextMenu>
</Button>
<Button Name="LaunchButton" Style="{DynamicResource LaunchButtonStyle}" Margin="0,0,0,8" Click="LaunchButton_Click" IsEnabled="False"/>
<TextBlock Name="GameVersionText" HorizontalAlignment="Center" Margin="0,0,0,25" Foreground="#A7FFFFFF" FontFamily="{DynamicResource Font}" FontSize="12">
<TextBlock.Effect>
<DropShadowEffect ShadowDepth="0"/>
</TextBlock.Effect>
</TextBlock>
<StackPanel Orientation="Horizontal" Margin="0,0,0,8">
<Button Name="LaunchButton" Style="{DynamicResource LaunchButtonStyle}" Click="LaunchButton_Click" IsEnabled="False"/>
<Button Name="OptionsButton" Style="{DynamicResource OptionsButtonStyle}" Click="OptionsButton_Click" IsEnabled="False">
<Button.ContextMenu>
<ContextMenu Name="OptionsContextMenu"/>
</Button.ContextMenu>
</Button>
</StackPanel>
</StackPanel>
<Grid Name="PreloadGrid" Visibility="Collapsed">
<Grid HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,364,50" Width="240" Height="50">
Expand Down Expand Up @@ -647,7 +694,7 @@
</StackPanel>
</Grid>
</Grid>
<StackPanel Name="DownloadProgressBarStackPanel" Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="50,36">
<StackPanel Name="DownloadProgressBarStackPanel" Orientation="Vertical" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="50,20">
<TextBlock Name="DownloadProgressText" VerticalAlignment="Center" HorizontalAlignment="Left" FontFamily="{DynamicResource Font}" FontSize="14" Foreground="White">
<TextBlock.Effect>
<DropShadowEffect BlurRadius="1" ShadowDepth="2"/>
Expand All @@ -669,7 +716,7 @@
</TextBlock.Effect>
</TextBlock>
</StackPanel>
<Grid Name="LogBox" Margin="10,128" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="900" Height="470" UseLayoutRounding="True" Visibility="Collapsed">
<Grid Name="LogBox" Margin="50,100" HorizontalAlignment="Left" VerticalAlignment="Bottom" Width="820" Height="470" UseLayoutRounding="True" Visibility="Collapsed">
<StackPanel>
<ScrollViewer Name="LogBoxScrollViewer" Width="{Binding Path=ActualWidth, ElementName=LogBox, Mode=OneWay}" Height="{Binding Path=ActualHeight, ElementName=LogBox, Mode=OneWay}" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto">
<RichTextBox Name="LogBoxRichTextBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="#C8000000" Foreground="White" FontFamily="Consolas" FocusVisualStyle="{StaticResource FocusVisual}" IsReadOnly="True">
Expand Down
Loading

0 comments on commit 8670809

Please sign in to comment.