From 2bfcee1e0ac2fb7a4bfacd552d3a5053c614dccf Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 01 十一月 2018 11:17:22 +0800
Subject: [PATCH] 3335 资源下载优先级别更新。
---
System/AssetVersion/InGameDownLoad.cs | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/System/AssetVersion/InGameDownLoad.cs b/System/AssetVersion/InGameDownLoad.cs
index dba7b55..4611786 100644
--- a/System/AssetVersion/InGameDownLoad.cs
+++ b/System/AssetVersion/InGameDownLoad.cs
@@ -16,10 +16,8 @@
public bool inGameDownLoadAllow = false;
- public float progress
- {
- get
- {
+ public float progress {
+ get {
return Mathf.Clamp01((float)showDownLoadedSize / showTotalSize);
}
}
@@ -34,11 +32,9 @@
int totalCount = 0;
int m_OkCount = 0;
- int okCount
- {
+ int okCount {
get { return m_OkCount; }
- set
- {
+ set {
m_OkCount = value;
}
}
@@ -53,11 +49,9 @@
Action onDownLoadOk;
Dominant m_DominantState = Dominant.None;
- public Dominant dominantState
- {
+ public Dominant dominantState {
get { return m_DominantState; }
- private set
- {
+ private set {
if (m_DominantState != value)
{
m_DominantState = value;
@@ -70,11 +64,9 @@
}
State m_State = State.None;
- public State state
- {
+ public State state {
get { return m_State; }
- set
- {
+ set {
if (m_State != value)
{
m_State = value;
@@ -91,8 +83,7 @@
public List<Reward> rewards = new List<Reward>();
public bool hasReward { get; private set; }
- public string completeDownLoadAccount
- {
+ public string completeDownLoadAccount {
get { return LocalSave.GetString("InGameDownLoadCompleteAccount"); }
set { LocalSave.SetString("InGameDownLoadCompleteAccount", value); }
}
@@ -103,6 +94,7 @@
{
inGameDownLoadAllow = false;
tasks = _tasks;
+ tasks.Sort(AssetDownLoadPriorCompare);
onDownLoadOk = _onDownLoadOk;
totalCount = tasks.Count;
@@ -246,7 +238,6 @@
}
}
-
IEnumerator Co_StartDownLoad()
{
downLoadedSizeRecord += RemoteFile.TotalDownloadedSize;
@@ -347,11 +338,9 @@
Clock netSwitchClock;
NetworkReachability m_NetworkReachability = NetworkReachability.NotReachable;
- NetworkReachability networkReachability
- {
+ NetworkReachability networkReachability {
get { return m_NetworkReachability; }
- set
- {
+ set {
if (m_NetworkReachability != value)
{
m_NetworkReachability = value;
@@ -388,11 +377,9 @@
bool m_SimulateWifi = true;
- public bool simulateWifi
- {
+ public bool simulateWifi {
get { return m_SimulateWifi; }
- set
- {
+ set {
if (m_SimulateWifi != value)
{
m_SimulateWifi = value;
@@ -539,6 +526,15 @@
}
}
+ private int AssetDownLoadPriorCompare(AssetVersion lhs, AssetVersion rhs)
+ {
+ var categoryA = lhs.GetAssetCategory();
+ var categoryB = rhs.GetAssetCategory();
+ var priorA = PriorBundleConfig.GetAssetPrior(categoryA, lhs.fileName);
+ var priorB = PriorBundleConfig.GetAssetPrior(categoryB, rhs.fileName);
+
+ return priorA < priorB ? -1 : 1;
+ }
public struct Reward
{
--
Gitblit v1.8.0