Merge branch 'master' into 【1.4】聚魂功能

client_linchunjie

2018-12-20 bf4e1051ef18bf57299d3c830f921864b6fda444

 System/ClientVersion/VersionUpdateWin.cs

@@ -99,17 +99,23 @@


                    m_ProgressSlider.value = VersionUtility.Instance.progress;



                    var downLoadedSize = ((float)RemoteFile.TotalDownloadedSize / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");

                    var totalSize = ((float)VersionUtility.Instance.GetApkSize() * 1024 / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");

                    m_Progress.text = Language.GetFromLocal(13, StringUtility.Contact(downLoadedSize, "M", "/", totalSize, "M"));

                    var totalSizeString = ((float)VersionUtility.Instance.GetApkSize() * 1024 / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");

                    var downLoadedSize = Mathf.Clamp(RemoteFile.TotalDownloadedSize, 0, VersionUtility.Instance.GetApkSize());

                    var downLoadedSizeString = ((float)downLoadedSize / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");





                    m_Progress.text = StringUtility.Contact((VersionUtility.Instance.progress * 100).ToString("f0"), "%");

                    m_Progress.text = Language.GetFromLocal(13, StringUtility.Contact(downLoadedSizeString, "M", "/", totalSizeString, "M"));

                }



                if (Time.frameCount % 2 == 0)

                {

                    m_DownLoadSpeed.text = RemoteFile.DownloadSpeed;

                    if (RemoteFile.TotalDownloadedSize >= VersionUtility.Instance.GetApkSize())

                    {

                        m_DownLoadSpeed.text = StringUtility.Contact(UnityEngine.Random.Range(5, 10), "KB/S");

                    }

                    else

                    {

                        m_DownLoadSpeed.text = RemoteFile.DownloadSpeed;

                    }

                }

            }

        }