InfStarMC/PCL-ISE
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.13.1.0

Browse Source
This commit is contained in:
LTCat
2026-08-02 01:00:16 +08:00
parent c7ccdd65dc
commit 7fb6e5d68e
61 changed files with 3291 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb
+2 -37
View File
@@ -368,7 +368,7 @@ pause"
'添加 Java Wrapper 作为主 Jar
Dim Arguments As String
If UseJavaWrapper AndAlso Not Settings.Get(Of Boolean)("LaunchAdvanceDisableJLW") Then
Arguments = $"-Doolloo.jlw.tmpdir=""{PathPure.TrimEnd("\")}"" -Duser.home=""{BaseMcFolderHome.TrimEnd("\")}"" -cp ""{Target}"" -jar ""{ExtractPatch("JavaWrapper")}"" optifine.Installer"
Arguments = $"-Doolloo.jlw.tmpdir=""{PathPure.Value.TrimEnd("\")}"" -Duser.home=""{BaseMcFolderHome.TrimEnd("\")}"" -cp ""{Target}"" -jar ""{LaunchUtils.ExtractPatch("Launch\JavaWrapper.jar", PathPure.Value)}"" optifine.Installer"
Else
Arguments = $"-Duser.home=""{BaseMcFolderHome.TrimEnd("\")}"" -cp ""{Target}"" optifine.Installer"
End If
@@ -939,7 +939,7 @@ Retry:
'添加 Java Wrapper 作为主 Jar
Dim Arguments As String
If UseJavaWrapper AndAlso Not Settings.Get(Of Boolean)("LaunchAdvanceDisableJLW") Then
Arguments = $"-Doolloo.jlw.tmpdir=""{PathPure.TrimEnd("\")}"" -cp ""{PathTemp}Cache\forge_installer.jar;{Target}"" -jar ""{ExtractPatch("JavaWrapper")}"" com.bangbang93.ForgeInstaller ""{McFolder}"
Arguments = $"-Doolloo.jlw.tmpdir=""{PathPure.Value.TrimEnd("\")}"" -cp ""{PathTemp}Cache\forge_installer.jar;{Target}"" -jar ""{LaunchUtils.ExtractPatch("Launch\JavaWrapper.jar", PathPure.Value)}"" com.bangbang93.ForgeInstaller ""{McFolder}"
Else
Arguments = $"-cp ""{PathTemp}Cache\forge_installer.jar;{Target}"" com.bangbang93.ForgeInstaller ""{McFolder}"
End If
@@ -2160,39 +2160,4 @@ Retry:
''' </summary>
Private VanillaSyncLock As New Object
''' <summary>
''' 释放补丁文件并返回完整文件路径。
''' </summary>
''' <param name="Patch">"LUA" 或 "JavaWrapper"。</param>
Public Function ExtractPatch(Patch As String) As String
Dim PatchPath As String = $"{PathPure}{Patch}.jar"
Logger.Info($"选定的 {Patch} 路径：{PatchPath}")
Static Lock As New Object
SyncLock Lock '避免 OptiFine 和 Forge 安装时同时释放导致冲突
Try
ExtractResources(PatchPath, Patch)
Catch ex As Exception
If FileUtils.Exists(PatchPath) Then
'因为未知原因可能变为只读文件（#4243）
Logger.Warn(ex, $"{Patch} 文件释放失败，但文件已存在，将在删除后尝试重新生成")
Try
FileUtils.Delete(PatchPath)
ExtractResources(PatchPath, Patch)
Catch ex2 As Exception
Logger.Warn(ex2, $"{Patch} 文件重新释放失败，将尝试更换文件名重新生成")
PatchPath = $"{PathPure}{Patch}2.jar"
Try
ExtractResources(PatchPath, Patch)
Catch ex3 As Exception
Throw New FileNotFoundException($"释放 {Patch} 最终尝试失败", ex3)
End Try
End Try
Else
Throw New FileNotFoundException($"释放 {Patch} 失败", ex)
End If
End Try
End SyncLock
Return PatchPath
End Function
End Module
Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
+1 -1
View File
@@ -1120,7 +1120,7 @@ Public Class PageDownloadInstall
#Region "安装"
Private Sub TextSelectName_KeyDown(sender As Object, e As KeyEventArgs) Handles TextSelectName.KeyDown
If e.Key = Key.Enter AndAlso BtnStart.IsEnabled Then BtnStart_Click()
If e.Key = Key.Enter AndAlso IsInSelectPage AndAlso BtnStart.IsEnabled Then BtnStart_Click()
End Sub
Private Sub BtnStart_Click() Handles BtnStart.Click
'确认版本隔离
Plain Craft Launcher 2/Pages/PageDownload/Resource/PageDownloadCompDetail.xaml.vb
+2 -5
View File
@@ -175,10 +175,7 @@ GroupDone:
If Project.ModLoaders.Flags.Count > 1 AndAlso '工程至少有两个加载器
Version.ResourceType = ResourceTypes.Mod AndAlso '是 Mod
McVersion.IsFormatFit(VerName) Then '不是 “快照版本” 之类的
For Each Loader In Version.ModLoaders.Flags
If Loader = ModLoaders.Quilt AndAlso Settings.Get(Of Boolean)("ToolDownloadIgnoreQuilt") Then Continue For
Loaders.Add(Loader.ToString & " ")
Next
Loaders.AddRange(Version.ModLoaders.Flags.Select(Function(f) f.ToString & " "))
End If
If Not Loaders.Any() Then Loaders.Add("") '保底加一个空的，确保它在一张卡片里
'实际添加
@@ -329,7 +326,7 @@ GroupDone:
Loader.Start(McFolderSelected & "versions\" & InstanceName & "\")
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
FrmMain.BtnExtraDownload.Ribble()
FrmMain.PageChange(FormMain.PageType.TaskManager)
Catch ex As Exception
Logger.Error(ex, "下载资源整合包失败")
Plain Craft Launcher 2/Pages/PageDownload/Resource/PageResource.xaml
+1 -1
View File
@@ -34,6 +34,7 @@
<TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="版本" Margin="0,0,18,0" />
<local:MyComboBox x:Name="TextSearchVersion" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" IsEditable="True" IsTextSearchEnabled="False">
<local:MyComboBoxItem Content="全部 (也可自行输入)" IsSelected="True" />
<local:MyComboBoxItem Content="26.2" />
<local:MyComboBoxItem Content="26.1" />
<local:MyComboBoxItem Content="1.21.11" />
<local:MyComboBoxItem Content="1.21.8" />
@@ -51,7 +52,6 @@
<local:MyComboBoxItem Content="Forge" Tag="1" />
<local:MyComboBoxItem Content="NeoForge" Tag="16" />
<local:MyComboBoxItem Content="Fabric" Tag="4" />
<local:MyComboBoxItem Content="Quilt" Tag="8" />
<local:MyComboBoxItem Content="LiteLoader" Tag="2" />
</local:MyComboBox>
<TextBlock VerticalAlignment="Center" Grid.Column="4" Grid.Row="2" HorizontalAlignment="Left" Text="类型" Margin="0,0,18,0" />
Plain Craft Launcher 2/Pages/PageInstance/PageInstanceExport.xaml
+13 -1
View File
@@ -181,6 +181,18 @@
RequireModLoaderOrOptiFine="True" />
</local:MyCheckBox.Tag>
</local:MyCheckBox>
<StackPanel Margin="30,0,0,0"
Visibility="{Binding Checked, ElementName=CheckOptionsShaderPacks, Converter={StaticResource BooleanToVisibilityConverter}}">
<local:MyCheckBox x:Name="CheckOptionsShaderPackSettings">
<local:MyCheckBox.Tag>
<local:ExportOption
Title="光影包设置"
Description="已选光影包的自定义设置"
ShowRules="shaderpacks/*.txt"
DefaultChecked="True" />
</local:MyCheckBox.Tag>
</local:MyCheckBox>
</StackPanel>
<StackPanel Margin="30,0,0,0" x:Name="PanOptionsShaderPacks"
Visibility="{Binding Checked, ElementName=CheckOptionsShaderPacks, Converter={StaticResource BooleanToVisibilityConverter}}">
</StackPanel>
@@ -299,4 +311,4 @@
x:Name="BtnExport" Text="开始导出"
LogoScale="1.1" Logo="M511 995a128 128 0 0 1-57-13L70 791a126 126 0 0 1-70-113V311a126 126 0 0 1 15-60V248c1-2 3-5 5-8a127 127 0 0 1 49-42L454 13a128 128 0 0 1 112 0l383 190a126 126 0 0 1 72 113v360a126 126 0 0 1-70 115L568 984c-17 7-37 11-57 11z m42-470v370l360-178c14-7 23-21 23-38v-335L554 524zM85 330v347a42 42 0 0 0 23 38l360 178V523L85 330zM135 260l375 189 137-65L286 188 135 260z m245-118l363 197 150-71-365-180a42 42 0 0 0-37 0l-111 53z" />
</Grid>
</local:MyPageRight>
</local:MyPageRight>
Plain Craft Launcher 2/Pages/PageInstance/PageInstanceExport.xaml.vb
+19 -5
View File
@@ -76,6 +76,7 @@ Public Class PageInstanceExport
If Not SubFolder.EnumerateFileSystemInfos().Any() Then Continue For
Dim NewCheckBox As New MyCheckBox With {. _
Tag = New ExportOption With {.Title = SubFolder.Name, .DefaultChecked = True, .Rules = StringUtils.LikePatternEscape($"{Folder}/{SubFolder.Name}/")}}
If AcceptCompressedFile Then GetExportOption(NewCheckBox).Description = "文件夹"
If Panel Is PanOptionsSaves Then GetExportOption(NewCheckBox).Description = SubFolder.LastWriteTime.ToString("yyyy'/'MM'/'dd HH':'mm")
Panel.Children.Add(NewCheckBox)
Next
@@ -249,9 +250,22 @@ Public Class PageInstanceExport
For Each CheckBox In GetAllOptions(False)
If Not CheckBox.Checked Then Continue For
Dim TargetOption = GetExportOption(CheckBox)
If TargetOption.Rules Is Nothing Then Continue For
Dim Rules = If(TargetOption.Rules?.Split("|"c).ToList(), New List(Of String))
'动态 Rules
If CheckBox Is CheckOptionsShaderPackSettings Then '光影包设置：只导出勾选的光影包的设置
For Each ShaderPackCheckBox In PanOptionsShaderPacks.Children.OfType(Of MyCheckBox)()
If Not ShaderPackCheckBox.Checked Then Continue For
Dim ShaderPackOption = GetExportOption(ShaderPackCheckBox)
Dim SettingFileName = ShaderPackOption.Rules.TrimEnd("/") & ".txt"
If Not FileUtils.Exists(Path.Combine(PageInstanceLeft.Instance.PathIndie, SettingFileName)) Then Continue For
Rules.Add(StringUtils.LikePatternEscape($"shaderpacks/{SettingFileName}"))
Next
End If
If Not Rules.Any() Then Continue For
Yield $"# {TargetOption.Title}"
For Each Rule In TargetOption.Rules.Split("|"c)
For Each Rule In Rules
Yield Rule
Next
Yield ""
@@ -412,7 +426,7 @@ Public Class PageInstanceExport
Dim LoaderName As String = $"导出整合包：" & PackName
For Each OngoingLoader In LoaderTaskbar
If OngoingLoader.Name <> LoaderName Then Continue For
FrmMain.PageChange(FormMain.PageType.DownloadManager)
FrmMain.PageChange(FormMain.PageType.TaskManager)
Return
Next
@@ -608,7 +622,7 @@ Public Class PageInstanceExport
Try
If ModrinthUploadMode Then Return 'Modrinth 上传模式下，不从 CurseForge 获取信息
Dim CurseForgeHashes = Loader.Input.Select(Function(m) m.CurseForgeHash)
Dim CurseForgeRaw As JContainer = DlModRequest("https://api.curseforge.com/v1/fingerprints/432/", HttpMethod.Post,
Dim CurseForgeRaw As JContainer = DlModRequest("https://api.curseforge.com/v1/fingerprints/432", HttpMethod.Post,
$"{{""fingerprints"": [{CurseForgeHashes.Join(",")}]}}", "application/json")("data")("exactMatches")
For Each ResultJson As JObject In CurseForgeRaw
If Not ResultJson.ContainsKey("file") Then Continue For
@@ -712,7 +726,7 @@ Public Class PageInstanceExport
LoaderTaskbarAdd(MainLoader)
FrmMain.BtnExtraDownload.ShowRefresh()
FrmMain.BtnExtraDownload.Ribble()
FrmMain.PageChange(FormMain.PageType.DownloadManager)
FrmMain.PageChange(FormMain.PageType.TaskManager)
End Sub
#End Region
Plain Craft Launcher 2/Pages/PageInstance/PageInstanceMod.xaml.vb
+4 -1
View File
@@ -309,7 +309,10 @@ Install:
For Each ModFile In FilePathList
Dim NewFileName = PathUtils.GetLastPart(ModFile).Replace(".disabled", "").Replace(".old", "")
If Not NewFileName.Contains(".") Then NewFileName += ".jar" '#4227
FileUtils.Copy(ModFile, Instance.PathIndie & "mods\" & NewFileName)
NewFileName = Instance.PathIndie & "mods\" & NewFileName
If ModFile = NewFileName Then Continue For '防止安装相同文件导致文件被删除
FileUtils.Delete(NewFileName, True)
FileUtils.Copy(ModFile, NewFileName)
Next
If FilePathList.IsSingle Then
Hint($"已安装 {PathUtils.GetLastPart(FilePathList.First).Replace(".disabled", "").Replace(".old", "")}！", HintType.Green)
Plain Craft Launcher 2/Pages/PageInstance/PageInstanceOverall.xaml
+6 -12
View File
@@ -62,18 +62,12 @@
</StackPanel>
</local:MyCard>
<local:MyCard Margin="0,0,0,15" Title="快捷方式" x:Name="PanFolder">
<StackPanel Margin="25,40,25,15">
<Grid Margin="0,2,0,7" 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="BtnFolderVersion" Text="版本文件夹" MinWidth="140" Padding="13,0" Margin="0,0,20,0" />
<local:MyButton x:Name="BtnFolderSaves" Text="存档文件夹" MinWidth="140" Padding="13,0" Margin="0,0,20,0" Grid.Column="1" />
<local:MyButton x:Name="BtnFolderMods" Text="Mod 文件夹" MinWidth="140" Padding="13,0" Margin="0,0,20,0" Grid.Column="2" />
</Grid>
</StackPanel>
<WrapPanel Margin="25,30,25,20">
<local:MyButton x:Name="BtnFolderVersion" Text="版本文件夹" MinWidth="140" Padding="13,0" Margin="0,13,20,0" Height="35" />
<local:MyButton x:Name="BtnFolderSaves" Text="存档文件夹" MinWidth="140" Padding="13,0" Margin="0,13,20,0" Height="35"/>
<local:MyButton x:Name="BtnFolderMods" Text="Mod 文件夹" MinWidth="140" Padding="13,0" Margin="0,13,20,0" Height="35"/>
<local:MyButton x:Name="BtnFolderScreen" Text="截图文件夹" MinWidth="140" Padding="13,0" Margin="0,13,20,0" Height="35" />
</WrapPanel>
</local:MyCard>
<local:MyCard Margin="0,0,0,15" Title="高级管理" x:Name="PanManage">
<StackPanel Margin="25,40,25,15">
Plain Craft Launcher 2/Pages/PageInstance/PageInstanceOverall.xaml.vb
+14 -3
View File
@@ -109,7 +109,8 @@ Public Class PageInstanceOverall
Dim OldPath As String = PageInstanceLeft.Instance.PathVersion
'修改此部分的同时修改快速安装的版本名检测*
Dim NewName As String = MyMsgBoxInput("重命名版本", "", OldName, New ObjectModel.Collection(Of Validate) From {
New ValidateFolderName(McFolderSelected & "versions", IgnoreCase:=False)})
New ValidateFolderName(McFolderSelected & "versions", IgnoreList:=New List(Of String) From {OldName})
})
If String.IsNullOrWhiteSpace(NewName) Then Return
Dim NewPath As String = McFolderSelected & "versions\" & NewName & "\"
'重新读取版本 JSON 信息，避免 JsonObject 中已被合并的项被重新存储
@@ -157,7 +158,7 @@ Public Class PageInstanceOverall
End Sub
'版本图标
Private Sub ComboDisplayLogo_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles ComboDisplayLogo.SelectionChanged
Private Sub ComboDisplayLogo_SelectionChanged() Handles ItemDisplayLogoCustom.PreviewMouseLeftButtonUp, ComboDisplayLogo.SelectionChanged
If Not (IsLoad AndAlso AniControlEnabled = 0) Then Return
'选择 自定义 时修改图片
Try
@@ -228,6 +229,13 @@ Public Class PageInstanceOverall
OpenExplorer(Folder)
End Sub
'截图文件夹
Private Sub BtnFolderScreen_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnFolderScreen.Click
Dim Folder As String = PageInstanceLeft.Instance.PathIndie & "screenshots\"
DirectoryUtils.Create(Folder)
OpenExplorer(Folder)
End Sub
#End Region
#Region "卡片：管理"
@@ -298,8 +306,11 @@ Public Class PageInstanceOverall
Try
Dim IsShiftPressed As Boolean = My.Computer.Keyboard.ShiftKeyDown
Dim IsHintIndie As Boolean = PageInstanceLeft.Instance.State <> McInstanceState.Error AndAlso PageInstanceLeft.Instance.PathIndie <> McFolderSelected
Dim SavesFolder = DirectoryUtils.GetInfo(PageInstanceLeft.Instance.PathIndie & "saves\")
Dim SaveEntries = If(SavesFolder.Exists, SavesFolder.EnumerateDirectories.OrderByDescending(Function(Save) Save.LastWriteTime).Select(Function(Save) $"{Save.Name}（上次修改：{StringUtils.FormatTimeSpan(Save.LastWriteTime - Date.Now, False)}）").ToList, New List(Of String))
Select Case MyMsgBox($"你确定要{If(IsShiftPressed, "永久", "")}删除版本 {PageInstanceLeft.Instance.Name} 吗？" &
If(IsHintIndie, vbCrLf & "由于该版本开启了版本隔离，删除版本时该版本对应的存档、资源包、Mod 等文件也将被一并删除！", ""),
If(IsHintIndie, vbCrLf & "该版本对应的存档、资源包、Mod 等文件也将被一并删除！" &
If(SaveEntries.Any, vbCrLf & vbCrLf & "这会删除以下存档：" & vbCrLf & "· " & SaveEntries.Join(vbCrLf & "· "), ""), ""),
"版本删除确认", , "取消",, IsHintIndie OrElse IsShiftPressed)
Case 1
PageInstanceLeft.Instance.ResetSettingsCache()
Plain Craft Launcher 2/Pages/PageInstance/PageInstanceSetup.xaml.vb
+3 -3
View File
@@ -83,7 +83,7 @@ Public Class PageInstanceSetup
Settings.Reset("VersionServerLogin", Instance:=PageInstanceLeft.Instance)
Settings.Reset("VersionArgumentIndieV2", Instance:=PageInstanceLeft.Instance)
Settings.Reset("VersionAdvanceAssets", Instance:=PageInstanceLeft.Instance)
Configs.InstanceForcedJava.Reset(PageInstanceLeft.Instance.Config)
Configs.JavaForced.Reset(PageInstanceLeft.Instance.Config)
JavaListRefreshWorker.Start()
Logger.Info("已初始化版本独立设置")
@@ -474,7 +474,7 @@ PreFin:
'========================================== 显示结果 ==========================================
BtnArgumentJavaSearch.IsEnabled = True
ComboArgumentJavaSelect.IsEnabled = True
Dim SelectedJava As Java = Configs.InstanceForcedJava.Get(PageInstanceLeft.Instance.Config)
Dim SelectedJava As Java = Configs.JavaForced.Get(PageInstanceLeft.Instance.Config)
'更新下拉框文本
If Not Configs.JavaList.Get().Any() Then
LabArgumentJava.Text = "未找到 Java，点击以导入已有的 Java"
@@ -492,7 +492,7 @@ PreFin:
AddHandler JavaItem.MouseLeftButtonUp, Sub(sender As Object, e As MouseButtonEventArgs) e.Handled = True
AddHandler JavaItem.Click,
Sub()
Configs.InstanceForcedJava.Set(JavaEntry, PageInstanceLeft.Instance.Config)
Configs.JavaForced.Set(JavaEntry, PageInstanceLeft.Instance.Config)
UpdateJavaList()
ComboArgumentJavaSelect.IsDropDownOpen = False
End Sub
Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb
+6
View File
@@ -108,6 +108,12 @@ Public Class PageLaunchRight
Case 17
Logger.Info("Bangumi 番剧主页")
Url = "https://bangumi.p.kaphia.qzz.io"
Case 18
Logger.Info("Bilibili 热门")
Url = "https://bilibili.p.kaphia.qzz.io"
Case 19
Logger.Info("Music 云音乐热门")
Url = "https://cloudmusic.p.kaphia.qzz.io"
End Select
End Select
'联网下载
Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuthSkin.xaml
+1 -1
View File
@@ -21,7 +21,7 @@
<TextBlock Name="TextEmail" Text="加载中" Margin="8,4,8,0" FontSize="12" HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" Foreground="{DynamicResource ColorBrushGray3}" />
</StackPanel>
<local:MyIconButton ToolTip="更换角色" Grid.Row="1" Height="14" Opacity="0" x:Name="BtnEdit" ToolTipService.InitialShowDelay="50" Grid.Column="0" HorizontalAlignment="Center" Logo="F1 M 53.2929,21.2929L 54.7071,22.7071C 56.4645,24.4645 56.4645,27.3137 54.7071,29.0711L 52.2323,31.5459L 44.4541,23.7677L 46.9289,21.2929C 48.6863,19.5355 51.5355,19.5355 53.2929,21.2929 Z M 31.7262,52.052L 23.948,44.2738L 43.0399,25.182L 50.818,32.9601L 31.7262,52.052 Z M 23.2409,47.1023L 28.8977,52.7591L 21.0463,54.9537L 23.2409,47.1023 Z" Margin="8,0,0,0" VerticalAlignment="Center" />
<local:MyIconButton ToolTip="退出登录" Grid.Row="1" Height="14" Opacity="0" x:Name="BtnExit" ToolTipService.InitialShowDelay="50" Grid.Column="2" HorizontalAlignment="Center" Logo="F1 M 51.0071,19.0027L 51.0071,27.0038L 48.0067,27.0038L 48.0067,22.0031L 25.0035,22.0031L 25.0035,54.0075L 48.0067,54.0075L 48.0067,49.0068L 51.0071,49.0068L 51.0071,57.008L 22.1698,57.008L 22.0031,19.0027L 51.0071,19.0027 Z M 30.0042,35.0049L 45.2563,35.0049L 37.005,28.0039L 47.0066,28.0039L 58.5082,38.0053L 47.0066,48.0067L 37.005,48.0067L 45.2563,41.0057L 30.0042,41.0057L 30.0042,35.0049 Z" Margin="0,0,8,0" VerticalAlignment="Center" />
<local:MyIconButton ToolTip="切换账号" Grid.Row="1" Height="14" Opacity="0" x:Name="BtnExit" ToolTipService.InitialShowDelay="50" Grid.Column="2" HorizontalAlignment="Center" Logo="M512 0A512 512 0 1 0 1024 512 512 512 0 0 0 512 0z m0 941.407086A429.407086 429.407086 0 1 1 941.407086 512 429.407086 429.407086 0 0 1 512 941.407086z m235.139657-368.64H264.045714a43.505371 43.505371 0 0 0-31.246628 72.060343l159.305143 166.765714a41.281829 41.281829 0 1 0 59.626057-56.788114l-94.997943-99.474286H747.227429a41.311086 41.311086 0 1 0 0-82.622172zM262.670629 450.940343H745.764571a43.505371 43.505371 0 0 0 31.246629-72.352914l-159.305143-166.765715a41.281829 41.281829 0 1 0-59.713828 57.022172l94.968685 99.474285H262.670629a41.281829 41.281829 0 0 0 0 82.563658z" Margin="0,0,8,0" VerticalAlignment="Center" />
</Grid>
<local:MySkin HorizontalAlignment="Center" VerticalAlignment="Top" x:Name="Skin" HasCape="False" />
</Grid>
Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb
+1 -1
View File
@@ -18,7 +18,7 @@ Public Class PageLoginMs
ComboAccounts.Items.Add(Item)
Next
Catch ex As Exception
Logger.Error(ex, $"微软登录信息出错，登录信息已被重置（{Settings.Get(Of String)("LoginMsJson")}）", LogBehavior.Toast)
Logger.Error(ex, $"微软登录信息出错，登录信息已被重置", LogBehavior.Toast)
Settings.Set("LoginMsJson", "{}")
End Try
'如果不保留输入，刷新列表后自动选择第一项
Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMsSkin.xaml
+6 -2
View File
@@ -28,6 +28,8 @@
<Separator />
<local:MyMenuItem Click="BtnSkinCape_Click" Header="修改披风"/>
<local:MyMenuItem Click="BtnSkinCapeRefresh_Click" Header="刷新披风列表"/>
<local:MyMenuItem Header="使用 CDKEY 兑换奖励"
local:CustomEventService.EventType="打开网页" local:CustomEventService.EventData="https://www.minecraft.net/zh-hans/redeem" />
</ContextMenu>
</local:MyIconButton.ContextMenu>
</local:MyIconButton>
@@ -36,8 +38,10 @@
LogoScale="1.1" Logo="M462.336 924.891429L73.142857 950.857143l25.965714-389.193143 467.017143-467.017143a73.398857 73.398857 0 0 1 103.789715 0l259.437714 259.437714a73.398857 73.398857 0 0 1 0 103.789715l-467.017143 467.017143z m155.684571-778.349715L202.861714 561.664l259.474286 259.474286L877.458286 405.942857 618.057143 146.541714zM151.003429 873.033143l233.508571-25.965714-207.579429-207.579429-25.965714 233.545143z m544.841142-492.982857l51.894858 51.894857-233.508572 233.508571-51.931428-51.894857 233.545142-233.508571z">
<local:MyIconButton.ContextMenu>
<ContextMenu Closed="HidePanel" HorizontalOffset="10" VerticalOffset="18">
<local:MyMenuItem Header="修改密码" local:CustomEventService.EventType="打开网页" local:CustomEventService.EventData="https://account.live.com/password/Change" />
<local:MyMenuItem Header="修改玩家名" local:CustomEventService.EventType="打开网页" local:CustomEventService.EventData="https://www.minecraft.net/zh-hans/msaprofile/mygames/editprofile" />
<local:MyMenuItem Header="修改密码"
local:CustomEventService.EventType="打开网页" local:CustomEventService.EventData="https://account.live.com/password/Change" />
<local:MyMenuItem Header="修改玩家名"
local:CustomEventService.EventType="打开网页" local:CustomEventService.EventData="https://www.minecraft.net/zh-hans/msaprofile/mygames/editprofile" />
</ContextMenu>
</local:MyIconButton.ContextMenu>
</local:MyIconButton>
Plain Craft Launcher 2/Pages/PageLaunch/PageLoginNideSkin.xaml
+1 -1
View File
@@ -22,7 +22,7 @@
</StackPanel>
<local:MyIconButton ToolTip="更改密码" Grid.Row="1" Height="14" Opacity="0" x:Name="BtnEdit" ToolTipService.InitialShowDelay="50" Grid.Column="0" HorizontalAlignment="Center" Logo="F1 M 53.2929,21.2929L 54.7071,22.7071C 56.4645,24.4645 56.4645,27.3137 54.7071,29.0711L 52.2323,31.5459L 44.4541,23.7677L 46.9289,21.2929C 48.6863,19.5355 51.5355,19.5355 53.2929,21.2929 Z M 31.7262,52.052L 23.948,44.2738L 43.0399,25.182L 50.818,32.9601L 31.7262,52.052 Z M 23.2409,47.1023L 28.8977,52.7591L 21.0463,54.9537L 23.2409,47.1023 Z" Margin="8,0,0,0" VerticalAlignment="Center"
local:CustomEventService.EventType="打开网页" local:CustomEventService.EventData="https://login.mc-user.com:233/account/changepw" />
<local:MyIconButton ToolTip="退出登录" Grid.Row="1" Height="14" Opacity="0" x:Name="BtnExit" ToolTipService.InitialShowDelay="50" Grid.Column="2" HorizontalAlignment="Center" Logo="F1 M 51.0071,19.0027L 51.0071,27.0038L 48.0067,27.0038L 48.0067,22.0031L 25.0035,22.0031L 25.0035,54.0075L 48.0067,54.0075L 48.0067,49.0068L 51.0071,49.0068L 51.0071,57.008L 22.1698,57.008L 22.0031,19.0027L 51.0071,19.0027 Z M 30.0042,35.0049L 45.2563,35.0049L 37.005,28.0039L 47.0066,28.0039L 58.5082,38.0053L 47.0066,48.0067L 37.005,48.0067L 45.2563,41.0057L 30.0042,41.0057L 30.0042,35.0049 Z" Margin="0,0,8,0" VerticalAlignment="Center" />
<local:MyIconButton ToolTip="切换账号" Grid.Row="1" Height="14" Opacity="0" x:Name="BtnExit" ToolTipService.InitialShowDelay="50" Grid.Column="2" HorizontalAlignment="Center" Logo="M512 0A512 512 0 1 0 1024 512 512 512 0 0 0 512 0z m0 941.407086A429.407086 429.407086 0 1 1 941.407086 512 429.407086 429.407086 0 0 1 512 941.407086z m235.139657-368.64H264.045714a43.505371 43.505371 0 0 0-31.246628 72.060343l159.305143 166.765714a41.281829 41.281829 0 1 0 59.626057-56.788114l-94.997943-99.474286H747.227429a41.311086 41.311086 0 1 0 0-82.622172zM262.670629 450.940343H745.764571a43.505371 43.505371 0 0 0 31.246629-72.352914l-159.305143-166.765715a41.281829 41.281829 0 1 0-59.713828 57.022172l94.968685 99.474285H262.670629a41.281829 41.281829 0 0 0 0 82.563658z" Margin="0,0,8,0" VerticalAlignment="Center" />
</Grid>
<local:MySkin HorizontalAlignment="Center" VerticalAlignment="Top" x:Name="Skin" HasCape="False" />
</Grid>
Plain Craft Launcher 2/Pages/PageLink/PageLinkMain.xaml.vb
+2 -2
View File
@@ -487,8 +487,8 @@ Public Class PageLinkMain
If FileUtils.Exists(PathEasyTier & "EasyTier.zip") Then
'解压
Dim ExtractPath As String = RequestTaskTempFolder()
FileUtils.ExtractToDirectory(PathEasyTier & "EasyTier.zip", ExtractPath,
progressHandler:=Sub(Percentage) Task.Progress = Percentage * 0.05)
'FileUtils.ExtractToDirectory(PathEasyTier & "EasyTier.zip", ExtractPath,
' progressHandler:=Sub(Percentage) Task.Progress = Percentage * 0.05)
DirectoryUtils.Copy(DirectoryUtils.EnumerateDirectories(ExtractPath, True).First, PathEasyTier)
'重命名
FileUtils.Move(PathEasyTier & "easytier-core.exe", PathEasyTier & "联机模块.exe")
Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml
+313 -312
View File
@@ -11,6 +11,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="45" />
<RowDefinition Height="45" />
<RowDefinition Height="45" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="40" />
@@ -18,21 +19,27 @@
<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">
<local:MyListItem IsHitTestVisible="False" Title="HerobrineXia" Margin="-5,0,15,0" Info="Plain Craft Launcher 的协力开发者！" Grid.Row="1" Grid.Column="1" />
<local:MyListItem IsHitTestVisible="False" Title="Plain Craft Launcher 2" Margin="-5,0,15,0" Info="当前版本：%VERSION%（%VERSIONCODE%.%BRANCH%）" Grid.Row="2" Grid.Column="1" x:Name="ItemAboutPcl" />
<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>
<Image Source="/Plain Craft Launcher 2;component/Images/Heads/LTCat.jpg" Grid.Row="0" Margin="3">
<Image Source="/Plain Craft Launcher 2;component/Images/Heads/HerobrineXia.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/Logo.png" Grid.Row="2" Margin="3">
<Image.Clip>
<EllipseGeometry Center="17 17" RadiusX="17" RadiusY="17" />
</Image.Clip>
</Image>
<local:MyButton Text="赞助 PCL !" Grid.Column="2" Grid.Row="0" Height="35" ColorType="Highlight"
local:CustomEventService.EventType="打开网页" local:CustomEventService.EventData="https://meloong.com/afd/a/LTCat" />
<local:MyButton Text="查看源代码" Grid.Column="2" Grid.Row="1" Height="35"
local:CustomEventService.EventType="打开网页" local:CustomEventService.EventData="https://github.com/Hex-Dragon/PCL2" />
<local:MyButton Text="检查更新" Grid.Column="2" Grid.Row="2" Height="35"
x:Name="BtnAboutUpdate" />
</Grid>
</local:MyCard>
<local:MyCard Margin="0,0,0,15" Title="特别鸣谢">
@@ -124,335 +131,329 @@
<local:MyCard Margin="0,0,0,15" Title="赞助者">
<StackPanel Margin="25,40,19,20">
<TextBlock HorizontalAlignment="Left" Text="以下是近期的高级赞助者们！感谢大家对 PCL 的支持！！！" Margin="0,0,25,5.5" TextTrimming="None" TextWrapping="WrapWithOverflow" />
<WrapPanel Margin="0,0,0,10">␍ <TextBlock Margin="0,1.5,6,0" Text="." />
<TextBlock Margin="0,1.5,6,0" Text="7" />
<TextBlock Margin="0,1.5,6,0" Text="ln" />
<TextBlock Margin="0,1.5,6,0" Text="sc" />
<TextBlock Margin="0,1.5,6,0" Text="龙" />
<TextBlock Margin="0,1.5,6,0" Text="人" />
<TextBlock Margin="0,1.5,6,0" Text="溈" />
<TextBlock Margin="0,1.5,6,0" Text="域" />
<TextBlock Margin="0,1.5,6,0" Text="菌" />
<TextBlock Margin="0,1.5,6,0" Text="。" />
<TextBlock Margin="0,1.5,6,0" Text="東" />
<TextBlock Margin="0,1.5,6,0" Text="喆" />
<TextBlock Margin="0,1.5,6,0" Text="辞" />
<TextBlock Margin="0,1.5,6,0" Text="溯" />
<WrapPanel Margin="0,0,0,10">␍ <TextBlock Margin="0,1.5,6,0" Text="L" />
<TextBlock Margin="0,1.5,6,0" Text="Z" />
<TextBlock Margin="0,1.5,6,0" Text="N" />
<TextBlock Margin="0,1.5,6,0" Text="...:" />
<TextBlock Margin="0,1.5,6,0" Text="妖" />
<TextBlock Margin="0,1.5,6,0" Text="萧" />
<TextBlock Margin="0,1.5,6,0" Text="乔" />
<TextBlock Margin="0,1.5,6,0" Text="liy" />
<TextBlock Margin="0,1.5,6,0" Text="xu" />
<TextBlock Margin="0,1.5,6,0" Text="lor" />
<TextBlock Margin="0,1.5,6,0" Text="💢" />
<TextBlock Margin="0,1.5,6,0" Text="ikii" />
<TextBlock Margin="0,1.5,6,0" Text="ym" />
<TextBlock Margin="0,1.5,6,0" Text="tstt" />
<TextBlock Margin="0,1.5,6,0" Text="hjk" />
<TextBlock Margin="0,1.5,6,0" Text="s11" />
<TextBlock Margin="0,1.5,6,0" Text="gxx" />
<TextBlock Margin="0,1.5,6,0" Text="Lhy" />
<TextBlock Margin="0,1.5,6,0" Text="jojo" />
<TextBlock Margin="0,1.5,6,0" Text="沙轻" />
<TextBlock Margin="0,1.5,6,0" Text="阳阳" />
<TextBlock Margin="0,1.5,6,0" Text="画卿" />
<TextBlock Margin="0,1.5,6,0" Text="幽灵" />
<TextBlock Margin="0,1.5,6,0" Text="御衡" />
<TextBlock Margin="0,1.5,6,0" Text="语墨" />
<TextBlock Margin="0,1.5,6,0" Text="若希" />
<TextBlock Margin="0,1.5,6,0" Text="少帅" />
<TextBlock Margin="0,1.5,6,0" Text="小怂" />
<TextBlock Margin="0,1.5,6,0" Text="叶虚" />
<TextBlock Margin="0,1.5,6,0" Text="伍十" />
<TextBlock Margin="0,1.5,6,0" Text="计计" />
<TextBlock Margin="0,1.5,6,0" Text="雪雪" />
<TextBlock Margin="0,1.5,6,0" Text="李镜" />
<TextBlock Margin="0,1.5,6,0" Text="迪勒" />
<TextBlock Margin="0,1.5,6,0" Text="。。" />
<TextBlock Margin="0,1.5,6,0" Text="优优" />
<TextBlock Margin="0,1.5,6,0" Text="青烬" />
<TextBlock Margin="0,1.5,6,0" Text="苏籁" />
<TextBlock Margin="0,1.5,6,0" Text="阿江" />
<TextBlock Margin="0,1.5,6,0" Text="绵绵" />
<TextBlock Margin="0,1.5,6,0" Text="萧白" />
<TextBlock Margin="0,1.5,6,0" Text="枫灵" />
<TextBlock Margin="0,1.5,6,0" Text="豆腐" />
<TextBlock Margin="0,1.5,6,0" Text="无聊" />
<TextBlock Margin="0,1.5,6,0" Text="闻序" />
<TextBlock Margin="0,1.5,6,0" Text="风鸢" />
<TextBlock Margin="0,1.5,6,0" Text="殉情" />
<TextBlock Margin="0,1.5,6,0" Text="朱磊" />
<TextBlock Margin="0,1.5,6,0" Text="先森" />
<TextBlock Margin="0,1.5,6,0" Text="文博" />
<TextBlock Margin="0,1.5,6,0" Text="月白" />
<TextBlock Margin="0,1.5,6,0" Text="角慕" />
<TextBlock Margin="0,1.5,6,0" Text="楽天" />
<TextBlock Margin="0,1.5,6,0" Text="九杳" />
<TextBlock Margin="0,1.5,6,0" Text="昨易" />
<TextBlock Margin="0,1.5,6,0" Text="W.H" />
<TextBlock Margin="0,1.5,6,0" Text="嘟嘟" />
<TextBlock Margin="0,1.5,6,0" Text="断疆" />
<TextBlock Margin="0,1.5,6,0" Text="麋鹿" />
<TextBlock Margin="0,1.5,6,0" Text="云心" />
<TextBlock Margin="0,1.5,6,0" Text="睚眦" />
<TextBlock Margin="0,1.5,6,0" Text="诡奇" />
<TextBlock Margin="0,1.5,6,0" Text="咲狐" />
<TextBlock Margin="0,1.5,6,0" Text="白云" />
<TextBlock Margin="0,1.5,6,0" Text="泽闻" />
<TextBlock Margin="0,1.5,6,0" Text="逍遥" />
<TextBlock Margin="0,1.5,6,0" Text="木鱼" />
<TextBlock Margin="0,1.5,6,0" Text="凌月" />
<TextBlock Margin="0,1.5,6,0" Text="梓昕" />
<TextBlock Margin="0,1.5,6,0" Text="白菜" />
<TextBlock Margin="0,1.5,6,0" Text="云上" />
<TextBlock Margin="0,1.5,6,0" Text="老赵" />
<TextBlock Margin="0,1.5,6,0" Text="拾岳" />
<TextBlock Margin="0,1.5,6,0" Text="济川" />
<TextBlock Margin="0,1.5,6,0" Text="樾安" />
<TextBlock Margin="0,1.5,6,0" Text="蜜狳" />
<TextBlock Margin="0,1.5,6,0" Text="七月" />
<TextBlock Margin="0,1.5,6,0" Text="北瓜" />
<TextBlock Margin="0,1.5,6,0" Text="昔涟" />
<TextBlock Margin="0,1.5,6,0" Text="浅璃" />
<TextBlock Margin="0,1.5,6,0" Text="成盏" />
<TextBlock Margin="0,1.5,6,0" Text="cc" />
<TextBlock Margin="0,1.5,6,0" Text="！" />
<TextBlock Margin="0,1.5,6,0" Text="一" />
<TextBlock Margin="0,1.5,6,0" Text="韆" />
<TextBlock Margin="0,1.5,6,0" Text="莫" />
<TextBlock Margin="0,1.5,6,0" Text="无" />
<TextBlock Margin="0,1.5,6,0" Text="澍" />
<TextBlock Margin="0,1.5,6,0" Text="ttt" />
<TextBlock Margin="0,1.5,6,0" Text="88" />
<TextBlock Margin="0,1.5,6,0" Text="33" />
<TextBlock Margin="0,1.5,6,0" Text="kk" />
<TextBlock Margin="0,1.5,6,0" Text="jjb" />
<TextBlock Margin="0,1.5,6,0" Text="+1" />
<TextBlock Margin="0,1.5,6,0" Text="Iirs" />
<TextBlock Margin="0,1.5,6,0" Text="Lio" />
<TextBlock Margin="0,1.5,6,0" Text="lrw" />
<TextBlock Margin="0,1.5,6,0" Text="LLL" />
<TextBlock Margin="0,1.5,6,0" Text="Sht" />
<TextBlock Margin="0,1.5,6,0" Text="Nul" />
<TextBlock Margin="0,1.5,6,0" Text="250" />
<TextBlock Margin="0,1.5,6,0" Text="kile" />
<TextBlock Margin="0,1.5,6,0" Text="pbc" />
<TextBlock Margin="0,1.5,6,0" Text="Aya" />
<TextBlock Margin="0,1.5,6,0" Text="mjp" />
<TextBlock Margin="0,1.5,6,0" Text="冒子" />
<TextBlock Margin="0,1.5,6,0" Text="王道" />
<TextBlock Margin="0,1.5,6,0" Text="鸡人" />
<TextBlock Margin="0,1.5,6,0" Text="喵根" />
<TextBlock Margin="0,1.5,6,0" Text="归墟" />
<TextBlock Margin="0,1.5,6,0" Text="键来" />
<TextBlock Margin="0,1.5,6,0" Text="而后" />
<TextBlock Margin="0,1.5,6,0" Text="南安" />
<TextBlock Margin="0,1.5,6,0" Text="ryan" />
<TextBlock Margin="0,1.5,6,0" Text="xx_α" />
<TextBlock Margin="0,1.5,6,0" Text="欸·柚" />
<TextBlock Margin="0,1.5,6,0" Text="liutd" />
<TextBlock Margin="0,1.5,6,0" Text="KIO3" />
<TextBlock Margin="0,1.5,6,0" Text=" 无悔" />
<TextBlock Margin="0,1.5,6,0" Text="曰久" />
<TextBlock Margin="0,1.5,6,0" Text="小翼" />
<TextBlock Margin="0,1.5,6,0" Text="鲤逐" />
<TextBlock Margin="0,1.5,6,0" Text="陌天" />
<TextBlock Margin="0,1.5,6,0" Text="eqw" />
<TextBlock Margin="0,1.5,6,0" Text="缘泠" />
<TextBlock Margin="0,1.5,6,0" Text="烨落" />
<TextBlock Margin="0,1.5,6,0" Text="安安" />
<TextBlock Margin="0,1.5,6,0" Text="寒叙" />
<TextBlock Margin="0,1.5,6,0" Text="诶嘿" />
<TextBlock Margin="0,1.5,6,0" Text="月月" />
<TextBlock Margin="0,1.5,6,0" Text="凌迟" />
<TextBlock Margin="0,1.5,6,0" Text="泰吉" />
<TextBlock Margin="0,1.5,6,0" Text="楚渡" />
<TextBlock Margin="0,1.5,6,0" Text="将夜" />
<TextBlock Margin="0,1.5,6,0" Text="滴雨" />
<TextBlock Margin="0,1.5,6,0" Text="无萤" />
<TextBlock Margin="0,1.5,6,0" Text="秋水" />
<TextBlock Margin="0,1.5,6,0" Text="团子" />
<TextBlock Margin="0,1.5,6,0" Text="川儿" />
<TextBlock Margin="0,1.5,6,0" Text="冥曌" />
<TextBlock Margin="0,1.5,6,0" Text="红中" />
<TextBlock Margin="0,1.5,6,0" Text="小云" />
<TextBlock Margin="0,1.5,6,0" Text="诗人" />
<TextBlock Margin="0,1.5,6,0" Text="狐狸" />
<TextBlock Margin="0,1.5,6,0" Text="游阙" />
<TextBlock Margin="0,1.5,6,0" Text="悠真" />
<TextBlock Margin="0,1.5,6,0" Text="天雨" />
<TextBlock Margin="0,1.5,6,0" Text="章凤" />
<TextBlock Margin="0,1.5,6,0" Text="空空" />
<TextBlock Margin="0,1.5,6,0" Text="去衣" />
<TextBlock Margin="0,1.5,6,0" Text="老抽" />
<TextBlock Margin="0,1.5,6,0" Text="七海" />
<TextBlock Margin="0,1.5,6,0" Text="品茗" />
<TextBlock Margin="0,1.5,6,0" Text="白桦" />
<TextBlock Margin="0,1.5,6,0" Text="狐斋" />
<TextBlock Margin="0,1.5,6,0" Text="猫神" />
<TextBlock Margin="0,1.5,6,0" Text="乙总" />
<TextBlock Margin="0,1.5,6,0" Text="屺野" />
<TextBlock Margin="0,1.5,6,0" Text="极光" />
<TextBlock Margin="0,1.5,6,0" Text="哈哈" />
<TextBlock Margin="0,1.5,6,0" Text="小洛" />
<TextBlock Margin="0,1.5,6,0" Text="璃辰" />
<TextBlock Margin="0,1.5,6,0" Text="Byet" />
<TextBlock Margin="0,1.5,6,0" Text="ZDD" />
<TextBlock Margin="0,1.5,6,0" Text="Um1" />
<TextBlock Margin="0,1.5,6,0" Text="2514" />
<TextBlock Margin="0,1.5,6,0" Text="4440" />
<TextBlock Margin="0,1.5,6,0" Text="Dr.松" />
<TextBlock Margin="0,1.5,6,0" Text="LiMu" />
<TextBlock Margin="0,1.5,6,0" Text="KING" />
<TextBlock Margin="0,1.5,6,0" Text="ᝰᧁꫀꪑⅈꪀⅈ💫" />
<TextBlock Margin="0,1.5,6,0" Text="ming" />
<TextBlock Margin="0,1.5,6,0" Text="CIYE_" />
<TextBlock Margin="0,1.5,6,0" Text="祇–仆" />
<TextBlock Margin="0,1.5,6,0" Text="Pluto" />
<TextBlock Margin="0,1.5,6,0" Text="LYX_7" />
<TextBlock Margin="0,1.5,6,0" Text="刘666" />
<TextBlock Margin="0,1.5,6,0" Text="Dong" />
<TextBlock Margin="0,1.5,6,0" Text="Lecen" />
<TextBlock Margin="0,1.5,6,0" Text="Hikari" />
<TextBlock Margin="0,1.5,6,0" Text="Vertin" />
<TextBlock Margin="0,1.5,6,0" Text="35035" />
<TextBlock Margin="0,1.5,6,0" Text="Dye乄" />
<TextBlock Margin="0,1.5,6,0" Text="白椰菜" />
<TextBlock Margin="0,1.5,6,0" Text="小白龙" />
<TextBlock Margin="0,1.5,6,0" Text="TeRiRi" />
<TextBlock Margin="0,1.5,6,0" Text="索菲亚" />
<TextBlock Margin="0,1.5,6,0" Text="穷哥们" />
<TextBlock Margin="0,1.5,6,0" Text="华华子" />
<TextBlock Margin="0,1.5,6,0" Text="欢喜果" />
<TextBlock Margin="0,1.5,6,0" Text="Fu_jc" />
<TextBlock Margin="0,1.5,6,0" Text="LEVA" />
<TextBlock Margin="0,1.5,6,0" Text="ZNLL" />
<TextBlock Margin="0,1.5,6,0" Text="joker" />
<TextBlock Margin="0,1.5,6,0" Text="RXZY" />
<TextBlock Margin="0,1.5,6,0" Text="白成y" />
<TextBlock Margin="0,1.5,6,0" Text="Rofni" />
<TextBlock Margin="0,1.5,6,0" Text="mzqc" />
<TextBlock Margin="0,1.5,6,0" Text="jason" />
<TextBlock Margin="0,1.5,6,0" Text="xxlzta" />
<TextBlock Margin="0,1.5,6,0" Text="end_x" />
<TextBlock Margin="0,1.5,6,0" Text="QWYJ" />
<TextBlock Margin="0,1.5,6,0" Text="qwqw" />
<TextBlock Margin="0,1.5,6,0" Text="Angel" />
<TextBlock Margin="0,1.5,6,0" Text="晓空er" />
<TextBlock Margin="0,1.5,6,0" Text="肥富帅" />
<TextBlock Margin="0,1.5,6,0" Text="小王子" />
<TextBlock Margin="0,1.5,6,0" Text="狐狸涩" />
<TextBlock Margin="0,1.5,6,0" Text="大涡流" />
<TextBlock Margin="0,1.5,6,0" Text="无名氏" />
<TextBlock Margin="0,1.5,6,0" Text="power" />
<TextBlock Margin="0,1.5,6,0" Text="苏清绾" />
<TextBlock Margin="0,1.5,6,0" Text="四月初" />
<TextBlock Margin="0,1.5,6,0" Text="雪落骆" />
<TextBlock Margin="0,1.5,6,0" Text="秋天爽" />
<TextBlock Margin="0,1.5,6,0" Text="茏三颜" />
<TextBlock Margin="0,1.5,6,0" Text="月落蝶" />
<TextBlock Margin="0,1.5,6,0" Text="蒲咩咩" />
<TextBlock Margin="0,1.5,6,0" Text="糖不哭" />
<TextBlock Margin="0,1.5,6,0" Text="风雨颜" />
<TextBlock Margin="0,1.5,6,0" Text="花江湖" />
<TextBlock Margin="0,1.5,6,0" Text="大馒头" />
<TextBlock Margin="0,1.5,6,0" Text="啊哈哈" />
<TextBlock Margin="0,1.5,6,0" Text="云与海" />
<TextBlock Margin="0,1.5,6,0" Text="V0rtex" />
<TextBlock Margin="0,1.5,6,0" Text="杨子普" />
<TextBlock Margin="0,1.5,6,0" Text="大阿科" />
<TextBlock Margin="0,1.5,6,0" Text="夷希微" />
<TextBlock Margin="0,1.5,6,0" Text="吃不饱" />
<TextBlock Margin="0,1.5,6,0" Text="爱熙熙" />
<TextBlock Margin="0,1.5,6,0" Text="丁老王" />
<TextBlock Margin="0,1.5,6,0" Text="吕雪源" />
<TextBlock Margin="0,1.5,6,0" Text="赵亦勋" />
<TextBlock Margin="0,1.5,6,0" Text="为南西" />
<TextBlock Margin="0,1.5,6,0" Text="下午觉" />
<TextBlock Margin="0,1.5,6,0" Text="李寒衣" />
<TextBlock Margin="0,1.5,6,0" Text="水不湿" />
<TextBlock Margin="0,1.5,6,0" Text="椛芷茈" />
<TextBlock Margin="0,1.5,6,0" Text="李察维" />
<TextBlock Margin="0,1.5,6,0" Text="十六夜" />
<TextBlock Margin="0,1.5,6,0" Text="皮小风" />
<TextBlock Margin="0,1.5,6,0" Text="紫风狐" />
<TextBlock Margin="0,1.5,6,0" Text="范桂圆" />
<TextBlock Margin="0,1.5,6,0" Text="芸芸云" />
<TextBlock Margin="0,1.5,6,0" Text="快夏波" />
<TextBlock Margin="0,1.5,6,0" Text="陈知远" />
<TextBlock Margin="0,1.5,6,0" Text="TaLula" />
<TextBlock Margin="0,1.5,6,0" Text="N线🧵" />
<TextBlock Margin="0,1.5,6,0" Text="秋辞白." />
<TextBlock Margin="0,1.5,6,0" Text="Keil_v5" />
<TextBlock Margin="0,1.5,6,0" Text="laimati" />
<TextBlock Margin="0,1.5,6,0" Text="TraSok" />
<TextBlock Margin="0,1.5,6,0" Text="CH2N8" />
<TextBlock Margin="0,1.5,6,0" Text="Ls-盛望" />
<TextBlock Margin="0,1.5,6,0" Text="FiLin12" />
<TextBlock Margin="0,1.5,6,0" Text="cz_awa" />
<TextBlock Margin="0,1.5,6,0" Text="SYMYR" />
<TextBlock Margin="0,1.5,6,0" Text="524950" />
<TextBlock Margin="0,1.5,6,0" Text="Trigger" />
<TextBlock Margin="0,1.5,6,0" Text="梦华书" />
<TextBlock Margin="0,1.5,6,0" Text="星期天" />
<TextBlock Margin="0,1.5,6,0" Text="铸日者" />
<TextBlock Margin="0,1.5,6,0" Text="晴云雯" />
<TextBlock Margin="0,1.5,6,0" Text="叶龙辉" />
<TextBlock Margin="0,1.5,6,0" Text="小零蚀" />
<TextBlock Margin="0,1.5,6,0" Text="唐墨白" />
<TextBlock Margin="0,1.5,6,0" Text="香子兰" />
<TextBlock Margin="0,1.5,6,0" Text="胡萝北" />
<TextBlock Margin="0,1.5,6,0" Text="乐永昶" />
<TextBlock Margin="0,1.5,6,0" Text="lingke" />
<TextBlock Margin="0,1.5,6,0" Text="东雪莲" />
<TextBlock Margin="0,1.5,6,0" Text="伊文斯" />
<TextBlock Margin="0,1.5,6,0" Text="丁乙恒" />
<TextBlock Margin="0,1.5,6,0" Text="朔望月" />
<TextBlock Margin="0,1.5,6,0" Text="V0rt3x" />
<TextBlock Margin="0,1.5,6,0" Text="提灯狼" />
<TextBlock Margin="0,1.5,6,0" Text="王孟清" />
<TextBlock Margin="0,1.5,6,0" Text="牛排鸭" />
<TextBlock Margin="0,1.5,6,0" Text="王靖淳" />
<TextBlock Margin="0,1.5,6,0" Text="嘿嘿地" />
<TextBlock Margin="0,1.5,6,0" Text="鹿露璐" />
<TextBlock Margin="0,1.5,6,0" Text="琪露诺" />
<TextBlock Margin="0,1.5,6,0" Text="亚波人" />
<TextBlock Margin="0,1.5,6,0" Text="卿天岚" />
<TextBlock Margin="0,1.5,6,0" Text="哈士奇" />
<TextBlock Margin="0,1.5,6,0" Text="江溪渺" />
<TextBlock Margin="0,1.5,6,0" Text="浮千傀" />
<TextBlock Margin="0,1.5,6,0" Text="恰啦啦" />
<TextBlock Margin="0,1.5,6,0" Text="梦痕丿" />
<TextBlock Margin="0,1.5,6,0" Text="α-蒎烯" />
<TextBlock Margin="0,1.5,6,0" Text="慕qwq" />
<TextBlock Margin="0,1.5,6,0" Text="Twicat" />
<TextBlock Margin="0,1.5,6,0" Text="stenac" />
<TextBlock Margin="0,1.5,6,0" Text="JOKER" />
<TextBlock Margin="0,1.5,6,0" Text="半日谣." />
<TextBlock Margin="0,1.5,6,0" Text="Triple9" />
<TextBlock Margin="0,1.5,6,0" Text="gediao" />
<TextBlock Margin="0,1.5,6,0" Text="Zen1th" />
<TextBlock Margin="0,1.5,6,0" Text="CH南宫" />
<TextBlock Margin="0,1.5,6,0" Text="bajie79" />
<TextBlock Margin="0,1.5,6,0" Text="_xundu" />
<TextBlock Margin="0,1.5,6,0" Text="TSLOLY" />
<TextBlock Margin="0,1.5,6,0" Text="ncg303" />
<TextBlock Margin="0,1.5,6,0" Text="cqg36k" />
<TextBlock Margin="0,1.5,6,0" Text="YueYue" />
<TextBlock Margin="0,1.5,6,0" Text="火羽白S" />
<TextBlock Margin="0,1.5,6,0" Text="AMumi" />
<TextBlock Margin="0,1.5,6,0" Text="qiumin" />
<TextBlock Margin="0,1.5,6,0" Text="cui白烁" />
<TextBlock Margin="0,1.5,6,0" Text="anyayu" />
<TextBlock Margin="0,1.5,6,0" Text="SISENG" />
<TextBlock Margin="0,1.5,6,0" Text="ro-suto" />
<TextBlock Margin="0,1.5,6,0" Text="GAGUA" />
<TextBlock Margin="0,1.5,6,0" Text="shijie02" />
<TextBlock Margin="0,1.5,6,0" Text="LULULU" />
<TextBlock Margin="0,1.5,6,0" Text="iso3824" />
<TextBlock Margin="0,1.5,6,0" Text="Yununy" />
<TextBlock Margin="0,1.5,6,0" Text="pnd6ou" />
<TextBlock Margin="0,1.5,6,0" Text="Liuaovo" />
<TextBlock Margin="0,1.5,6,0" Text="Akashi7" />
<TextBlock Margin="0,1.5,6,0" Text="softtype" />
<TextBlock Margin="0,1.5,6,0" Text="dumpyy" />
<TextBlock Margin="0,1.5,6,0" Text="LO_WSY" />
<TextBlock Margin="0,1.5,6,0" Text="Mirtium" />
<TextBlock Margin="0,1.5,6,0" Text="adccadc" />
<TextBlock Margin="0,1.5,6,0" Text="Bug虫爷" />
<TextBlock Margin="0,1.5,6,0" Text="DylanPL" />
<TextBlock Margin="0,1.5,6,0" Text="moxuan" />
<TextBlock Margin="0,1.5,6,0" Text="elyruirui" />
<TextBlock Margin="0,1.5,6,0" Text="井上青叶" />
<TextBlock Margin="0,1.5,6,0" Text="懒人ROY" />
<TextBlock Margin="0,1.5,6,0" Text="殇殇月月" />
<TextBlock Margin="0,1.5,6,0" Text="日隅汐音" />
<TextBlock Margin="0,1.5,6,0" Text="小猫渔民" />
<TextBlock Margin="0,1.5,6,0" Text="凤辞时笙" />
<TextBlock Margin="0,1.5,6,0" Text="清苍星海" />
<TextBlock Margin="0,1.5,6,0" Text="芒果挺忙" />
<TextBlock Margin="0,1.5,6,0" Text="只鱼二三" />
<TextBlock Margin="0,1.5,6,0" Text="エンソウ" />
<TextBlock Margin="0,1.5,6,0" Text="高露威姿" />
<TextBlock Margin="0,1.5,6,0" Text="雪本柚子" />
<TextBlock Margin="0,1.5,6,0" Text="萌新求带" />
<TextBlock Margin="0,1.5,6,0" Text="顾炎武月" />
<TextBlock Margin="0,1.5,6,0" Text="刻记牛杂" />
<TextBlock Margin="0,1.5,6,0" Text="小飞小飞" />
<TextBlock Margin="0,1.5,6,0" Text="纯真雪豹" />
<TextBlock Margin="0,1.5,6,0" Text="罗兹瓦尔" />
<TextBlock Margin="0,1.5,6,0" Text="安静的雨" />
<TextBlock Margin="0,1.5,6,0" Text="北牧辰曦" />
<TextBlock Margin="0,1.5,6,0" Text="下次一定" />
<TextBlock Margin="0,1.5,6,0" Text="飞天土钩" />
<TextBlock Margin="0,1.5,6,0" Text="曲线生活" />
<TextBlock Margin="0,1.5,6,0" Text="管那么多" />
<TextBlock Margin="0,1.5,6,0" Text="我叫杨戬" />
<TextBlock Margin="0,1.5,6,0" Text="乐风昭苏" />
<TextBlock Margin="0,1.5,6,0" Text="丨离凡丨" />
<TextBlock Margin="0,1.5,6,0" Text="如图建系" />
<TextBlock Margin="0,1.5,6,0" Text="酒筵辞夕" />
<TextBlock Margin="0,1.5,6,0" Text="踏马的淦" />
<TextBlock Margin="0,1.5,6,0" Text="夜殇羽镰" />
<TextBlock Margin="0,1.5,6,0" Text="星尘墨韵" />
<TextBlock Margin="0,1.5,6,0" Text="聆听冰风" />
<TextBlock Margin="0,1.5,6,0" Text="Yi_xuan" />
<TextBlock Margin="0,1.5,6,0" Text="MC芬达" />
<TextBlock Margin="0,1.5,6,0" Text="shallow" />
<TextBlock Margin="0,1.5,6,0" Text="𝕳轩辕氏" />
<TextBlock Margin="0,1.5,6,0" Text="谜茶360" />
<TextBlock Margin="0,1.5,6,0" Text="Eventful" />
<TextBlock Margin="0,1.5,6,0" Text="Molioos" />
<TextBlock Margin="0,1.5,6,0" Text="logicum" />
<TextBlock Margin="0,1.5,6,0" Text="一叶知秋" />
<TextBlock Margin="0,1.5,6,0" Text="狼烟居士" />
<TextBlock Margin="0,1.5,6,0" Text="千风伶羽" />
<TextBlock Margin="0,1.5,6,0" Text="mumiao" />
<TextBlock Margin="0,1.5,6,0" Text="欧刃赛卌" />
<TextBlock Margin="0,1.5,6,0" Text="蓝白幻影" />
<TextBlock Margin="0,1.5,6,0" Text="鸭梨山大" />
<TextBlock Margin="0,1.5,6,0" Text="一条鱼瓯" />
<TextBlock Margin="0,1.5,6,0" Text="Kang_XL" />
<TextBlock Margin="0,1.5,6,0" Text="Crispykit" />
<TextBlock Margin="0,1.5,6,0" Text="vorinshe" />
<TextBlock Margin="0,1.5,6,0" Text="凉曦luke" />
<TextBlock Margin="0,1.5,6,0" Text="Eiluosha" />
<TextBlock Margin="0,1.5,6,0" Text="GKD小哥" />
<TextBlock Margin="0,1.5,6,0" Text="苇渚泊舟" />
<TextBlock Margin="0,1.5,6,0" Text="花开富贵" />
<TextBlock Margin="0,1.5,6,0" Text="多肉藕片" />
<TextBlock Margin="0,1.5,6,0" Text="浮屠阿仙" />
<TextBlock Margin="0,1.5,6,0" Text="繁星萤火" />
<TextBlock Margin="0,1.5,6,0" Text="沐风沐雨" />
<TextBlock Margin="0,1.5,6,0" Text="金槍羽翼" />
<TextBlock Margin="0,1.5,6,0" Text="龘羅孖倆" />
<TextBlock Margin="0,1.5,6,0" Text="鸽子王雷" />
<TextBlock Margin="0,1.5,6,0" Text="红莲焚霞" />
<TextBlock Margin="0,1.5,6,0" Text="老凌野少" />
<TextBlock Margin="0,1.5,6,0" Text="孤酒青魇" />
<TextBlock Margin="0,1.5,6,0" Text="天空奇己" />
<TextBlock Margin="0,1.5,6,0" Text="霜月秋阳" />
<TextBlock Margin="0,1.5,6,0" Text="啃瓜咸鱼" />
<TextBlock Margin="0,1.5,6,0" Text="淡墨染星" />
<TextBlock Margin="0,1.5,6,0" Text="2k2k114" />
<TextBlock Margin="0,1.5,6,0" Text="肉蛋葱鸡" />
<TextBlock Margin="0,1.5,6,0" Text="傻鹅二号" />
<TextBlock Margin="0,1.5,6,0" Text="动漫阿宅" />
<TextBlock Margin="0,1.5,6,0" Text="只若初见" />
<TextBlock Margin="0,1.5,6,0" Text="Sakuzyo" />
<TextBlock Margin="0,1.5,6,0" Text="1415145" />
<TextBlock Margin="0,1.5,6,0" Text="消失的喵" />
<TextBlock Margin="0,1.5,6,0" Text="春山如笑" />
<TextBlock Margin="0,1.5,6,0" Text="幻天阿绝" />
<TextBlock Margin="0,1.5,6,0" Text="忘道蜂枫" />
<TextBlock Margin="0,1.5,6,0" Text="心软的神" />
<TextBlock Margin="0,1.5,6,0" Text="砂锅豆腐" />
<TextBlock Margin="0,1.5,6,0" Text="好人好逝" />
<TextBlock Margin="0,1.5,6,0" Text="登峰破晓" />
<TextBlock Margin="0,1.5,6,0" Text="东隅未殁" />
<TextBlock Margin="0,1.5,6,0" Text="MuMAA" />
<TextBlock Margin="0,1.5,6,0" Text="溯枫qwq" />
<TextBlock Margin="0,1.5,6,0" Text="Tacenda" />
<TextBlock Margin="0,1.5,6,0" Text="sky fung" />
<TextBlock Margin="0,1.5,6,0" Text="👁👄👃" />
<TextBlock Margin="0,1.5,6,0" Text="秋慕owo" />
<TextBlock Margin="0,1.5,6,0" Text="船长Yuki" />
<TextBlock Margin="0,1.5,6,0" Text="是小61呀" />
<TextBlock Margin="0,1.5,6,0" Text="Disbelief" />
<TextBlock Margin="0,1.5,6,0" Text="Manatsu" />
<TextBlock Margin="0,1.5,6,0" Text="Ace_墨尘" />
<TextBlock Margin="0,1.5,6,0" Text="Murousa" />
<TextBlock Margin="0,1.5,6,0" Text="mulberry" />
<TextBlock Margin="0,1.5,6,0" Text="lyh20218" />
<TextBlock Margin="0,1.5,6,0" Text="HIK4RI39" />
<TextBlock Margin="0,1.5,6,0" Text="Gwen_jin" />
<TextBlock Margin="0,1.5,6,0" Text="EthanCAi" />
<TextBlock Margin="0,1.5,6,0" Text="Maplefor" />
<TextBlock Margin="0,1.5,6,0" Text="Dryadove" />
<TextBlock Margin="0,1.5,6,0" Text="Xiaomo_y" />
<TextBlock Margin="0,1.5,6,0" Text="DWS3333" />
<TextBlock Margin="0,1.5,6,0" Text="EnochHcx" />
<TextBlock Margin="0,1.5,6,0" Text="47号虾球" />
<TextBlock Margin="0,1.5,6,0" Text="Alancnel" />
<TextBlock Margin="0,1.5,6,0" Text="Muertesl" />
<TextBlock Margin="0,1.5,6,0" Text="猫幺Suro" />
<TextBlock Margin="0,1.5,6,0" Text="i&apos;g&apos;d&apos;y&apos;f&apos;s" />
<TextBlock Margin="0,1.5,6,0" Text="xiaochen" />
<TextBlock Margin="0,1.5,6,0" Text="ㅤSIMV9r" />
<TextBlock Margin="0,1.5,6,0" Text="alpHabet" />
<TextBlock Margin="0,1.5,6,0" Text="Charlotte" />
<TextBlock Margin="0,1.5,6,0" Text="paperfish" />
<TextBlock Margin="0,1.5,6,0" Text="stealtoup" />
<TextBlock Margin="0,1.5,6,0" Text="bingyan0" />
<TextBlock Margin="0,1.5,6,0" Text="MselQAQ" />
<TextBlock Margin="0,1.5,6,0" Text="UZQueen" />
<TextBlock Margin="0,1.5,6,0" Text="hihospital" />
<TextBlock Margin="0,1.5,6,0" Text="_東森浮星_" />
<TextBlock Margin="0,1.5,6,0" Text="Com_XDN" />
<TextBlock Margin="0,1.5,6,0" Text="SEIGLE404" />
<TextBlock Margin="0,1.5,6,0" Text="Kevin2022" />
<TextBlock Margin="0,1.5,6,0" Text="梓晨Otaku" />
<TextBlock Margin="0,1.5,6,0" Text="凌点工作室" />
<TextBlock Margin="0,1.5,6,0" Text="千秋万载猹" />
<TextBlock Margin="0,1.5,6,0" Text="超级大月光" />
<TextBlock Margin="0,1.5,6,0" Text="精酿糯米酒" />
<TextBlock Margin="0,1.5,6,0" Text="不「成」器" />
<TextBlock Margin="0,1.5,6,0" Text="无常之客星" />
<TextBlock Margin="0,1.5,6,0" Text="第一年冬天" />
<TextBlock Margin="0,1.5,6,0" Text="大王上早八" />
<TextBlock Margin="0,1.5,6,0" Text="爱吃小笼包" />
<TextBlock Margin="0,1.5,6,0" Text="红楼彡揽月" />
<TextBlock Margin="0,1.5,6,0" Text="画海听竹者" />
<TextBlock Margin="0,1.5,6,0" Text="白哥咯咯咯" />
<TextBlock Margin="0,1.5,6,0" Text="懒得喷喷喷" />
<TextBlock Margin="0,1.5,6,0" Text="估计不会玩" />
<TextBlock Margin="0,1.5,6,0" Text="伊南宁门特" />
<TextBlock Margin="0,1.5,6,0" Text="秋山有希子" />
<TextBlock Margin="0,1.5,6,0" Text="氧化氧化氧" />
<TextBlock Margin="0,1.5,6,0" Text="傻悠不知道" />
<TextBlock Margin="0,1.5,6,0" Text="不爱吃灼芋" />
<TextBlock Margin="0,1.5,6,0" Text="山枕檀痕涴" />
<TextBlock Margin="0,1.5,6,0" Text="你是妖怪叭" />
<TextBlock Margin="0,1.5,6,0" Text="不知名玩家" />
<TextBlock Margin="0,1.5,6,0" Text="Prifo_lone" />
<TextBlock Margin="0,1.5,6,0" Text="有....暗星！" />
<TextBlock Margin="0,1.5,6,0" Text="Hitsser 1.0" />
<TextBlock Margin="0,1.5,6,0" Text="一只憨火龙" />
<TextBlock Margin="0,1.5,6,0" Text="异色收集癖" />
<TextBlock Margin="0,1.5,6,0" Text="DsxiaKsxia" />
<TextBlock Margin="0,1.5,6,0" Text="Plainsman" />
<TextBlock Margin="0,1.5,6,0" Text="湛蓝一四七" />
<TextBlock Margin="0,1.5,6,0" Text="翰墨续丹青" />
<TextBlock Margin="0,1.5,6,0" Text="凛果与百橙" />
<TextBlock Margin="0,1.5,6,0" Text="Touma000" />
<TextBlock Margin="0,1.5,6,0" Text="回忆de天空" />
<TextBlock Margin="0,1.5,6,0" Text="Yunlimeng" />
<TextBlock Margin="0,1.5,6,0" Text="GODxianyu" />
<TextBlock Margin="0,1.5,6,0" Text="叶落才知秋" />
<TextBlock Margin="0,1.5,6,0" Text="好喝的氦三" />
<TextBlock Margin="0,1.5,6,0" Text="星河奈叶风" />
<TextBlock Margin="0,1.5,6,0" Text="魔法且河豚" />
<TextBlock Margin="0,1.5,6,0" Text="魏小泓泓泓" />
<TextBlock Margin="0,1.5,6,0" Text="阴冷潮湿酱" />
<TextBlock Margin="0,1.5,6,0" Text="一只白色缨" />
<TextBlock Margin="0,1.5,6,0" Text="结局的椰子" />
<TextBlock Margin="0,1.5,6,0" Text="三玖二拾柒" />
<TextBlock Margin="0,1.5,6,0" Text="旭旭大魔王" />
<TextBlock Margin="0,1.5,6,0" Text="离人如飘萍" />
<TextBlock Margin="0,1.5,6,0" Text="秋葉逐殘夏" />
<TextBlock Margin="0,1.5,6,0" Text="水星有海吗" />
<TextBlock Margin="0,1.5,6,0" Text="ac纯萌新cy" />
<TextBlock Margin="0,1.5,6,0" Text="岁月suiyue" />
<TextBlock Margin="0,1.5,6,0" Text="陌然MajorC" />
<TextBlock Margin="0,1.5,6,0" Text="-Pareidolia." />
<TextBlock Margin="0,1.5,6,0" Text="蛙蛙大王Kzr" />
<TextBlock Margin="0,1.5,6,0" Text="Yhcmdbfwz" />
<TextBlock Margin="0,1.5,6,0" Text="Equilibrium" />
<TextBlock Margin="0,1.5,6,0" Text="陌泽陌泽MZ" />
<TextBlock Margin="0,1.5,6,0" Text="咖啡R3borN" />
<TextBlock Margin="0,1.5,6,0" Text="1234567890" />
<TextBlock Margin="0,1.5,6,0" Text="GUGUGAGA" />
<TextBlock Margin="0,1.5,6,0" Text="2366445223" />
<TextBlock Margin="0,1.5,6,0" Text="arrovartsk77" />
<TextBlock Margin="0,1.5,6,0" Text="Elegytairitsu" />
<TextBlock Margin="0,1.5,6,0" Text="南小彩的梦想" />
<TextBlock Margin="0,1.5,6,0" Text="Ayers赜蠹嬭" />
<TextBlock Margin="0,1.5,6,0" Text="We1J1uSh1" />
<TextBlock Margin="0,1.5,6,0" Text="xinghen233" />
<TextBlock Margin="0,1.5,6,0" Text="kingkongair" />
<TextBlock Margin="0,1.5,6,0" Text="最后一只斑鸠" />
<TextBlock Margin="0,1.5,6,0" Text="刻晴天下第一" />
<TextBlock Margin="0,1.5,6,0" Text="幸运的蓝耀星" />
<TextBlock Margin="0,1.5,6,0" Text="整没用的红球" />
<TextBlock Margin="0,1.5,6,0" Text="端午节吃饺子" />
<TextBlock Margin="0,1.5,6,0" Text="DLurker7840" />
<TextBlock Margin="0,1.5,6,0" Text="Don_Quixote" />
<TextBlock Margin="0,1.5,6,0" Text="随便写的名字" />
<TextBlock Margin="0,1.5,6,0" Text="芥末味青豌豆" />
<TextBlock Margin="0,1.5,6,0" Text="鹅给金华额度" />
<TextBlock Margin="0,1.5,6,0" Text="LisaPatorsed" />
<TextBlock Margin="0,1.5,6,0" Text="鸡屁股配大蒜" />
<TextBlock Margin="0,1.5,6,0" Text="我真没想开摆" />
<TextBlock Margin="0,1.5,6,0" Text="我不想取名字" />
<TextBlock Margin="0,1.5,6,0" Text="平安京的封兽" />
<TextBlock Margin="0,1.5,6,0" Text="被压力的鸭梨" />
<TextBlock Margin="0,1.5,6,0" Text="小田love白子" />
<TextBlock Margin="0,1.5,6,0" Text="Sasha_Xiong" />
<TextBlock Margin="0,1.5,6,0" Text="赤狸_crisnow" />
<TextBlock Margin="0,1.5,6,0" Text="Name0emaN" />
<TextBlock Margin="0,1.5,6,0" Text="happypickles" />
<TextBlock Margin="0,1.5,6,0" Text="无中生有为dd" />
<TextBlock Margin="0,1.5,6,0" Text="polarisdream" />
<TextBlock Margin="0,1.5,6,0" Text="YHKooooooy" />
<TextBlock Margin="0,1.5,6,0" Text="Sakura2403ly" />
<TextBlock Margin="0,1.5,6,0" Text="Flying Potato" />
<TextBlock Margin="0,1.5,6,0" Text="陈昊骏泥碳GR" />
<TextBlock Margin="0,1.5,6,0" Text="funnyzhuling" />
<TextBlock Margin="0,1.5,6,0" Text="AYGY暗夜古韵" />
<TextBlock Margin="0,1.5,6,0" Text="Kecdl_Chacha" />
<TextBlock Margin="0,1.5,6,0" Text="对方正在输入 ..." />
<TextBlock Margin="0,1.5,6,0" Text="Chihaya-Anon" />
<TextBlock Margin="0,1.5,6,0" Text="虚域染指亦起舞" />
<TextBlock Margin="0,1.5,6,0" Text="半人半灵的麻薯" />
<TextBlock Margin="0,1.5,6,0" Text="霜雪焉能见太阳" />
<TextBlock Margin="0,1.5,6,0" Text="章鱼哥的琪露诺" />
<TextBlock Margin="0,1.5,6,0" Text="Turbo_Zhang" />
<TextBlock Margin="0,1.5,6,0" Text="SUBLawrence" />
<TextBlock Margin="0,1.5,6,0" Text="Epsilon-9新人" />
<TextBlock Margin="0,1.5,6,0" Text="TheDovebach" />
<TextBlock Margin="0,1.5,6,0" Text="wobushi_furry" />
<TextBlock Margin="0,1.5,6,0" Text="FTC夏日的余晖" />
<TextBlock Margin="0,1.5,6,0" Text="Isshiki Satoshi" />
<TextBlock Margin="0,1.5,6,0" Text="Srive_Schegler" />
<TextBlock Margin="0,1.5,6,0" Text="1080p安全卫士" />
<TextBlock Margin="0,1.5,6,0" Text="开心上学玩游戏" />
<TextBlock Margin="0,1.5,6,0" Text="重生之发财传奇" />
<TextBlock Margin="0,1.5,6,0" Text="某科学的小狐狸" />
<TextBlock Margin="0,1.5,6,0" Text="爱喝可乐的猫猫" />
<TextBlock Margin="0,1.5,6,0" Text="Vsinger-洛天依" />
<TextBlock Margin="0,1.5,6,0" Text="芙利莲最も強い" />
<TextBlock Margin="0,1.5,6,0" Text="洋葱香菜炒蛋子" />
<TextBlock Margin="0,1.5,6,0" Text="不开心，不快乐" />
<TextBlock Margin="0,1.5,6,0" Text="忧郁的破产鼠鼠" />
<TextBlock Margin="0,1.5,6,0" Text="我的世界爱好者" />
<TextBlock Margin="0,1.5,6,0" Text="半透明的小透明" />
<TextBlock Margin="0,1.5,6,0" Text="到处闲逛的咸鱼" />
<TextBlock Margin="0,1.5,6,0" Text="什么落寒都不是" />
<TextBlock Margin="0,1.5,6,0" Text="没什么名字好取" />
<TextBlock Margin="0,1.5,6,0" Text="Wanderer5147" />
<TextBlock Margin="0,1.5,6,0" Text="取个名字耗阳寿" />
<TextBlock Margin="0,1.5,6,0" Text="AAA神秘人批发" />
<TextBlock Margin="0,1.5,6,0" Text="Bangbang2025" />
<TextBlock Margin="0,1.5,6,0" Text="贝吉蒙Begimon" />
<TextBlock Margin="0,1.5,6,0" Text="Kozume_Kenma" />
<TextBlock Margin="0,1.5,6,0" Text="Taskmgr-MEMZ" />
<TextBlock Margin="0,1.5,6,0" Text="漫天星火为谁舞？" />
<TextBlock Margin="0,1.5,6,0" Text="常凱申（刘小胖）" />
<TextBlock Margin="0,1.5,6,0" Text="赚够三千万就瘦瘦" />
<TextBlock Margin="0,1.5,6,0" Text="大道五十天衍四九" />
<TextBlock Margin="0,1.5,6,0" Text="爱停电用户_查尔德" />
<TextBlock Margin="0,1.5,6,0" Text="狸猫曾在学校烤面包" />
<TextBlock Margin="0,1.5,6,0" Text="(´o̴̶̷̤ㅂo̴̶̷̤`)" />
<TextBlock Margin="0,1.5,6,0" Text="克洛伊.冯.爱因兹贝伦" />
<TextBlock Margin="0,1.5,6,0" Text="（*＾ワ＾*）^_^$$" />
<TextBlock Margin="0,1.5,6,0" Text="GongzhuHuanerAwA" />
<TextBlock Margin="0,1.5,6,0" Text="幽兰黛尔【Druandal】" />
<TextBlock Margin="0,1.5,6,0" Text="codm我要玩一辈子cx-9" />
<TextBlock Margin="0,1.5,6,0" Text="取个名字真难0.0" />
<TextBlock Margin="0,1.5,6,0" Text="NoTuring_Steve" />
<TextBlock Margin="0,1.5,6,0" Text="冰冰watermelon" />
<TextBlock Margin="0,1.5,6,0" Text="DOODOODOOD" />
<TextBlock Margin="0,1.5,6,0" Text="小句号就是小句号" />
<TextBlock Margin="0,1.5,6,0" Text="弹跳爆炸小鱼珠🐟" />
<TextBlock Margin="0,1.5,6,0" Text="Xanadu Silk Fable" />
<TextBlock Margin="0,1.5,6,0" Text="看我的都得白内障了" />
<TextBlock Margin="0,1.5,6,0" Text="【点击请输入文本】" />
<TextBlock Margin="0,1.5,6,0" Text="AAA难办批发商乌鸦" />
<TextBlock Margin="0,1.5,6,0" Text="zhuanzhuanzhaun!" />
<TextBlock Margin="0,1.5,6,0" Text="你上课记得记得你先忙" />
</WrapPanel>
<Grid Height="35">
<Grid.ColumnDefinitions>
Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml.vb
+3
View File
@@ -27,5 +27,8 @@ Public Class PageOtherAbout
Private Sub BtnDonateOutput_Click(sender As Object, e As EventArgs) Handles BtnDonateOutput.Click
GeneratePotatoCode()
End Sub
Private Sub BtnAboutUpdate_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnAboutUpdate.Click
UpdateCheckByButton()
End Sub
End Class
Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb
+4 -1
View File
@@ -185,8 +185,11 @@ Public Class PageSelectRight
Try
Dim IsShiftPressed As Boolean = My.Computer.Keyboard.ShiftKeyDown
Dim IsHintIndie As Boolean = Instance.State <> McInstanceState.Error AndAlso Instance.PathIndie <> McFolderSelected
Dim SavesFolder = DirectoryUtils.GetInfo(Instance.PathIndie & "saves\")
Dim SaveEntries = If(SavesFolder.Exists, SavesFolder.EnumerateDirectories.OrderByDescending(Function(Save) Save.LastWriteTime).Select(Function(Save) $"{Save.Name}（上次修改：{StringUtils.FormatTimeSpan(Save.LastWriteTime - Date.Now, False)}）").ToList, New List(Of String))
Select Case MyMsgBox($"你确定要{If(IsShiftPressed, "永久", "")}删除版本 {Instance.Name} 吗？" &
If(IsHintIndie, vbCrLf & "由于该版本开启了版本隔离，删除版本时该版本对应的存档、资源包、Mod 等文件也将被一并删除！", ""),
If(IsHintIndie, vbCrLf & "该版本对应的存档、资源包、Mod 等文件也将被一并删除！", "") &
If(SaveEntries.Any, vbCrLf & vbCrLf & "这会删除以下存档：" & vbCrLf & "· " & SaveEntries.Join(vbCrLf & "· "), ""),
"版本删除确认", , "取消",, True)
Case 1
Instance.ResetSettingsCache()
Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml
-3
View File
@@ -64,7 +64,6 @@
<RowDefinition Height="7" />
<RowDefinition Height="28" />
<RowDefinition Height="7" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="来源" Margin="0,0,25,0" />
<local:MyComboBox x:Name="ComboDownloadMod" Grid.Row="0" Grid.ColumnSpan="2" local:SettingService.Key="ToolDownloadMod" Grid.Column="1">
@@ -87,8 +86,6 @@
<local:MyComboBoxItem Content="标题显示译名，详情显示文件名" IsSelected="True" />
<local:MyComboBoxItem Content="标题显示文件名，详情显示译名" />
</local:MyComboBox>
<local:MyCheckBox Margin="0,2,0,4" Text="在显示 Mod 加载器时忽略 Quilt" Grid.Row="6" Height="22" Grid.ColumnSpan="2"
x:Name="CheckDownloadIgnoreQuilt" local:SettingService.Key="ToolDownloadIgnoreQuilt" />
</Grid>
</StackPanel>
</local:MyCard>
Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml
+2
View File
@@ -284,6 +284,8 @@
<local:MyComboBoxItem local:SettingService.Value="15" Content="Minecraft 芝士站（作者：awaEric233）" />
<local:MyComboBoxItem local:SettingService.Value="16" Content="整合包推荐引擎（作者：CHMYGZ）" />
<local:MyComboBoxItem local:SettingService.Value="17" Content="Bangumi 番剧主页（作者：wzyaeu）" />
<local:MyComboBoxItem local:SettingService.Value="18" Content="Bilibili 热门（作者：wzyaeu）" />
<local:MyComboBoxItem local:SettingService.Value="19" Content="Music 云音乐热门（作者：wzyaeu）" />
</local:MyComboBox>
</Grid>
</StackPanel>
Plain Craft Launcher 2/Pages/PageSetup/Settings.vb
+17 -5
View File
@@ -120,7 +120,6 @@ Public Class Settings
New Setting("ToolDownloadVersion", 1, Source:=Sources.Registry),
New Setting("ToolDownloadTranslate", 0, Source:=Sources.Registry),
New Setting("ToolDownloadTranslateV2", 1, Source:=Sources.Registry),
New Setting("ToolDownloadIgnoreQuilt", True, Source:=Sources.Registry),
New Setting("ToolDownloadCert", False, Source:=Sources.Registry, OnChanged:=AddressOf ModNet.ShouldValidateSslCertificateOnLogin),
New Setting("ToolDownloadMod", 2, Source:=Sources.Registry),
New Setting("ToolModLocalNameStyle", 0, Source:=Sources.Registry),
@@ -261,7 +260,11 @@ Public Class Settings
Case Sources.Normal
WriteIni("Setup", Key, Value)
Case Sources.Registry
WriteReg(Key, Value)
Try
RegistryUtils.Write($"HKEY_CURRENT_USER\Software\{RegFolder}", Key, Value)
Catch ex As Exception
Logger.Warn(ex, $"写入注册表失败（{Key} → {Value}）", LogBehavior.Toast)
End Try
Case Sources.Instance
If Instance Is Nothing Then Throw New Exception($"保存版本独立设置 {Key} 时未提供目标版本")
WriteIni(Instance.PathVersion & "PCL\Setup.ini", Key, Value)
@@ -327,7 +330,7 @@ Public Class Settings
Case Sources.Normal
GotValue = ReadIni("Setup", Key, DefaultValue)
Case Sources.Registry
GotValue = ReadReg(Key, DefaultValue)
GotValue = RegistryUtils.TryRead($"HKEY_CURRENT_USER\Software\{RegFolder}", Key, DefaultValue)
Case Sources.Instance
If Instance Is Nothing Then
Throw New Exception($"读取版本设置 {Key} 时未提供目标版本")
@@ -386,7 +389,11 @@ Public Class Settings
Case Sources.Normal
DeleteIniKey("Setup", Key)
Case Sources.Registry
DeleteReg(Key)
Try
RegistryUtils.Delete($"HKEY_CURRENT_USER\Software\{RegFolder}", Key)
Catch ex As Exception
Logger.Warn(ex, $"删除注册表失败（{Key}）", LogBehavior.Toast)
End Try
Case Sources.Instance
If Instance Is Nothing Then Throw New Exception($"重置版本设置 {Key} 时未提供目标版本")
DeleteIniKey(Instance.PathVersion & "PCL\Setup.ini", Key)
@@ -414,7 +421,12 @@ Public Class Settings
Case Sources.Normal
Return HasIniKey("Setup", Key)
Case Sources.Registry
Return HasReg(Key)
Try
Return RegistryUtils.Has($"HKEY_CURRENT_USER\Software\{RegFolder}", Key)
Catch ex As Exception
Logger.Warn(ex, $"判断注册表 {Key} 是否存在时出错")
Return False
End Try
Case Else 'Source.Instance
If Instance Is Nothing Then Throw New Exception($"判断版本设置 {Key} 是否存在时未提供目标版本")
Return HasIniKey(Instance.PathVersion & "PCL\Setup.ini", Key)
Plain Craft Launcher 2/Pages/PageSpeedLeft.xaml.vb
+14 -14
View File
@@ -32,7 +32,7 @@ Public Class PageSpeedLeft
'定时器任务
Private ReadOnly RightCards As New Dictionary(Of String, MyCard)
Private Sub Watcher()
If Not FrmMain.PageCurrent = FormMain.PageType.DownloadManager Then Return
If Not FrmMain.PageCurrent = FormMain.PageType.TaskManager Then Return
Try
#Region "更新左边栏"
@@ -55,7 +55,7 @@ Public Class PageSpeedLeft
#End Region
Catch ex As Exception
Logger.Error(ex, "下载管理左栏监视出错")
Logger.Error(ex, "任务管理左栏监视出错")
End Try
If FrmSpeedRight Is Nothing OrElse FrmSpeedRight.PanMain Is Nothing Then Return
Try
@@ -63,7 +63,7 @@ Public Class PageSpeedLeft
TaskRefresh(Loader)
Next
Catch ex As Exception
Logger.Error(ex, "下载管理右栏监视出错")
Logger.Error(ex, "任务管理右栏监视出错")
End Try
End Sub
Public Sub TaskRefresh(Loader As LoaderBase)
@@ -106,7 +106,7 @@ Public Class PageSpeedLeft
#Region "进度不同，更新卡片"
Try
If Card.Children.Count < LoaderList.Count * 2 Then
Logger.Warn($"刷新下载管理卡片 {Loader.Name} 失败：卡片中仅有 {Card.Children.Count} 个子项，要求至少有 {LoaderList.Count * 2} 个子项")
Logger.Warn($"刷新任务管理卡片 {Loader.Name} 失败：卡片中仅有 {Card.Children.Count} 个子项，要求至少有 {LoaderList.Count * 2} 个子项")
Exit Try
End If
Dim Row As Integer = 0
@@ -133,12 +133,12 @@ Public Class PageSpeedLeft
Row += 1
Next
Catch ex As Exception
Logger.Error(ex, $"刷新下载管理卡片 {Loader.Name} 失败")
Logger.Error(ex, $"刷新任务管理卡片 {Loader.Name} 失败")
End Try
#End Region
End Select
Catch ex As Exception
Logger.Error(ex, $"更新下载管理显示失败（{Loader.State}）")
Logger.Error(ex, $"更新任务管理显示失败（{Loader.State}）")
End Try
ElseIf Not (Loader.State = LoadState.Canceled OrElse Loader.State = LoadState.Finished) Then
Try
@@ -177,23 +177,23 @@ Public Class PageSpeedLeft
Try
Card = GetObjectFromXML(CardXAML)
Catch ex As Exception
Logger.Warn(ex, "新建下载管理卡片失败")
Logger.Warn(ex, "新建任务管理卡片失败")
Logger.Info($"出错的卡片内容：{vbCrLf}{CardXAML}")
Throw
End Try
FrmSpeedRight.PanMain.Children.Insert(0, Card)
RightCards.Add(Loader.Name, Card)
Logger.Info($"新建下载管理卡片：{Loader.Name}")
Logger.Info($"新建任务管理卡片：{Loader.Name}")
'添加取消按钮
Dim Cancel As New MyIconButton With {.Name = "BtnCancel", .Logo = "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", .Height = 20, .Margin = New Thickness(0, 10, 10, 0), .LogoScale = 1.1, .HorizontalAlignment = HorizontalAlignment.Right, .VerticalAlignment = VerticalAlignment.Top}
Card.Children.Add(Cancel)
AddHandler Cancel.Click,
Sub(sender As MyIconButton, e As EventArgs)
AniDispose(sender, False)
AniDispose(Card, True, Sub() If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.DownloadManager Then FrmMain.PageBack())
AniDispose(Card, True, Sub() If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.TaskManager Then FrmMain.PageBack())
RightCards.Remove(Loader.Name)
LoaderTaskbar.Remove(Loader)
Logger.Info($"关闭下载管理卡片：{Loader.Name}，且移出任务列表")
Logger.Info($"关闭任务管理卡片：{Loader.Name}，且移出任务列表")
RunInThread(Sub() Loader.Cancel())
End Sub
'如果已经失败，再刷新一次，修改成失败的控件
@@ -203,11 +203,11 @@ Public Class PageSpeedLeft
End If
#End Region
Catch ex As Exception
Logger.Error(ex, "添加下载管理卡片失败")
Logger.Error(ex, "添加任务管理卡片失败")
End Try
End If
Catch ex As Exception
Logger.Error(ex, "刷新下载管理显示失败")
Logger.Error(ex, "刷新任务管理显示失败")
End Try
End Sub
Public Sub TaskRemove(Loader As Object)
@@ -218,7 +218,7 @@ Public Class PageSpeedLeft
Dim Card As Grid = RightCards(Loader.Name)
FrmSpeedRight.PanMain.Children.Remove(Card)
RightCards.Remove(Loader.Name)
Logger.Info($"移除下载管理卡片：{Loader.Name}")
Logger.Info($"移除任务管理卡片：{Loader.Name}")
End Sub)
End If
End Sub
@@ -227,7 +227,7 @@ Public Class PageSpeedLeft
''' 若没有任务，尝试返回主页。
''' </summary>
Private Sub TryReturnToHome()
If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.DownloadManager Then
If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.TaskManager Then
FrmMain.PageBack()
End If
End Sub