Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-09-17 b8f56070e35503272bb387b5d62476cda3d22b96

 Core/GameEngine/Login/Launch.cs

@@ -13,11 +13,9 @@
    static public LaunchStage currentStage { get { return m_CurrentStage; } }



    static float m_Progress = 0f;

    static public float progress

    {

    static public float progress {

        get { return m_Progress; }

        set

        {

        set {

            if (m_Progress != value)

            {

                m_Progress = value;

@@ -185,7 +183,6 @@
        OperationLogCollect.Instance.RecordEvent(2);



        m_CurrentStage = LaunchStage.ClientVersion;



        if (!Application.isEditor || InGameDownTestUtility.enable)

        {

            VersionUtility.Instance.RequestVersionCheck();

@@ -201,43 +198,45 @@
            }

        }



        m_CurrentStage = LaunchStage.DownLoad;

        switch (VersionConfig.Get().assetAccess)

        if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 1)

        {

            case InstalledAsset.IngoreDownLoad:

                break;

            case InstalledAsset.NullAsset:

            case InstalledAsset.HalfAsset:

            case InstalledAsset.FullAsset:

                AssetVersionUtility.GetAssetVersionFile();

            m_CurrentStage = LaunchStage.DownLoad;

            switch (VersionConfig.Get().assetAccess)

            {

                case InstalledAsset.IngoreDownLoad:

                    break;

                case InstalledAsset.NullAsset:

                case InstalledAsset.HalfAsset:

                case InstalledAsset.FullAsset:

                    AssetVersionUtility.GetAssetVersionFile();



                progressBuf = progress;

                timer = 0f;

                duration = 1.5f;



                while (!AssetVersionUtility.checkAssetCompleted)

                {

                    timer += Time.deltaTime;

                    progress = Mathf.Clamp(progressBuf + timer / duration * 0.3f, progressBuf, progressBuf + 0.3f);

                    yield return null;

                }



                if (!AssetVersionUtility.priorAssetDownLoadDone)

                {

                    AssetVersionUtility.BeginDownLoadTask(true);

                    while (!AssetVersionUtility.priorAssetDownLoadDone)

                    progressBuf = progress;

                    timer = 0f;

                    duration = 1.5f;

                    while (!AssetVersionUtility.checkAssetCompleted)

                    {

                        timer += Time.deltaTime;

                        progress = Mathf.Clamp(progressBuf + timer / duration * 0.3f, progressBuf, progressBuf + 0.3f);

                        yield return null;

                    }



                    yield return WaitingForSecondConst.WaitMS200;

                }

                    if (!AssetVersionUtility.priorAssetDownLoadDone)

                    {

                        AssetVersionUtility.BeginDownLoadTask(true);

                        while (!AssetVersionUtility.priorAssetDownLoadDone)

                        {

                            yield return null;

                        }



                if (!AssetVersionUtility.unPriorAssetDownLoadDone)

                {

                    AssetVersionUtility.BeginDownLoadTask(false);

                }

                break;

                        yield return WaitingForSecondConst.WaitMS200;

                    }



                    if (!AssetVersionUtility.unPriorAssetDownLoadDone)

                    {

                        AssetVersionUtility.BeginDownLoadTask(false);

                    }

                    break;

            }

        }



        if (!AssetSource.allFromEditor)