3335 场景切换重构

client_Wu Xijin

2019-01-31 ebb9029ae49e831f3f540bd5349d04b028026d9e

3335 场景切换重构

 System/Loading/LoadingWin.cs

@@ -41,6 +41,8 @@
        float refProgress = 0f;

        float expectDuration = 5f;



        float overTimer = 0f;



        LoadingType loadingType = LoadingType.Normal;



        #region Built-in

@@ -54,6 +56,8 @@


        protected override void OnPreOpen()

        {

            overTimer = 0f;

            refProgress = 0f;

            var useDefautBackGround = false;

            if (!AssetSource.uiFromEditor)

            {

@@ -195,7 +199,6 @@
                else

                {

                    m_ContainerProgress.gameObject.SetActive(true);

                    refProgress = 0f;

                    m_ProgressSlider.ResetValue(0f);

                }

            }

@@ -223,7 +226,6 @@
        protected override void LateUpdate()

        {

            base.LateUpdate();



            if (loadingType == LoadingType.Normal)

            {

                if (StageLoad.Instance.progress + 0.1f > refProgress)

@@ -233,6 +235,19 @@


                m_ProgressSlider.value = refProgress;

            }



            overTimer += Time.deltaTime;

            if (overTimer > 15f)

            {

                overTimer -= 5f;



                var loginModel = ModelCenter.Instance.GetModel<LoginModel>();

                if (!loginModel.busy && !CrossServerLogin.Instance.busy && !StageLoad.Instance.isLoading)

                {

                    WindowCenter.Instance.Close<LoadingWin>();

                }

            }



        }



        private List<int> GetShowFunctions(int _level)