From fdc56a2a4be338d955c9c13e43be667f6b87ec57 Mon Sep 17 00:00:00 2001 From: ENC_Euphony <2330458484@qq.com> Date: Thu, 7 Aug 2025 16:15:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?style:=20=E4=B8=80=E4=B8=AA=20typo=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Controls/MyCard.vb | 49 +- .../PageDownload/Comp/MyCompItem.xaml.vb | 2 +- .../Comp/PageDownloadCompDetail.xaml.vb | 4 +- .../PageDownload/PageDownloadClient.xaml.vb | 2 +- .../PageDownload/PageDownloadForge.xaml.vb | 2 +- .../PageDownload/PageDownloadInstall.xaml | 14 +- .../PageDownload/PageDownloadInstall.xaml.vb | 72 +- .../PageDownloadLiteLoader.xaml.vb | 2 +- .../PageDownload/PageDownloadNeoForge.xaml.vb | 2 +- .../PageDownload/PageDownloadOptiFine.xaml.vb | 2 +- .../Pages/PageOther/PageOtherAbout.xaml | 981 +++++++++--------- .../Pages/PageOther/PageOtherHelp.xaml.vb | 2 +- .../Pages/PageSelectRight.xaml.vb | 6 +- .../Pages/PageSetup/PageSetupLaunch.xaml | 4 +- .../Pages/PageSetup/PageSetupSystem.xaml | 2 +- .../Pages/PageVersion/PageVersionExport.xaml | 2 +- .../Pages/PageVersion/PageVersionSetup.xaml | 2 +- .../Plain Craft Launcher 2.vbproj | 2 +- Plain Craft Launcher 2/Resources/Custom.xaml | 36 +- 19 files changed, 601 insertions(+), 587 deletions(-) diff --git a/Plain Craft Launcher 2/Controls/MyCard.vb b/Plain Craft Launcher 2/Controls/MyCard.vb index decffd4..47652d9 100644 --- a/Plain Craft Launcher 2/Controls/MyCard.vb +++ b/Plain Craft Launcher 2/Controls/MyCard.vb @@ -90,7 +90,7 @@ MainGrid.Children.Add(MainSwap) End If '改变默认的折叠 - If IsSwaped AndAlso SwapControl IsNot Nothing Then + If IsSwapped AndAlso SwapControl IsNot Nothing Then MainSwap.RenderTransform = New RotateTransform(If(SwapLogoRight, 270, 0)) '取消由于高度变化被迫触发的高度动画 Dim RawUseAnimation As Boolean = UseAnimation @@ -224,7 +224,7 @@ Private ActualUsedHeight As Double '回滚实际高度（例如 NaN） Private Sub MySizeChanged(sender As Object, e As SizeChangedEventArgs) Handles Me.SizeChanged If Not UseAnimation Then Return - Dim DeltaHeight As Double = If(IsSwaped, SwapedHeight, e.NewSize.Height) - e.PreviousSize.Height + Dim DeltaHeight As Double = If(IsSwapped, SwapedHeight, e.NewSize.Height) - e.PreviousSize.Height '卡片的进入时动画已被页面通用切换动画替代 If e.PreviousSize.Height = 0 OrElse IsHeightAnimating OrElse Math.Abs(DeltaHeight) < 1 OrElse ActualHeight = 0 Then Return StartHeightAnimation(DeltaHeight, e.PreviousSize.Height, False) @@ -269,18 +269,18 @@ Sub() IsHeightAnimating = False Height = ActualUsedHeight - If IsSwaped AndAlso SwapControl IsNot Nothing Then SwapControl.Visibility = Visibility.Collapsed + If IsSwapped AndAlso SwapControl IsNot Nothing Then SwapControl.Visibility = Visibility.Collapsed End Sub,, True)) AniStart(AnimList, "MyCard Height " & Uuid) IsHeightAnimating = True - ActualUsedHeight = If(IsSwaped, SwapedHeight, Height) + ActualUsedHeight = If(IsSwapped, SwapedHeight, Height) Height = PreviousHeight End Sub ''' ''' 通知 MyCard，控件内容已改变，需要中断动画并更新高度。 ''' Public Sub TriggerForceResize() - Height = If(IsSwaped, SwapedHeight, Double.NaN) + Height = If(IsSwapped, SwapedHeight, Double.NaN) AniStop("MyCard Height " & Uuid) IsHeightAnimating = False End Sub @@ -300,26 +300,39 @@ ''' ''' 是否已被折叠。 ''' - Public Property IsSwaped As Boolean + Public Property IsSwapped As Boolean Get - Return _IsSwaped + Return _IsSwapped End Get Set(value As Boolean) - If _IsSwaped = value Then Return - _IsSwaped = value + If _IsSwapped = value Then Return + _IsSwapped = value If SwapControl Is Nothing Then Return '展开 - If Not IsSwaped AndAlso TypeOf SwapControl Is StackPanel Then StackInstall(SwapControl, SwapType, Title) + If Not IsSwapped AndAlso TypeOf SwapControl Is StackPanel Then StackInstall(SwapControl, SwapType, Title) '若尚未加载，会在 Loaded 事件中触发无动画的折叠，不需要在这里进行 If Not IsLoaded Then Return '更新高度 SwapControl.Visibility = Visibility.Visible TriggerForceResize() '改变箭头 - AniStart(AaRotateTransform(MainSwap, If(_IsSwaped, If(SwapLogoRight, 270, 0), 180) - CType(MainSwap.RenderTransform, RotateTransform).Angle, 250,, New AniEaseOutFluent(AniEasePower.ExtraStrong)), "MyCard Swap " & Uuid, True) + AniStart(AaRotateTransform(MainSwap, If(_IsSwapped, If(SwapLogoRight, 270, 0), 180) - CType(MainSwap.RenderTransform, RotateTransform).Angle, 250,, New AniEaseOutFluent(AniEasePower.ExtraStrong)), "MyCard Swap " & Uuid, True) + End Set + End Property + Private _IsSwapped As Boolean = False + + ''' + ''' 是否已被折叠。(已过时，请使用 IsSwapped) + ''' + + Public Property IsSwaped As Boolean + Get + Return IsSwapped + End Get + Set(value As Boolean) + IsSwapped = value End Set End Property - Private _IsSwaped As Boolean = False Public Property SwapLogoRight As Boolean = False Private IsMouseDown As Boolean = False @@ -328,8 +341,8 @@ Public Const SwapedHeight As Integer = 40 Private Sub MyCard_MouseLeftButtonDown(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonDown Dim Pos As Double = Mouse.GetPosition(Me).Y - If Not IsSwaped AndAlso - (SwapControl Is Nothing OrElse Pos > If(IsSwaped, SwapedHeight, SwapedHeight - 6) OrElse (Pos = 0 AndAlso Not IsMouseDirectlyOver)) Then Return '检测点击位置；或已经不在可视树上的误判 + If Not IsSwapped AndAlso + (SwapControl Is Nothing OrElse Pos > If(IsSwapped, SwapedHeight, SwapedHeight - 6) OrElse (Pos = 0 AndAlso Not IsMouseDirectlyOver)) Then Return '检测点击位置；或已经不在可视树上的误判 IsMouseDown = True End Sub Private Sub MyCard_MouseLeftButtonUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp @@ -337,8 +350,8 @@ IsMouseDown = False Dim Pos As Double = Mouse.GetPosition(Me).Y - If Not IsSwaped AndAlso - (SwapControl Is Nothing OrElse Pos > If(IsSwaped, SwapedHeight, SwapedHeight - 6) OrElse (Pos = 0 AndAlso Not IsMouseDirectlyOver)) Then Return '检测点击位置；或已经不在可视树上的误判 + If Not IsSwapped AndAlso + (SwapControl Is Nothing OrElse Pos > If(IsSwapped, SwapedHeight, SwapedHeight - 6) OrElse (Pos = 0 AndAlso Not IsMouseDirectlyOver)) Then Return '检测点击位置；或已经不在可视树上的误判 Dim ee = New RouteEventArgs(True) RaiseEvent PreviewSwap(Me, ee) @@ -347,8 +360,8 @@ Return End If - IsSwaped = Not IsSwaped - Log("[Control] " & If(IsSwaped, "折叠卡片", "展开卡片") & If(Title Is Nothing, "", "：" & Title)) + IsSwapped = Not IsSwapped + Log("[Control] " & If(IsSwapped, "折叠卡片", "展开卡片") & If(Title Is Nothing, "", "：" & Title)) RaiseEvent Swap(Me, ee) End Sub Private Sub MyCard_MouseLeave_Swap(sender As Object, e As MouseEventArgs) Handles Me.MouseLeave diff --git a/Plain Craft Launcher 2/Pages/PageDownload/Comp/MyCompItem.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/Comp/MyCompItem.xaml.vb index 12c51af..47b17e9 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/Comp/MyCompItem.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/Comp/MyCompItem.xaml.vb @@ -97,7 +97,7 @@ Dim Titles As New List(Of String) If FrmMain.PageCurrent.Page = FormMain.PageType.CompDetail Then For Each Card As MyCard In FrmDownloadCompDetail.PanResults.Children - If Card.Title <> "" AndAlso Not Card.IsSwaped Then Titles.Add(Card.Title) + If Card.Title <> "" AndAlso Not Card.IsSwapped Then Titles.Add(Card.Title) Next Log("[Comp] 记录当前已展开的卡片：" & String.Join("、", Titles)) FrmMain.PageCurrent.Additional(1) = Titles diff --git a/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageDownloadCompDetail.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageDownloadCompDetail.xaml.vb index 32a0c61..1337e49 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageDownloadCompDetail.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageDownloadCompDetail.xaml.vb @@ -205,7 +205,7 @@ CType(FrmMain.PageCurrent.Additional(1), List(Of String)).Contains(NewCard.Title)) Then MyCard.StackInstall(NewStack, If(PageType = CompType.ModPack, 9, 8), Pair.Key) '9 是安装，8 是另存为 Else - NewCard.IsSwaped = True + NewCard.IsSwapped = True End If '增加提示 If Pair.Key = "其他版本" Then @@ -214,7 +214,7 @@ Next '如果只有一张卡片，展开第一张卡片 If PanResults.Children.Count = 1 Then - CType(PanResults.Children(0), MyCard).IsSwaped = False + CType(PanResults.Children(0), MyCard).IsSwapped = False End If Catch ex As Exception Log(ex, "可视化工程下载列表出错", LogLevel.Feedback) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index 2af82b7..78c963c 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -88,7 +88,7 @@ Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Pair.Value} NewCard.Children.Add(NewStack) NewCard.SwapControl = NewStack - NewCard.IsSwaped = True + NewCard.IsSwapped = True PanMain.Children.Add(NewCard) Next Catch ex As Exception diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadForge.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadForge.xaml.vb index 04a74e0..b7f42f0 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadForge.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadForge.xaml.vb @@ -19,7 +19,7 @@ Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Version} NewCard.Children.Add(NewStack) NewCard.SwapControl = NewStack - NewCard.IsSwaped = True + NewCard.IsSwapped = True PanMain.Children.Add(NewCard) Next ''非官方源警示 diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml index 35c1a4e..79fa3ce 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml @@ -27,7 +27,7 @@ - + @@ -45,7 +45,7 @@ Data="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z" /> - + @@ -63,7 +63,7 @@ Data="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z" /> - + @@ -81,7 +81,7 @@ Data="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z" /> - + @@ -99,7 +99,7 @@ Data="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z" /> - + @@ -119,7 +119,7 @@ Data="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z" /> - + @@ -137,7 +137,7 @@ Data="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z" /> - + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 61eedf1..b099c60 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -54,13 +54,13 @@ DisabledPageAnimControls.Remove(BtnStart) BtnStart.Show = True - CardOptiFine.IsSwaped = True - CardLiteLoader.IsSwaped = True - CardForge.IsSwaped = True - CardNeoForge.IsSwaped = True - CardFabric.IsSwaped = True - CardFabricApi.IsSwaped = True - CardOptiFabric.IsSwaped = True + CardOptiFine.IsSwapped = True + CardLiteLoader.IsSwapped = True + CardForge.IsSwapped = True + CardNeoForge.IsSwapped = True + CardFabric.IsSwapped = True + CardFabricApi.IsSwapped = True + CardOptiFabric.IsSwapped = True If Not Setup.Get("HintInstallBack") Then Setup.Set("HintInstallBack", True) @@ -318,8 +318,8 @@ 'OptiFine Dim OptiFineError As String = LoadOptiFineGetError() CardOptiFine.MainSwap.Visibility = If(OptiFineError Is Nothing, Visibility.Visible, Visibility.Collapsed) - If OptiFineError IsNot Nothing Then CardOptiFine.IsSwaped = True '例如在同时展开卡片时选择了不兼容项则强制折叠 - SetOptiFineInfoShow(CardOptiFine.IsSwaped) + If OptiFineError IsNot Nothing Then CardOptiFine.IsSwapped = True '例如在同时展开卡片时选择了不兼容项则强制折叠 + SetOptiFineInfoShow(CardOptiFine.IsSwapped) If SelectedOptiFine Is Nothing Then BtnOptiFineClear.Visibility = Visibility.Collapsed ImgOptiFine.Visibility = Visibility.Collapsed @@ -338,8 +338,8 @@ CardLiteLoader.Visibility = Visibility.Visible Dim LiteLoaderError As String = LoadLiteLoaderGetError() CardLiteLoader.MainSwap.Visibility = If(LiteLoaderError Is Nothing, Visibility.Visible, Visibility.Collapsed) - If LiteLoaderError IsNot Nothing Then CardLiteLoader.IsSwaped = True '例如在同时展开卡片时选择了不兼容项则强制折叠 - SetLiteLoaderInfoShow(CardLiteLoader.IsSwaped) + If LiteLoaderError IsNot Nothing Then CardLiteLoader.IsSwapped = True '例如在同时展开卡片时选择了不兼容项则强制折叠 + SetLiteLoaderInfoShow(CardLiteLoader.IsSwapped) If SelectedLiteLoader Is Nothing Then BtnLiteLoaderClear.Visibility = Visibility.Collapsed ImgLiteLoader.Visibility = Visibility.Collapsed @@ -355,8 +355,8 @@ 'Forge Dim ForgeError As String = LoadForgeGetError() CardForge.MainSwap.Visibility = If(ForgeError Is Nothing, Visibility.Visible, Visibility.Collapsed) - If ForgeError IsNot Nothing Then CardForge.IsSwaped = True - SetForgeInfoShow(CardForge.IsSwaped) + If ForgeError IsNot Nothing Then CardForge.IsSwapped = True + SetForgeInfoShow(CardForge.IsSwapped) If SelectedForge Is Nothing Then BtnForgeClear.Visibility = Visibility.Collapsed ImgForge.Visibility = Visibility.Collapsed @@ -375,8 +375,8 @@ CardNeoForge.Visibility = Visibility.Visible Dim NeoForgeError As String = LoadNeoForgeGetError() CardNeoForge.MainSwap.Visibility = If(NeoForgeError Is Nothing, Visibility.Visible, Visibility.Collapsed) - If NeoForgeError IsNot Nothing Then CardNeoForge.IsSwaped = True - SetNeoForgeInfoShow(CardNeoForge.IsSwaped) + If NeoForgeError IsNot Nothing Then CardNeoForge.IsSwapped = True + SetNeoForgeInfoShow(CardNeoForge.IsSwapped) If SelectedNeoForge Is Nothing Then BtnNeoForgeClear.Visibility = Visibility.Collapsed ImgNeoForge.Visibility = Visibility.Collapsed @@ -396,8 +396,8 @@ CardFabric.Visibility = Visibility.Visible Dim FabricError As String = LoadFabricGetError() CardFabric.MainSwap.Visibility = If(FabricError Is Nothing, Visibility.Visible, Visibility.Collapsed) - If FabricError IsNot Nothing Then CardFabric.IsSwaped = True - SetFabricInfoShow(CardFabric.IsSwaped) + If FabricError IsNot Nothing Then CardFabric.IsSwapped = True + SetFabricInfoShow(CardFabric.IsSwapped) If SelectedFabric Is Nothing Then BtnFabricClear.Visibility = Visibility.Collapsed ImgFabric.Visibility = Visibility.Collapsed @@ -417,8 +417,8 @@ CardFabricApi.Visibility = Visibility.Visible Dim FabricApiError As String = LoadFabricApiGetError() CardFabricApi.MainSwap.Visibility = If(FabricApiError Is Nothing, Visibility.Visible, Visibility.Collapsed) - If FabricApiError IsNot Nothing OrElse SelectedFabric Is Nothing Then CardFabricApi.IsSwaped = True - SetFabricApiInfoShow(CardFabricApi.IsSwaped) + If FabricApiError IsNot Nothing OrElse SelectedFabric Is Nothing Then CardFabricApi.IsSwapped = True + SetFabricApiInfoShow(CardFabricApi.IsSwapped) If SelectedFabricApi Is Nothing Then BtnFabricApiClear.Visibility = Visibility.Collapsed ImgFabricApi.Visibility = Visibility.Collapsed @@ -438,8 +438,8 @@ CardOptiFabric.Visibility = Visibility.Visible Dim OptiFabricError As String = LoadOptiFabricGetError() CardOptiFabric.MainSwap.Visibility = If(OptiFabricError Is Nothing, Visibility.Visible, Visibility.Collapsed) - If OptiFabricError IsNot Nothing OrElse SelectedFabric Is Nothing Then CardOptiFabric.IsSwaped = True - SetOptiFabricInfoShow(CardOptiFabric.IsSwaped) + If OptiFabricError IsNot Nothing OrElse SelectedFabric Is Nothing Then CardOptiFabric.IsSwapped = True + SetOptiFabricInfoShow(CardOptiFabric.IsSwapped) If SelectedOptiFabric Is Nothing Then BtnOptiFabricClear.Visibility = Visibility.Collapsed ImgOptiFabric.Visibility = Visibility.Collapsed @@ -639,7 +639,7 @@ Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Pair.Value} NewCard.Children.Add(NewStack) NewCard.SwapControl = NewStack - NewCard.IsSwaped = True + NewCard.IsSwapped = True PanMinecraft.Children.Add(NewCard) Next '自动选择版本 @@ -755,14 +755,14 @@ OptiFabric_Loaded() Forge_Loaded() NeoForge_Loaded() - CardOptiFine.IsSwaped = True + CardOptiFine.IsSwapped = True SelectReload() End Sub Private Sub OptiFine_Clear(sender As Object, e As MouseButtonEventArgs) Handles BtnOptiFineClear.MouseLeftButtonUp SelectedOptiFine = Nothing SelectedOptiFabric = Nothing AutoSelectedOptiFabric = False - CardOptiFine.IsSwaped = True + CardOptiFine.IsSwapped = True e.Handled = True Forge_Loaded() NeoForge_Loaded() @@ -816,12 +816,12 @@ '选择与清除 Private Sub LiteLoader_Selected(sender As MyListItem, e As EventArgs) SelectedLiteLoader = sender.Tag - CardLiteLoader.IsSwaped = True + CardLiteLoader.IsSwapped = True SelectReload() End Sub Private Sub LiteLoader_Clear(sender As Object, e As MouseButtonEventArgs) Handles BtnLiteLoaderClear.MouseLeftButtonUp SelectedLiteLoader = Nothing - CardLiteLoader.IsSwaped = True + CardLiteLoader.IsSwapped = True e.Handled = True SelectReload() End Sub @@ -902,14 +902,14 @@ '选择与清除 Private Sub Forge_Selected(sender As MyListItem, e As EventArgs) SelectedForge = sender.Tag - CardForge.IsSwaped = True + CardForge.IsSwapped = True If SelectedOptiFine IsNot Nothing AndAlso Not IsOptiFineSuitForForge(SelectedOptiFine, SelectedForge) Then SelectedOptiFine = Nothing OptiFine_Loaded() SelectReload() End Sub Private Sub Forge_Clear(sender As Object, e As MouseButtonEventArgs) Handles BtnForgeClear.MouseLeftButtonUp SelectedForge = Nothing - CardForge.IsSwaped = True + CardForge.IsSwapped = True e.Handled = True OptiFine_Loaded() SelectReload() @@ -964,13 +964,13 @@ '选择与清除 Private Sub NeoForge_Selected(sender As MyListItem, e As EventArgs) SelectedNeoForge = sender.Tag - CardNeoForge.IsSwaped = True + CardNeoForge.IsSwapped = True OptiFine_Loaded() SelectReload() End Sub Private Sub NeoForge_Clear(sender As Object, e As MouseButtonEventArgs) Handles BtnNeoForgeClear.MouseLeftButtonUp SelectedNeoForge = Nothing - CardNeoForge.IsSwaped = True + CardNeoForge.IsSwapped = True e.Handled = True OptiFine_Loaded() SelectReload() @@ -1030,7 +1030,7 @@ SelectedFabric = sender.Tag("version").ToString FabricApi_Loaded() OptiFabric_Loaded() - CardFabric.IsSwaped = True + CardFabric.IsSwapped = True SelectReload() End Sub Private Sub Fabric_Clear(sender As Object, e As MouseButtonEventArgs) Handles BtnFabricClear.MouseLeftButtonUp @@ -1039,7 +1039,7 @@ AutoSelectedFabricApi = False SelectedOptiFabric = Nothing AutoSelectedOptiFabric = False - CardFabric.IsSwaped = True + CardFabric.IsSwapped = True e.Handled = True SelectReload() End Sub @@ -1151,12 +1151,12 @@ '选择与清除 Private Sub FabricApi_Selected(sender As MyListItem, e As EventArgs) SelectedFabricApi = sender.Tag - CardFabricApi.IsSwaped = True + CardFabricApi.IsSwapped = True SelectReload() End Sub Private Sub FabricApi_Clear(sender As Object, e As MouseButtonEventArgs) Handles BtnFabricApiClear.MouseLeftButtonUp SelectedFabricApi = Nothing - CardFabricApi.IsSwaped = True + CardFabricApi.IsSwapped = True e.Handled = True SelectReload() End Sub @@ -1243,12 +1243,12 @@ '选择与清除 Private Sub OptiFabric_Selected(sender As MyListItem, e As EventArgs) SelectedOptiFabric = sender.Tag - CardOptiFabric.IsSwaped = True + CardOptiFabric.IsSwapped = True SelectReload() End Sub Private Sub OptiFabric_Clear(sender As Object, e As MouseButtonEventArgs) Handles BtnOptiFabricClear.MouseLeftButtonUp SelectedOptiFabric = Nothing - CardOptiFabric.IsSwaped = True + CardOptiFabric.IsSwapped = True e.Handled = True SelectReload() End Sub diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml.vb index ac18c47..7eff1c8 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml.vb @@ -34,7 +34,7 @@ Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Pair.Value} NewCard.Children.Add(NewStack) NewCard.SwapControl = NewStack - NewCard.IsSwaped = True + NewCard.IsSwapped = True PanMain.Children.Add(NewCard) Next Catch ex As Exception diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml.vb index 064dda5..37cdcda 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml.vb @@ -23,7 +23,7 @@ Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Pair.Value} NewCard.Children.Add(NewStack) NewCard.SwapControl = NewStack - NewCard.IsSwaped = True + NewCard.IsSwapped = True PanMain.Children.Add(NewCard) Next Catch ex As Exception diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml.vb index f843529..7eebac8 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml.vb @@ -38,7 +38,7 @@ Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Pair.Value} NewCard.Children.Add(NewStack) NewCard.SwapControl = NewStack - NewCard.IsSwaped = True + NewCard.IsSwapped = True PanMain.Children.Add(NewCard) Next Catch ex As Exception diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml index cff69c5..f872639 100644 --- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml +++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml @@ -1,491 +1,492 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherHelp.xaml.vb b/Plain Craft Launcher 2/Pages/PageOther/PageOtherHelp.xaml.vb index 46a8bf4..a1a4c96 100644 --- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherHelp.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherHelp.xaml.vb @@ -55,7 +55,7 @@ If Type = "指南" Then MyCard.StackInstall(NewStack, 11, "指南") Else - NewCard.IsSwaped = True + NewCard.IsSwapped = True End If PanList.Children.Add(NewCard) Next diff --git a/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb b/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb index 19f89cf..e6e7d27 100644 --- a/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb @@ -81,15 +81,15 @@ PanMain.Children.Add(NewCard) '确定卡片是否展开 If Card.Key = McVersionCardType.Rubbish OrElse Card.Key = McVersionCardType.Error OrElse Card.Key = McVersionCardType.Fool Then - NewCard.IsSwaped = True + NewCard.IsSwapped = True Else MyCard.StackInstall(NewStack, 0, CardTitle) End If Next '若只有一个卡片，则强制展开 - If PanMain.Children.Count = 1 AndAlso CType(PanMain.Children(0), MyCard).IsSwaped Then - CType(PanMain.Children(0), MyCard).IsSwaped = False + If PanMain.Children.Count = 1 AndAlso CType(PanMain.Children(0), MyCard).IsSwapped Then + CType(PanMain.Children(0), MyCard).IsSwapped = False End If '判断应该显示哪一个页面 diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml index a04f7f7..edcdeda 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml @@ -171,7 +171,7 @@ - + @@ -218,7 +218,7 @@ - + diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml index 9fd7422..d975f22 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml @@ -182,7 +182,7 @@ --> - + diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml index 0ad86db..9a38492 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml @@ -235,7 +235,7 @@ - + diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml index a933ed1..a15de4b 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml @@ -192,7 +192,7 @@ - + diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj index 999063b..2716746 100644 --- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj +++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj @@ -8,7 +8,7 @@ WinExe PCL Plain Craft Launcher 2 - v4.6.2 + v4.8.1 Custom false diff --git a/Plain Craft Launcher 2/Resources/Custom.xaml b/Plain Craft Launcher 2/Resources/Custom.xaml index ae282bc..a2459db 100644 --- a/Plain Craft Launcher 2/Resources/Custom.xaml +++ b/Plain Craft Launcher 2/Resources/Custom.xaml @@ -3,7 +3,7 @@ 下列内容均基于 WPF 框架。你可以在继续之前先尝试自学 XAML 与 WPF 的基础，这能让你更轻松地理解下列内容。 你也可以使用 Ctrl + F 快速查找。例如，若需要改变文本颜色，则搜索 “颜色” 即可。 --> - + @@ -14,17 +14,17 @@ - + + Text="卡片（local:MyCard）的 Title 属性决定了它的标题。 为卡片添加 CanSwap 属性让它可以被折叠，True 代表是，False 代表否。在此基础上，再使用 IsSwapped 属性调整它是否默认被折叠。" /> - + @@ -34,7 +34,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -336,7 +336,7 @@ local:MyImage（图片）： local:MyCard（卡片）： - Title：设置显示的标题文本 - CanSwap：卡片是否可以折叠，True 为是，False 为否 - - IsSwaped：卡片是否默认折叠，要求 CanSwap 必须为 True + - IsSwapped：卡片是否默认折叠，要求 CanSwap 必须为 True - HorizontalAlignment：若使用，要求 CanSwap 必须为 False - UseAnimation：是否在展开等高度改变时触发动画；True 为是（默认），False 为否 - SwapLogoRight：卡片折叠时的箭头是朝下还是朝右；True 为朝右，False 为朝下（默认） From 10a5a309683ecc1da224301a61c7bc3b37877d85 Mon Sep 17 00:00:00 2001 From: ENC_Euphony <2330458484@qq.com> Date: Thu, 7 Aug 2025 19:30:37 +0800 Subject: [PATCH 2/2] Update Plain Craft Launcher 2.vbproj --- Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj index 2716746..999063b 100644 --- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj +++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj @@ -8,7 +8,7 @@ WinExe PCL Plain Craft Launcher 2 - v4.8.1 + v4.6.2 Custom false