合并开发分支，自动构建

src/KuroGameDownloadProgram/KuroGameDownloadProgram.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<LangVersion>preview</LangVersion>
@@ -23,4 +23,10 @@
     <Folder Include="Services\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="Assets\HpatchzResource\hpatchz.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

src/KuroGameDownloadProgram/Program.cs

@@ -1,41 +1,139 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using System.Text.Json;
+using CommunityToolkit.Mvvm.ComponentModel;
 using Haiyu.Plugin.Services;
 using Haiyu.RpcClient;
 using KuroGameDownloadProgram;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using System.Text.Json;
 using Waves.Api.Models;
 using Waves.Api.Models.GameWikiiClient;
 using Waves.Core;
 using Waves.Core.Common;
 using Waves.Core.Contracts;
 using Waves.Core.GameContext;
 using Waves.Core.GameContext.Contexts;
+using Waves.Core.GameContext.ContextsV2;
 using Waves.Core.Helpers;
 using Waves.Core.Models;
+using Waves.Core.Models.CoreApi;
 using Waves.Core.Models.Downloader;
+using Waves.Core.Models.Enums;
 using Waves.Core.Services;
 using Waves.Core.Settings;
 
+GameContextFactory.GameBassPath =
+    Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Waves";
+
 IHost host = Host.CreateDefaultBuilder(args)
     .ConfigureServices(services =>
     {
         services.AddGameContext();
         services.AddSingleton<CloudGameService>();
-        services.AddSingleton<CloudConfigManager>((s) =>
-        {
-            return new CloudConfigManager(AppSettings.CloudFolderPath);
-        });
-        services.AddSingleton<IHttpClientService,HttpClientService>();
+        services.AddSingleton<CloudConfigManager>(
+            (s) =>
+            {
+                return new CloudConfigManager(AppSettings.CloudFolderPath);
+            }
+        );
+        services.AddSingleton<IHttpClientService, HttpClientService>();
         services.AddSingleton<AppSettings>();
+        services.AddKeyedSingleton<LoggerService>(
+            "AppLog",
+            (s, e) =>
+            {
+                var logger = new LoggerService();
+                logger.InitLogger(AppSettings.LogPath, Serilog.RollingInterval.Day);
+                return logger;
+            }
+        );
     })
     .Build();
-GameContextFactory.GameBassPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "\\Waves";
-var mainGame = host.Services.GetRequiredKeyedService<IGameContext>(nameof(PunishMainGameContext));
-await mainGame.InitAsync();
-var launcher = await mainGame.GetGameLauncherSourceAsync(null);
-var previous = launcher
-            .ResourceDefault.Config.PatchConfig.Last();
-
-Console.ReadLine();
+
+var v2 = host.Services.GetRequiredKeyedService<IGameContextV2>(nameof(WavesMainGameContextV2));
+await v2.InitAsync();
+v2.ProgressState.OnProgressChanged += (t) =>
+{
+    int oldLeft = Console.CursorLeft;
+    int oldTop = Console.CursorTop;
+    try
+    {
+        Console.SetCursorPosition(0, 0);
+        double percentage = t.Percentage;
+        string progressBar = "[";
+        int filledTabs = (int)(percentage / 2);
+        progressBar += new string('=', filledTabs);
+        progressBar += new string(' ', 50 - filledTabs);
+        progressBar += $"] {percentage,6:F2}%";
+        Console.Write(progressBar.PadRight(Console.WindowWidth - 1));
+        Console.SetCursorPosition(0, 1);
+        string stepInfo =
+            $"IsProd:{t.Prod} Step {t.CurrentStepIndex + 1}/{t.TotalSteps}: {t.StepName} | Action: {t.CurrentAction} | {t.CurrentStepTip}";
+        Console.Write(stepInfo.PadRight(Console.WindowWidth - 1));
+        Console.SetCursorPosition(0, 2);
+        string currentFile =
+            $"Current File: {System.IO.Path.GetFileName(t.FilePath)} | {GameProgressTracker.FormatBytes(t.FileCurrentSize)} / {GameProgressTracker.FormatBytes(t.FileTotalSize)}";
+        Console.Write(currentFile.PadRight(Console.WindowWidth - 1));
+        Console.SetCursorPosition(0, 3);
+        string speedInfo =
+            $"Speed: {t.GetSpeedText()} | Bytes: {GameProgressTracker.FormatBytes(t.CurrentBytes)} / {GameProgressTracker.FormatBytes(t.TotalBytes)}";
+        Console.Write(speedInfo.PadRight(Console.WindowWidth - 1));
+        int line = 4;
+        Console.SetCursorPosition(0, line++);
+        Console.Write("Active Files:".PadRight(Console.WindowWidth - 1));
+        var activeSnap = t.ActiveFiles.ToArray();
+        foreach (var file in activeSnap)
+        {
+            Console.SetCursorPosition(0, line++);
+            string fileInfo =
+                $" -> {file.Key}: {GameProgressTracker.FormatBytes(file.Value.Current)} / {GameProgressTracker.FormatBytes(file.Value.Total)}";
+            Console.Write(fileInfo.PadRight(Console.WindowWidth - 1));
+        }
+        for (int i = 0; i < 5; i++)
+        {
+            Console.SetCursorPosition(0, line + i);
+            Console.Write(new string(' ', Console.WindowWidth - 1));
+        }
+    }
+    catch { }
+    finally
+    {
+        Console.SetCursorPosition(0, 15);
+    }
+};
+
+Console.Clear();
+Console.SetCursorPosition(0, 15);
+await v2.StartInstallGameResource(true);
+while (true)
+{
+    Console.WriteLine("Q停止，P暂停，R恢复，输入数字设定下载速度（MB）,回车确认");
+    var input = Console.ReadLine();
+    switch (input)
+    {
+        case "Q":
+            await v2.StopCannelTaskAsync();
+            return;
+        case "P":
+            await v2.PauseDownloadAsync();
+            break;
+        case "R":
+            await v2.ResumeDownloadAsync();
+            break;
+        case var s when long.TryParse(s, out long speed):
+            await v2.SetDownloadSpeedAsync(speed);
+            break;
+    }
+}
+
+
+public class TestContext : KuroGameContextBaseV2
+{
+    public TestContext(KuroGameApiConfig config, string contextName)
+        : base(config, contextName) { }
+
+    public override string GameContextNameKey => throw new NotImplementedException();
+
+    public override GameType GameType => throw new NotImplementedException();
+
+    public override Type ContextType => throw new NotImplementedException();
+}

src/Project.WPFUninstaller/MainWindow.xaml.cs

@@ -14,7 +14,7 @@ namespace Project.WPFUninstaller
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
-    public partial class MainWindow : Window
+    public partial class MainWindow
     {
         public MainWindow()
         {

src/Setup/Project.WPFSetup/Common/SetupProperty.cs

@@ -23,7 +23,7 @@ public class SetupProperty
     public IList<ISetup> UnSetups { get; private set; }
     public string InstallExeName { get; internal set; }
 
-    public string HelpLink => "https://www.github.com/blametwo/Haiyu.git";
+    public string HelpLink => "https://github.com/HaiyuGame/Haiyu/issues";
 
     public string UnInstallArgs { get; internal set; }
 

src/Setup/Project.WPFSetup/Common/Setups/DecompressionSetup.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.IO.Compression;
+using System.Text.Json;
 using SharpCompress.Archives.SevenZip;
 
 namespace Project.WPFSetup.Common.Setups;
@@ -30,6 +31,7 @@ public DecompressionSetup() { }
     {
         try
         {
+            List<string> installFile = new List<string>();
             using (var memoryStream = new MemoryStream(fileBuffer))
             using (var archive = SharpCompress.Archives.Zip.ZipArchive.Open(memoryStream))
             {
@@ -80,8 +82,24 @@ await fileStream
                                 progress?.Report((percentComplete, SetupName));
                             }
                         }
+                        installFile.Add(path);
+                        //创建卸载快照
                     }
                 }
+
+                var datFile = Path.Combine(rootDir, "unstall.dat");
+                var unstallexe = Path.Combine(rootDir, "uninstall.exe");
+                if (File.Exists(datFile))
+                {
+                    File.Delete(datFile);
+                }
+                installFile.Add(datFile);
+                installFile.Add(unstallexe);
+                var datFs = File.CreateText(datFile);
+                var jsonStr = JsonSerializer.Serialize(installFile);
+                await datFs.WriteLineAsync(jsonStr);
+                await datFs.FlushAsync();
+                datFs.Dispose();
             }
             return ("", true);
         }

src/Setup/Project.WPFSetup/Common/Setups/DeleteInstallFolderSetup.cs

@@ -1,5 +1,6 @@
 using System.IO;
 using System.IO.Compression;
+using System.Text.Json;
 
 namespace Project.WPFSetup.Common.Setups;
 
@@ -23,58 +24,43 @@ int maxValue
 
     public async Task<bool> Remove(SetupProperty setupProperty, string directoryPath)
     {
-        return await Task.Run(() =>
+        try
         {
-            try
+            return await Task.Run(async () =>
             {
-                if (!Directory.Exists(directoryPath))
+                var installFolder = setupProperty.InstallPath;
+                var uninstallDat = Path.Combine(installFolder, "unstall.dat");
+                var unstallexe = Path.Combine(installFolder, "uninstall.exe");
+                if (File.Exists(uninstallDat))
                 {
-                    Console.WriteLine("指定的目录不存在。");
-                    return true;
+                    var reader = File.OpenText(uninstallDat);
+                    var list = JsonSerializer.Deserialize<List<string>>(await reader.ReadToEndAsync());
+                    if (list == null)
+                        return true;
+                    try
+                    {
+                        foreach (var file in list)
+                        {
+                            if (File.Exists(file))
+                            {
+                                File.Delete(file);
+                            }
+                        }
+                    }
+                    catch
+                    {
+                    }
+                    reader.Dispose();
                 }
-                Directory.Delete(directoryPath, true);
-                //var bytes = Resources.Resource1.InstallFile;
-                //using MemoryStream memoryStream = new MemoryStream(bytes);
-                //using (ZipArchive zipArchive = new ZipArchive(memoryStream))
-                //{
-                //    var files = zipArchive.Entries.Select(x => x.FullName).ToArray();
-                //    foreach (
-                //        var file in Directory.GetFiles(
-                //            directoryPath,
-                //            "*.*",
-                //            SearchOption.TopDirectoryOnly
-                //        )
-                //    )
-                //    {
-                //        try
-                //        {
-                //            File.Delete(file);
-                //            Console.WriteLine($"已删除文件: {file}");
-                //        }
-                //        catch (Exception ex)
-                //        {
-                //            Console.WriteLine($"无法删除文件 {file}: {ex.Message}");
-                //        }
-                //    }
-                //    foreach (
-                //        var dir in Directory.GetDirectories(
-                //            directoryPath,
-                //            "*",
-                //            SearchOption.TopDirectoryOnly
-                //        )
-                //    )
-                //    {
-                //        try
-                //        {
-                //            Directory.Delete(dir, true);
-                //        }
-                //        catch (Exception) { }
-                //    }
-                //}
-
-            }
-            catch (Exception ex) { }
-            return true;
-        });
+                File.Delete(uninstallDat);
+                File.Delete(unstallexe);
+                return true;
+            });
+        }
+        catch (Exception)
+        {
+            return false;
+        }
+
     }
 }