Merge branch 'master' into Cross_Server

client_Wu Xijin

2018-12-20 bbadf78895fea6b8fe5970f9adb9c77e9723a5e4

Merge branch 'master' into Cross_Server

 System/AssetVersion/DownLoadWin.cs

@@ -86,14 +86,23 @@
                {

                    timer -= 1f;

                    m_ProgressSlider.value = DownLoadAndDiscompressTask.Instance.progress;

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

                    var totalSize = ((float)DownLoadAndDiscompressTask.Instance.totalSize / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");

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

                    var totalSizeString = ((float)DownLoadAndDiscompressTask.Instance.totalSize / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");

                    var downLoadedSize = Mathf.Clamp(RemoteFile.TotalDownloadedSize, 0, DownLoadAndDiscompressTask.Instance.totalSize - 1);

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



                    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 >= DownLoadAndDiscompressTask.Instance.totalSize)

                    {

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

                    }

                    else

                    {

                        m_DownLoadSpeed.text = RemoteFile.DownloadSpeed;

                    }

                }

            }

        }


 System/AssetVersion/InGameDownLoadWin.cs

@@ -108,14 +108,22 @@
                {

                    timer -= 1f;

                    m_ProgressSlider.value = InGameDownLoad.Instance.progress;

                    var downLoadedSize = ((float)InGameDownLoad.Instance.showDownLoadedSize / InGameDownLoad.BYTE_PER_MILLIONBYTE).ToString("f1");

                    var totalSize = ((float)InGameDownLoad.Instance.showTotalSize / InGameDownLoad.BYTE_PER_MILLIONBYTE).ToString("f1");

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

                    var totalSizeString = ((float)InGameDownLoad.Instance.showTotalSize / InGameDownLoad.BYTE_PER_MILLIONBYTE).ToString("f1");

                    var downLoadedSize = Mathf.Clamp(InGameDownLoad.Instance.showDownLoadedSize, 0, InGameDownLoad.Instance.showTotalSize - 1);

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

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

                }



                if (Time.frameCount % 2 == 0)

                {

                    m_DownLoadSpeed.text = RemoteFile.DownloadSpeed;

                    if (InGameDownLoad.Instance.showDownLoadedSize >= InGameDownLoad.Instance.showTotalSize)

                    {

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

                    }

                    else

                    {

                        m_DownLoadSpeed.text = RemoteFile.DownloadSpeed;

                    }

                }

            }

        }


 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;

                    }

                }

            }

        }


 System/Dungeon/TrialSweepResultWin.cs

@@ -48,6 +48,7 @@
        protected override void OnPreOpen()

        {

            model.getDungeonResultEvent += GetDungeonResultEvent;

            Display();

        }



        protected override void OnAfterOpen()