diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 678ed88..d1a4006 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -10,7 +10,7 @@ Public Class FormMain Dim FeatureList As New List(Of KeyValuePair(Of Integer, String)) '统计更新日志条目 #If BETA Then - If LastVersion < 291 Then 'Release 2.6.0 + If LastVersion < 292 Then 'Release 2.6.0 FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持在多个正版账号间切换")) FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "在缺少 Java 时会自动下载所需的 Java")) FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "重新制作正版登录页面")) @@ -106,7 +106,7 @@ Public Class FormMain '3:BUG+ IMP* FEAT- '2:BUG* IMP- '1:BUG- - If LastVersion < 290 Then 'Snapshot 2.6.0 + If LastVersion < 291 Then 'Snapshot 2.6.0 FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持在多个正版账号间切换")) FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "Mod / 整合包下载会单独列出筛选的版本")) FeatureCount += 10 diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index 9136bd8..058c0d9 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -14,9 +14,9 @@ Public Module ModBase Public Const VersionBaseName As String = "2.6.0" '不含分支前缀的显示用版本名 Public Const VersionStandardCode As String = "2.6.0." & VersionBranchCode '标准格式的四段式版本号 #If BETA Then - Public Const VersionCode As Integer = 291 'Release + Public Const VersionCode As Integer = 292 'Release #Else - Public Const VersionCode As Integer = 290 'Snapshot + Public Const VersionCode As Integer = 291 'Snapshot #End If '自动生成的版本信息 Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb index e54eb06..c671fa8 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb @@ -25,7 +25,7 @@ ComboAccounts.SelectedIndex = If(KeepInput, Math.Max(0, IndexBefore), 0) End Sub Private Sub ComboAccounts_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles ComboAccounts.SelectionChanged - If AniControlEnabled <> 0 OrElse ComboAccounts.SelectedItem Is Nothing Then Exit Sub + If AniControlEnabled <> 0 OrElse ComboAccounts.SelectedItem Is Nothing OrElse ComboAccounts.ContentPresenter Is Nothing Then Exit Sub If TypeOf ComboAccounts.SelectedItem Is MyListItem Then ComboAccounts.ContentPresenter.Content = CType(ComboAccounts.SelectedItem, MyListItem).Title ElseIf TypeOf ComboAccounts.SelectedItem Is MyComboBoxItem Then diff --git a/最新正式版.zip b/最新正式版.zip index 9bd4d6e..4c5384e 100644 Binary files a/最新正式版.zip and b/最新正式版.zip differ