Official Release v1.8

IchimakiKasura · Aug 4, 2023 · 0b2a052 · 0b2a052
1 parent f94ec0a
commit 0b2a052
Show file tree

Hide file tree

Showing 26 changed files with 535 additions and 422 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -28,7 +28,6 @@
             "args": [
                 "publish",
                 "-c:Preview",
-                "-p:DefineConstants=IsPreviewBuild",
                 "${workspaceFolder}\\src\\HoyoLauncher.csproj"
             ]
         },

diff --git a/readme.md b/readme.md
@@ -23,7 +23,7 @@ The App requires [NET-7](https://download.visualstudio.microsoft.com/download/pr
 |![](readme/MainOverview/main.jpg)|
 <div align="center">
 
-_this picture was taken using previewbuild version 1.8.0.3_
+_this picture was taken using previewbuild version 1.8.804.5_
 
 </div>
 
@@ -36,7 +36,7 @@ _this picture was taken using previewbuild version 1.8.0.3_
 |![](readme/MainOverview/update.jpg)|![](readme/MainOverview/download.jpg)|
 <div align="center">
 
-_these picture was taken using previewbuild version from 1.8.0.3 to 1.8.705.4_
+_these picture was taken using previewbuild version from 1.8.0.3 to 1.8.804.5_
 
 </div>
 

diff --git a/readme/MainOverview/download.jpg b/readme/MainOverview/download.jpg
diff --git a/readme/MainOverview/main.jpg b/readme/MainOverview/main.jpg
diff --git a/readme/MainOverview/update.jpg b/readme/MainOverview/update.jpg
diff --git a/src/HoyoLauncher.Controls/SideButtons/HoyoButton.xaml b/src/HoyoLauncher.Controls/SideButtons/HoyoButton.xaml
@@ -1,9 +1,6 @@
 <UserControl x:Class="HoyoLauncher.Controls.SideButtons.HoyoButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
              Name="root">
 
     <Button Name="mainButton" Click="Clicked">

diff --git a/src/HoyoLauncher.Core/EventHandlers/Events.cs b/src/HoyoLauncher.Core/EventHandlers/Events.cs
@@ -39,7 +39,7 @@ public static void PreDownloadButton()
         {
             if(e.ChangedButton is not MouseButton.Left) return;
 
-            if(Directory.GetFiles(HoyoMain.CurrentGameSelected.GAME_INSTALL_PATH, "*.zip").Length >= 1)
+            if(Directory.GetFiles(HoyoMain.CurrentGameSelected.GAME_INSTALL_PATH, "*.*").Where(s=>s.EndsWith(".zip") || s.EndsWith(".7z")).Any())
             {
                 HoyoMessageBox.Show(HoyoWindow.Title, "The file is already downloaded!\r\rIf the download was stopped last time, It need to be re-downloaded again by deleting the file.\r", HoyoWindow);
                 return;

diff --git a/src/HoyoLauncher.Core/EventHandlers/WindowEvents/WindowLaunchButton.cs b/src/HoyoLauncher.Core/EventHandlers/WindowEvents/WindowLaunchButton.cs
@@ -18,7 +18,7 @@ private static async void EventClick(object s, RoutedEventArgs e)
 
         if(!Equals(HoyoWindow.LaunchButton.Content, LaunchText.GAME_DEFAULT_TEXT))
         {
-            if(Directory.GetFiles(HoyoMain.CurrentGameSelected.GAME_INSTALL_PATH, "*.zip").Length > 0)
+            if(Directory.GetFiles(HoyoMain.CurrentGameSelected.GAME_INSTALL_PATH, "*.*").Where(s=>s.EndsWith(".zip") || s.EndsWith(".7z")).Any())
             {
                 HoyoMain.ProcessStart(HoyoMain.ExecutableName);
                 HoyoMessageBox.Show("A Very Cool Message Box", "Opening Original Launcher to Update the game!\r\rIf the File is downloaded, You can just press the Update again on the Original Launcher\rAnd it will extract it smoothly.\r\r If the File was stopped mid-way of downloading, It will resume its progress on the Original Launcher.\r", HoyoWindow);

diff --git a/src/HoyoLauncher.Core/GameChanger/FetchAPI.cs b/src/HoyoLauncher.Core/GameChanger/FetchAPI.cs
@@ -1,3 +1,5 @@
+using System.Text.RegularExpressions;
+
 namespace HoyoLauncher.Core.GameChanger;
 
 public sealed partial class GameChange : HoyoMain
@@ -24,7 +26,7 @@ static async Task<HoyoValues> FetchAPI(GameConfigRead GameConfig, HoyoValues val
         if(!CurrentGameSelected.GAME_CONFIG_CACHE.GameConfigExist)
             return values;
 
-        if (GameAPI is { DownloadFile: not null } && Directory.GetFiles(CurrentGameSelected.GAME_INSTALL_PATH, "*.zip").Length >= 1)
+        if (GameAPI is { DownloadFile: not null } && Directory.GetFiles(CurrentGameSelected.GAME_INSTALL_PATH, "*.*").Where(s=>s.EndsWith(".zip") || s.EndsWith(".7z")).Any())
         {
             values.VersionBubble = Visibility.Collapsed;
 

diff --git a/src/HoyoLauncher.Core/HoyoMain.cs b/src/HoyoLauncher.Core/HoyoMain.cs
@@ -105,7 +105,7 @@ static void AppFirstRun()
         HoyoWindow.Loaded += async (s, e) =>
         {
             await Task.Delay(1000);
-            new ShortTour { Owner = HoyoWindow }.ShowDialog();
+            new ShortTourWindow { Owner = HoyoWindow }.ShowDialog();
         };
 
         App.Config.FIRST_RUN = true;

diff --git a/src/ShorTour.xaml → src/HoyoLauncher.ShortTour/ShorTour.xaml b/src/ShorTour.xaml → src/HoyoLauncher.ShortTour/ShorTour.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="HoyoLauncher.ShortTour"
+<Window x:Class="HoyoLauncher.ShortTour.ShortTourWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         WindowStartupLocation="CenterOwner"

diff --git a/src/ShorTour.xaml.cs → src/HoyoLauncher.ShortTour/ShorTour.xaml.cs b/src/ShorTour.xaml.cs → src/HoyoLauncher.ShortTour/ShorTour.xaml.cs
@@ -1,21 +1,21 @@
-namespace HoyoLauncher;
+namespace HoyoLauncher.ShortTour;
 
-public partial class ShortTour : Window
+public partial class ShortTourWindow : Window
 {
     [StaticWindow]
-    public static ShortTour ShortTourWindow { get; set; }
+    public static ShortTourWindow ShortTourWindowStatic { get; set; }
 
     static int CurrentImage;
-    public ShortTour()
+    public ShortTourWindow()
     {
         InitializeComponent();
 
-        ShortTourWindow = this;
+        ShortTourWindowStatic = this;
 
         CurrentImage = 1;
 
         HoyoWindow.BLACK_THING.Visibility = Visibility.Visible;
-        WindowDrag.MouseDown += App.DragMove<ShortTour>;
+        WindowDrag.MouseDown += App.DragMove<ShortTourWindow>;
 
         MainImageSource.Background = new ImageBrush(ImageLocation());
 

diff --git a/src/HoyoLauncher.csproj b/src/HoyoLauncher.csproj
@@ -6,197 +6,39 @@
         <Nullable>disable</Nullable>
         <UseWPF>true</UseWPF>
         <UseWindowsForms>true</UseWindowsForms>
-        <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies> 
     </PropertyGroup>
 
-    <PropertyGroup>
-        <Authors>IchimakiKasura</Authors>
-        <Company>IchimakiKasura</Company>
-        <AssemblyName>CeeleLauncher</AssemblyName>
-        <Product>CeeleLauncher</Product>
-        <Version>1.8.726.5</Version>
-        <AssemblyVersion>$(Version)</AssemblyVersion>
-        <FileVersion>$(Version)</FileVersion>
-        <Copyright>Copyright © CeeleLauncher 2023</Copyright>
-        <NeutralLanguage>en</NeutralLanguage>
-        <ApplicationIcon>Resources\Icons\256.ico</ApplicationIcon>
-        <SignAssembly>True</SignAssembly>
-        <RepositoryType>https://github.com/IchimakiKasura/CeeleLauncher</RepositoryType>
-        <DebugType>None</DebugType>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$(Configuration) == Debug">
-        <DebugType>portable</DebugType>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="$(Configuration) == Release Or $(Configuration) == Preview">
-        <Optimize>True</Optimize>
-        <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <PublishProtocol>FileSystem</PublishProtocol>
-        <PublishSingleFile>True</PublishSingleFile>
-        <SelfContained>False</SelfContained>
-        <PublishReadyToRun>True</PublishReadyToRun>
-    </PropertyGroup>
-
     <ItemGroup>
-      <ProjectReference Include="..\ini-reader\src\IniParser\IniParser.csproj" />
+        <ProjectReference Include="..\ini-reader\src\IniParser\IniParser.csproj" />
     </ItemGroup>
 
-    <!-- Resources -->
-    <ItemGroup>
-        <!-- Selection Button pictures -->
-        <Resource Include="Resources\Buttons\Selection\GenshinSelectionButton.png" />
-        <Resource Include="Resources\Buttons\Selection\HI3SelectionButton.png" />
-        <Resource Include="Resources\Buttons\Selection\HSRSelectionButton.png" />
-		<Resource Include="Resources\Buttons\Selection\ZZZSelectionButton.png" />
-		<Resource Include="Resources\Buttons\Selection\TOTSelectionButton.png" />
-
-        <!-- Button pictures -->
-        <Resource Include="Resources\Buttons\gear.png" />
-        <Resource Include="Resources\Buttons\GI.jpg" />
-        <Resource Include="Resources\Buttons\HI3.jpg" />
-        <Resource Include="Resources\Buttons\home.png" />
-        <Resource Include="Resources\Buttons\globe.png" />
-		<Resource Include="Resources\Buttons\screenshot.png" />
-		<Resource Include="Resources\Buttons\launcher.png" />
-        <Resource Include="Resources\Buttons\HSR.jpg" />
-        <Resource Include="Resources\Buttons\TOT.jpg" />
-        <Resource Include="Resources\Buttons\ZZZ.jpg" />
-        <Resource Include="Resources\Buttons\PreDownload.png" />
-        <Resource Include="Resources\Buttons\refresh.png" />
-
-        <!-- Icon pictures -->
-        <Resource Include="Resources\Icons\16.ico" />
-        <Resource Include="Resources\Icons\64.ico" />
-        <Resource Include="Resources\Icons\128.ico" />
-        <Resource Include="Resources\Icons\256.ico" />
-
-        <!-- Others uhh pictures -->
-		<Resource Include="Resources\ceele_Icon.png" />
-        <Resource Include="Resources\CeeleLauncher.png" />
-        <Resource Include="Resources\defaultBG.jpg" />
-		<Resource Include="Resources\github.png" />
-
-        <!-- Background pictures -->
-		<Resource Include="Resources\DEFAULT_GENSHIN_BG.jpg" />
-        <Resource Include="Resources\DEFAULT_HSR_BG.jpg" />
-        <Resource Include="Resources\DEFAULT_HI3_BG.jpg" />
-        <Resource Include="Resources\DEFAULT_ZZZ_BG.jpg" />
-		<Resource Include="Resources\DEFAULT_TOT_BG.jpg" />
-
-        <!-- Tour pictures -->
-        <Resource Include="Resources\ShortTour\1.png" />
-        <Resource Include="Resources\ShortTour\2.png" />
-        <Resource Include="Resources\ShortTour\3.png" />
-        <Resource Include="Resources\ShortTour\4.png" />
-        <Resource Include="Resources\ShortTour\5.png" />
-        <Resource Include="Resources\ShortTour\6.png" />
-        <Resource Include="Resources\ShortTour\7.png" />
-        <Resource Include="Resources\ShortTour\8.png" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Using Include="System" />
-        <Using Include="System.IO" />
-        <Using Include="System.Net" />
-        <Using Include="System.Text" />
-        <Using Include="System.Linq" />
-        <Using Include="System.Drawing" Alias="Draw" />
-        <Using Include="System.Windows" />
-        <Using Include="System.Net.Http" />
-        <Using Include="System.Text.Json" />
-        <Using Include="System.Threading" />
-        <Using Include="System.Reflection" />
-        <Using Include="System.Collections.Immutable" />
-        <Using Include="System.Diagnostics" />
-        <Using Include="System.Windows.Forms" Alias="Forms" />
-        <Using Include="System.Windows.Input" />
-        <Using Include="System.Windows.Media" />
-        <Using Include="System.ComponentModel" />
-        <Using Include="System.Threading.Tasks" />
-        <Using Include="System.Windows.Controls" />
-        <Using Include="System.Collections.Generic" />
-        <Using Include="System.Windows.Media.Imaging" />
-        <Using Include="System.Net.NetworkInformation" />
-        <Using Include="System.Runtime.InteropServices" />
-        <Using Include="System.Windows.Media.Animation" />
-    </ItemGroup>
+    <Import Project="props/GlobalUsing.props" />
+    <Import Project="props/AppInfo.props" />
+    <Import Project="props/Publish.props" />
+    <Import Project="props/ItemGroupResources.props" />
+    <Import Project="props/Resx.props" />
 
     <ItemGroup>
         <Using Include="HoyoLauncher.MainWindow" Static="true" />
 
         <Using Include="HoyoLauncher.Core" />
-		<Using Include="HoyoLauncher.Core.API" />
+        <Using Include="HoyoLauncher.Core.API" />
         <Using Include="HoyoLauncher.Core.Config" />
         <Using Include="HoyoLauncher.Core.Record" />
         <Using Include="HoyoLauncher.Core.Attributes" />
         <Using Include="HoyoLauncher.Core.GameChanger" />
-		
+        
         <Using Include="HoyoLauncher.Resources" />
         <Using Include="HoyoLauncher.Resources.Icons" />
-		<Using Include="HoyoLauncher.Resources.Buttons.Selection" />
-
+        <Using Include="HoyoLauncher.Resources.Buttons.Selection" />
+
+        <Using Include="HoyoLauncher.ShortTour" />
         <Using Include="HoyoLauncher.Controls.SideButtons" />
-		<Using Include="HoyoLauncher.HoyoLauncherMessageBox" />
-		
-		<Using Include="AppResources" />
+        <Using Include="HoyoLauncher.HoyoLauncherMessageBox" />
+        
+        <Using Include="AppResources" />
 
-		<Using Include="IniParser" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Compile Update="Properties\ToolTips.Designer.cs">
-          <DependentUpon>ToolTips.resx</DependentUpon>
-          <DesignTime>True</DesignTime>
-          <AutoGen>True</AutoGen>
-        </Compile>
-        <Compile Update="Properties\LaunchText.Designer.cs">
-          <DependentUpon>LaunchText.resx</DependentUpon>
-          <DesignTime>True</DesignTime>
-          <AutoGen>True</AutoGen>
-        </Compile>
-        <Compile Update="Properties\Games.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Games.resx</DependentUpon>
-        </Compile>
-        <Compile Update="HoyoLauncher Core\Settings.Designer.cs">
-            <DesignTimeSharedInput>True</DesignTimeSharedInput>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Settings.settings</DependentUpon>
-        </Compile>
-        <Compile Update="Properties\Settings.Designer.cs">
-          <DesignTimeSharedInput>True</DesignTimeSharedInput>
-          <AutoGen>True</AutoGen>
-          <DependentUpon>Settings.settings</DependentUpon>
-        </Compile>
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Update="Properties\ToolTips.resx">
-          <CustomToolNamespace>AppResources</CustomToolNamespace>
-          <LastGenOutput>ToolTips.Designer.cs</LastGenOutput>
-          <Generator>PublicResXFileCodeGenerator</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Update="Properties\LaunchText.resx">
-          <CustomToolNamespace>AppResources</CustomToolNamespace>
-          <LastGenOutput>LaunchText.Designer.cs</LastGenOutput>
-          <Generator>PublicResXFileCodeGenerator</Generator>
-        </EmbeddedResource>
-        <EmbeddedResource Update="Properties\Games.resx">
-            <Generator>PublicResXFileCodeGenerator</Generator>
-            <LastGenOutput>Games.Designer.cs</LastGenOutput>
-            <CustomToolNamespace>AppResources</CustomToolNamespace>
-        </EmbeddedResource>
+        <Using Include="IniParser" />
     </ItemGroup>
 
-    <ItemGroup>
-        <None Update="Properties\Settings.settings">
-            <Generator>SettingsSingleFileGenerator</Generator>
-            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-            <CustomToolNamespace>AppSettings</CustomToolNamespace>
-        </None>
-    </ItemGroup>
-
 </Project>
diff --git a/src/HoyoLauncher.csproj.user b/src/HoyoLauncher.csproj.user
diff --git a/src/MainWindow.xaml b/src/MainWindow.xaml
@@ -1,11 +1,8 @@
 <Window x:Class="HoyoLauncher.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ButtonControl="clr-namespace:HoyoLauncher.Controls.SideButtons"
         xmlns:TopButtonControl="clr-namespace:HoyoLauncher.Controls.TopButtons"
-        mc:Ignorable="d"
         Title="Ceele Launcher" Height="720" Width="1280"
         WindowStyle="None"
         AllowsTransparency="true"