From 9b09f189e2830126a6d2f45dcba6b64c316960d0 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 16 九月 2025 20:56:33 +0800
Subject: [PATCH] 0312 增加下载模块
---
Main/Core/GameEngine/Launch/CheckAssetValidTask.cs | 2
Main/System/AssetVersion/DownLoadAndDiscompressHotTask.cs.meta | 0
Main/System/AssetVersion/InGameDownLoad.cs | 21 +-
Main/System/AssetVersion/AssetVersionUtility.cs | 4
/dev/null | 11 -
Main/System/AssetVersion/InGameDownLoadWin.cs | 4
Main/System/AssetVersion/DownLoadAndDiscompressHotTask.cs | 22 +--
Main/System/AssetVersion/DownLoadWin.cs | 248 ++++++++++++++++++++--------------------
Main/System/ClientVersion/VersionUtility.cs | 6
Main/System/Login/LoginWin.cs | 2
Main/System/AssetVersion/DownloadHotMgr.cs | 35 +++--
Main/System/AssetVersion/DownloadHotMgr.cs.meta | 0
12 files changed, 171 insertions(+), 184 deletions(-)
diff --git a/Main/Core/GameEngine/Launch/CheckAssetValidTask.cs b/Main/Core/GameEngine/Launch/CheckAssetValidTask.cs
index 36b06c7..9c9e358 100644
--- a/Main/Core/GameEngine/Launch/CheckAssetValidTask.cs
+++ b/Main/Core/GameEngine/Launch/CheckAssetValidTask.cs
@@ -26,7 +26,7 @@
{
var remoteURL = StringUtility.Contact(VersionUtility.Instance.versionInfo.GetResourcesURL(VersionConfig.Get().branch), Language.fixPath, "/config/PriorBundle.txt");
var localURL = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, "config/PriorBundle.txt");
- var downloadTask = new DownloadTask(remoteURL, localURL);
+ var downloadTask = new DownloadHotTask(remoteURL, localURL);
downloadTask.BeginDownload(AssetVersionUtility.OnDownLoadPriorBundle);
//AssetVersionUtility.GetAssetVersionFile();
diff --git a/Main/System/AssetVersion/AssetVersionUtility.cs b/Main/System/AssetVersion/AssetVersionUtility.cs
index b67aa6c..0e21a00 100644
--- a/Main/System/AssetVersion/AssetVersionUtility.cs
+++ b/Main/System/AssetVersion/AssetVersionUtility.cs
@@ -68,7 +68,7 @@
}
- public static void OnDownLoadPriorBundle(DownloadTask task)
+ public static void OnDownLoadPriorBundle(DownloadHotTask task)
{
if (task.IsDone)
{
@@ -166,7 +166,7 @@
if (_prior)
{
m_PriorAssetDownLoadDone = false;
- DownLoadAndDiscompressTask.Instance.Prepare(priorDownLoadAssetVersions, () => { m_PriorAssetDownLoadDone = true; });
+ DownLoadAndDiscompressHotTask.Instance.Prepare(priorDownLoadAssetVersions, () => { m_PriorAssetDownLoadDone = true; });
}
else
{
diff --git a/Main/System/AssetVersion/DownLoadAndDiscompressTask.cs b/Main/System/AssetVersion/DownLoadAndDiscompressHotTask.cs
similarity index 88%
rename from Main/System/AssetVersion/DownLoadAndDiscompressTask.cs
rename to Main/System/AssetVersion/DownLoadAndDiscompressHotTask.cs
index 5953a11..b4a44aa 100644
--- a/Main/System/AssetVersion/DownLoadAndDiscompressTask.cs
+++ b/Main/System/AssetVersion/DownLoadAndDiscompressHotTask.cs
@@ -6,13 +6,13 @@
using Cysharp.Threading.Tasks;
-public class DownLoadAndDiscompressTask : Singleton<DownLoadAndDiscompressTask>
+public class DownLoadAndDiscompressHotTask : Singleton<DownLoadAndDiscompressHotTask>
{
public const int BYTE_PER_KILOBYTE = 1024;
public const int BYTE_PER_MILLIONBYTE = 1048576;
- public float progress { get { return Mathf.Clamp01((float)DownloadMgr.Instance.DownloadedBytes / totalSize); } }
+ public float progress { get { return Mathf.Clamp01((float)DownloadHotMgr.Instance.DownloadedBytes / totalSize); } }
List<AssetVersion> tasks = new List<AssetVersion>();
public bool isDone { get { return step == Step.Completed; } }
@@ -73,9 +73,7 @@
if (totalSize > BYTE_PER_MILLIONBYTE)
{
- // TODO YYL
- // UIManager.Instance.OpenWindow<DownLoadWin>();
- // WindowCenter.Instance.OpenFromLocal<DownLoadWin>();
+ UIManager.Instance.OpenWindow<DownLoadWin>();
}
else
{
@@ -88,7 +86,7 @@
{
step = Step.DownLoad;
- Co_StartDownLoad();
+ Co_StartDownLoad().Forget();
// SnxxzGame.Instance.StartCoroutine(Co_StartDownLoad());
// TODO YYL
@@ -99,18 +97,18 @@
{
while (tasks.Count > 0)
{
- DownloadMgr.Instance.Prepare();
+ DownloadHotMgr.Instance.Prepare();
for (int i = 0; i < tasks.Count; i++)
{
var assetVersion = tasks[i];
var remoteURL = StringUtility.Contact(VersionUtility.Instance.versionInfo.GetResourcesURL(VersionConfig.Get().branch), Language.fixPath, "/", assetVersion.relativePath);
var localURL = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, assetVersion.relativePath);
- DownloadMgr.Instance.AddTask(new DownloadTask(remoteURL, localURL));
+ DownloadHotMgr.Instance.AddTask(new DownloadHotTask(remoteURL, localURL));
}
- DownloadMgr.Instance.Begin();
+ DownloadHotMgr.Instance.Begin();
- while (!DownloadMgr.Instance.IsFinished)
+ while (!DownloadHotMgr.Instance.IsFinished)
{
await UniTask.DelayFrame(1);
}
@@ -136,8 +134,8 @@
step = Step.Completed;
- UIManager.Instance.OpenWindow<DownLoadWin>();
- UIManager.Instance.OpenWindow<InGameDownLoadWin>();
+ UIManager.Instance.CloseWindow<DownLoadWin>();
+ UIManager.Instance.CloseWindow<InGameDownLoadWin>();
if (downLoadOkCallBack != null)
{
diff --git a/Main/System/AssetVersion/DownLoadAndDiscompressTask.cs.meta b/Main/System/AssetVersion/DownLoadAndDiscompressHotTask.cs.meta
similarity index 100%
rename from Main/System/AssetVersion/DownLoadAndDiscompressTask.cs.meta
rename to Main/System/AssetVersion/DownLoadAndDiscompressHotTask.cs.meta
diff --git a/Main/System/AssetVersion/DownLoadWin.cs b/Main/System/AssetVersion/DownLoadWin.cs
index 7582b43..f9f444e 100644
--- a/Main/System/AssetVersion/DownLoadWin.cs
+++ b/Main/System/AssetVersion/DownLoadWin.cs
@@ -9,146 +9,144 @@
using UnityEngine;
using UnityEngine.UI;
- public class DownLoadWin : UIBase
+public class DownLoadWin : UIBase
+{
+ [SerializeField] RectTransform m_ContainerHint;
+ [SerializeField] RichText m_Content;
+ [SerializeField] Button m_Confirm;
+ [SerializeField] Button m_Cancel;
+
+ [SerializeField] Transform m_ContainerProgress;
+ [SerializeField] SmoothSlider m_ProgressSlider;
+ [SerializeField] Text m_Progress;
+ [SerializeField] Text m_DownLoadSpeed;
+
+ float timer = 1f;
+
+ protected override void InitComponent()
{
- [SerializeField] RectTransform m_ContainerHint;
- [SerializeField] RichText m_Content;
- [SerializeField] Button m_Confirm;
- [SerializeField] Button m_Cancel;
+ m_Confirm.AddListener(Confirm);
+ m_Cancel.AddListener(Cancel);
+ }
- [SerializeField] Transform m_ContainerProgress;
- [SerializeField] SmoothSlider m_ProgressSlider;
- [SerializeField] Text m_Progress;
- [SerializeField] Text m_DownLoadSpeed;
- [SerializeField] Transform awardObj;
-
- float timer = 1f;
-
- protected override void InitComponent()
+ protected override void OnPreOpen()
+ {
+ timer = 1f;
+ if (Application.internetReachability == NetworkReachability.ReachableViaLocalAreaNetwork)
{
- m_Confirm.AddListener(Confirm);
- m_Cancel.AddListener(Cancel);
+ DownLoadAndDiscompressHotTask.Instance.StartDownLoad();
}
- protected override void OnPreOpen()
+ OnDownLoadStepChange(DownLoadAndDiscompressHotTask.Instance.step);
+
+ }
+
+ protected override void OnOpen()
+ {
+ DownLoadAndDiscompressHotTask.Instance.downLoadStepChangeEvent += OnDownLoadStepChange;
+ }
+
+ protected override void OnPreClose()
+ {
+ DownLoadAndDiscompressHotTask.Instance.downLoadStepChangeEvent -= OnDownLoadStepChange;
+ }
+
+ protected override void OnClose()
+ {
+ }
+
+ private void OnDownLoadStepChange(DownLoadAndDiscompressHotTask.Step _step)
+ {
+ switch (_step)
{
- timer = 1f;
- if (Application.internetReachability == NetworkReachability.ReachableViaLocalAreaNetwork)
+ case DownLoadAndDiscompressHotTask.Step.DownLoadPrepared:
+ m_ContainerHint.SetActive(true);
+ m_ContainerProgress.SetActive(false);
+ DisplayHintContent();
+ break;
+ case DownLoadAndDiscompressHotTask.Step.DownLoad:
+ m_ContainerHint.SetActive(false);
+ m_ContainerProgress.SetActive(true);
+ DisplayHintContent();
+ break;
+ }
+ }
+
+ protected void LateUpdate()
+ {
+ var step = DownLoadAndDiscompressHotTask.Instance.step;
+ if (step == DownLoadAndDiscompressHotTask.Step.DownLoad)
+ {
+ timer += Time.deltaTime;
+ if (timer > 1f)
{
- DownLoadAndDiscompressTask.Instance.StartDownLoad();
- }
+ timer -= 1f;
+ m_ProgressSlider.value = DownLoadAndDiscompressHotTask.Instance.progress;
+ var totalSizeString = ((float)DownLoadAndDiscompressHotTask.Instance.totalSize / DownLoadAndDiscompressHotTask.BYTE_PER_MILLIONBYTE).ToString("f1");
+ var downLoadedSize = Mathf.Clamp(DownloadHotMgr.Instance.DownloadedBytes, 0, DownLoadAndDiscompressHotTask.Instance.totalSize - 1);
+ var downLoadedSizeString = ((float)downLoadedSize / DownLoadAndDiscompressHotTask.BYTE_PER_MILLIONBYTE).ToString("f1");
- OnDownLoadStepChange(DownLoadAndDiscompressTask.Instance.step);
+ m_Progress.text = Language.GetFromLocal(13, StringUtility.Contact(downLoadedSizeString, "M", "/", totalSizeString, "M"));
- awardObj.SetActive(InGameDownLoad.Instance.IsShowDownloadAward());
- }
-
- protected override void OnOpen()
- {
- DownLoadAndDiscompressTask.Instance.downLoadStepChangeEvent += OnDownLoadStepChange;
- }
-
- protected override void OnPreClose()
- {
- DownLoadAndDiscompressTask.Instance.downLoadStepChangeEvent -= OnDownLoadStepChange;
- }
-
- protected override void OnClose()
- {
- }
-
- private void OnDownLoadStepChange(DownLoadAndDiscompressTask.Step _step)
- {
- switch (_step)
- {
- case DownLoadAndDiscompressTask.Step.DownLoadPrepared:
- m_ContainerHint.SetActive(true);
- m_ContainerProgress.SetActive(false);
- DisplayHintContent();
- break;
- case DownLoadAndDiscompressTask.Step.DownLoad:
- m_ContainerHint.SetActive(false);
- m_ContainerProgress.SetActive(true);
- DisplayHintContent();
- break;
- }
- }
-
- protected void LateUpdate()
- {
- var step = DownLoadAndDiscompressTask.Instance.step;
- if (step == DownLoadAndDiscompressTask.Step.DownLoad)
- {
- timer += Time.deltaTime;
- if (timer > 1f)
+ if (downLoadedSize >= DownLoadAndDiscompressHotTask.Instance.totalSize)
{
- timer -= 1f;
- m_ProgressSlider.value = DownLoadAndDiscompressTask.Instance.progress;
- var totalSizeString = ((float)DownLoadAndDiscompressTask.Instance.totalSize / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");
- var downLoadedSize = Mathf.Clamp(DownloadMgr.Instance.DownloadedBytes, 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 (downLoadedSize >= DownLoadAndDiscompressTask.Instance.totalSize)
- {
- m_DownLoadSpeed.text = StringUtility.Contact(UnityEngine.Random.Range(5, 10), "KB/S");
- }
- else
- {
- m_DownLoadSpeed.text = DownloadMgr.Instance.SpeedFormat;
- }
+ m_DownLoadSpeed.text = StringUtility.Contact(UnityEngine.Random.Range(5, 10), "KB/S");
+ }
+ else
+ {
+ m_DownLoadSpeed.text = DownloadHotMgr.Instance.SpeedFormat;
}
}
}
-
- private void DisplayHintContent()
- {
- var step = DownLoadAndDiscompressTask.Instance.step;
-
- switch (step)
- {
- case DownLoadAndDiscompressTask.Step.DownLoadPrepared:
- var totalCount = DownLoadAndDiscompressTask.Instance.totalCount;
- var totalSize = DownLoadAndDiscompressTask.Instance.totalSize;
-
- if (totalSize > DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE)
- {
- var sizeDescription = ((float)totalSize / DownLoadAndDiscompressTask.BYTE_PER_MILLIONBYTE).ToString("f1");
- m_Content.text = Language.GetFromLocal(DownLoadAndDiscompressTask.Instance.restartApp ? 1 : 2, totalCount, sizeDescription);
- }
- else
- {
- var sizeDescription = ((float)totalSize / DownLoadAndDiscompressTask.BYTE_PER_KILOBYTE).ToString("f1");
- m_Content.text = Language.GetFromLocal(DownLoadAndDiscompressTask.Instance.restartApp ? 11 : 12, totalCount, sizeDescription);
- }
- break;
- case DownLoadAndDiscompressTask.Step.DownLoad:
- m_Content.text = Language.GetFromLocal(3);
- break;
- }
- }
-
- private void Confirm()
- {
- timer = 1f;
- var step = DownLoadAndDiscompressTask.Instance.step;
-
- switch (step)
- {
- case DownLoadAndDiscompressTask.Step.DownLoadPrepared:
- DownLoadAndDiscompressTask.Instance.StartDownLoad();
- break;
- }
- }
-
- private void Cancel()
- {
- Application.Quit();
- }
-
}
+ private void DisplayHintContent()
+ {
+ var step = DownLoadAndDiscompressHotTask.Instance.step;
+
+ switch (step)
+ {
+ case DownLoadAndDiscompressHotTask.Step.DownLoadPrepared:
+ var totalCount = DownLoadAndDiscompressHotTask.Instance.totalCount;
+ var totalSize = DownLoadAndDiscompressHotTask.Instance.totalSize;
+
+ if (totalSize > DownLoadAndDiscompressHotTask.BYTE_PER_MILLIONBYTE)
+ {
+ var sizeDescription = ((float)totalSize / DownLoadAndDiscompressHotTask.BYTE_PER_MILLIONBYTE).ToString("f1");
+ m_Content.text = Language.GetFromLocal(DownLoadAndDiscompressHotTask.Instance.restartApp ? 1 : 2, totalCount, sizeDescription);
+ }
+ else
+ {
+ var sizeDescription = ((float)totalSize / DownLoadAndDiscompressHotTask.BYTE_PER_KILOBYTE).ToString("f1");
+ m_Content.text = Language.GetFromLocal(DownLoadAndDiscompressHotTask.Instance.restartApp ? 11 : 12, totalCount, sizeDescription);
+ }
+ break;
+ case DownLoadAndDiscompressHotTask.Step.DownLoad:
+ m_Content.text = Language.GetFromLocal(3);
+ break;
+ }
+ }
+
+ private void Confirm()
+ {
+ timer = 1f;
+ var step = DownLoadAndDiscompressHotTask.Instance.step;
+
+ switch (step)
+ {
+ case DownLoadAndDiscompressHotTask.Step.DownLoadPrepared:
+ DownLoadAndDiscompressHotTask.Instance.StartDownLoad();
+ break;
+ }
+ }
+
+ private void Cancel()
+ {
+ Application.Quit();
+ }
+
+}
+
diff --git a/Main/System/AssetVersion/DownloadMgr.cs b/Main/System/AssetVersion/DownloadHotMgr.cs
similarity index 92%
rename from Main/System/AssetVersion/DownloadMgr.cs
rename to Main/System/AssetVersion/DownloadHotMgr.cs
index 88f7a21..08cccad 100644
--- a/Main/System/AssetVersion/DownloadMgr.cs
+++ b/Main/System/AssetVersion/DownloadHotMgr.cs
@@ -10,7 +10,7 @@
using Cysharp.Threading.Tasks;
-public class DownloadMgr : SingletonMonobehaviour<DownloadMgr>
+public class DownloadHotMgr : SingletonMonobehaviour<DownloadHotMgr>
{
#region 閰嶇疆
public static int MaxRetryTimes = 5;//鏈�澶ч噸璇曠殑娆℃暟
@@ -19,14 +19,14 @@
#endregion
#region 浠诲姟鍒楄〃
- private Dictionary<string, DownloadTask> allTask = new Dictionary<string, DownloadTask>(); //鎵�鏈変换鍔＄粍
- private Queue<DownloadTask> waitTask = new Queue<DownloadTask>(); //褰撳墠绛夊緟涓嬭浇鐨勪换鍔�
- private Dictionary<string, DownloadTask> downloadTask = new Dictionary<string, DownloadTask>(); //褰撳墠姝ｅ湪涓嬭浇鐨勪换鍔�
+ private Dictionary<string, DownloadHotTask> allTask = new Dictionary<string, DownloadHotTask>(); //鎵�鏈変换鍔＄粍
+ private Queue<DownloadHotTask> waitTask = new Queue<DownloadHotTask>(); //褰撳墠绛夊緟涓嬭浇鐨勪换鍔�
+ private Dictionary<string, DownloadHotTask> downloadTask = new Dictionary<string, DownloadHotTask>(); //褰撳墠姝ｅ湪涓嬭浇鐨勪换鍔�
#endregion 浠诲姟鍒楄〃
private bool isBegin;
private int startTickcount = 0;
- private Func<bool, DownloadTask, bool> onTaskCompleted;//鏂囦欢涓嬭浇瀹屾垚鍥炶皟锛�<鏄惁鍏ㄩ儴瀹屾垚锛屼换鍔″璞★紝return true:绔嬪嵆閲嶈瘯锛宖alse:鍒伴槦灏鹃噸璇�>
+ private Func<bool, DownloadHotTask, bool> onTaskCompleted;//鏂囦欢涓嬭浇瀹屾垚鍥炶皟锛�<鏄惁鍏ㄩ儴瀹屾垚锛屼换鍔″璞★紝return true:绔嬪嵆閲嶈瘯锛宖alse:鍒伴槦灏鹃噸璇�>
//鎬婚�熷害
private float speed;
@@ -69,7 +69,7 @@
}
//娣诲姞浠诲姟
- public DownloadMgr AddTask(DownloadTask task)
+ public DownloadHotMgr AddTask(DownloadHotTask task)
{
if (allTask.ContainsKey(task.Key))
{
@@ -82,7 +82,7 @@
}
//鍑嗗涓嬭浇锛岄噸缃姸鎬�
- public DownloadMgr Prepare()
+ public DownloadHotMgr Prepare()
{
Stop();
this.onTaskCompleted = null;
@@ -99,7 +99,7 @@
/// </summary>
/// <param name="onTaskCompleted">浠诲姟缁撴潫鍥炶皟</param>
/// <returns></returns>
- public DownloadMgr Begin(Func<bool, DownloadTask, bool> onTaskCompleted = null)
+ public DownloadHotMgr Begin(Func<bool, DownloadHotTask, bool> onTaskCompleted = null)
{
this.onTaskCompleted = onTaskCompleted;
startTickcount = TimeUtility.AllSeconds;
@@ -145,7 +145,7 @@
}
// 浠诲姟涓嬭浇瀹屾垚
- private void OnTaskCompleted(DownloadTask task)
+ private void OnTaskCompleted(DownloadHotTask task)
{
downloadTask.Remove(task.Key);
if (task.IsDone)//涓嬭浇鎴愬姛
@@ -180,7 +180,7 @@
-public class DownloadTask
+public class DownloadHotTask
{
//涓嬭浇浠诲姟鐘舵��
public enum TaskState
@@ -195,7 +195,7 @@
public readonly string tempFile;//涓存椂鏂囦欢鍦板潃
private readonly bool clearCache;//鏄惁娓呴櫎鏃х殑涓嬭浇缂撳瓨锛岋紙鏂偣缁紶锛�
public readonly object obj; //鑷畾涔夊璞�
- private Action<DownloadTask> onCompleted;//涓嬭浇瀹屾垚鍥炶皟
+ private Action<DownloadHotTask> onCompleted;//涓嬭浇瀹屾垚鍥炶皟
private TaskState state;//涓嬭浇鐘舵��
public bool isStop;//涓嬭浇琚仠姝�
@@ -230,7 +230,7 @@
/// <param name="localUrl">鏈湴淇濆瓨鍦板潃</param>
/// <param name="obj">鑷畾涔夊璞�</param>
/// <param name="clearCache">鏄惁娓呴櫎涓婃涓嬭浇鐨勭紦瀛�</param>
- public DownloadTask(string remoteUrl, string localUrl, object obj = null, bool clearCache = false)
+ public DownloadHotTask(string remoteUrl, string localUrl, object obj = null, bool clearCache = false)
{
this.remoteUrl = remoteUrl;
this.localFile = localUrl;
@@ -266,11 +266,11 @@
if (IsWorking)
return;
- Co_GetHeader();
+ Co_GetHeader().Forget();
// SnxxzGame.Instance.StartCoroutine(Co_GetHeader());
}
- public bool BeginDownload(Action<DownloadTask> onCompleted)
+ public bool BeginDownload(Action<DownloadHotTask> onCompleted)
{
if ((IsWorking && requestHeaderOk) || IsDone)//宸茬粡鍦ㄤ笅杞戒换鍔′腑鎴栧凡缁忎笅杞藉畬鎴愪簡
return false;
@@ -278,7 +278,7 @@
failedTimes = 0;
this.onCompleted = onCompleted;
this.isStop = false;
- Co_DownloadFile();
+ Co_DownloadFile().Forget();
// SnxxzGame.Instance.StartCoroutine(Co_DownloadFile());
return true;
}
@@ -300,7 +300,7 @@
Debug.LogFormat("寮�濮嬭幏鍙栧ご淇℃伅锛歿0}", remoteUrl);
using (var www = UnityWebRequest.Head(remoteUrl))
{
- www.timeout = DownloadMgr.TimeOut;
+ www.timeout = DownloadHotMgr.TimeOut;
await www.SendWebRequest();
if (www.result == UnityWebRequest.Result.ConnectionError || www.result == UnityWebRequest.Result.ProtocolError)
{
@@ -443,6 +443,7 @@
private async UniTask Move(string sourceFile, string destFile)
{
+
var copyState = 0;//澶嶅埗鏂囦欢鐘舵�侊紝0绛夊緟锛�1鎴愬姛锛�2澶辫触
try
{
@@ -464,6 +465,8 @@
}
else
SetFailed("涓存椂鏂囦欢鏀瑰悕鍑洪敊");
+
+ await UniTask.CompletedTask;
}
}
diff --git a/Main/System/AssetVersion/DownloadMgr.cs.meta b/Main/System/AssetVersion/DownloadHotMgr.cs.meta
similarity index 100%
rename from Main/System/AssetVersion/DownloadMgr.cs.meta
rename to Main/System/AssetVersion/DownloadHotMgr.cs.meta
diff --git a/Main/System/AssetVersion/InGameDownLoad.cs b/Main/System/AssetVersion/InGameDownLoad.cs
index dfcc104..3a5965e 100644
--- a/Main/System/AssetVersion/InGameDownLoad.cs
+++ b/Main/System/AssetVersion/InGameDownLoad.cs
@@ -27,7 +27,7 @@
public bool isDone { get { return state == State.Completed; } } //鏄惁鍏ㄩ儴涓嬭浇瀹屾垚
//绐楀彛涓樉绀虹殑宸蹭笅杞藉ぇ灏�
- public long showDownLoadedSize { get { return DownloadMgr.Instance.DownloadedBytes - backGroundDownLoadSizeRecord; } }
+ public long showDownLoadedSize { get { return DownloadHotMgr.Instance.DownloadedBytes - backGroundDownLoadSizeRecord; } }
public long showTotalSize { get { return totalSize - backGroundDownLoadSizeRecord; } }//绐楀彛涓樉绀虹殑鎬诲ぇ灏�
public int showTotalCount { get { return totalCount - downLoadedCountRecord; } }//绐楀彛涓樉绀虹殑鎬绘暟閲�
public int showOkCount { get { return okCount - downLoadedCountRecord; } }//绐楀彛涓樉绀虹殑涓嬭浇瀹屾垚鏁伴噺
@@ -91,7 +91,7 @@
private void Awake()
{
- DownloadMgr.MaxDownLoadTask = GetMaxTask();
+ DownloadHotMgr.MaxDownLoadTask = GetMaxTask();
}
private void LateUpdate()
@@ -145,7 +145,7 @@
okCount = 0;
totalSize = 0;
- DownloadMgr.Instance.Prepare();
+ DownloadHotMgr.Instance.Prepare();
for (int i = 0; i < this.assets.Count; i++)
{
@@ -164,7 +164,7 @@
//娣诲姞涓嬭浇浠诲姟
var remoteURL = StringUtility.Contact(VersionUtility.Instance.versionInfo.GetResourcesURL(VersionConfig.Get().branch), Language.fixPath, "/", assetVersion.relativePath);
var localURL = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, assetVersion.relativePath);
- DownloadMgr.Instance.AddTask(new DownloadTask(remoteURL, localURL, assetVersion));
+ DownloadHotMgr.Instance.AddTask(new DownloadHotTask(remoteURL, localURL, assetVersion));
}
state = State.None;
@@ -245,7 +245,7 @@
case Dominant.Half:
if (dominantState == Dominant.None)
{
- backGroundDownLoadSizeRecord = DownloadMgr.Instance.DownloadedBytes;
+ backGroundDownLoadSizeRecord = DownloadHotMgr.Instance.DownloadedBytes;
downLoadedCountRecord = okCount;
}
StartDownLoad();
@@ -254,7 +254,7 @@
case Dominant.Whole:
if (dominantState == Dominant.None)
{
- backGroundDownLoadSizeRecord = DownloadMgr.Instance.DownloadedBytes;
+ backGroundDownLoadSizeRecord = DownloadHotMgr.Instance.DownloadedBytes;
downLoadedCountRecord = okCount;
Pause();
state = State.Prepared;
@@ -265,8 +265,7 @@
state = State.Prepared;
}
dominantState = Dominant.Whole;
- UIManager.Instance.OpenWindow<InGameDownLoadWin>();
- // // WindowCenter.Instance.Open<InGameDownLoadWin>();
+ // UIManager.Instance.OpenWindow<InGameDownLoadWin>();
break;
}
}
@@ -277,7 +276,7 @@
if (state == State.None || state == State.Prepared || state == State.Pause)
{
state = State.DownLoad;
- DownloadMgr.Instance.Begin(OnFileDownLoadCompleted);
+ DownloadHotMgr.Instance.Begin(OnFileDownLoadCompleted);
}
}
@@ -286,13 +285,13 @@
{
if (state == State.DownLoad)
{
- DownloadMgr.Instance.Stop();
+ DownloadHotMgr.Instance.Stop();
state = State.Pause;
}
}
//鏂囦欢涓嬭浇瀹屾垚鍥炶皟
- private bool OnFileDownLoadCompleted(bool finished, DownloadTask task)
+ private bool OnFileDownLoadCompleted(bool finished, DownloadHotTask task)
{
if (task.IsDone && task.obj is AssetVersion)
{
diff --git a/Main/System/AssetVersion/InGameDownLoadWin.cs b/Main/System/AssetVersion/InGameDownLoadWin.cs
index 19f5179..2725c8c 100644
--- a/Main/System/AssetVersion/InGameDownLoadWin.cs
+++ b/Main/System/AssetVersion/InGameDownLoadWin.cs
@@ -39,7 +39,7 @@
downLoadGo.SetListener(() => {
downLoadGo.isOn = !downLoadGo.isOn;
InGameDownLoad.Instance.downLoadGo = downLoadGo.isOn;
- DownloadMgr.MaxDownLoadTask = InGameDownLoad.Instance.GetMaxTask();
+ DownloadHotMgr.MaxDownLoadTask = InGameDownLoad.Instance.GetMaxTask();
});
}
@@ -118,7 +118,7 @@
}
else
{
- m_DownLoadSpeed.text = DownloadMgr.Instance.SpeedFormat;
+ m_DownLoadSpeed.text = DownloadHotMgr.Instance.SpeedFormat;
}
}
}
diff --git a/Main/System/ClientVersion/VersionUtility.cs b/Main/System/ClientVersion/VersionUtility.cs
index 42ad9f4..610a55d 100644
--- a/Main/System/ClientVersion/VersionUtility.cs
+++ b/Main/System/ClientVersion/VersionUtility.cs
@@ -20,7 +20,7 @@
public string androidRoot { get { return string.Empty;/*StringUtility.Contact(SDKUtils.Instance.DeviceRootPath, "/", VersionConfig.Get().bundleIdentifier);*/ } }
- public DownloadTask downloadTask;
+ public DownloadHotTask downloadTask;
private string versionUrl;
public float progress
{
@@ -199,11 +199,11 @@
var remoteURL = GetApkRemoteUrl();
var apkLocalUrl = GetApkLocalUrl();
- downloadTask = new DownloadTask(remoteURL, apkLocalUrl);
+ downloadTask = new DownloadHotTask(remoteURL, apkLocalUrl);
downloadTask.BeginDownload(OnDownLoadApkCompleted);
}
- private void OnDownLoadApkCompleted(DownloadTask task)
+ private void OnDownLoadApkCompleted(DownloadHotTask task)
{
if (task.IsDone)
{
diff --git a/Main/System/GeneralConfig/ConstDefine.cs b/Main/System/GeneralConfig/ConstDefine.cs
deleted file mode 100644
index e3d784a..0000000
--- a/Main/System/GeneralConfig/ConstDefine.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-public static class HttpHeader
-{
- public const string ContentLength = "Content-Length";//鍐呭闀垮害
- public const string ContentType = "Content-Type";//琛ㄧず鍚庨潰鐨勬枃妗ｅ睘浜庝粈涔圡IME绫诲瀷銆�
- public const string Date = "Date";//褰撳墠鐨凣MT鏃堕棿銆�
- public const string LastModified = "Last-Modified";//鏂囨。鐨勬渶鍚庢敼鍔ㄦ椂闂�
- public const string AcceptRanges = "Accept-Ranges";//鏄惁鏀寔鑼冨洿璇锋眰
- public const string Range = "Range";//璇锋眰鑼冨洿
-}
-
-//Android 鍔ㄦ�佺敵璇风殑鏉冮檺鍒楄〃
-public static class AndroidPermissions
-{
- public const string RECORD_AUDIO = "android.permission.RECORD_AUDIO"; //褰曢煶
-
-}
\ No newline at end of file
diff --git a/Main/System/GeneralConfig/ConstDefine.cs.meta b/Main/System/GeneralConfig/ConstDefine.cs.meta
deleted file mode 100644
index 8102037..0000000
--- a/Main/System/GeneralConfig/ConstDefine.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0d4b467ed17462041ace70f28b3a8542
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Main/System/Login/LoginWin.cs b/Main/System/Login/LoginWin.cs
index 5f942a2..9d9f3ef 100644
--- a/Main/System/Login/LoginWin.cs
+++ b/Main/System/Login/LoginWin.cs
@@ -110,7 +110,7 @@
firstOpenEnd = true;
InGameDownLoad.Instance.downLoadGo = false;
- DownloadMgr.MaxDownLoadTask = InGameDownLoad.Instance.GetMaxTask();
+ DownloadHotMgr.MaxDownLoadTask = InGameDownLoad.Instance.GetMaxTask();
}
protected override void OnPreClose()
--
Gitblit v1.8.0