up 修复导入问题

Coloryr · Jul 20, 2024 · 501f7f6 · 501f7f6
1 parent c3d5d5b
commit 501f7f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/ColorMC.Core/CoreMain.cs b/src/ColorMC.Core/CoreMain.cs
@@ -15,7 +15,7 @@ namespace ColorMC.Core;
 public static class ColorMCCore
 {
     public const string TopVersion = "A27";
-    public const string DateVersion = "20240719";
+    public const string DateVersion = "20240720";
 
     /// <summary>
     /// 版本号

diff --git a/src/ColorMC.Core/Helpers/AddGameHelper.cs b/src/ColorMC.Core/Helpers/AddGameHelper.cs
@@ -31,6 +31,7 @@ public static async Task<GameRes> AddGame(AddGameArg arg)
         GameSettingObj? game = null;
 
         bool isfind = false;
+        bool ismmc = false;
 
         var file1 = Path.GetFullPath(arg.Local + "/" + "mmc-pack.json");
         var file2 = Path.GetFullPath(arg.Local + "/" + "instance.cfg");
@@ -44,6 +45,7 @@ public static async Task<GameRes> AddGame(AddGameArg arg)
                     var mmc1 = PathHelper.ReadText(file2)!;
                     game = mmc.ToColorMC(mmc1, out var icon);
                     game.Icon = icon + ".png";
+                    ismmc = true;
                     isfind = true;
                 }
             }
@@ -108,7 +110,7 @@ public static async Task<GameRes> AddGame(AddGameArg arg)
             };
         }
 
-        await game.CopyFile(arg.Local, arg.Unselect);
+        await game.CopyFile(arg.Local, arg.Unselect, ismmc);
 
         return new GameRes
         {

diff --git a/src/ColorMC.Core/Helpers/GameHelper.cs b/src/ColorMC.Core/Helpers/GameHelper.cs
@@ -808,6 +808,7 @@ public static List<string> ScanVersions(string dir)
     {
         var list = new List<string>();
         var dirs = PathHelper.GetDirs(dir);
+        dirs.Insert(0, new DirectoryInfo(dir));
         foreach (var item in dirs)
         {
             if (item.Name == "versions")

diff --git a/src/ColorMC.Core/LaunchPath/InstancesPath.cs b/src/ColorMC.Core/LaunchPath/InstancesPath.cs
@@ -995,9 +995,10 @@ public static Task<bool> Remove(this GameSettingObj obj, ColorMCCore.Request? re
     /// <param name="obj">游戏实例</param>
     /// <param name="local">目标地址</param>
     /// <param name="unselect">未选择的文件</param>
+    /// <param name="dir">根目录方式复制</param>
     /// <returns></returns>
     public static async Task CopyFile(this GameSettingObj obj,
-        string local, List<string>? unselect)
+        string local, List<string>? unselect, bool dir)
     {
         local = Path.GetFullPath(local);
         var list = PathHelper.GetAllFile(local);
@@ -1006,7 +1007,7 @@ public static async Task CopyFile(this GameSettingObj obj,
             list.RemoveAll(item => unselect.Contains(item.FullName));
         }
         int basel = local.Length;
-        var local1 = obj.GetGamePath();
+        var local1 = dir ? obj.GetBasePath() : obj.GetGamePath();
         await Task.Run(() =>
         {
             foreach (var item in list)