ENC_Euphony 1 год назад
Родитель
Сommit
fdc56a2a4b

+ 31 - 18
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
     ''' <summary>
     ''' 通知 MyCard,控件内容已改变,需要中断动画并更新高度。
     ''' </summary>
     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 @@
     ''' <summary>
     ''' 是否已被折叠。
     ''' </summary>
-    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
+    
+    ''' <summary>
+    ''' 是否已被折叠。(已过时,请使用 IsSwapped)
+    ''' </summary>
+    <Obsolete("请使用 IsSwapped 属性,IsSwaped 存在拼写错误")>
+    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

+ 1 - 1
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

+ 2 - 2
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)

+ 1 - 1
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

+ 1 - 1
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
             ''非官方源警示

+ 7 - 7
Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml

@@ -27,7 +27,7 @@
                         <local:MyHint Text="必须安装 OptiFabric 才能正常使用 OptiFine!" Margin="0,10,0,0" x:Name="HintOptiFabric" Theme="Red" />
                         <local:MyHint Text="安装结束后,请在 Mod 下载中搜索 OptiFabric Origins 并下载,否则 OptiFine 会无法使用!" Margin="0,10,0,0" x:Name="HintOptiFabricOld" Theme="Yellow" />
                         <local:MyHint Text="OptiFine 与一部分 Mod 的兼容性不佳,请谨慎安装。" Margin="0,10,0,0" x:Name="HintModOptiFine" Theme="Yellow" />
-                        <local:MyCard Title="Forge" Height="40" Margin="0,12,0,0" x:Name="CardForge" IsSwaped="True" CanSwap="True" SwapLogoRight="True">
+                        <local:MyCard Title="Forge" Height="40" Margin="0,12,0,0" x:Name="CardForge" IsSwapped="True" CanSwap="True" SwapLogoRight="True">
                         <StackPanel Margin="20,40,18,15" VerticalAlignment="Top" Name="PanForge" />
                         <Grid x:Name="PanForgeInfo" Height="18" Margin="132,11,15,0" VerticalAlignment="Top" Tag="True">
                             <Grid.RenderTransform>
@@ -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" />
                         </Grid>
                     </local:MyCard>
-                        <local:MyCard Title="NeoForge" Height="40" Margin="0,12,0,0" x:Name="CardNeoForge" IsSwaped="True" CanSwap="True" SwapLogoRight="True">
+                        <local:MyCard Title="NeoForge" Height="40" Margin="0,12,0,0" x:Name="CardNeoForge" IsSwapped="True" CanSwap="True" SwapLogoRight="True">
                         <StackPanel Margin="20,40,18,15" VerticalAlignment="Top" Name="PanNeoForge" />
                         <Grid x:Name="PanNeoForgeInfo" Height="18" Margin="132,11,15,0" VerticalAlignment="Top" Tag="True">
                             <Grid.RenderTransform>
@@ -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" />
                         </Grid>
                     </local:MyCard>
-                        <local:MyCard Title="Fabric" Height="40" Margin="0,12,0,0" x:Name="CardFabric" IsSwaped="True" CanSwap="True" SwapLogoRight="True">
+                        <local:MyCard Title="Fabric" Height="40" Margin="0,12,0,0" x:Name="CardFabric" IsSwapped="True" CanSwap="True" SwapLogoRight="True">
                         <StackPanel Margin="20,40,18,15" VerticalAlignment="Top" Name="PanFabric" />
                         <Grid x:Name="PanFabricInfo" Height="18" Margin="132,11,15,0" VerticalAlignment="Top" Tag="True">
                             <Grid.RenderTransform>
@@ -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" />
                         </Grid>
                     </local:MyCard>
-                        <local:MyCard Title="Fabric API" Height="40" Margin="0,12,0,0" x:Name="CardFabricApi" IsSwaped="True" CanSwap="True" SwapLogoRight="True">
+                        <local:MyCard Title="Fabric API" Height="40" Margin="0,12,0,0" x:Name="CardFabricApi" IsSwapped="True" CanSwap="True" SwapLogoRight="True">
                         <StackPanel Margin="20,40,18,15" VerticalAlignment="Top" Name="PanFabricApi" />
                         <Grid x:Name="PanFabricApiInfo" Height="18" Margin="132,11,15,0" VerticalAlignment="Top" Tag="True">
                             <Grid.RenderTransform>
@@ -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" />
                         </Grid>
                     </local:MyCard>
-                        <local:MyCard Title="OptiFine" Height="40" Margin="0,12,0,0" x:Name="CardOptiFine" IsSwaped="True" CanSwap="True" SwapLogoRight="True">
+                        <local:MyCard Title="OptiFine" Height="40" Margin="0,12,0,0" x:Name="CardOptiFine" IsSwapped="True" CanSwap="True" SwapLogoRight="True">
                         <StackPanel Margin="20,40,18,15" VerticalAlignment="Top">
                             <StackPanel Name="PanOptiFine" />
                         </StackPanel>
@@ -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" />
                         </Grid>
                     </local:MyCard>
-                        <local:MyCard Title="OptiFabric" Height="40" Margin="0,12,0,0" x:Name="CardOptiFabric" IsSwaped="True" CanSwap="True" SwapLogoRight="True">
+                        <local:MyCard Title="OptiFabric" Height="40" Margin="0,12,0,0" x:Name="CardOptiFabric" IsSwapped="True" CanSwap="True" SwapLogoRight="True">
                         <StackPanel Margin="20,40,18,15" VerticalAlignment="Top" Name="PanOptiFabric" />
                         <Grid x:Name="PanOptiFabricInfo" Height="18" Margin="132,11,15,0" VerticalAlignment="Top" Tag="True">
                             <Grid.RenderTransform>
@@ -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" />
                         </Grid>
                     </local:MyCard>
-                        <local:MyCard Title="LiteLoader" Height="40" Margin="0,12,0,0" x:Name="CardLiteLoader" IsSwaped="True" CanSwap="True" SwapLogoRight="True">
+                        <local:MyCard Title="LiteLoader" Height="40" Margin="0,12,0,0" x:Name="CardLiteLoader" IsSwapped="True" CanSwap="True" SwapLogoRight="True">
                         <StackPanel Margin="20,40,18,15" VerticalAlignment="Top" Name="PanLiteLoader" />
                         <Grid x:Name="PanLiteLoaderInfo" Height="18" Margin="132,11,15,0" VerticalAlignment="Top" Tag="True">
                             <Grid.RenderTransform>

+ 36 - 36
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 491 - 490
Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml

@@ -1,491 +1,492 @@
-<local:MyPageRight
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:PCL" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-    mc:Ignorable="d" x:Class="PageOtherAbout"
-    PanScroll="{Binding ElementName=PanBack}" RenderOptions.BitmapScalingMode="LowQuality">
-    <local:MyScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" x:Name="PanBack">
-        <StackPanel x:Name="PanMain" Margin="25,10" Grid.IsSharedSizeScope="True">
-            <local:MyCard Margin="0,15" Title="关于">
-                <Grid Margin="21,40,21,16">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="45" />
-                        <RowDefinition Height="45" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="40" />
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="150" />
-                    </Grid.ColumnDefinitions>
-                    <local:MyListItem IsHitTestVisible="False" Title="龙腾猫跃" Margin="-5,0,15,0" Info="Plain Craft Launcher 的作者!" Grid.Row="0" Grid.Column="1" />
-                    <local:MyListItem IsHitTestVisible="False" Title="Plain Craft Launcher 2" Margin="-5,0,15,0" Info="当前版本:%VERSION%(%VERSIONCODE%.%BRANCH%)" Grid.Row="1" Grid.Column="1" x:Name="ItemAboutPcl" />
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/Logo.png" Grid.Row="1" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/LTCat.jpg" Grid.Row="0" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <local:MyButton Text="赞助作者" Grid.Column="2" Grid.Row="0" Height="35" EventType="打开网页" EventData="https://afdian.com/a/LTCat" />
-                    <local:MyButton Text="查看源代码" Grid.Column="2" Grid.Row="1" Height="35" EventType="打开网页" EventData="https://github.com/Hex-Dragon/PCL2" />
-                </Grid>
-            </local:MyCard>
-            <local:MyCard Margin="0,0,0,15" Title="特别鸣谢">
-                <Grid Margin="21,40,21,16">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="45" />
-                        <RowDefinition Height="45" />
-                        <RowDefinition Height="45" />
-                        <RowDefinition Height="45" />
-                        <RowDefinition Height="45" />
-                        <RowDefinition Height="45" />
-                        <RowDefinition Height="45" />
-                        <RowDefinition Height="45" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="40" />
-                        <ColumnDefinition />
-                        <ColumnDefinition Width="150" />
-                    </Grid.ColumnDefinitions>
-                    <local:MyListItem Title="bangbang93" Margin="-5,0,15,0" IsHitTestVisible="False" Info="提供 BMCLAPI 镜像源和 Forge 安装工具,详见 https://bmclapi.bangbang93.com" Grid.Row="0" Grid.Column="1" />
-                    <local:MyButton x:Name="BtnAboutBmclapi" Text="赞助镜像源" Grid.Row="0" Grid.Column="2" Height="35" />
-                    <local:MyListItem Title="MC 百科" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="提供了 Mod 名称的中文翻译和更多相关信息!" Grid.Row="1" Grid.Column="1" />
-                    <local:MyButton x:Name="BtnAboutWiki" Text="打开百科" Grid.Row="1" Grid.Column="2" Height="35" />
-                    <local:MyListItem Title="00ll00" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="提供了 Java Launch Wrapper 和一些重要服务支持!" Grid.Row="2" Grid.Column="1" />
-                    <local:MyListItem Title="z0z0r4" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="提供了 MCIM 中国 Mod 下载镜像源和帮助库图床!" Grid.Row="3" Grid.Column="1" />
-                    <local:MyListItem Title="Patrick" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="设计并制作了 PCL 图标,让我从做图标的水深火热中得到了解脱……" Grid.Row="4" Grid.Column="1" />
-                    <local:MyListItem Title="Hao_Tian" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="在内测中找出了一大堆没人想得到的诡异 Bug,有非同寻常的 Bug 体质" Grid.Row="5" Grid.Column="1" />
-                    <local:MyListItem Title="Minecraft 中文论坛" Margin="-5,0,15,0" IsHitTestVisible="False" Info="虽然已经关站了,但感谢此前提供了 MCBBS 镜像源……" Grid.Row="6" Grid.Column="1" />
-                    <local:MyListItem Title="PCL 内群的各位" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="感谢内群的沙雕网友们这么久以来对我和 PCL 的支持与鼓励!" Grid.Row="7" Grid.Column="1" />
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/bangbang93.png" Grid.Row="0" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/wiki.png" Grid.Row="1" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/00ll00.png" Grid.Row="2" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/z0z0r4.png" Grid.Row="3" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/Patrick.png" Grid.Row="4" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/Hao_Tian.jpg" Grid.Row="5" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/MCBBS.png" Grid.Row="6" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/PCL2.png" Grid.Row="7" Margin="3">
-                        <Image.Clip>
-                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
-                        </Image.Clip>
-                    </Image>
-                </Grid>
-            </local:MyCard>
-            <local:MyCard Margin="0,0,0,15" Title="赞助者">
-                <StackPanel Margin="25,40,10,20">
-                    <TextBlock HorizontalAlignment="Left" Text="以下是 2025 年 6 月的高级赞助者们!感谢各位对 PCL 和伟大的咕咕咕事业的支持!" Margin="0,0,25,5.5" TextTrimming="None" TextWrapping="WrapWithOverflow" />
-                    <WrapPanel Margin="0,0,0,10">
                        <TextBlock Width="120" Margin="0,1.5" Text="星月" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Nemo" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="长歌当天" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="飒黎lIlIlI" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="hy" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="SaDhhJe" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="风铃子啊" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="柠娜" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="W丶北辰" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="才KRE" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Yang_mistakeof" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="close eyes" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="顾顾" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="LTuuxj" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="花吃" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="FICazk" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="屑屑你" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="凉凉" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="WDSJ" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Tohka" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="lz" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="哦嚯嚯嚯皮筋头" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="陈肖杰" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="MC小满" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="残光" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="玖玖璃" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="水晶OTZ" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="伯克礼" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="白猫海贼船" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="zhang1232" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Never" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Fish_pomelo" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="生风" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="富士山下" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="小七" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="发呆的呆毛君" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="天黑时看月亮" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="夜枫" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="_章333_" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="孙杰" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="wby" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="封尾==" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="你与空白皆无名" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="鱼" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="zzxniubi" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="炎燚火淼淼" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="三巿" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="奈落" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="华佗" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="oran9e" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="赤冰雨" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Urizen" />
-                        <TextBlock Width="120" Margin="0,1.5" Text=":)" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="skyqyzm" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="橘子皮丶" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="额外awa" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="安上月" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="念城南" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="多低山丘陵" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="书童呀" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="sxy192425" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="李好啊" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="MH_Nine" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="周先生" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="原" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="良田满穗" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="柴" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="庭师" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="。,。" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="DHLH" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Xayj" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="绳网用户#37" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="LLLL" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="深绯红" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="奇伢七星" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Akapigo" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Shink_guns" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Aqua 极&amp;坏." />
-                        <TextBlock Width="120" Margin="0,1.5" Text="大事化小蛋糕" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Nakiya233" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="花小妖" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="septebr" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="一只马喽" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="下暴雨BWB" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="QAQ" />
-                        <TextBlock Width="240" Margin="0,1.5" Text="sl土豆社区服主B友" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Wang" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="......" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="ResTmoW" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="bochibochibo" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="铸魂之灵" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="柏柏柏" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Mart1s" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="KuruM148" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="KaiTouCrow" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="LIE-SHAN" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="慈悲方舟" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="于析" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="陌道" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="摇椅上的猫" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="五个麦卷" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Miraclepoi" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="XiaoLI" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="啊吧啊吧的肥宅" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="不娶雨婷不改名" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="oppo19" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="博麗靈夢" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="莹 of yours" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="ChinaFZXPVP" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="城之内sama" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="ENXI" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="steve_c418" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="洛长安" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="magic_muggle" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="小猫游六喵" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="JY" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="雪豹起司可颂" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="wlsy" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="齐先生爱溜达" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="是小泠啊" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="xioyiao" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="BunnyMiku" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="dadagga" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="无极之笔" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="xiaoyu" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="王梓杰" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="wjbjjd" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Candy_Mo" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="lettmin_" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="七九·Alnasl" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="辉" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="何为最优解" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="crazy丶天人" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="XsBlueSky" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="冬将軍" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="tiechui" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Liu2Shi2Pu2" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Yu_s" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="刘四妹" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="枝皙" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="CC" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Slana23" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="MMMy" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Venuse" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="microjie" />
-                        <TextBlock Width="240" Margin="0,1.5" Text="Miner#Cetyleno~^" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="春江花月夜" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="落南子" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="AL1Su-爱丽丝" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="我木有呆毛" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="乌羽" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="知性de含羞草" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="星の殇" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="IED LTAM" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="格罗夫斯基" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="梦启泉" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="岁月无痕" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="????" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="超级脑壳" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="空梦" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="薛小欣" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="蛋黄豆角" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="芒果茶州" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="癫风院院长" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="三十一" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="美醉了" />
-                        <TextBlock Width="240" Margin="0,1.5" Text="中科院在逃量子计算机" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="." />
-                        <TextBlock Width="120" Margin="0,1.5" Text="枫" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="jjj" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="clilick" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="我很快乐" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Phoenix tamer" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Lsp77" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="太阳神" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="ikun0014" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="IncredibleYu" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="在下粉毛控" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="SuperCrazyK" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="阿柔" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="HaKNa" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="胡十一" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="菲利絲" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="迷梦的羽" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="20018" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="波比科普员" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Xiao_JIA" />
-                        <TextBlock Width="240" Margin="0,1.5" Text="龙腾我是你的头号粉丝" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="keer1563" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="百鬼まル" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="DPSYnt" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="七色彩羽" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="臭氧化碳" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="情来风" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="柒月" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="汪汪队队长" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="迷路的猫" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="ktyxlan_lan" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="琳琅039" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="黑色额度" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="sahaua" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="宦昭" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="镜刹" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="房石诶多" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="熊" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="NQ" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="我志永纯" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="漫城" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="憨憨的小草" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="泽涛" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="星海鹿樱" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="祭°" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="赛冷特呀" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="无妄之灾" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="ZGW2008" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="没事多喝感冒灵" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="一梦筱筱" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="twokness" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="hhy7171" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="子虚" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="猫羽" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="有氧丁真" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="dddr" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="天气热" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Emmanuel" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="夕尽暮染" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Bob_Marcus" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="初心无尘" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="朱利安" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="461863352" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="庭" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Xing_K" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="yzt" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="nuycn" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="鸡人" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="爱无界i" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Zik yeung" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="墨子吉安" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="柠果籽" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="cai1" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="小比登T^T" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="hb" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="caizzz" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="yyin" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="無言" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="修" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="改头换面" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="无敌百搭的款式" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="御坂1354号" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="木子" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="萤火焱攸" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="盼盼不是Panda" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="烤肉真香" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="ZhuTan12" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="tom" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="洛竹" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="foob" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="Garylu" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="阮绍轩" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="xin822" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="BAIgivele" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="ljc" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="暖笑" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="焦糖流酥" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="绚丽的星河" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="魔导兔" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="吾乃斗笔" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="君殇" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="沙轻" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="邓布利多" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="红薯散养专业户" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="十言" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="vvvghjvvv" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="法斯" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="DASENSUN" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="HTS" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="握不住信新心" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="sycuuj133" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="天杉大将军" />
-                        <TextBlock Width="120" Margin="0,1.5" Text="风见翎" />
+<local:MyPageRight
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:PCL" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    mc:Ignorable="d" x:Class="PageOtherAbout"
+    PanScroll="{Binding ElementName=PanBack}" RenderOptions.BitmapScalingMode="LowQuality">
+    <local:MyScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" x:Name="PanBack">
+        <StackPanel x:Name="PanMain" Margin="25,10" Grid.IsSharedSizeScope="True">
+            <local:MyCard Margin="0,15" Title="关于">
+                <Grid Margin="21,40,21,16">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="45" />
+                        <RowDefinition Height="45" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="40" />
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="150" />
+                    </Grid.ColumnDefinitions>
+                    <local:MyListItem IsHitTestVisible="False" Title="龙腾猫跃" Margin="-5,0,15,0" Info="Plain Craft Launcher 的作者!" Grid.Row="0" Grid.Column="1" />
+                    <local:MyListItem IsHitTestVisible="False" Title="Plain Craft Launcher 2" Margin="-5,0,15,0" Info="当前版本:%VERSION%(%VERSIONCODE%.%BRANCH%)" Grid.Row="1" Grid.Column="1" x:Name="ItemAboutPcl" />
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/Logo.png" Grid.Row="1" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/LTCat.jpg" Grid.Row="0" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <local:MyButton Text="赞助作者" Grid.Column="2" Grid.Row="0" Height="35" EventType="打开网页" EventData="https://afdian.com/a/LTCat" />
+                    <local:MyButton Text="查看源代码" Grid.Column="2" Grid.Row="1" Height="35" EventType="打开网页" EventData="https://github.com/Hex-Dragon/PCL2" />
+                </Grid>
+            </local:MyCard>
+            <local:MyCard Margin="0,0,0,15" Title="特别鸣谢">
+                <Grid Margin="21,40,21,16">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="45" />
+                        <RowDefinition Height="45" />
+                        <RowDefinition Height="45" />
+                        <RowDefinition Height="45" />
+                        <RowDefinition Height="45" />
+                        <RowDefinition Height="45" />
+                        <RowDefinition Height="45" />
+                        <RowDefinition Height="45" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="40" />
+                        <ColumnDefinition />
+                        <ColumnDefinition Width="150" />
+                    </Grid.ColumnDefinitions>
+                    <local:MyListItem Title="bangbang93" Margin="-5,0,15,0" IsHitTestVisible="False" Info="提供 BMCLAPI 镜像源和 Forge 安装工具,详见 https://bmclapi.bangbang93.com" Grid.Row="0" Grid.Column="1" />
+                    <local:MyButton x:Name="BtnAboutBmclapi" Text="赞助镜像源" Grid.Row="0" Grid.Column="2" Height="35" />
+                    <local:MyListItem Title="MC 百科" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="提供了 Mod 名称的中文翻译和更多相关信息!" Grid.Row="1" Grid.Column="1" />
+                    <local:MyButton x:Name="BtnAboutWiki" Text="打开百科" Grid.Row="1" Grid.Column="2" Height="35" />
+                    <local:MyListItem Title="00ll00" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="提供了 Java Launch Wrapper 和一些重要服务支持!" Grid.Row="2" Grid.Column="1" />
+                    <local:MyListItem Title="z0z0r4" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="提供了 MCIM 中国 Mod 下载镜像源和帮助库图床!" Grid.Row="3" Grid.Column="1" />
+                    <local:MyListItem Title="Patrick" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="设计并制作了 PCL 图标,让我从做图标的水深火热中得到了解脱……" Grid.Row="4" Grid.Column="1" />
+                    <local:MyListItem Title="Hao_Tian" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="在内测中找出了一大堆没人想得到的诡异 Bug,有非同寻常的 Bug 体质" Grid.Row="5" Grid.Column="1" />
+                    <local:MyListItem Title="Minecraft 中文论坛" Margin="-5,0,15,0" IsHitTestVisible="False" Info="虽然已经关站了,但感谢此前提供了 MCBBS 镜像源……" Grid.Row="6" Grid.Column="1" />
+                    <local:MyListItem Title="PCL 内群的各位" Margin="-5,0,0,0" IsHitTestVisible="False" Grid.ColumnSpan="2" Info="感谢内群的沙雕网友们这么久以来对我和 PCL 的支持与鼓励!" Grid.Row="7" Grid.Column="1" />
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/bangbang93.png" Grid.Row="0" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/wiki.png" Grid.Row="1" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/00ll00.png" Grid.Row="2" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/z0z0r4.png" Grid.Row="3" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/Patrick.png" Grid.Row="4" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/Hao_Tian.jpg" Grid.Row="5" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/MCBBS.png" Grid.Row="6" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                    <Image Source="/Plain Craft Launcher 2;component/Images/Heads/PCL2.png" Grid.Row="7" Margin="3">
+                        <Image.Clip>
+                            <EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
+                        </Image.Clip>
+                    </Image>
+                </Grid>
+            </local:MyCard>
+            <local:MyCard Margin="0,0,0,15" Title="赞助者">
+                <StackPanel Margin="25,40,10,20">
+                    <TextBlock HorizontalAlignment="Left" Text="以下是 2025 年 6 月的高级赞助者们!感谢各位对 PCL 和伟大的咕咕咕事业的支持!" Margin="0,0,25,5.5" TextTrimming="None" TextWrapping="WrapWithOverflow" />
+                    <WrapPanel Margin="0,0,0,10">
+                        <TextBlock Width="120" Margin="0,1.5" Text="星月" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Nemo" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="长歌当天" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="飒黎lIlIlI" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="hy" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="SaDhhJe" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="风铃子啊" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="柠娜" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="W丶北辰" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="才KRE" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Yang_mistakeof" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="close eyes" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="顾顾" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="LTuuxj" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="花吃" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="FICazk" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="屑屑你" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="凉凉" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="WDSJ" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Tohka" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="lz" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="哦嚯嚯嚯皮筋头" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="陈肖杰" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="MC小满" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="残光" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="玖玖璃" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="水晶OTZ" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="伯克礼" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="白猫海贼船" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="zhang1232" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Never" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Fish_pomelo" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="生风" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="富士山下" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="小七" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="发呆的呆毛君" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="天黑时看月亮" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="夜枫" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="_章333_" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="孙杰" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="wby" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="封尾==" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="你与空白皆无名" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="鱼" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="zzxniubi" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="炎燚火淼淼" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="三巿" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="奈落" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="华佗" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="oran9e" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="赤冰雨" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Urizen" />
+                        <TextBlock Width="120" Margin="0,1.5" Text=":)" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="skyqyzm" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="橘子皮丶" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="额外awa" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="安上月" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="念城南" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="多低山丘陵" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="书童呀" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="sxy192425" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="李好啊" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="MH_Nine" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="周先生" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="原" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="良田满穗" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="柴" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="庭师" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="。,。" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="DHLH" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Xayj" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="绳网用户#37" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="LLLL" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="深绯红" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="奇伢七星" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Akapigo" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Shink_guns" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Aqua 极&amp;坏." />
+                        <TextBlock Width="120" Margin="0,1.5" Text="大事化小蛋糕" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Nakiya233" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="花小妖" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="septebr" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="一只马喽" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="下暴雨BWB" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="QAQ" />
+                        <TextBlock Width="240" Margin="0,1.5" Text="sl土豆社区服主B友" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Wang" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="......" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="ResTmoW" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="bochibochibo" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="铸魂之灵" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="柏柏柏" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Mart1s" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="KuruM148" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="KaiTouCrow" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="LIE-SHAN" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="慈悲方舟" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="于析" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="陌道" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="摇椅上的猫" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="五个麦卷" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Miraclepoi" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="XiaoLI" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="啊吧啊吧的肥宅" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="不娶雨婷不改名" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="oppo19" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="博麗靈夢" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="莹 of yours" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="ChinaFZXPVP" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="城之内sama" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="ENXI" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="steve_c418" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="洛长安" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="magic_muggle" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="小猫游六喵" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="JY" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="雪豹起司可颂" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="wlsy" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="齐先生爱溜达" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="是小泠啊" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="xioyiao" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="BunnyMiku" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="dadagga" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="无极之笔" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="xiaoyu" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="王梓杰" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="wjbjjd" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Candy_Mo" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="lettmin_" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="七九·Alnasl" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="辉" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="何为最优解" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="crazy丶天人" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="XsBlueSky" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="冬将軍" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="tiechui" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Liu2Shi2Pu2" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Yu_s" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="刘四妹" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="枝皙" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="CC" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Slana23" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="MMMy" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Venuse" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="microjie" />
+                        <TextBlock Width="240" Margin="0,1.5" Text="Miner#Cetyleno~^" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="春江花月夜" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="落南子" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="AL1Su-爱丽丝" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="我木有呆毛" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="乌羽" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="知性de含羞草" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="星の殇" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="IED LTAM" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="格罗夫斯基" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="梦启泉" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="岁月无痕" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="????" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="超级脑壳" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="空梦" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="薛小欣" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="蛋黄豆角" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="芒果茶州" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="癫风院院长" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="三十一" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="美醉了" />
+                        <TextBlock Width="240" Margin="0,1.5" Text="中科院在逃量子计算机" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="." />
+                        <TextBlock Width="120" Margin="0,1.5" Text="枫" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="jjj" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="clilick" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="我很快乐" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Phoenix tamer" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Lsp77" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="太阳神" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="ikun0014" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="IncredibleYu" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="在下粉毛控" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="SuperCrazyK" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="阿柔" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="HaKNa" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="胡十一" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="菲利絲" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="迷梦的羽" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="20018" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="波比科普员" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Xiao_JIA" />
+                        <TextBlock Width="240" Margin="0,1.5" Text="龙腾我是你的头号粉丝" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="keer1563" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="百鬼まル" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="DPSYnt" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="七色彩羽" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="臭氧化碳" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="情来风" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="柒月" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="汪汪队队长" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="迷路的猫" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="ktyxlan_lan" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="琳琅039" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="黑色额度" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="sahaua" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="宦昭" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="镜刹" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="房石诶多" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="熊" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="NQ" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="我志永纯" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="漫城" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="憨憨的小草" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="泽涛" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="星海鹿樱" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="祭°" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="赛冷特呀" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="无妄之灾" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="ZGW2008" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="没事多喝感冒灵" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="一梦筱筱" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="twokness" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="hhy7171" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="子虚" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="猫羽" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="有氧丁真" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="dddr" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="天气热" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Emmanuel" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="夕尽暮染" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Bob_Marcus" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="初心无尘" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="朱利安" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="461863352" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="庭" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Xing_K" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="yzt" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="nuycn" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="鸡人" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="爱无界i" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Zik yeung" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="墨子吉安" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="柠果籽" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="cai1" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="小比登T^T" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="hb" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="caizzz" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="yyin" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="無言" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="修" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="改头换面" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="无敌百搭的款式" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="御坂1354号" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="木子" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="萤火焱攸" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="盼盼不是Panda" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="烤肉真香" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="ZhuTan12" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="tom" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="洛竹" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="foob" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="Garylu" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="阮绍轩" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="xin822" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="BAIgivele" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="ljc" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="暖笑" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="焦糖流酥" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="绚丽的星河" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="魔导兔" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="吾乃斗笔" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="君殇" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="沙轻" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="邓布利多" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="红薯散养专业户" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="十言" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="vvvghjvvv" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="法斯" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="DASENSUN" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="HTS" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="握不住信新心" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="sycuuj133" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="天杉大将军" />
+                        <TextBlock Width="120" Margin="0,1.5" Text="风见翎" />
                         <TextBlock Width="120" Margin="0,1.5" Text="江心Rain" />
-                    </WrapPanel>
-                    <Grid Height="35">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
-                        </Grid.ColumnDefinitions>
-                        <local:MyButton x:Name="BtnDonateOutput" Grid.Column="0" MinWidth="140" Text="生成解锁码" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ColorType="Highlight" Visibility="Collapsed" />
-                        <local:MyButton x:Name="BtnDonateDonate" Grid.Column="0" MinWidth="140" Text="赞助作者" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ColorType="Highlight" EventType="打开网页" EventData="https://afdian.com/a/LTCat" />
-                        <local:MyButton x:Name="BtnDonateCopy" Grid.Column="1" MinWidth="140" Text="复制识别码" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" />
-                        <local:MyButton x:Name="BtnDonateInput" Grid.Column="2" MinWidth="140" Text="输入解锁码" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" />
-                    </Grid>
-                </StackPanel>
-            </local:MyCard>
-            <local:MyCard Margin="0,0,0,15" Title="法律信息" IsSwaped="True" CanSwap="True">
-                <StackPanel Margin="25,39,23,20">
-                    <TextBlock Text="隐私说明" TextWrapping="Wrap" Margin="0,6,0,4" FontWeight="Bold" />
-                    <TextBlock Margin="0,0,0,2" LineHeight="17" Text="本软件的 User Agent 中包含启动器的版本号,以统计各版本的用户数量。&#13;除此之外,本软件不会向开发者上传任何其他信息。" TextWrapping="Wrap" />
-                    <TextBlock Text="其他信息" TextWrapping="Wrap" Margin="0,12,0,4" FontWeight="Bold" />
-                    <TextBlock Margin="0,0,0,2" LineHeight="17" Text="Copyright © 龙腾猫跃 2016. All Rights Reserved.&#13;计算机软件著作权登记号:2020SR0875133&#13;违法违规行为举报投诉邮箱:[email protected]&#13;非 MINECRAFT 官方产品。未经 MOJANG 或 MICROSOFT 批准,也不与 MOJANG 或 MICROSOFT 关联。" TextWrapping="Wrap" />
-                    <StackPanel Orientation="Horizontal" Height="35" HorizontalAlignment="Left" Margin="0,12,0,0">
-                        <local:MyButton Text="用户协议与免责声明" Width="170" Padding="13,0" Margin="0,0,20,0" ColorType="Highlight" EventType="打开网页" EventData="https://shimo.im/docs/rGrd8pY8xWkt6ryW" />
-                        <local:MyButton Text="开源代码" Width="140" Padding="13,0" EventType="打开网页" EventData="https://github.com/Hex-Dragon/PCL2" />
-                    </StackPanel>
-                </StackPanel>
-            </local:MyCard>
-            <local:MyCard Margin="0,0,0,15" Title="许可与版权声明" IsSwaped="True" CanSwap="True">
-                <Grid Margin="25,42,23,4">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="20" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="60" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="60" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="60" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="60" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="60" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="60" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="60" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" Grid.Column="0" Text="Java Launch Wrapper" TextWrapping="Wrap" FontWeight="Bold" />
-                    <TextBlock Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2022 00ll00&#xa;Licensed under the MIT License." TextWrapping="Wrap" />
-                    <local:MyButton Grid.Row="1" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://github.com/00ll00/java_launch_wrapper" />
-                    <local:MyButton Grid.Row="1" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://github.com/00ll00/java_launch_wrapper?tab=MIT-1-ov-file#readme" />
-
-                    <TextBlock Grid.Row="2" Grid.Column="0" Text="Newtonsoft.Json" TextWrapping="Wrap" FontWeight="Bold" />
-                    <TextBlock Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2007 James Newton-King&#xa;Licensed under the MIT License." TextWrapping="Wrap" />
-                    <local:MyButton Grid.Row="3" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://www.newtonsoft.com/json" />
-                    <local:MyButton Grid.Row="3" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://opensource.org/licenses/MIT" />
-                    
-                    <TextBlock Grid.Row="4" Grid.Column="0" Text="NAudio" TextWrapping="Wrap" FontWeight="Bold" />
-                    <TextBlock Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2015 Mark Heath ([email protected])&#xa;Licensed under the MIT License." TextWrapping="Wrap" />
-                    <local:MyButton Grid.Row="5" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://github.com/naudio/NAudio" />
-                    <local:MyButton Grid.Row="5" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left" 
-                                    EventType="打开网页" EventData="https://github.com/naudio/NAudio/blob/master/license.txt" />
-                    
-                    <TextBlock Grid.Row="6" Grid.Column="0" Text="Ookii.Dialogs" TextWrapping="Wrap" FontWeight="Bold" />
-                    <TextBlock Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2009 Sven Groot (Ookii.org)" TextWrapping="Wrap" />
-                    <local:MyButton Grid.Row="7" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://www.ookii.org/Software/Dialogs/" />
-                    <local:MyButton Grid.Row="7" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://github.com/caioproiete/ookii-dialogs-wpf/blob/master/LICENSE" />
-                    
-                    <TextBlock Grid.Row="8" Grid.Column="0" Text="Iconmonstr" TextWrapping="Wrap" FontWeight="Bold" />
-                    <TextBlock Grid.Row="8" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2019 iconmonstr (Alexander Kahlkopf)" TextWrapping="Wrap" />
-                    <local:MyButton Grid.Row="9" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://iconmonstr.com/" />
-                    <local:MyButton Grid.Row="9" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://iconmonstr.com/license/" />
-                    
-                    <TextBlock Grid.Row="10" Grid.Column="0" Text="libwebp wrapper for .NET" TextWrapping="Wrap" FontWeight="Bold" />
-                    <TextBlock Grid.Row="10" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2012 Imazen&#xa;Licensed under the MIT License." TextWrapping="Wrap" />
-                    <local:MyButton Grid.Row="11" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://github.com/imazen/libwebp-net" />
-                    <local:MyButton Grid.Row="11" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://github.com/imazen/libwebp-net/blob/master/LICENSE.txt" />
-
-                    <TextBlock Grid.Row="12" Grid.Column="0" Text="Iconfont" TextWrapping="Wrap" FontWeight="Bold" />
-                    <TextBlock Grid.Row="12" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © ALIMAMA MUX, powered by alimama THX." TextWrapping="Wrap" />
-                    <local:MyButton Grid.Row="13" Grid.Column="2" MinWidth="140" Text="查看原网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
-                                    EventType="打开网页" EventData="https://www.iconfont.cn/" />
-
-                </Grid>
-            </local:MyCard>
-        </StackPanel>
-    </local:MyScrollViewer>
-</local:MyPageRight>
+                    </WrapPanel>
+                    <Grid Height="35">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                        </Grid.ColumnDefinitions>
+                        <local:MyButton x:Name="BtnDonateOutput" Grid.Column="0" MinWidth="140" Text="生成解锁码" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ColorType="Highlight" Visibility="Collapsed" />
+                        <local:MyButton x:Name="BtnDonateDonate" Grid.Column="0" MinWidth="140" Text="赞助作者" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ColorType="Highlight" EventType="打开网页" EventData="https://afdian.com/a/LTCat" />
+                        <local:MyButton x:Name="BtnDonateCopy" Grid.Column="1" MinWidth="140" Text="复制识别码" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" />
+                        <local:MyButton x:Name="BtnDonateInput" Grid.Column="2" MinWidth="140" Text="输入解锁码" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" />
+                    </Grid>
+                </StackPanel>
+            </local:MyCard>
+            <local:MyCard Margin="0,0,0,15" Title="法律信息" IsSwapped="True" CanSwap="True">
+                <StackPanel Margin="25,39,23,20">
+                    <TextBlock Text="隐私说明" TextWrapping="Wrap" Margin="0,6,0,4" FontWeight="Bold" />
+                    <TextBlock Margin="0,0,0,2" LineHeight="17" Text="本软件的 User Agent 中包含启动器的版本号,以统计各版本的用户数量。&#13;除此之外,本软件不会向开发者上传任何其他信息。" TextWrapping="Wrap" />
+                    <TextBlock Text="其他信息" TextWrapping="Wrap" Margin="0,12,0,4" FontWeight="Bold" />
+                    <TextBlock Margin="0,0,0,2" LineHeight="17" Text="Copyright © 龙腾猫跃 2016. All Rights Reserved.&#13;计算机软件著作权登记号:2020SR0875133&#13;违法违规行为举报投诉邮箱:[email protected]&#13;非 MINECRAFT 官方产品。未经 MOJANG 或 MICROSOFT 批准,也不与 MOJANG 或 MICROSOFT 关联。" TextWrapping="Wrap" />
+                    <StackPanel Orientation="Horizontal" Height="35" HorizontalAlignment="Left" Margin="0,12,0,0">
+                        <local:MyButton Text="用户协议与免责声明" Width="170" Padding="13,0" Margin="0,0,20,0" ColorType="Highlight" EventType="打开网页" EventData="https://shimo.im/docs/rGrd8pY8xWkt6ryW" />
+                        <local:MyButton Text="开源代码" Width="140" Padding="13,0" EventType="打开网页" EventData="https://github.com/Hex-Dragon/PCL2" />
+                    </StackPanel>
+                </StackPanel>
+            </local:MyCard>
+            <local:MyCard Margin="0,0,0,15" Title="许可与版权声明" IsSwapped="True" CanSwap="True">
+                <Grid Margin="25,42,23,4">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="60" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="60" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="60" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="60" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="60" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="60" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="60" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <TextBlock Grid.Row="0" Grid.Column="0" Text="Java Launch Wrapper" TextWrapping="Wrap" FontWeight="Bold" />
+                    <TextBlock Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2022 00ll00&#xa;Licensed under the MIT License." TextWrapping="Wrap" />
+                    <local:MyButton Grid.Row="1" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://github.com/00ll00/java_launch_wrapper" />
+                    <local:MyButton Grid.Row="1" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://github.com/00ll00/java_launch_wrapper?tab=MIT-1-ov-file#readme" />
+
+                    <TextBlock Grid.Row="2" Grid.Column="0" Text="Newtonsoft.Json" TextWrapping="Wrap" FontWeight="Bold" />
+                    <TextBlock Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2007 James Newton-King&#xa;Licensed under the MIT License." TextWrapping="Wrap" />
+                    <local:MyButton Grid.Row="3" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://www.newtonsoft.com/json" />
+                    <local:MyButton Grid.Row="3" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://opensource.org/licenses/MIT" />
+                    
+                    <TextBlock Grid.Row="4" Grid.Column="0" Text="NAudio" TextWrapping="Wrap" FontWeight="Bold" />
+                    <TextBlock Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2015 Mark Heath ([email protected])&#xa;Licensed under the MIT License." TextWrapping="Wrap" />
+                    <local:MyButton Grid.Row="5" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://github.com/naudio/NAudio" />
+                    <local:MyButton Grid.Row="5" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left" 
+                                    EventType="打开网页" EventData="https://github.com/naudio/NAudio/blob/master/license.txt" />
+                    
+                    <TextBlock Grid.Row="6" Grid.Column="0" Text="Ookii.Dialogs" TextWrapping="Wrap" FontWeight="Bold" />
+                    <TextBlock Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2009 Sven Groot (Ookii.org)" TextWrapping="Wrap" />
+                    <local:MyButton Grid.Row="7" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://www.ookii.org/Software/Dialogs/" />
+                    <local:MyButton Grid.Row="7" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://github.com/caioproiete/ookii-dialogs-wpf/blob/master/LICENSE" />
+                    
+                    <TextBlock Grid.Row="8" Grid.Column="0" Text="Iconmonstr" TextWrapping="Wrap" FontWeight="Bold" />
+                    <TextBlock Grid.Row="8" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2019 iconmonstr (Alexander Kahlkopf)" TextWrapping="Wrap" />
+                    <local:MyButton Grid.Row="9" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://iconmonstr.com/" />
+                    <local:MyButton Grid.Row="9" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://iconmonstr.com/license/" />
+                    
+                    <TextBlock Grid.Row="10" Grid.Column="0" Text="libwebp wrapper for .NET" TextWrapping="Wrap" FontWeight="Bold" />
+                    <TextBlock Grid.Row="10" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © 2012 Imazen&#xa;Licensed under the MIT License." TextWrapping="Wrap" />
+                    <local:MyButton Grid.Row="11" Grid.Column="2" MinWidth="140" Text="查看来源网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://github.com/imazen/libwebp-net" />
+                    <local:MyButton Grid.Row="11" Grid.Column="3" MinWidth="140" Text="查看许可文档" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://github.com/imazen/libwebp-net/blob/master/LICENSE.txt" />
+
+                    <TextBlock Grid.Row="12" Grid.Column="0" Text="Iconfont" TextWrapping="Wrap" FontWeight="Bold" />
+                    <TextBlock Grid.Row="12" Grid.Column="2" Grid.ColumnSpan="2" Text="Copyright © ALIMAMA MUX, powered by alimama THX." TextWrapping="Wrap" />
+                    <local:MyButton Grid.Row="13" Grid.Column="2" MinWidth="140" Text="查看原网站" Padding="13,0" Margin="0,7,20,18" HorizontalAlignment="Left"
+                                    EventType="打开网页" EventData="https://www.iconfont.cn/" />
+
+                </Grid>
+            </local:MyCard>
+        </StackPanel>
+    </local:MyScrollViewer>
+</local:MyPageRight>

+ 1 - 1
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

+ 3 - 3
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
 
             '判断应该显示哪一个页面

+ 2 - 2
Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml

@@ -171,7 +171,7 @@
                     </Grid>
                 </StackPanel>
             </local:MyCard>
-            <local:MyCard x:Name="CardSkin" Margin="0,0,0,15" Title="离线皮肤" CanSwap="True" IsSwaped="True">
+            <local:MyCard x:Name="CardSkin" Margin="0,0,0,15" Title="离线皮肤" CanSwap="True" IsSwapped="True">
                 <StackPanel Margin="25,40,25,15">
                     <local:MyHint Text="由于技术问题,此功能只保证对 1.19.2 以前的版本有效!" Theme="Yellow" Margin="0,0,0,10" />
                     <Grid Margin="-1,0,0,0">
@@ -218,7 +218,7 @@
                     </Grid>
                 </StackPanel>
             </local:MyCard>
-            <local:MyCard Margin="0,0,0,15" Title="高级启动选项" IsSwaped="True" CanSwap="True">
+            <local:MyCard Margin="0,0,0,15" Title="高级启动选项" IsSwapped="True" CanSwap="True">
                 <Grid Margin="25,40,25,15">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />

+ 1 - 1
Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml

@@ -182,7 +182,7 @@
                     </Grid>
                 </StackPanel>
             </local:MyCard> -->
-            <local:MyCard x:Name="CardDebug" Margin="0,0,0,15" Title="调试选项" CanSwap="True" IsSwaped="True">
+            <local:MyCard x:Name="CardDebug" Margin="0,0,0,15" Title="调试选项" CanSwap="True" IsSwapped="True">
                 <StackPanel Margin="25,40,25,15">
                     <Grid x:Name="PanDebugAnim" Height="22" Margin="0,0,0,10">
                         <Grid.ColumnDefinitions>

+ 1 - 1
Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml

@@ -235,7 +235,7 @@
                         </StackPanel>
                     </StackPanel>
                 </local:MyCard>
-                <local:MyCard Title="高级选项" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+                <local:MyCard Title="高级选项" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
                     <StackPanel Margin="25,37,23,20">
                         <local:MyHint Text="建议仅在无法稳定连接 CurseForge 或 Modrinth 时才打包资源文件。&#xa;请不要公开发布含资源文件的整合包,这会违反部分 Mod 的使用协议!"
                                       Theme="Yellow" Margin="0,2,0,8" Visibility="{Binding Checked, ElementName=CheckAdvancedInclude, Converter={StaticResource BooleanToVisibilityConverter}}" />

+ 1 - 1
Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml

@@ -192,7 +192,7 @@
                     <local:MyButton x:Name="BtnServerAuthLittle" Height="35" MinWidth="150" Margin="0,12,0,0" Text="设置为 LittleSkin" HorizontalAlignment="Left" ColorType="Highlight" />
                 </StackPanel>
             </local:MyCard>
-            <local:MyCard x:Name="CardAdvance" Margin="0,0,0,15" Title="高级启动选项" IsSwaped="True" CanSwap="True">
+            <local:MyCard x:Name="CardAdvance" Margin="0,0,0,15" Title="高级启动选项" IsSwapped="True" CanSwap="True">
                 <Grid Margin="25,40,25,15">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" SharedSizeGroup="Name" />

+ 1 - 1
Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>PCL</RootNamespace>
     <AssemblyName>Plain Craft Launcher 2</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <MyType>Custom</MyType>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile>

+ 18 - 18
Plain Craft Launcher 2/Resources/Custom.xaml

@@ -3,7 +3,7 @@
      下列内容均基于 WPF 框架。你可以在继续之前先尝试自学 XAML 与 WPF 的基础,这能让你更轻松地理解下列内容。
      你也可以使用 Ctrl + F 快速查找。例如,若需要改变文本颜色,则搜索 “颜色” 即可。 -->
 
-<local:MyCard Title="纯文本" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="纯文本" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="每个 local:MyCard 代表一张卡片,你可以添加、删除格式类似的 MyCard 来添加多个卡片。每个 TextBlock 代表一段文本,你可以在 Text 属性中书写任何你想写的内容,也可以自行添加更多的 TextBlock。" />
@@ -14,17 +14,17 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="卡片、提示条" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="卡片、提示条" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <local:MyHint Text="local:MyHint 代表提示条。" />
         <local:MyHint Margin="0,8,0,2" Theme="Blue"
                     Text="将提示条的 Theme 属性改为 Blue、Yellow 或 Red 即可修改配色。&#xA;使用左边的那堆字符可以在任意地方手动换行,如果需要使用等号、引号等特殊字符,可以自行百度 XAML 转义字符。" />
         <TextBlock TextWrapping="Wrap" Margin="0,6,0,0"
-                    Text="卡片(local:MyCard)的 Title 属性决定了它的标题。&#xA;为卡片添加 CanSwap 属性让它可以被折叠,True 代表是,False 代表否。在此基础上,再使用 IsSwaped 属性调整它是否默认被折叠。" />
+                    Text="卡片(local:MyCard)的 Title 属性决定了它的标题。&#xA;为卡片添加 CanSwap 属性让它可以被折叠,True 代表是,False 代表否。在此基础上,再使用 IsSwapped 属性调整它是否默认被折叠。" />
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="长宽属性、图片" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="长宽属性、图片" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4" Width="320" HorizontalAlignment="Right"
                     Text="任意项目都可以添加 Width 与 Height 属性来控制宽高。HorizontalAlignment 属性可以控制对齐:Center 代表居中,Right 代表居右,例如这段文本就被居右了。" />
@@ -34,7 +34,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="按钮" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="按钮" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="添加 local:MyButton 即可新建一个按钮。你需要限定它的尺寸与位置,并通过 Padding 属性进一步控制它的内边距。" />
@@ -53,7 +53,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="事件 1:打开网页、弹出窗口" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="事件 1:打开网页、弹出窗口" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
                     Text="将按钮的 EventType 属性设为 打开网页,然后在 EventData 属性中写入网址,即可通过点击按钮打开网页。" />
@@ -70,7 +70,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="事件 2:启动游戏" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="事件 2:启动游戏" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="将 EventType 设置为 启动游戏,EventData 设置为具体的游戏版本,即可通过点击按钮启动游戏。如果当前游戏文件夹没有该版本,则无法启动。" />
@@ -87,7 +87,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="事件 3:执行命令" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="事件 3:执行命令" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="将 EventType 设置为 执行命令(或 打开文件),EventData 设置为文件路径,即可点击打开特定文件或启动程序。" />
@@ -106,7 +106,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="事件 4:其他事件类型" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="事件 4:其他事件类型" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock Margin="0,4,0,6" FontWeight="Bold"
                     Text="EventType 共有以下种类:" />
@@ -141,7 +141,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="StackPanel 横向布局" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="StackPanel 横向布局" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
                     Text="你需要使用 StackPanel 在一行里塞下多个按钮。你可以仅在这个教学卡片的基础上稍作调整,来实现自己的按钮布局。" />
@@ -166,7 +166,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="列表项 1:基础" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="列表项 1:基础" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="你也可以使用列表项 “local:MyListItem” 来替代按钮,其使用方式与按钮类似。" />
@@ -183,7 +183,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="列表项 2:内置图片" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="列表项 2:内置图片" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="PCL 内置了一些 Minecraft 方块与物品图片,可以直接使用。"/>
@@ -221,7 +221,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="主题色" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="主题色" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,15"
                     Text="你可以用类似 {DynamicResource ColorBrush5} 的格式使用 PCL 当前的主题颜色,修改末尾的数字编号以改变颜色浓度。" />
@@ -242,7 +242,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="替换标记" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="替换标记" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="在花括号 {} 中写入特定内容,PCL 会在加载时对其进行替换。&#xa;例如,path 会被替换为 PCL 可执行文件所在文件夹({path}),用于在 EventData 中指定特定文件,或是加载图片。" />
@@ -253,7 +253,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="进阶:Grid 布局" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="进阶:Grid 布局" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="如果要实现更复杂的布局,则必须使用 Grid。Grid 可以让按钮们自动适应窗口宽度:随意拉伸 PCL 窗口,按钮大小会自动改变。" />
@@ -276,7 +276,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="进阶:图标按钮" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="进阶:图标按钮" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="MyIconTextButton 是一种带有自定义矢量图标的按钮变体,它同样支持 EventType 与 EventData 属性。&#xa;通过设置 Logo 属性来控制它的图标,设置 LogoScale 属性还可以调整图标的缩放比例。" />
@@ -301,7 +301,7 @@
     </StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="进阶:联网主页" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+<local:MyCard Title="进阶:联网主页" Margin="0,0,0,15" CanSwap="True" IsSwapped="True">
     <StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
                     Text="如果你在尝试制作联网更新的主页,可以查看下方的 GitHub 讨论页。&#xa;你可以根据其中的介绍为主页添加版本号检查以节省流量,也可以通过检查 Referer 和 User Agent 来确定对方的 PCL 版本。" />
@@ -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 为朝下(默认)