From c8d3e3bc65d9d1021c41b07fbbedd0c6afeb2b8c Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期二, 10 六月 2025 23:57:22 +0800 Subject: [PATCH] 0312 版本号统一显示格式;表格重复加载;去除登录界面音乐;隐私界面调整;界面存在动画才增加根节点,无动画时默认组件可交互,点击空关闭mask的层级问题 --- Main/System/Login/LoginManager.cs | 135 +++++++++++++++++++++++--------------------- 1 files changed, 70 insertions(+), 65 deletions(-) diff --git a/Main/System/Login/LoginManager.cs b/Main/System/Login/LoginManager.cs index 0d8724a..0a44969 100644 --- a/Main/System/Login/LoginManager.cs +++ b/Main/System/Login/LoginManager.cs @@ -294,72 +294,77 @@ } public C0101_tagCPlayerLogin Get0101SendPackage(H0101_tagServerPrepared _serverInfo) + { + var send = new C0101_tagCPlayerLogin(); + switch (VersionConfig.Get().versionAuthority) { - var send = new C0101_tagCPlayerLogin(); - switch (VersionConfig.Get().versionAuthority) - { - case VersionAuthority.InterTest: - send.IDType = 1; - send.AccID = accountBuf; - if (sdkLoginResult == null) - send.Password = "111"; - else - send.Password = sdkLoginResult.token; - send.MAC = DeviceUtility.GetMac(); - send.Version = _serverInfo.Version; - send.LineNO = 255; - send.AppID = VersionConfig.Get().appId; - send.AccountID = 1000;// 鍐呴儴鐧婚檰鐨勬椂鍊欑殑id - send.TokenExpire = "1519750743000";// 鍐呴儴鐧婚檰鐨勬椂闀�,鏃犳墍璋撶殑 - send.Phone = 0; - send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag; - send.Adult = 1; - send.ExtraLen = 0; - send.Extra = ""; - break; - case VersionAuthority.Release: - { - var deviceInfo = DeviceUtility.GetDeviceModel(); - deviceInfo.Replace(" ", "").Replace("=", "").Replace("%", "").Replace("-", "").Replace("|", ""); - var versionStr = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex, "_", deviceInfo); - - send.Extra = StringUtility.Contact(VersionConfig.Get().SpID, "|", - SDKUtils.Instance.Device.uniqueID, "|", - sdkLoginResult.token, "|", - sdkLoginResult.qkUserName, "|", - versionStr.Substring(0, Math.Min(24, versionStr.Length))); - - - Debug.Log("=====> extra: " + send.Extra); - send.ExtraLen = (ushort)send.Extra.Length; - - send.IDType = (byte)SDKUtils.Instance.ChannelPlatform; + case VersionAuthority.InterTest: + send.IDType = 1; + send.AccID = accountBuf; + if (sdkLoginResult == null) + send.Password = "111"; + else send.Password = sdkLoginResult.token; - send.AccID = sdkLoginResult.account; - send.MAC = DeviceUtility.GetMac(); - send.Version = _serverInfo.Version; - send.LineNO = 255; - send.AppID = VersionConfig.Get().appId; - send.AccountID = (uint)sdkLoginResult.accountID; - send.TokenExpire = sdkLoginResult.tokenExpire; - send.Phone = (byte)sdkLoginResult.phone; - send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag; - if (sdkIDCheckIDAuthentication.type == "1") - { - send.Adult = 1; - } - else if (sdkIDCheckIDAuthentication.type == "2") - { - send.Adult = MathUtility.CheckAdult(sdkIDCheckIDAuthentication.card_id) ? (byte)1 : (byte)0; - } - else - { - send.Adult = 0; - } - break; - } - } - - return send; + send.MAC = DeviceUtility.GetMac(); + send.Version = _serverInfo.Version; + send.LineNO = 255; + send.AppID = VersionConfig.Get().appId; + send.AccountID = 1000;// 鍐呴儴鐧婚檰鐨勬椂鍊欑殑id + send.TokenExpire = "1519750743000";// 鍐呴儴鐧婚檰鐨勬椂闀�,鏃犳墍璋撶殑 + send.Phone = 0; + send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag; + send.Adult = 1; + send.ExtraLen = 0; + send.Extra = ""; + break; + case VersionAuthority.Release: + { + var deviceInfo = DeviceUtility.GetDeviceModel(); + deviceInfo.Replace(" ", "").Replace("=", "").Replace("%", "").Replace("-", "").Replace("|", ""); + var versionStr = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex, "_", deviceInfo); + + send.Extra = StringUtility.Contact(VersionConfig.Get().SpID, "|", + SDKUtils.Instance.Device.uniqueID, "|", + sdkLoginResult.token, "|", + sdkLoginResult.qkUserName, "|", + versionStr.Substring(0, Math.Min(24, versionStr.Length))); + + + Debug.Log("=====> extra: " + send.Extra); + send.ExtraLen = (ushort)send.Extra.Length; + + send.IDType = (byte)SDKUtils.Instance.ChannelPlatform; + send.Password = sdkLoginResult.token; + send.AccID = sdkLoginResult.account; + send.MAC = DeviceUtility.GetMac(); + send.Version = _serverInfo.Version; + send.LineNO = 255; + send.AppID = VersionConfig.Get().appId; + send.AccountID = (uint)sdkLoginResult.accountID; + send.TokenExpire = sdkLoginResult.tokenExpire; + send.Phone = (byte)sdkLoginResult.phone; + send.ServerID = (uint)ServerListCenter.Instance.currentServer.region_flag; + if (sdkIDCheckIDAuthentication.type == "1") + { + send.Adult = 1; + } + else if (sdkIDCheckIDAuthentication.type == "2") + { + send.Adult = MathUtility.CheckAdult(sdkIDCheckIDAuthentication.card_id) ? (byte)1 : (byte)0; + } + else + { + send.Adult = 0; + } + break; + } } + + return send; + } + + public string GetVersionStr() + { + return StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex, "_", InitialFunctionConfig.Get("version").Numerical1); + } } -- Gitblit v1.8.0