From 1b8d164061a7b984c721a6262593e60285d89909 Mon Sep 17 00:00:00 2001
From: youzi-3222 <youzi_2333@163.com>
Date: Thu, 23 Jan 2025 08:00:59 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modules/Minecraft/ModModpack.vb                |  4 +++-
 .../Pages/PageVersion/PageVersionExport.xaml.vb    | 14 ++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
index 741ff4d..8d49ff3 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb	
@@ -998,6 +998,7 @@ Retry:
     End Function
 
 #End Region
+
 #Region "不同类型整合包的导出方法"
     Private Function ExportModrinth(Task As LoaderTask(Of ExportOptions, Boolean)) As Boolean
         Try
@@ -1005,6 +1006,7 @@ Retry:
             Dim DestPath = Task.Input.Dest
             Dim Additional = Task.Input.Additional
             Dim Name = Task.Input.Name
+            Dim Description = Task.Input.Desc
             Dim VerID = Task.Input.VerID
             Log($"[Export] 导出整合包（Modrinth）：{Version.Path} -> {DestPath}，额外版本文件 {Additional.Count} 个")
             Dim tempDir As String = $"{ExpTempDir}{GetUuid()}\"
@@ -1121,7 +1123,7 @@ JumpMod:
                 {"formatVersion", 1},
                 {"versionId", VerID},
                 {"name", If(String.IsNullOrEmpty(Name), Version.Name, Name)},
-                {"summary", Version.Info},
+                {"summary", Description},
                 {"files", files},
                 {"dependencies", depend}
             }
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb
index c6fb5d7..8486bbe 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml.vb	
@@ -9,10 +9,16 @@
         AniControlEnabled += 1
 
         If CurrentVer <> PageVersionLeft.Version.Path Then
-            '说明切换到另一个版本了，所有的绝对路径都要重置，否则爆炸
+            '说明切换到另一个版本了，所有的设置都要重置
             CurrentPath = ""
             Selected = New List(Of String)
             CurrentVer = PageVersionLeft.Version.Path
+
+            TbExportName.Text = ""
+            TbExportVersion.Text = ""
+            ComboDisplayLogo.SelectedIndex = 0
+            CustomLogoVal = Nothing
+            TbExportDesc.Text = ""
         End If
 
         TbExportName.ShowValidateResult = True
@@ -216,11 +222,10 @@
     '复选框与高级选项同步
     Private Sub PanCommonFiles_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs) Handles PanCommonFiles.MouseLeftButtonUp
         For Each c In PanCommonFiles.Children
-            If TypeOf c IsNot MyCheckBox Then Continue For
             If String.IsNullOrEmpty(c.Tag) Then Continue For
             For Each l In PanFileList.Children
                 If TypeOf l Is MyListItem Then
-                    If l.Tag.Replace("\", "") = c.Tag Then
+                    If If(l.Tag.EndsWith("\"), GetFolderNameFromPath(l.Tag), GetFileNameFromPath(l.Tag)) = c.Tag Then
                         l.Checked = c.Checked
                         SelectedChange(c.Checked, PageVersionLeft.Version.Path & c.Tag)
                     End If
@@ -331,7 +336,8 @@
         End Sub)
         Dim Combo = New LoaderCombo(Of ExportOptions)($"导出整合包 {PageVersionLeft.Version.Name}", {Loader})
         Combo.Start(New ExportOptions(PageVersionLeft.Version, savePath, CheckIncludePCL.Checked, contains.Distinct.ToArray,
-                                       PCLSetupGlobal:=CheckIncludeSetup.Checked, Name:=TbExportName.Text, VerID:=TbExportVersion.Text))
+                                       PCLSetupGlobal:=CheckIncludeSetup.Checked, Name:=TbExportName.Text, Desc:=TbExportDesc.Text,
+                                       VerID:=TbExportVersion.Text))
         LoaderTaskbarAdd(Combo)
     End Sub