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/Config/ConfigBase.cs | 2 Main/System/Launch/LoadingWin.cs | 4 Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs | 14 +- Main/Core/GameEngine/Launch/InitSettingTask.cs | 2 Main/System/Sound/SoundPlayer.cs | 32 ++-- Main/Config/ConfigManager.cs | 4 Main/System/Login/LoginWin.cs | 23 +-- Main/System/ClientVersion/RequestSecretWin.cs | 6 Main/System/Login/GameAgeWarnWin.cs | 48 ++----- Main/System/UIBase/UIBase.cs | 44 ++++--- Main/System/Language/Language.cs | 2 Main/Core/GameEngine/Launch/LaunchInHot.cs | 9 Main/System/Launch/LaunchWin.cs | 5 Main/System/Login/LoginManager.cs | 135 +++++++++++---------- 14 files changed, 161 insertions(+), 169 deletions(-) diff --git a/Main/Config/ConfigBase.cs b/Main/Config/ConfigBase.cs index 8358695..41f3c51 100644 --- a/Main/Config/ConfigBase.cs +++ b/Main/Config/ConfigBase.cs @@ -59,8 +59,6 @@ { dic.Clear(); - Dictionary<string, string> rawDatas = new Dictionary<string, string>(); - for (int i = 3; i < lines.Length; i++) { string line = lines[i]; diff --git a/Main/Config/ConfigManager.cs b/Main/Config/ConfigManager.cs index b884d3f..bbed737 100644 --- a/Main/Config/ConfigManager.cs +++ b/Main/Config/ConfigManager.cs @@ -54,7 +54,7 @@ typeof(GmCmdConfig), typeof(GuideConfig), typeof(IconConfig), - typeof(InitialFunctionConfig), + //typeof(InitialFunctionConfig), typeof(ItemConfig), typeof(KickOutReasonConfig), typeof(LanguageConfig), @@ -68,7 +68,7 @@ typeof(PlayerFaceStarConfig), typeof(PlayerLVConfig), typeof(priorbundleConfig), - typeof(PriorLanguageConfig), + //typeof(PriorLanguageConfig), typeof(RichTextMsgReplaceConfig), typeof(RuleConfig), typeof(SkillConfig), diff --git a/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs b/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs index 901b976..13755ed 100644 --- a/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs +++ b/Main/Core/GameEngine/Launch/BuiltInAssetCopyTask.cs @@ -37,16 +37,18 @@ if (!firstLaunch) { - LoadInitalConfig().Forget(); + //LoadInitalConfig().Forget(); + done = true; } } - protected async UniTask LoadInitalConfig() - { - await ConfigManager.Instance.LoadConfigByType(typeof(InitialFunctionConfig)); + //搴旇鏄笅杞芥渶鏂扮殑琛ㄦ牸鍚庡啀娆″姞杞� 闈炴嫹璐� + //protected async UniTask LoadInitalConfig() + //{ + // await ConfigManager.Instance.LoadConfigByType(typeof(InitialFunctionConfig)); - done = true; - } + // done = true; + //} public override void End() { diff --git a/Main/Core/GameEngine/Launch/InitSettingTask.cs b/Main/Core/GameEngine/Launch/InitSettingTask.cs index 911b1e2..8f0d469 100644 --- a/Main/Core/GameEngine/Launch/InitSettingTask.cs +++ b/Main/Core/GameEngine/Launch/InitSettingTask.cs @@ -14,7 +14,7 @@ { ShaderUtility.InitGlobalParams(); SoundPlayer.CreateSoundPlayer(); - SoundPlayer.Instance.PlayLoginMusic(); + //SoundPlayer.Instance.PlayLoginMusic(); SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume()); SystemSetting.Instance.SetSoundEffect(SystemSetting.Instance.GetSoundEffect()); diff --git a/Main/Core/GameEngine/Launch/LaunchInHot.cs b/Main/Core/GameEngine/Launch/LaunchInHot.cs index dabf573..db9c737 100644 --- a/Main/Core/GameEngine/Launch/LaunchInHot.cs +++ b/Main/Core/GameEngine/Launch/LaunchInHot.cs @@ -26,11 +26,12 @@ Application.backgroundLoadingPriority = ThreadPriority.High; Screen.sleepTimeout = SleepTimeout.NeverSleep; - InitSystemMgr(); - SDKUtils.Instance.Init(); //鍘焥dk鎺ュ彛 - // 杩欓噷杩樻病寮�濮嬪姞杞介厤缃� 浣嗘槸鎻愬墠鍔犺浇浜嗕緵LaunchWin浣跨敤 - LanguageConfig.ForceInit(); + InitSystemMgr(); + SDKUtils.Instance.Init(); //鍘焥dk鎺ュ彛 + + // 杩欓噷杩樻病寮�濮嬪姞杞介厤缃� 浣嗘槸鎻愬墠鍔犺浇浜嗕緵LaunchWin浣跨敤 + PriorLanguageConfig.ForceInit(); InitialFunctionConfig.ForceInit(); UIManager.Instance.OpenWindow<LaunchWin>(); diff --git a/Main/System/ClientVersion/RequestSecretWin.cs b/Main/System/ClientVersion/RequestSecretWin.cs index 8fe9c0d..48e3a0a 100644 --- a/Main/System/ClientVersion/RequestSecretWin.cs +++ b/Main/System/ClientVersion/RequestSecretWin.cs @@ -30,10 +30,12 @@ #endif }); m_Fuwu.SetListener(()=> { - UIManager.Instance.OpenWindow<GameAgeWarnWin>().SetFunctionOrder(1); + GameAgeWarnWin.data = 1; + UIManager.Instance.OpenWindow<GameAgeWarnWin>(); }); m_Yinsi.SetListener(() => { - UIManager.Instance.OpenWindow<GameAgeWarnWin>().SetFunctionOrder(2); + GameAgeWarnWin.data = 2; + UIManager.Instance.OpenWindow<GameAgeWarnWin>(); }); } diff --git a/Main/System/Language/Language.cs b/Main/System/Language/Language.cs index 1649f33..e626307 100644 --- a/Main/System/Language/Language.cs +++ b/Main/System/Language/Language.cs @@ -97,7 +97,7 @@ // if (_id.StartsWith(NewBieGuideScriptableObject.GuidesPrefixNewBie) || // _id.StartsWith(NewBieGuideScriptableObject.GuidesPrefixFun)) // return string.Empty; - // Debug.LogFormat("缂哄皯璇█琛ㄩ厤缃�,id: {0}", _id); + Debug.LogErrorFormat("缂哄皯璇█琛ㄩ厤缃�,id: {0}", _id); #endif return string.Empty; } diff --git a/Main/System/Launch/LaunchWin.cs b/Main/System/Launch/LaunchWin.cs index e850fd6..2ad2b73 100644 --- a/Main/System/Launch/LaunchWin.cs +++ b/Main/System/Launch/LaunchWin.cs @@ -118,8 +118,9 @@ else { m_AndroidProgressContainer.SetActive(true); - m_IosProgressContainer.SetActive(false); - m_Version.text = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex, Language.Id); + m_IosProgressContainer.SetActive(false); + //鎵撳寘鐗堟湰 + 鍔熻兘鐗堟湰 + 璇█ID + m_Version.text = LoginManager.Instance.GetVersionStr(); } if (m_StageDescription != null) diff --git a/Main/System/Launch/LoadingWin.cs b/Main/System/Launch/LoadingWin.cs index 9b13597..0a014b5 100644 --- a/Main/System/Launch/LoadingWin.cs +++ b/Main/System/Launch/LoadingWin.cs @@ -59,7 +59,9 @@ { base.OnPreOpen(); currentProgress = targetProgress = 0; - Refresh(); + Refresh(); + //鎵撳寘鐗堟湰 + 鍔熻兘鐗堟湰 + 璇█ID + m_Version.text = LoginManager.Instance.GetVersionStr(); } protected override void OnPreClose() diff --git a/Main/System/Login/GameAgeWarnWin.cs b/Main/System/Login/GameAgeWarnWin.cs index f693f39..b47ca1a 100644 --- a/Main/System/Login/GameAgeWarnWin.cs +++ b/Main/System/Login/GameAgeWarnWin.cs @@ -15,47 +15,27 @@ [SerializeField] Transform m_Title3; //骞撮緞 [SerializeField] Transform m_Info3; [SerializeField] Button m_Close; - // 鐢熷懡鍛ㄦ湡 - protected override void Awake() - { - base.Awake(); - // 鍒濆鍖栫粍浠跺紩鐢� + + + public static int data = 1; + + + protected override void InitComponent() + { + m_Close.AddListener(CloseWindow); } - protected override void Start() - { - base.Start(); - // 鍒濆鍖栨暟鎹� - } // UI浜嬩欢 protected override void OnOpen() { - base.OnOpen(); - // 绐楀彛鎵撳紑鏃剁殑閫昏緫 - - // m_Title1.SetActive(functionOrder == 1); - // m_Info1.SetActive(functionOrder == 1); - // m_Title2.SetActive(functionOrder == 2); - // m_Info2.SetActive(functionOrder == 2); - // m_Title3.SetActive(functionOrder == 3); - // m_Info3.SetActive(functionOrder == 3); + m_Title1.SetActive(data == 1); + m_Info1.SetActive(data == 1); + m_Title2.SetActive(data == 2); + m_Info2.SetActive(data == 2); + m_Title3.SetActive(data == 3); + m_Info3.SetActive(data == 3); } - protected override void OnClose() - { - base.OnClose(); - // 绐楀彛鍏抽棴鏃剁殑閫昏緫 - } - public override void Refresh() - { - base.Refresh(); - // 鍒锋柊UI鏄剧ず - } - - public void SetFunctionOrder(int _functionOrder) - { - - } } 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); + } } diff --git a/Main/System/Login/LoginWin.cs b/Main/System/Login/LoginWin.cs index 71a2696..79d97db 100644 --- a/Main/System/Login/LoginWin.cs +++ b/Main/System/Login/LoginWin.cs @@ -64,18 +64,17 @@ m_CleanCache.SetListener(CleanCache); serverRead.SetListener(() => { - GameAgeWarnWin win = UIManager.Instance.OpenWindow<GameAgeWarnWin>(); - win.SetFunctionOrder(1); - // WindowCenter.Instance.OpenFromLocal<GameAgeWarnWin>(1); + GameAgeWarnWin.data = 1; + UIManager.Instance.OpenWindow<GameAgeWarnWin>(); }); hideRead.SetListener(() => { - GameAgeWarnWin win = UIManager.Instance.OpenWindow<GameAgeWarnWin>(); - win.SetFunctionOrder(2); + GameAgeWarnWin.data = 2; + UIManager.Instance.OpenWindow<GameAgeWarnWin>(); }); ageWarn.SetListener(() => { - GameAgeWarnWin win = UIManager.Instance.OpenWindow<GameAgeWarnWin>(); - win.SetFunctionOrder(3); + GameAgeWarnWin.data = 3; + UIManager.Instance.OpenWindow<GameAgeWarnWin>(); }); } @@ -125,12 +124,10 @@ public override void Refresh() { base.Refresh(); - Debug.Log("鍒锋柊鐧诲綍绐楀彛"); - - - // 鐗堟湰淇℃伅 - string strVersion = StringUtility.Contact("ver ", InitialFunctionConfig.Get("version").Numerical1); - verInfo.text = strVersion; + Debug.Log("鍒锋柊鐧诲綍绐楀彛"); + + //鎵撳寘鐗堟湰 + 鍔熻兘鐗堟湰 + 璇█ID + verInfo.text = LoginManager.Instance.GetVersionStr(); var sprite = BuiltInLoader.LoadSprite("TB_DL_Logo"); m_Logo.overrideSprite = sprite; diff --git a/Main/System/Sound/SoundPlayer.cs b/Main/System/Sound/SoundPlayer.cs index 6c897a2..3315f86 100644 --- a/Main/System/Sound/SoundPlayer.cs +++ b/Main/System/Sound/SoundPlayer.cs @@ -302,23 +302,23 @@ } } - public void PlayLoginMusic() - { - var loginMusic = BuiltInLoader.LoadMusic("Music_Login"); - if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic) - { - StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false)); - } - } + //public void PlayLoginMusic() + //{ + // var loginMusic = BuiltInLoader.LoadMusic("Music_Login"); + // if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic) + // { + // StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false)); + // } + //} - private void LateUpdate() - { - // if (CameraController.Instance != null && CameraController.Instance.CameraObject != null) - // { - // this.transform.position = CameraController.Instance.transform.position + new Vector3(0, 5, 0); - // this.transform.rotation = CameraController.Instance.CameraObject.transform.rotation; - // } - } + //private void LateUpdate() + //{ + // if (CameraController.Instance != null && CameraController.Instance.CameraObject != null) + // { + // this.transform.position = CameraController.Instance.transform.position + new Vector3(0, 5, 0); + // this.transform.rotation = CameraController.Instance.CameraObject.transform.rotation; + // } + //} IEnumerator Co_BackGroundMusicFadeOutIn(AudioClip _clip, bool _oneShot) { diff --git a/Main/System/UIBase/UIBase.cs b/Main/System/UIBase/UIBase.cs index 42d62ae..4002e55 100644 --- a/Main/System/UIBase/UIBase.cs +++ b/Main/System/UIBase/UIBase.cs @@ -79,7 +79,7 @@ // 缁勪欢寮曠敤 protected Canvas canvas; protected CanvasGroup canvasGroup; - protected RectTransform _rectTransform; + protected RectTransform _rectTransform; //鐣岄潰榛樿娣诲姞鏍硅妭鐐圭敤浜庤〃鐜扮晫闈㈠紑鍚叧闂姩鐢� // 鍔ㄧ敾鐩稿叧 protected Vector3 originalPosition; @@ -118,6 +118,9 @@ private void CreateRootNode() { + if (openAnimationType == UIAnimationType.None && closeAnimationType == UIAnimationType.None) + return; + List<Transform> children = new List<Transform>(); foreach (Transform child in transform) { @@ -127,13 +130,14 @@ rootNode = new GameObject("WindowRoot"); rootNode.transform.SetParent(transform, false); rootNode.layer = LayerMask.NameToLayer("UI"); - _rectTransform = rootNode.AddMissingComponent<RectTransform>(); - _rectTransform.anchorMin = new Vector2(0.5f, 0.5f); - _rectTransform.anchorMax = new Vector2(0.5f, 0.5f); + _rectTransform = rootNode.AddMissingComponent<RectTransform>(); + + //璁剧疆鎴愭媺浼告晥鏋滐紝鍜岀埗瀹瑰櫒淇濇寔鍚屾牱澶у皬鑷姩閫傞厤 + _rectTransform.anchorMin = Vector2.zero; + _rectTransform.anchorMax = Vector2.one; _rectTransform.pivot = new Vector2(0.5f, 0.5f); - _rectTransform.sizeDelta = new Vector2(750, 1334); // 榛樿澶у皬锛屽彲浠ユ牴鎹渶瑕佽皟鏁� _rectTransform.anchoredPosition = Vector2.zero; - _rectTransform.localScale = Vector3.one; + _rectTransform.sizeDelta = Vector2.zero; // 璁剧疆涓�0锛岃〃绀烘媺浼稿埌鐖跺鍣ㄥぇ灏� foreach (Transform child in children) { @@ -147,21 +151,21 @@ } protected async UniTask ApplySettings() - { - await UniTask.DelayFrame(5); - - if (null != transform) + { + if (clickEmptySpaceClose) { - if (clickEmptySpaceClose) - { - GameObject goBtnESC = GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/ClickEmptyCloseMask"), transform); - // Load - btnClickEmptyClose = goBtnESC.GetComponent<Button>(); - btnClickEmptyClose.AddListener(CloseWindow); - btnClickEmptyClose.transform.SetAsFirstSibling(); - } + //寤惰繜鍒涘缓浼氬鑷村眰绾у湪ScreenMask涔嬩笂 + GameObject goBtnESC = GameObject.Instantiate(Resources.Load<GameObject>("Prefabs/ClickEmptyCloseMask"), transform); + btnClickEmptyClose = goBtnESC.GetComponent<Button>(); + btnClickEmptyClose.AddListener(CloseWindow); + btnClickEmptyClose.transform.SetAsFirstSibling(); + await UniTask.DelayFrame(5); + + btnClickEmptyClose = goBtnESC.GetComponent<Button>(); + btnClickEmptyClose.AddListener(CloseWindow); } } + protected async void ExecuteNextFrame(Action _action) { @@ -663,8 +667,8 @@ if (canvasGroup != null) { canvasGroup.alpha = 1f; - canvasGroup.interactable = false; - canvasGroup.blocksRaycasts = false; + canvasGroup.interactable = true; + canvasGroup.blocksRaycasts = true; } if (canvasScaler != null) { -- Gitblit v1.8.0