webgl代码合并 1

yyl

2026-03-26 1ab047b5fdd933c38ba0519ec2e83a44512ea8d7

 Main/System/Launch/LaunchWin.cs

@@ -8,6 +8,7 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using Cysharp.Threading.Tasks;



@@ -53,39 +54,62 @@
            m_TotalProgressSlider.value = 0f;
        }

        if (null == VersionConfig.config)
        {
            throw new Exception("VersionConfig is null when LaunchWin open, check VersionConfig.GetAsync for more details");
        }

        // m_AlphaTween.SetStartState();

        m_BuildTime.text = VersionConfig.Get().debugVersion ? VersionConfig.Get().buildTime : "";
        m_BuildTime.text = VersionConfig.config.debugVersion ? VersionConfig.config.buildTime : "";

        if (m_NetworkContainer != null)
        {
            m_NetworkContainer.SetActive(false);
        } 

        var AppleCheck   = InitialFunctionConfig.Get("CheckTime").Numerical1;
        var AndroidCheck = InitialFunctionConfig.Get("CheckTime").Numerical2;
        var CheckAll = InitialFunctionConfig.Get("NetworkCheck").Numerical1;
        var checkTimeCfg = LaunchCommon.InitialFunctionConfig.Get("CheckTime");
        var networkCheckCfg = LaunchCommon.InitialFunctionConfig.Get("NetworkCheck");
        Debug.LogErrorFormat("checktimecfg is null {0}, networkCheckCfg is null {1}", checkTimeCfg == null, networkCheckCfg == null);
        var AppleCheck   = checkTimeCfg?.Numerical1 ?? "0";
        var AndroidCheck = checkTimeCfg?.Numerical2 ?? "0";
        var CheckAll = networkCheckCfg?.Numerical1 ?? "3";
        AllTimes = int.Parse(CheckAll);
        var CheckTime = InitialFunctionConfig.Get("NetworkCheck").Numerical2;
        var CheckTime = networkCheckCfg?.Numerical2 ?? "5";
        WaitSeconds = int.Parse(CheckTime);
        ShowCircleView = false;
        if (Application.platform == RuntimePlatform.IPhonePlayer && AppleCheck == "1")
            ShowCircleView = true;
        if (Application.platform == RuntimePlatform.Android && AndroidCheck == "1")
            ShowCircleView = true;

        if (ShowCircleView)
        
        if (Application.platform == RuntimePlatform.WebGLPlayer)
        {
            m_AndroidProgressContainer.SetActive(false);
            m_IosProgressContainer.SetActive(true);
            m_Version.text = string.Empty;
            m_IosProgressContainer.SetActive(false);
            LoginManager.Instance.GetVersionStr().ContinueWith(versionStr =>
            {
                m_Version.text = versionStr;
            }).Forget();
        }
        else
        {
            m_AndroidProgressContainer.SetActive(true);
            m_IosProgressContainer.SetActive(false);
            //打包版本 + 功能版本 + 语言ID
            m_Version.text = LoginManager.Instance.GetVersionStr();
            if (ShowCircleView)
            {
                m_AndroidProgressContainer.SetActive(false);
                m_IosProgressContainer.SetActive(true);
                m_Version.text = string.Empty;
            }
            else
            {
                m_AndroidProgressContainer.SetActive(true);
                m_IosProgressContainer.SetActive(false);
                //打包版本 + 功能版本 + 语言ID
                LoginManager.Instance.GetVersionStr().ContinueWith(versionStr =>
                {
                    m_Version.text = versionStr;
                }).Forget();
            }
        }

        if (m_StageDescription != null)