From bf4e1051ef18bf57299d3c830f921864b6fda444 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 十二月 2018 10:38:10 +0800
Subject: [PATCH] Merge branch 'master' into 【1.4】聚魂功能
---
System/AssetVersion/DownLoadWin.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/System/AssetVersion/DownLoadWin.cs b/System/AssetVersion/DownLoadWin.cs
index cdd8e9c..b8fc83b 100644
--- a/System/AssetVersion/DownLoadWin.cs
+++ b/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;
+ }
}
}
}
--
Gitblit v1.8.0