Skip to content

Commit 42f3712

Browse files
committed
fix(log): 修复部分地方使用原版日志的问题
1 parent f7785f5 commit 42f3712

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Plain Craft Launcher 2/FormMain.xaml.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ Public Class FormMain
494494
FeedbackInfo()
495495
Log("请在 https://github.com/PCL-Community/PCL2-CE/issues 提交错误报告,以便于社区解决此问题!(这也有可能是原版 PCL 的问题)")
496496
IsLogShown = True
497-
ShellOnly(Path & "PCL\Log1.txt")
497+
ShellOnly(Path & "PCL\Log-CE1.log")
498498
End If
499499
Thread.Sleep(500) '防止 PCL 在记事本打开前就被掐掉
500500
End If

Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb

+3-3
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Extracted:
179179
MatchName = "游戏崩溃前的输出.txt" OrElse MatchName = "rawoutput.log" Then
180180
TargetType = AnalyzeFileType.MinecraftLog
181181
If DirectFile Is Nothing Then DirectFile = LogFile
182-
ElseIf MatchName = "启动器日志.txt" OrElse MatchName = "PCL2 启动器日志.txt" OrElse MatchName = "PCL 启动器日志.txt" OrElse MatchName = "log1.txt" Then
182+
ElseIf MatchName = "启动器日志.txt" OrElse MatchName = "PCL2 启动器日志.txt" OrElse MatchName = "PCL 启动器日志.txt" OrElse MatchName = "log1.txt" OrElse MatchName = "log-ce1.log" Then
183183
If LogFile.Value.Any(Function(s) s.Contains("以下为游戏输出的最后一段内容")) Then
184184
TargetType = AnalyzeFileType.MinecraftLog
185185
If DirectFile Is Nothing Then DirectFile = LogFile
@@ -245,7 +245,7 @@ Extracted:
245245
Log("[Crash] 输出报告:" & SelectedFile.Key & ",作为 Minecraft 或启动器日志")
246246
Next
247247
'选择一份最佳的来自启动器的游戏日志
248-
For Each FileName As String In {"rawoutput.log", "启动器日志.txt", "log1.txt", "游戏崩溃前的输出.txt", "PCL2 启动器日志.txt", "PCL 启动器日志.txt"}
248+
For Each FileName As String In {"rawoutput.log", "启动器日志.txt", "log1.txt", "log-ce1.log", "游戏崩溃前的输出.txt", "PCL2 启动器日志.txt", "PCL 启动器日志.txt"}
249249
If FileNameDict.ContainsKey(FileName) Then
250250
Dim CurrentLog = FileNameDict(FileName)
251251
'截取 “以下为游戏输出的最后一段内容” 后的内容
@@ -900,7 +900,7 @@ NextStack:
900900
Select Case FileName
901901
Case "LatestLaunch.bat"
902902
FileName = "启动脚本.bat"
903-
Case "Log1.txt"
903+
Case "Log-CE1.log"
904904
FileName = "PCL 启动器日志.txt"
905905
FileEncoding = Encoding.UTF8
906906
Case "RawOutput.log"

Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
Analyzer.Prepare()
361361
Analyzer.Analyze(Version)
362362
Analyzer.Output(False, New List(Of String) From
363-
{Version.Path & Version.Name & ".json", Path & "PCL\Log1.txt", Path & "PCL\LatestLaunch.bat"})
363+
{Version.Path & Version.Name & ".json", Path & "PCL\Log-CE1.log", Path & "PCL\LatestLaunch.bat"})
364364
Catch ex As Exception
365365
Log(ex, "崩溃分析失败", LogLevel.Feedback)
366366
End Try

Plain Craft Launcher 2/Resources/Custom.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
9999
Text="此外,PCL 会将文件中的 “花括号 path” 替换为 PCL 可执行文件所在文件夹({path}),可以用于执行特定程序或加载图片。" />
100100
<local:MyButton Margin="0,4,0,10" Width="200" Height="35"
101-
Text="打开 PCL 日志" EventType="打开文件" EventData="Log1.txt" ToolTip="PCL 的日志文件就在 PCL 文件夹内,且名为 Log1.txt" />
101+
Text="打开 PCL-CE 日志" EventType="打开文件" EventData="Log-CE1.log" ToolTip="PCL 社区版的日志文件就在 PCL 文件夹内,且名为 Log-CE1.log" />
102102
<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
103103
Text="就像为游戏指定服务器 IP 一样,你也可以在 EventData 的竖线后为程序添加启动参数。" />
104104
<local:MyButton Margin="0,4,0,0" Width="200" Height="35"

0 commit comments

Comments
 (0)