Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-24 6ce4ae16561fd205c8bb3f530d5a20033f207f4f

 System/AssetVersion/InGameDownLoadProgress.cs

@@ -28,7 +28,8 @@
                && InGameDownLoad.Instance.completeDownLoadAccount == PlayerDatas.Instance.baseData.AccID)

            {

                m_ProgressText.gameObject.SetActive(true);

                m_ProgressText.text = "100%";

                var progress = Mathf.RoundToInt(InGameDownLoad.Instance.progress * 100);

                m_ProgressText.text = StringUtility.Contact(progress, "%");

                this.gameObject.SetActive(true);

            }

            else

@@ -91,7 +92,8 @@
                case InGameDownLoad.State.Award:

                    this.gameObject.SetActive(true);

                    m_ProgressText.gameObject.SetActive(true);

                    m_ProgressText.text = "100%";

                    var progress = Mathf.RoundToInt(InGameDownLoad.Instance.progress * 100);

                    m_ProgressText.text = StringUtility.Contact(progress, "%");

                    break;

            }

        }

@@ -105,11 +107,15 @@
        {

            m_ProgressSlider.fillAmount = InGameDownLoad.Instance.progress;



            if (m_ProgressText != null)

            if (InGameDownLoad.Instance.state == InGameDownLoad.State.DownLoad)

            {

                var progress = Mathf.RoundToInt(InGameDownLoad.Instance.progress * 100);

                m_ProgressText.text = StringUtility.Contact(Mathf.Clamp(progress, 0, 99), "%");

                if (m_ProgressText != null)

                {

                    var progress = Mathf.RoundToInt(InGameDownLoad.Instance.progress * 100);

                    m_ProgressText.text = StringUtility.Contact(Mathf.Clamp(progress, 0, 99), "%");

                }

            }



        }



        private void OpenInGameDownloadWin()