🐛 修复 {mcv} 被替换的问题

This commit is contained in:
youzi-2333
2024-06-19 13:07:32 +08:00
parent a32bf0b79e
commit 82dacd7eeb
3 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -43,7 +43,7 @@
End Sub) End Sub)
Case "启动游戏" Case "启动游戏"
If Data(0) = "$mcv" Then Data(0) = McVersionCurrent.Name If Data(0) = "\current" Then Data(0) = McVersionCurrent.Name
If McLaunchStart(New McLaunchOptions With If McLaunchStart(New McLaunchOptions With
{.ServerIp = If(Data.Length >= 2, Data(1), Nothing), .Version = New McVersion(Data(0))}) Then {.ServerIp = If(Data.Length >= 2, Data(1), Nothing), .Version = New McVersion(Data(0))}) Then
Hint("正在启动 " & Data(0) & "……") Hint("正在启动 " & Data(0) & "……")
@@ -665,7 +665,6 @@ NextFile:
Dim Result = Xaml.Replace("{path}", EscapeXML(Path)) Dim Result = Xaml.Replace("{path}", EscapeXML(Path))
Result = RegexReplaceEach(Result, Function() EscapeXML(PageOtherTest.GetRandomHint()), "\{hint\}") Result = RegexReplaceEach(Result, Function() EscapeXML(PageOtherTest.GetRandomHint()), "\{hint\}")
Result = RegexReplaceEach(Result, Function() EscapeXML(PageOtherTest.GetRandomCave()), "\{cave\}") Result = RegexReplaceEach(Result, Function() EscapeXML(PageOtherTest.GetRandomCave()), "\{cave\}")
Result = Result.Replace("{mcv}", "$mcv") '不知道为啥,实例化 {mcv} 有可能会炸掉,只能先把它换掉,再换成版本名
Return Result Return Result
End Function End Function
+2 -2
View File
@@ -81,9 +81,9 @@
<local:MyButton Margin="0,4,0,0" Width="250" Height="35" <local:MyButton Margin="0,4,0,0" Width="250" Height="35"
Text="启动 1.12.2 并进入 Hypixel" EventType="启动游戏" EventData="1.12.2|mc.hypixel.net" ToolTip="服务器 IP:mc.hypixel.net" /> Text="启动 1.12.2 并进入 Hypixel" EventType="启动游戏" EventData="1.12.2|mc.hypixel.net" ToolTip="服务器 IP:mc.hypixel.net" />
<TextBlock TextWrapping="Wrap" Margin="0,0,0,4" <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
Text="使用 “花括号 mcv” 可以表示当前被选中的游戏版本,但请注意,这只在 EventData 属性中有效。" /> Text="使用 {mcver} 可以表示当前被选中的游戏版本,但请注意,这只在 EventData 属性中有效。" />
<local:MyButton Margin="0,4,0,10" Width="250" Height="35" <local:MyButton Margin="0,4,0,10" Width="250" Height="35"
Text="启动当前选中版本并进入 Hypixel" EventType="启动游戏" EventData="{mcv}|mc.hypixel.net" ToolTip="服务器 IP:mc.hypixel.net" /> Text="启动当前选中版本并进入 Hypixel" EventType="启动游戏" EventData="{mcver}|mc.hypixel.net" ToolTip="服务器 IP:mc.hypixel.net" />
</StackPanel> </StackPanel>
</local:MyCard> </local:MyCard>