From bbadf78895fea6b8fe5970f9adb9c77e9723a5e4 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 20 十二月 2018 10:48:10 +0800
Subject: [PATCH] Merge branch 'master' into Cross_Server
---
System/AssetVersion/InGameDownLoadWin.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/System/AssetVersion/InGameDownLoadWin.cs b/System/AssetVersion/InGameDownLoadWin.cs
index b5e8ab9..1dbc6b2 100644
--- a/System/AssetVersion/InGameDownLoadWin.cs
+++ b/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;
+ }
}
}
}
--
Gitblit v1.8.0