From 25eb0e50d4e815efb16d1a9953beac6ea1c7cfc3 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期六, 28 三月 2026 10:14:32 +0800
Subject: [PATCH] webgl merge
---
Assets/Launch/Common/DownLoadAndDiscompressTask.cs | 246 ++++++++++++++++++++++++------------------------
1 files changed, 123 insertions(+), 123 deletions(-)
diff --git a/Assets/Launch/Common/DownLoadAndDiscompressTask.cs b/Assets/Launch/Common/DownLoadAndDiscompressTask.cs
index 770151a..eb2dded 100644
--- a/Assets/Launch/Common/DownLoadAndDiscompressTask.cs
+++ b/Assets/Launch/Common/DownLoadAndDiscompressTask.cs
@@ -1,146 +1,146 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System;
-using LaunchCommon;
-using Cysharp.Threading.Tasks;
+锘�// using System.Collections;
+// using System.Collections.Generic;
+// using UnityEngine;
+// using System;
+// using LaunchCommon;
+// using Cysharp.Threading.Tasks;
-public class DownLoadAndDiscompressTask : Singleton<DownLoadAndDiscompressTask>
-{
- public const int BYTE_PER_KILOBYTE = 1024;
+// public class DownLoadAndDiscompressTask : Singleton<DownLoadAndDiscompressTask>
+// {
+// public const int BYTE_PER_KILOBYTE = 1024;
- public float progress { get { return Mathf.Clamp01((float)DownloadMgr.Instance.DownloadedBytes / totalSize); } }
+// public float progress { get { return Mathf.Clamp01((float)DownloadMgr.Instance.DownloadedBytes / totalSize); } }
- List<AssetVersion> tasks = new List<AssetVersion>();
- public bool isDone { get { return step == Step.Completed; } }
- public int totalSize { get; private set; }
- public int totalCount { get; private set; }
+// List<AssetVersion> tasks = new List<AssetVersion>();
+// public bool isDone { get { return step == Step.Completed; } }
+// public int totalSize { get; private set; }
+// public int totalCount { get; private set; }
- public event Action<Step> downLoadStepChangeEvent;
+// public event Action<Step> downLoadStepChangeEvent;
- Action downLoadOkCallBack;
+// Action downLoadOkCallBack;
- Step m_Step = Step.None;
- public Step step
- {
- get { return m_Step; }
- set
- {
- if (m_Step != value)
- {
- m_Step = value;
+// Step m_Step = Step.None;
+// public Step step
+// {
+// get { return m_Step; }
+// set
+// {
+// if (m_Step != value)
+// {
+// m_Step = value;
- if (downLoadStepChangeEvent != null)
- {
- downLoadStepChangeEvent(m_Step);
- }
- }
- }
- }
+// if (downLoadStepChangeEvent != null)
+// {
+// downLoadStepChangeEvent(m_Step);
+// }
+// }
+// }
+// }
- public void Prepare(List<AssetVersion> _downLoadTasks, Action _downLoadOkCallBack)
- {
- tasks = _downLoadTasks;
- downLoadOkCallBack = _downLoadOkCallBack;
+// public void Prepare(List<AssetVersion> _downLoadTasks, Action _downLoadOkCallBack)
+// {
+// tasks = _downLoadTasks;
+// downLoadOkCallBack = _downLoadOkCallBack;
- totalCount = tasks.Count;
- step = Step.DownLoadPrepared;
- totalSize = 0;
+// totalCount = tasks.Count;
+// step = Step.DownLoadPrepared;
+// totalSize = 0;
- for (int i = 0; i < tasks.Count; i++)
- {
- var task = tasks[i];
- totalSize += task.size;
- }
+// for (int i = 0; i < tasks.Count; i++)
+// {
+// var task = tasks[i];
+// totalSize += task.size;
+// }
- StartDownLoad();
- }
+// StartDownLoad();
+// }
- public void StartDownLoad()
- {
- step = Step.DownLoad;
- Co_StartDownLoad().Forget();
- }
+// public void StartDownLoad()
+// {
+// step = Step.DownLoad;
+// Co_StartDownLoad().Forget();
+// }
- async UniTask Co_StartDownLoad()
- {
- int downLoadTryCount = 0;
- List<bool> checkDownFile = new List<bool>();
- while (tasks.Count > 0)
- {
- DownloadMgr.MaxDownLoadTask = 10;
- DownloadMgr.Instance.Prepare();
- for (int i = 0; i < tasks.Count; i++)
- {
- var assetVersion = tasks[i];
- VersionConfigEx config = await VersionConfigEx.Get();
- var remoteURL = StringUtility.Concat(LocalResManager.Instance.versionInfo.GetResourcesURL(config.branch), LocalResManager.fixPath, "/", assetVersion.relativePath);
- var localURL = StringUtility.Concat(LocalResManager.Instance.ExternalStorePath, assetVersion.relativePath);
- DownloadMgr.Instance.AddTask(new DownloadTask(remoteURL, localURL));
- }
+// async UniTask Co_StartDownLoad()
+// {
+// int downLoadTryCount = 0;
+// List<bool> checkDownFile = new List<bool>();
+// while (tasks.Count > 0)
+// {
+// DownloadMgr.MaxDownLoadTask = 10;
+// DownloadMgr.Instance.Prepare();
+// for (int i = 0; i < tasks.Count; i++)
+// {
+// var assetVersion = tasks[i];
+// VersionConfigEx config = await VersionConfigEx.Get();
+// var remoteURL = StringUtility.Concat(LocalResManager.Instance.versionInfo.GetResourcesURL(config.branch), LocalResManager.fixPath, "/", assetVersion.relativePath);
+// var localURL = StringUtility.Concat(LocalResManager.Instance.ExternalStorePath, assetVersion.relativePath);
+// DownloadMgr.Instance.AddTask(new DownloadTask(remoteURL, localURL));
+// }
- DownloadMgr.Instance.Begin();
+// DownloadMgr.Instance.Begin();
- while (!DownloadMgr.Instance.IsFinished)
- {
- await UniTask.Yield();
- }
+// while (!DownloadMgr.Instance.IsFinished)
+// {
+// await UniTask.Yield();
+// }
- checkDownFile = new List<bool>();
- //妫�鏌ヤ笅杞藉畬鎴愬悗鐨勬枃浠舵槸鍚︽湁鏁�
- var filledTasks = new List<AssetVersion>();//鏃犳晥鐨勬枃浠�
- for (int i = 0; i < tasks.Count; i++)
- {
- var assetVersion = tasks[i];
- var correctFile = assetVersion.CheckLocalFileValid(checkDownFile);
- if (correctFile)
- assetVersion.localValid = true;
- else
- filledTasks.Add(assetVersion);
- }
+// checkDownFile = new List<bool>();
+// //妫�鏌ヤ笅杞藉畬鎴愬悗鐨勬枃浠舵槸鍚︽湁鏁�
+// var filledTasks = new List<AssetVersion>();//鏃犳晥鐨勬枃浠�
+// for (int i = 0; i < tasks.Count; i++)
+// {
+// var assetVersion = tasks[i];
+// var correctFile = assetVersion.CheckLocalFileValid(checkDownFile);
+// if (correctFile)
+// assetVersion.localValid = true;
+// else
+// filledTasks.Add(assetVersion);
+// }
- if (filledTasks.Count > 0)
- {
- //鏂囦欢澶у皬鎴栬�匨D5涓嶅锛�1. cdn璧勬簮纭疄閿欒 2.cdn鎺ㄩ�佽繃绋嬩腑 鏂囦欢涓嶅尮閰�
- //闇�瑕侀噸鏂颁笅杞絃ogicVersion鏂囦欢
- if (checkDownFile.Count > 0)
- {
- downLoadTryCount++;
- }
- Debug.LogErrorFormat("璧勬簮涓嬭浇瀹屽悗鏈墈0}涓枃浠舵棤鏁�({1})锛岄噸鏂板紑濮嬩笅杞�", filledTasks.Count, filledTasks[0].fileName);
- }
- tasks = filledTasks;
- if (downLoadTryCount >= 1)
- {
- LocalResManager.step = LocalResManager.LoadDllStep.PrepareDownLoad;
- break;
- }
- }
+// if (filledTasks.Count > 0)
+// {
+// //鏂囦欢澶у皬鎴栬�匨D5涓嶅锛�1. cdn璧勬簮纭疄閿欒 2.cdn鎺ㄩ�佽繃绋嬩腑 鏂囦欢涓嶅尮閰�
+// //闇�瑕侀噸鏂颁笅杞絃ogicVersion鏂囦欢
+// if (checkDownFile.Count > 0)
+// {
+// downLoadTryCount++;
+// }
+// Debug.LogErrorFormat("璧勬簮涓嬭浇瀹屽悗鏈墈0}涓枃浠舵棤鏁�({1})锛岄噸鏂板紑濮嬩笅杞�", filledTasks.Count, filledTasks[0].fileName);
+// }
+// tasks = filledTasks;
+// if (downLoadTryCount >= 1)
+// {
+// LocalResManager.step = LocalResManager.LoadDllStep.ReadBytes;
+// break;
+// }
+// }
- if (downLoadTryCount >= 1)
- {
- Debug.LogError("logic璧勬簮涓嬭浇澶辫触锛岃鍛婃彁绀猴紝閫�鍑哄崗绋�");
- LocalResManager.downLoadCount++;
- return;
- }
+// if (downLoadTryCount >= 1)
+// {
+// Debug.LogError("logic璧勬簮涓嬭浇澶辫触锛岃鍛婃彁绀猴紝閫�鍑哄崗绋�");
+// LocalResManager.downLoadCount++;
+// return;
+// }
- Debug.Log("璧勬簮鍏ㄩ儴涓嬭浇瀹屾垚");
+// Debug.Log("璧勬簮鍏ㄩ儴涓嬭浇瀹屾垚");
- step = Step.Completed;
+// step = Step.Completed;
- if (downLoadOkCallBack != null)
- {
- downLoadOkCallBack();
- downLoadOkCallBack = null;
- }
- }
+// if (downLoadOkCallBack != null)
+// {
+// downLoadOkCallBack();
+// downLoadOkCallBack = null;
+// }
+// }
- public enum Step
- {
- None,
- DownLoadPrepared,
- DownLoad,
- Completed,
- }
-}
\ No newline at end of file
+// public enum Step
+// {
+// None,
+// DownLoadPrepared,
+// DownLoad,
+// Completed,
+// }
+// }
\ No newline at end of file
--
Gitblit v1.8.0