From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Debug/DebugLogin.cs | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Main/System/Debug/DebugLogin.cs b/Main/System/Debug/DebugLogin.cs
index 0ffee1b..62c4d56 100644
--- a/Main/System/Debug/DebugLogin.cs
+++ b/Main/System/Debug/DebugLogin.cs
@@ -61,6 +61,11 @@
public void Login()
{
+ if (null == VersionConfig.config)
+ {
+ throw new System.Exception("VersionConfig is null when Login, game will pause here");
+ }
+
appidRecorder = appid.text;
serverIdRecorder = serverId.text;
accountRecorder = account.text;
@@ -72,8 +77,8 @@
if (!string.IsNullOrEmpty(appid.text))
{
- bool needRestore = VersionConfig.Get().m_AppId != appid.text;
- VersionConfig.Get().m_AppId = appid.text;
+ bool needRestore = VersionConfig.config.m_AppId != appid.text;
+ VersionConfig.config.m_AppId = appid.text;
#if UNITY_EDITOR
//debug鐧诲綍鍚庣浜屾鍚姩榛樿鎭㈠test
if (needRestore)
@@ -85,19 +90,18 @@
if (isToken.isOn)
{
- // var loginModel = ModelCenter.Instance.GetModel<LoginModel>();
- // LoginManager.Instance.sdkLoginResult = new SDKUtils.FP_LoginOk()
- // {
- // account = account.text,
- // token = password.text,
- // tokenExpire = "1519750743000",
- // phone = 0,
- // accountID = 1000
- // };
+ LoginManager.Instance.sdkLoginResult = new SDKUtils.FP_LoginOk()
+ {
+ account = account.text,
+ token = password.text,
+ tokenExpire = "1519750743000",
+ phone = 0,
+ accountID = 1000
+ };
LoginManager.Instance.sdkLogined = true;
var ip = ServerListCenter.Instance.currentServer.region_domain;
- var port = ServerListCenter.Instance.currentServer.login_port;
+ var port = ServerListCenter.Instance.currentServer.http_port;
var gamePort = ServerListCenter.Instance.currentServer.game_port;
if (!string.IsNullOrEmpty(serverId.text))
{
--
Gitblit v1.8.0