From 5129f68dadfebc3477fa29452cc914fcbcbb0106 Mon Sep 17 00:00:00 2001 From: 1415ddfer <1783488228@qq.com> Date: Tue, 9 Jul 2024 02:23:49 +0800 Subject: [PATCH] fix web login --- Manager/EngineManager.cs | 1 + Manager/LoginManager.cs | 4 +-- StaticHandleProtol.cs | 56 +++++++++++++++++++++------------------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Manager/EngineManager.cs b/Manager/EngineManager.cs index c459e8b..a5512f4 100644 --- a/Manager/EngineManager.cs +++ b/Manager/EngineManager.cs @@ -170,6 +170,7 @@ namespace Zerolauncher.Manager private void Handle(object sender, DataReceivedEventArgs e) { + Trace.WriteLine($"from client:{e.Data}"); var lines = e.Data == null? [""] : e.Data.Split(" ", 2); // 切成两半 switch (lines[0]) { diff --git a/Manager/LoginManager.cs b/Manager/LoginManager.cs index 3ff0f51..c29962e 100644 --- a/Manager/LoginManager.cs +++ b/Manager/LoginManager.cs @@ -194,7 +194,7 @@ namespace Zerolauncher.Manager await Task.Delay(1000); if (!game.Send($"{StaticHandleS.HintText} 自动登录失败,将在{i}后启用网页登录,关闭窗口取消")) { return; } } - game.Send($"{StaticHandleS.UseBrowser} {need_web}"); - } + game.Send($"{StaticHandleS.UseBrowser} {need_web} {game.account.providerId + 1} {game.account.serverId} {game.account.userName} {game.account.userPWD}"); + } } } diff --git a/StaticHandleProtol.cs b/StaticHandleProtol.cs index ac2d7a3..4ad69fd 100644 --- a/StaticHandleProtol.cs +++ b/StaticHandleProtol.cs @@ -1,32 +1,34 @@ namespace Zerolauncher { - class StaticHandleS - { - public const string ShowWindow = "a0"; - public const string HintText = "b0"; - public const string MiniSize = "c0"; - public const string NormalSize = "d0"; - public const string UseBrowser = "e0"; - public const string GameSa = "f0"; - public const string CloseGame = "g0"; - public const string UpdateInfo = "h0"; - } + class StaticHandleS + { + public const string ShowWindow = "a0"; + public const string HintText = "b0"; + public const string MiniSize = "c0"; + public const string NormalSize = "d0"; + public const string UseBrowser = "e0"; + public const string GameSa = "f0"; + public const string CloseGame = "g0"; + public const string UpdateInfo = "h0"; + public const string VerifyDone = "i0"; + } - class StaticHandleC - { - public const string LoadDone = "0a"; - public const string StartDone = "0b"; - public const string BrowserDone = "0c"; - public const string StartGame = "0d"; - public const string GameDone = "0e"; - public const string Version = "0f"; - public const string DownloadDone = "0g"; - } + class StaticHandleC + { + public const string LoadDone = "0a"; + public const string StartDone = "0b"; + public const string BrowserDone = "0c"; + public const string StartGame = "0d"; + public const string GameDone = "0e"; + public const string Version = "0f"; + public const string DownloadDone = "0g"; + public const string TakeVerify = "0i"; + } - class StaticHandleA - { - public const string GameMode = "0a"; - public const string UpdateMode = "0b"; - public const string VersionMode = "0c"; - } + class StaticHandleA + { + public const string GameMode = "0a"; + public const string UpdateMode = "0b"; + public const string VersionMode = "0c"; + } }