From fa02f5e0159caecaaf519ec31f5ff6b4f3884e30 Mon Sep 17 00:00:00 2001 From: YIJANGs <153354935+YIJANGs@users.noreply.github.com> Date: Wed, 8 Apr 2026 22:50:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E7=9A=84=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Minecraft/ModLaunch.vb | 19 ++++++++++++------- .../Pages/PageSetup/Settings.vb | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb index c684380..b146918 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb @@ -534,16 +534,15 @@ NextInner: Public McLoginAuthLoader As New LoaderTask(Of McLoginServer, McLoginResult)("Loader Login Auth", AddressOf McLoginServerStart) With {.ReloadTimeout = 1000 * 60 * 10} '主加载函数，返回所有需要的登录信息 - Private McLoginMsRefreshTime As Long = 0 '上次刷新登录的时间 + Private McLoginMsRefreshTime As Long = Val(Settings.Get("CacheMsV2OAuthExpires")) 'Minecraft Access Token到期时间 Private Sub McLoginMsStart(Data As LoaderTask(Of McLoginMs, McLoginResult)) Dim Input As McLoginMs = Data.Input Dim LogUsername As String = Input.UserName McLaunchLog("登录方式：正版（" & If(LogUsername = "", "尚未登录", LogUsername) & "）") Data.Progress = 0.05 '检查是否已经登录完成 - If Not Data.IsForceRestarting AndAlso '不要求强行重启 - Input.AccessToken <> "" AndAlso '已经登录过了 - (McLoginMsRefreshTime > 0 AndAlso GetTimeMs() - McLoginMsRefreshTime < 1000 * 60 * 10) Then '完成时间在 10 分钟内 + If Not Data.IsForceRestarting AndAlso '不要求强行重启 'Input.AccessToken <> "" AndAlso '已经登录过了 + (McLoginMsRefreshTime > 0 AndAlso GetUnixTimestamp() < McLoginMsRefreshTime) Then '完成时间在有效期内 Data.Output = New McLoginResult With {.AccessToken = Input.AccessToken, .Name = Input.UserName, .Uuid = Input.Uuid, .Type = "Microsoft", .ClientToken = Input.Uuid, .ProfileJson = Input.ProfileJson} GoTo SkipLogin @@ -570,7 +569,9 @@ Relogin: Dim Tokens = MsLoginStep3(XBLToken) Data.Progress = 0.55 If Data.IsInterrupted Then Throw New ThreadInterruptedException - Dim AccessToken As String = MsLoginStep4(Tokens) + Dim Step4Tokens As String() = MsLoginStep4(Tokens) + Dim AccessToken As String = Step4Tokens(0) + McLoginMsRefreshTime = GetUnixTimestamp() + Step4Tokens(1) 'Token 到期时间，以秒为单位 Data.Progress = 0.7 If Data.IsInterrupted Then Throw New ThreadInterruptedException MsLoginStep5(AccessToken) @@ -584,6 +585,7 @@ Relogin: Settings.Set("CacheMsV2Uuid", Result(0)) Settings.Set("CacheMsV2Name", Result(1)) Settings.Set("CacheMsV2ProfileJson", Result(2)) + Settings.Set("CacheMsV2OAuthExpires", McLoginMsRefreshTime) Dim MsJson As JObject = GetJson(Settings.Get("LoginMsJson")) MsJson.Remove(Input.UserName) '如果更改了玩家名…… MsJson(Result(1)) = OAuthRefreshToken @@ -1001,7 +1003,7 @@ Retry: } End Function '微软登录步骤 4：从 {XSTSToken, UHS} 获取 Minecraft AccessToken - Private Function MsLoginStep4(Tokens As String()) As String + Private Function MsLoginStep4(Tokens As String()) As String() McLaunchLog("开始微软登录步骤 4/6") Dim Request As String = New JObject(New JProperty("identityToken", $"XBL3.0 x={Tokens(1)};{Tokens(0)}")).ToString(0) @@ -1022,7 +1024,10 @@ Retry: End If End Try - Return GetJson(Result)("access_token").ToString + Return { + GetJson(Result)("access_token").ToString, + GetJson(Result)("expires_in").ToString '以秒为单位 + } End Function '微软登录步骤 5：验证微软账号是否持有 MC，这也会刷新 XGP Private Sub MsLoginStep5(AccessToken As String) diff --git a/Plain Craft Launcher 2/Pages/PageSetup/Settings.vb b/Plain Craft Launcher 2/Pages/PageSetup/Settings.vb index f90473b..4590d44 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/Settings.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/Settings.vb @@ -45,6 +45,7 @@ New Setting("CacheMsName", "", Source:=Sources.Registry, Encrypted:=True), New Setting("CacheMsV2Migrated", False, Source:=Sources.Registry), New Setting("CacheMsV2OAuthRefresh", "", Source:=Sources.Registry, Encrypted:=True), + New Setting("CacheMsV2OAuthExpires", 0, Source:=Sources.Registry), New Setting("CacheMsV2Access", "", Source:=Sources.Registry, Encrypted:=True), New Setting("CacheMsV2ProfileJson", "", Source:=Sources.Registry, Encrypted:=True), New Setting("CacheMsV2Uuid", "", Source:=Sources.Registry, Encrypted:=True),