龙腾猫跃 3 lat temu
rodzic
commit
d540b94448

+ 11 - 1
Plain Craft Launcher 2/FormMain.xaml.vb

@@ -10,6 +10,11 @@ Public Class FormMain
         Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
         Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
         '统计更新日志条目
         '统计更新日志条目
 #If BETA Then
 #If BETA Then
+        If LastVersion < 281 Then 'Release 2.4.9
+            FeatureCount += 1
+            BugCount += 5
+            If LastVersion = 279 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复进入 Mod、整合包下载页时报错的 Bug"))
+        End If
         If LastVersion < 279 Then 'Release 2.4.8
         If LastVersion < 279 Then 'Release 2.4.8
             FeatureCount += 1
             FeatureCount += 1
             BugCount += 10
             BugCount += 10
@@ -121,6 +126,11 @@ Public Class FormMain
         '3:BUG+ IMP* FEAT-
         '3:BUG+ IMP* FEAT-
         '2:BUG* IMP-
         '2:BUG* IMP-
         '1:BUG-
         '1:BUG-
+        If LastVersion < 282 Then 'Snapshot 2.4.9
+            FeatureCount += 1
+            BugCount += 5
+            If LastVersion = 280 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复进入 Mod、整合包下载页时报错的 Bug"))
+        End If
         If LastVersion < 280 Then 'Snapshot 2.4.8
         If LastVersion < 280 Then 'Snapshot 2.4.8
             FeatureCount += 1
             FeatureCount += 1
             BugCount += 10
             BugCount += 10
@@ -313,7 +323,7 @@ Public Class FormMain
         '输出更新日志
         '输出更新日志
         RunInNewThread(Sub()
         RunInNewThread(Sub()
                            If MyMsgBox(Content, "PCL2 已更新至 " & VersionDisplayName, "确定", "完整更新日志") = 2 Then
                            If MyMsgBox(Content, "PCL2 已更新至 " & VersionDisplayName, "确定", "完整更新日志") = 2 Then
-                               OpenWebsite("https://afdian.net/@LTCat?tab=feed")
+                               OpenWebsite("https://afdian.net/a/LTCat?tab=feed")
                            End If
                            End If
                        End Sub, "UpdateLog Output")
                        End Sub, "UpdateLog Output")
     End Sub
     End Sub

+ 4 - 4
Plain Craft Launcher 2/Modules/Base/ModBase.vb

@@ -10,12 +10,12 @@ Public Module ModBase
 #Region "声明"
 #Region "声明"
 
 
     '下列版本信息由更新器自动修改
     '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.4.8" '不含分支前缀的显示用版本名
-    Public Const VersionStandardCode As String = "2.4.8." & VersionBranchCode '标准格式的四段式版本号
+    Public Const VersionBaseName As String = "2.4.9" '不含分支前缀的显示用版本名
+    Public Const VersionStandardCode As String = "2.4.9." & VersionBranchCode '标准格式的四段式版本号
 #If BETA Then
 #If BETA Then
-    Public Const VersionCode As Integer = 279 'Release
+    Public Const VersionCode As Integer = 281 'Release
 #Else
 #Else
-    Public Const VersionCode As Integer = 280 'Snapshot
+    Public Const VersionCode As Integer = 282 'Snapshot
 #End If
 #End If
     '自动生成的版本信息
     '自动生成的版本信息
     Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
     Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName

+ 3 - 1
Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb

@@ -742,7 +742,9 @@ Redo:
                             Case "RawOutput.log"
                             Case "RawOutput.log"
                                 FileName = "游戏崩溃前的输出.txt"
                                 FileName = "游戏崩溃前的输出.txt"
                         End Select
                         End Select
-                        WriteFile(TempFolder & "Report\" & FileName, SecretFilter(ReadFile(OutputFile)))
+                        If File.Exists(OutputFile) Then
+                            WriteFile(TempFolder & "Report\" & FileName, SecretFilter(ReadFile(OutputFile)))
+                        End If
                     Next
                     Next
                     '导出报告
                     '导出报告
                     Compression.ZipFile.CreateFromDirectory(TempFolder & "Report\", FileAddress)
                     Compression.ZipFile.CreateFromDirectory(TempFolder & "Report\", FileAddress)

+ 1 - 1
Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb

@@ -1406,7 +1406,7 @@
                             String.Join(" ", Entry.CurseForgeId.Split("-").Select(Function(w) w.Substring(0, 1).ToUpper & w.Substring(1, w.Length - 1))) & ")")
                             String.Join(" ", Entry.CurseForgeId.Split("-").Select(Function(w) w.Substring(0, 1).ToUpper & w.Substring(1, w.Length - 1))) & ")")
                     End If
                     End If
                 End If
                 End If
-                DlCfProjectDb.Add(Entry.CurseForgeId, Entry)
+                DlCfProjectDb(Entry.CurseForgeId) = Entry
             Next
             Next
         Next
         Next
     End Sub
     End Sub

+ 4 - 3
Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb

@@ -190,7 +190,7 @@ NextInner:
                     End Sub)
                     End Sub)
         If CheckResult <> "" Then Throw New ArgumentException(CheckResult)
         If CheckResult <> "" Then Throw New ArgumentException(CheckResult)
         '求赞助
         '求赞助
-        If ThemeCheckGold() Then Exit Sub
+#If BETA Then
         RunInNewThread(Sub()
         RunInNewThread(Sub()
                            Select Case Setup.Get("SystemLaunchCount")
                            Select Case Setup.Get("SystemLaunchCount")
                                Case 20, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000
                                Case 20, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000
@@ -198,10 +198,11 @@ NextInner:
                                                "如果觉得 PCL2 还算好用的话,也可以考虑小小地赞助一下作者呢 qwq……" & vbCrLf &
                                                "如果觉得 PCL2 还算好用的话,也可以考虑小小地赞助一下作者呢 qwq……" & vbCrLf &
                                                "毕竟一个人开发也不容易(小声)……",
                                                "毕竟一个人开发也不容易(小声)……",
                                                "求赞助啦……", "这就赞助!", "但是我拒绝") = 1 Then
                                                "求赞助啦……", "这就赞助!", "但是我拒绝") = 1 Then
-                                       OpenWebsite("https://afdian.net/@LTCat/plan")
+                                       OpenWebsite("https://afdian.net/a/LTCat/plan")
                                    End If
                                    End If
                            End Select
                            End Select
                        End Sub, "Donate")
                        End Sub, "Donate")
+#End If
     End Sub
     End Sub
 
 
 #End Region
 #End Region
@@ -1835,7 +1836,7 @@ NextVersion:
                         Else
                         Else
                             PackFormat = 9
                             PackFormat = 9
                         End If
                         End If
-                    Case 19
+                    Case 19, 99 '99 是快照版
                         If McVersionCurrent.Version.McCodeSub <= 2 Then
                         If McVersionCurrent.Version.McCodeSub <= 2 Then
                             PackFormat = 9
                             PackFormat = 9
                         Else
                         Else

+ 2 - 2
Plain Craft Launcher 2/My Project/AssemblyInfo.vb

@@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices
 ' 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
 ' 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
 ' 方法是按如下所示使用“*”
 ' 方法是按如下所示使用“*”
 
 
-<Assembly: AssemblyVersion("2.4.8.0")>
-<Assembly: AssemblyFileVersion("2.4.8.0")>
+<Assembly: AssemblyVersion("2.4.9.0")>
+<Assembly: AssemblyFileVersion("2.4.9.0")>
 <Assembly: NeutralResourcesLanguage("")>
 <Assembly: NeutralResourcesLanguage("")>

+ 1 - 1
Plain Craft Launcher 2/Pages/PageLink/PageLinkFeedback.xaml

@@ -27,7 +27,7 @@
                 <StackPanel Margin="20,40,18,18">
                 <StackPanel Margin="20,40,18,18">
                     <local:MyListItem Title="联机反馈与交流" Info="加入联机模块官方 QQ 群反馈联机异常,或询问联机功能的使用方式"
                     <local:MyListItem Title="联机反馈与交流" Info="加入联机模块官方 QQ 群反馈联机异常,或询问联机功能的使用方式"
                               Type="Clickable" PaddingRight="20" Logo="pack://application:,,,/images/Blocks/RedstoneBlock.png"
                               Type="Clickable" PaddingRight="20" Logo="pack://application:,,,/images/Blocks/RedstoneBlock.png"
-                              EventType="打开网页" EventData="https://shimowendang.com/docs/KrkEVXz1K0frowAJ#anchor-7qQG" />
+                              EventType="打开网页" EventData="https://shimo.im/docs/KrkEVXz1K0frowAJ#anchor-7qQG" />
                     <local:MyListItem Title="违法违规举报" Info="投诉、举报联机使用者的各类违法违规行为"
                     <local:MyListItem Title="违法违规举报" Info="投诉、举报联机使用者的各类违法违规行为"
                               Type="Clickable" EventType="打开网页" EventData="https://shimo.im/docs/rGrd8pY8xWkt6ryW#anchor-7x6P"
                               Type="Clickable" EventType="打开网页" EventData="https://shimo.im/docs/rGrd8pY8xWkt6ryW#anchor-7x6P"
                               PaddingRight="20" Logo="pack://application:,,,/images/Blocks/RedstoneBlock.png" />
                               PaddingRight="20" Logo="pack://application:,,,/images/Blocks/RedstoneBlock.png" />