From a13a8dd83f9cca9de9db20d90fc252f22c35cb9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Tue, 22 Apr 2025 07:14:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(MyMsgLogin):=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E8=A2=AB=E5=B0=81=E7=A6=81=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb index 174f4be..3058ea2 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb @@ -125,6 +125,8 @@ ElseIf ex.Message.Contains("expired_token") Then Finished(New Exception("$登录用时太长啦，重新试试吧！")) Return + ElseIf ex.Message.Contains("abuse") Then + Finished(New Exception("该账号已被封禁，无法登录")) ElseIf ex.Message.Contains("AADSTS70000") Then '可能不能判 “invalid_grant”，见 #269 Finished(New RestartException) Return From de7dffefe8fcb4fc62879471ca9d512e88771465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Wed, 23 Apr 2025 20:28:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style(MyMsgLogin):=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michaelshenmo <121526475+Michaelshenmo@users.noreply.github.com> --- Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb index 3058ea2..fa9103b 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb @@ -125,8 +125,8 @@ ElseIf ex.Message.Contains("expired_token") Then Finished(New Exception("$登录用时太长啦，重新试试吧！")) Return - ElseIf ex.Message.Contains("abuse") Then - Finished(New Exception("该账号已被封禁，无法登录")) + ElseIf ex.Message.ContainsF("abuse mode") Then + Finished(New Exception("该账号似乎已被微软封禁，无法登录。")) ElseIf ex.Message.Contains("AADSTS70000") Then '可能不能判 “invalid_grant”，见 #269 Finished(New RestartException) Return From a197845749bf58b9c662e07e785b82615429d616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Wed, 23 Apr 2025 20:30:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=B0=91=E4=BA=86=20$?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb index fa9103b..0966ffc 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/MyMsgLogin.xaml.vb @@ -126,7 +126,7 @@ Finished(New Exception("$登录用时太长啦，重新试试吧！")) Return ElseIf ex.Message.ContainsF("abuse mode") Then - Finished(New Exception("该账号似乎已被微软封禁，无法登录。")) + Finished(New Exception("$该账号似乎已被微软封禁，无法登录。")) ElseIf ex.Message.Contains("AADSTS70000") Then '可能不能判 “invalid_grant”，见 #269 Finished(New RestartException) Return