update 复位代码

client_Hale

2019-10-21 bac73dc8a03dee11fb1b5cecbd77252a21868bd7

update 复位代码

 Core/GameEngine/Login/Launch.cs

@@ -28,50 +28,50 @@
        SDKUtility.Instance.Init();



        var builtInAssetCopyTask = new BuiltInAssetCopyTask();

        // var initSettingTask = new InitSettingTask();

        // var sdkInitedTask = new SDKInitedTask();

        // var assetCopyTask = new AssetCopyTask();

        // var assetDecompressTask = new AssetDecompressTask();

        // var getVersionInfoTask = new GetVersionInfoTask();

        // var checkAssetValidTask = new CheckAssetValidTask();

        // var downLoadAssetTask = new DownLoadAssetTask();

        // var assetBundleInitTask = new AssetBundleInitTask();

        // var configInitTask = new ConfigInitTask();

        // var launchFadeOutTask = new LaunchFadeOutTask();



        // if (!Application.isEditor)

        // {

        //     tasks.Enqueue(sdkInitedTask);

        // }

        var initSettingTask = new InitSettingTask();

        var sdkInitedTask = new SDKInitedTask();

        var assetCopyTask = new AssetCopyTask();

        var assetDecompressTask = new AssetDecompressTask();

        var getVersionInfoTask = new GetVersionInfoTask();

        var checkAssetValidTask = new CheckAssetValidTask();

        var downLoadAssetTask = new DownLoadAssetTask();

        var assetBundleInitTask = new AssetBundleInitTask();

        var configInitTask = new ConfigInitTask();

        var launchFadeOutTask = new LaunchFadeOutTask();



        tasks.Enqueue(builtInAssetCopyTask);

        // tasks.Enqueue(initSettingTask);

        tasks.Enqueue(initSettingTask);



        // switch (Application.platform)

        // {

        //     case RuntimePlatform.WindowsEditor:

        //         tasks.Enqueue(getVersionInfoTask);

        //         break;

        //     case RuntimePlatform.Android:

        //         tasks.Enqueue(getVersionInfoTask);

        //         tasks.Enqueue(assetCopyTask);

        //         tasks.Enqueue(assetDecompressTask);

        //         break;

        //     case RuntimePlatform.IPhonePlayer:

        //         tasks.Enqueue(getVersionInfoTask);

        //         tasks.Enqueue(assetCopyTask);

        //         break;

        //     case RuntimePlatform.WindowsPlayer:

        //         tasks.Enqueue(assetCopyTask);

        //         tasks.Enqueue(getVersionInfoTask);

        //         break;

        // }

        if (!Application.isEditor)

        {

            tasks.Enqueue(sdkInitedTask);

        }



        // tasks.Enqueue(checkAssetValidTask);

        // tasks.Enqueue(downLoadAssetTask);

        // tasks.Enqueue(assetBundleInitTask);

        // tasks.Enqueue(configInitTask);

        // tasks.Enqueue(launchFadeOutTask);

        switch (Application.platform)

        {

            case RuntimePlatform.WindowsEditor:

                tasks.Enqueue(getVersionInfoTask);

                break;

            case RuntimePlatform.Android:

                tasks.Enqueue(getVersionInfoTask);

                tasks.Enqueue(assetCopyTask);

                tasks.Enqueue(assetDecompressTask);

                break;

            case RuntimePlatform.IPhonePlayer:

                tasks.Enqueue(getVersionInfoTask);

                tasks.Enqueue(assetCopyTask);

                break;

            case RuntimePlatform.WindowsPlayer:

                tasks.Enqueue(assetCopyTask);

                tasks.Enqueue(getVersionInfoTask);

                break;

        }



        tasks.Enqueue(checkAssetValidTask);

        tasks.Enqueue(downLoadAssetTask);

        tasks.Enqueue(assetBundleInitTask);

        tasks.Enqueue(configInitTask);

        tasks.Enqueue(launchFadeOutTask);



        CalculateExpectTotalTime();

    }

@@ -207,7 +207,7 @@


        public override void Begin()

        {

            UnityEngine.Debug.Log("BuiltInAssetCopyTask.Begin");

            Debug.Log("BuiltInAssetCopyTask.Begin");

            duration = Mathf.Max(0.1f, expectTime);



            if (Application.isEditor)

@@ -238,7 +238,7 @@


        public override void End()

        {

            UnityEngine.Debug.Log("BuiltInAssetCopyTask.End");

            Debug.Log("BuiltInAssetCopyTask.End");

            if (!AssetSource.builtInFromEditor)

            {

                AssetBundleUtility.Instance.InitBuiltInAsset();

@@ -423,7 +423,7 @@


        public override void Begin()

        {

            UnityEngine.Debug.Log("InitSettingTask.Begin");

            Debug.Log("InitSettingTask.Begin");

            ShaderUtility.InitGlobalParams();

            SoundPlayer.CreateSoundPlayer();

            SoundPlayer.Instance.PlayLoginMusic();

@@ -456,7 +456,7 @@


        public override void End()

        {

            UnityEngine.Debug.Log("InitSettingTask.End");

            Debug.Log("InitSettingTask.End");

            expectTime = timer;

        }



@@ -475,14 +475,14 @@


        public override void Begin()

        {

            UnityEngine.Debug.Log("SDKInitedTask.Begin");

            Debug.Log("SDKInitedTask.Begin");

            m_CurrentStage = LaunchStage.SDKInit;

            duration = Mathf.Max(0.1f, expectTime);

        }



        public override void End()

        {

            UnityEngine.Debug.Log("SDKInitedTask.End");

            Debug.Log("SDKInitedTask.End");

            expectTime = timer;

            DebugEx.LogFormat("{0}执行时长：{1}；", this.GetType().Name, timer);



@@ -530,7 +530,7 @@


        public override void Begin()

        {

            UnityEngine.Debug.Log("AssetCopyTask.Begin");

            Debug.Log("AssetCopyTask.Begin");

            m_CurrentStage = LaunchStage.AssetCopy;

            duration = Mathf.Max(0.5f, expectTime);

            outTime = 50f;

@@ -558,7 +558,7 @@


        public override void End()

        {

            UnityEngine.Debug.Log("AssetCopyTask.End");

            Debug.Log("AssetCopyTask.End");

            expectTime = timer;

            DebugEx.LogFormat("{0}执行时长：{1}；", this.GetType().Name, timer);



@@ -790,7 +790,7 @@


        public override void Begin()

        {

            UnityEngine.Debug.Log("AssetDeCompressTask.Begin");

            Debug.Log("AssetDeCompressTask.Begin");

            m_CurrentStage = LaunchStage.AssetDecompress;

            duration = Mathf.Max(0.5f, expectTime);



@@ -807,7 +807,7 @@


        public override void End()

        {

            UnityEngine.Debug.Log("AssetDeCompressTask.End");

            Debug.Log("AssetDeCompressTask.End");

            AssetDeCompressTask.assetDeCompressVersion = VersionConfig.Get().version;

            AssetDeCompressTask.Delete7zFiles(ResourcesPath.Instance.ExternalStorePath);

        }

@@ -842,7 +842,7 @@


        public override void Begin()

        {

            UnityEngine.Debug.Log("GetVersionInfoTask.Begin");

            Debug.Log("GetVersionInfoTask.Begin");

            m_CurrentStage = LaunchStage.ClientVersion;

            duration = Mathf.Max(0.5f, expectTime);



@@ -877,7 +877,7 @@


        public override void End()

        {

            UnityEngine.Debug.Log("GetVersionInfoTask.End");

            Debug.Log("GetVersionInfoTask.End");

            expectTime = timer;

            DebugEx.LogFormat("{0}执行时长：{1}；", this.GetType().Name, timer);

        }