🐛 修复已知问题

This commit is contained in:
youzi-3222
2025-01-23 08:00:59 +08:00
parent 74a9d18fc5
commit 1b8d164061
2 changed files with 13 additions and 5 deletions
@@ -998,6 +998,7 @@ Retry:
End Function End Function
#End Region #End Region
#Region "不同类型整合包的导出方法" #Region "不同类型整合包的导出方法"
Private Function ExportModrinth(Task As LoaderTask(Of ExportOptions, Boolean)) As Boolean Private Function ExportModrinth(Task As LoaderTask(Of ExportOptions, Boolean)) As Boolean
Try Try
@@ -1005,6 +1006,7 @@ Retry:
Dim DestPath = Task.Input.Dest Dim DestPath = Task.Input.Dest
Dim Additional = Task.Input.Additional Dim Additional = Task.Input.Additional
Dim Name = Task.Input.Name Dim Name = Task.Input.Name
Dim Description = Task.Input.Desc
Dim VerID = Task.Input.VerID Dim VerID = Task.Input.VerID
Log($"[Export] 导出整合包(Modrinth):{Version.Path} -> {DestPath},额外版本文件 {Additional.Count} 个") Log($"[Export] 导出整合包(Modrinth):{Version.Path} -> {DestPath},额外版本文件 {Additional.Count} 个")
Dim tempDir As String = $"{ExpTempDir}{GetUuid()}\" Dim tempDir As String = $"{ExpTempDir}{GetUuid()}\"
@@ -1121,7 +1123,7 @@ JumpMod:
{"formatVersion", 1}, {"formatVersion", 1},
{"versionId", VerID}, {"versionId", VerID},
{"name", If(String.IsNullOrEmpty(Name), Version.Name, Name)}, {"name", If(String.IsNullOrEmpty(Name), Version.Name, Name)},
{"summary", Version.Info}, {"summary", Description},
{"files", files}, {"files", files},
{"dependencies", depend} {"dependencies", depend}
} }
@@ -9,10 +9,16 @@
AniControlEnabled += 1 AniControlEnabled += 1
If CurrentVer <> PageVersionLeft.Version.Path Then If CurrentVer <> PageVersionLeft.Version.Path Then
'说明切换到另一个版本了,所有的绝对路径都要重置,否则爆炸 '说明切换到另一个版本了,所有的设置都要重置
CurrentPath = "" CurrentPath = ""
Selected = New List(Of String) Selected = New List(Of String)
CurrentVer = PageVersionLeft.Version.Path CurrentVer = PageVersionLeft.Version.Path
TbExportName.Text = ""
TbExportVersion.Text = ""
ComboDisplayLogo.SelectedIndex = 0
CustomLogoVal = Nothing
TbExportDesc.Text = ""
End If End If
TbExportName.ShowValidateResult = True TbExportName.ShowValidateResult = True
@@ -216,11 +222,10 @@
'复选框与高级选项同步 '复选框与高级选项同步
Private Sub PanCommonFiles_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs) Handles PanCommonFiles.MouseLeftButtonUp Private Sub PanCommonFiles_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs) Handles PanCommonFiles.MouseLeftButtonUp
For Each c In PanCommonFiles.Children For Each c In PanCommonFiles.Children
If TypeOf c IsNot MyCheckBox Then Continue For
If String.IsNullOrEmpty(c.Tag) Then Continue For If String.IsNullOrEmpty(c.Tag) Then Continue For
For Each l In PanFileList.Children For Each l In PanFileList.Children
If TypeOf l Is MyListItem Then 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 l.Checked = c.Checked
SelectedChange(c.Checked, PageVersionLeft.Version.Path & c.Tag) SelectedChange(c.Checked, PageVersionLeft.Version.Path & c.Tag)
End If End If
@@ -331,7 +336,8 @@
End Sub) End Sub)
Dim Combo = New LoaderCombo(Of ExportOptions)($"导出整合包 {PageVersionLeft.Version.Name}", {Loader}) Dim Combo = New LoaderCombo(Of ExportOptions)($"导出整合包 {PageVersionLeft.Version.Name}", {Loader})
Combo.Start(New ExportOptions(PageVersionLeft.Version, savePath, CheckIncludePCL.Checked, contains.Distinct.ToArray, 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) LoaderTaskbarAdd(Combo)
End Sub End Sub