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

client_linchunjie

2018-08-23 a0cdd162c1d85d709973884aa73c7bf35ece1628

 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;

            }

        }