Merge remote-tracking branch 'origin/master' into SpringFestival

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/Launch/LaunchWin.cs

@@ -19,9 +19,7 @@
        [SerializeField] Image m_BackGround;

        [SerializeField] RectTransform m_AndroidProgressContainer;

        [SerializeField] SmoothSlider m_PartProgressSlider;

        [SerializeField] Text m_PartProgress;

        [SerializeField] SmoothSlider m_TotalProgressSlider;

        [SerializeField] Text m_TotalProgress;

        [SerializeField] Text m_StageDescription;

        [SerializeField] RectTransform m_IosProgressContainer;

        [SerializeField] Text m_IosProgressTip;

@@ -32,6 +30,7 @@
        bool assetBuildTimeShowed = false;



        Launch.LaunchStage showStage = Launch.LaunchStage.None;

        int showStep = 0;

        string stepDescription = string.Empty;



        float backGroundTimer = 0f;

@@ -65,7 +64,11 @@
        {

            backGroundTimer = 0f;

            backGroundIndex = 0;

            m_TotalProgressSlider.ResetValue(0f);

            if (m_TotalProgressSlider != null)

            {

                m_TotalProgressSlider.ResetValue(0f);

            }



            m_AlphaTween.SetStartState();



            m_Version.text = StringUtility.Contact(VersionConfig.Get().version, "_", VersionConfig.Get().buildIndex);

@@ -102,7 +105,18 @@


        protected override void OnAfterClose()

        {



        }



        protected override void OnActived()

        {

            base.OnActived();

            if (m_TotalProgressSlider == null)

            {

                m_TotalProgressSlider = this.GetComponentInChildren<SmoothSlider>(true);

            }

        }



        #endregion



        public void FadeOut()

@@ -110,26 +124,28 @@
            m_AlphaTween.Play();

        }



        string GetLaunchStageDescription(Launch.LaunchStage _stage)

        string GetLaunchStageDescription(Launch.LaunchStage _stage, int step)

        {

            switch (_stage)

            {

                case Launch.LaunchStage.SDKInit:

                    return Language.GetFromLocal(36);

                case Launch.LaunchStage.AssetCopy:

                    return Language.GetFromLocal(37);

                    return StringUtility.Contact(Language.GetFromLocal(37), "(", step, ")");

                case Launch.LaunchStage.AssetDecompress:

                    return StringUtility.Contact(Language.GetFromLocal(38), "(", step, ")");

                case Launch.LaunchStage.ClientVersion:

                    return Language.GetFromLocal(38);

                case Launch.LaunchStage.CheckAsset:

                    return Language.GetFromLocal(39);

                case Launch.LaunchStage.DownLoad:

                case Launch.LaunchStage.CheckAsset:

                    return Language.GetFromLocal(40);

                case Launch.LaunchStage.AssetBundleInit:

                case Launch.LaunchStage.DownLoad:

                    return Language.GetFromLocal(41);

                case Launch.LaunchStage.ConfigInit:

                case Launch.LaunchStage.AssetBundleInit:

                    return Language.GetFromLocal(42);

                case Launch.LaunchStage.ConfigInit:

                    return StringUtility.Contact(Language.GetFromLocal(43), "(", step, ")");

                case Launch.LaunchStage.Complete:

                    return Language.GetFromLocal(43);

                    return Language.GetFromLocal(44);

                default:

                    return "";

            }

@@ -166,28 +182,43 @@
            else

            {

                var progressInfo = Launch.progressInfo;

                m_TotalProgressSlider.value = progressInfo.totalProgress;

                m_TotalProgress.text = StringUtility.Contact(Mathf.RoundToInt(progressInfo.totalProgress * 100), "%");



                if (progressInfo.stage == Launch.LaunchStage.DownLoad)

                {

                    if (m_PartProgressSlider.gameObject.activeInHierarchy)

                    if (m_PartProgressSlider != null && m_PartProgressSlider.gameObject.activeInHierarchy)

                    {

                        m_PartProgressSlider.gameObject.SetActive(false);

                    }



                    if (m_TotalProgressSlider != null && m_TotalProgressSlider.gameObject.activeInHierarchy)

                    {

                        m_TotalProgressSlider.gameObject.SetActive(false);

                    }

                }

                else

                {

                    if (!m_PartProgressSlider.gameObject.activeInHierarchy)

                    if (m_PartProgressSlider != null && !m_PartProgressSlider.gameObject.activeInHierarchy)

                    {

                        m_PartProgressSlider.gameObject.SetActive(true);

                    }



                    m_PartProgressSlider.value = progressInfo.partProgress;

                    m_PartProgress.text = StringUtility.Contact(Mathf.RoundToInt(progressInfo.partProgress * 100), "%");

                    if (m_TotalProgressSlider != null && !m_TotalProgressSlider.gameObject.activeInHierarchy)

                    {

                        m_TotalProgressSlider.gameObject.SetActive(true);

                    }



                    if (m_TotalProgressSlider != null)

                    {

                        m_TotalProgressSlider.value = progressInfo.totalProgress;

                    }



                    if (m_PartProgressSlider != null)

                    {

                        m_PartProgressSlider.value = progressInfo.partProgress;

                    }

                }



                DisplayStageDescription(progressInfo.stage);

                DisplayStageDescription(progressInfo.stage, progressInfo.step);



                if (!assetBuildTimeShowed && AssetVersionUtility.assetsBuildTime != DateTime.MinValue)

                {

@@ -199,12 +230,16 @@


        }



        private void DisplayStageDescription(Launch.LaunchStage stage)

        private void DisplayStageDescription(Launch.LaunchStage stage, int step)

        {

            if (showStage != stage)

            if (showStage != stage || showStep != step)

            {

                showStage = stage;

                m_StageDescription.text = GetLaunchStageDescription(stage);

                showStep = step;

                if (m_StageDescription != null)

                {

                    m_StageDescription.text = GetLaunchStageDescription(stage, step);

                }

            }

        }