mirror of
https://github.com/tuyoogame/YooAsset.git
synced 2026-05-26 18:50:10 +00:00
Compare commits
2 Commits
2.3.18
...
5da8c6baf8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5da8c6baf8 | ||
|
|
33356cb270 |
@@ -73,8 +73,10 @@ namespace YooAsset
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:初始化的时候缓存文件校验最大并发数
|
/// 自定义参数:初始化的时候缓存文件校验最大并发数
|
||||||
|
/// 默认值:32(推荐范围 1-128)
|
||||||
|
/// 说明:过大的值可能导致线程池任务过多,影响系统稳定性
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int FileVerifyMaxConcurrency { private set; get; } = int.MaxValue;
|
public int FileVerifyMaxConcurrency { private set; get; } = 32;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:数据文件追加文件格式
|
/// 自定义参数:数据文件追加文件格式
|
||||||
@@ -88,13 +90,17 @@ namespace YooAsset
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:最大并发连接数
|
/// 自定义参数:最大并发连接数
|
||||||
|
/// 默认值:10(推荐范围 1-32)
|
||||||
|
/// 说明:过大的并发数可能被服务器限流,也会增加本地资源消耗
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int DownloadMaxConcurrency { private set; get; } = int.MaxValue;
|
public int DownloadMaxConcurrency { private set; get; } = 10;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:每帧发起的最大请求数
|
/// 自定义参数:每帧发起的最大请求数
|
||||||
|
/// 默认值:5(推荐范围 1-10)
|
||||||
|
/// 说明:避免单帧发起过多请求导致卡顿
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int DownloadMaxRequestPerFrame { private set; get; } = int.MaxValue;
|
public int DownloadMaxRequestPerFrame { private set; get; } = 5;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 自定义参数:下载任务的看门狗机制监控时间
|
/// 自定义参数:下载任务的看门狗机制监控时间
|
||||||
@@ -242,7 +248,14 @@ namespace YooAsset
|
|||||||
else if (name == FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY)
|
else if (name == FileSystemParametersDefine.FILE_VERIFY_MAX_CONCURRENCY)
|
||||||
{
|
{
|
||||||
int convertValue = Convert.ToInt32(value);
|
int convertValue = Convert.ToInt32(value);
|
||||||
FileVerifyMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
|
if (convertValue > 256)
|
||||||
|
{
|
||||||
|
YooLogger.Warning($"FILE_VERIFY_MAX_CONCURRENCY value {convertValue} is too large, clamped to 256. Recommended range: 1 - 128.");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 限制在合理范围内:1-256
|
||||||
|
// 超过 256 的并发数对于文件验证来说没有意义,反而会增加线程池压力
|
||||||
|
FileVerifyMaxConcurrency = Mathf.Clamp(convertValue, 1, 256);
|
||||||
}
|
}
|
||||||
else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
|
else if (name == FileSystemParametersDefine.APPEND_FILE_EXTENSION)
|
||||||
{
|
{
|
||||||
@@ -255,12 +268,22 @@ namespace YooAsset
|
|||||||
else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_CONCURRENCY)
|
else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_CONCURRENCY)
|
||||||
{
|
{
|
||||||
int convertValue = Convert.ToInt32(value);
|
int convertValue = Convert.ToInt32(value);
|
||||||
DownloadMaxConcurrency = Mathf.Clamp(convertValue, 1, int.MaxValue);
|
if (convertValue > 64)
|
||||||
|
{
|
||||||
|
YooLogger.Warning($"DOWNLOAD_MAX_CONCURRENCY value {convertValue} is too large, clamped to 64. Recommended range: 1 - 32.");
|
||||||
|
}
|
||||||
|
|
||||||
|
DownloadMaxConcurrency = Mathf.Clamp(convertValue, 1, 64);
|
||||||
}
|
}
|
||||||
else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_REQUEST_PER_FRAME)
|
else if (name == FileSystemParametersDefine.DOWNLOAD_MAX_REQUEST_PER_FRAME)
|
||||||
{
|
{
|
||||||
int convertValue = Convert.ToInt32(value);
|
int convertValue = Convert.ToInt32(value);
|
||||||
DownloadMaxRequestPerFrame = Mathf.Clamp(convertValue, 1, int.MaxValue);
|
if (convertValue > 20)
|
||||||
|
{
|
||||||
|
YooLogger.Warning($"DOWNLOAD_MAX_REQUEST_PER_FRAME value {convertValue} is too large, clamped to 20. Recommended range: 1 - 10.");
|
||||||
|
}
|
||||||
|
|
||||||
|
DownloadMaxRequestPerFrame = Mathf.Clamp(convertValue, 1, 20);
|
||||||
}
|
}
|
||||||
else if (name == FileSystemParametersDefine.DOWNLOAD_WATCH_DOG_TIME)
|
else if (name == FileSystemParametersDefine.DOWNLOAD_WATCH_DOG_TIME)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -188,11 +188,19 @@ namespace YooAsset
|
|||||||
// 结束记录
|
// 结束记录
|
||||||
DebugEndRecording();
|
DebugEndRecording();
|
||||||
|
|
||||||
//注意:如果完成回调内发生异常,会导致Task无限期等待
|
try
|
||||||
_callback?.Invoke(this);
|
{
|
||||||
|
_callback?.Invoke(this);
|
||||||
if (_taskCompletionSource != null)
|
}
|
||||||
_taskCompletionSource.TrySetResult(null);
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
YooLogger.Error($"Exception in completion callback: {ex}");
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (_taskCompletionSource != null)
|
||||||
|
_taskCompletionSource.TrySetResult(null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -269,6 +269,7 @@ namespace YooAsset
|
|||||||
|
|
||||||
if (_resManager.UseWeakReferenceHandle)
|
if (_resManager.UseWeakReferenceHandle)
|
||||||
{
|
{
|
||||||
|
// TODO 高危风险:如果移除弱引用失败,会导致资源永远无法释放。
|
||||||
if (RemoveWeakReference(handle) == false)
|
if (RemoveWeakReference(handle) == false)
|
||||||
throw new System.Exception("Should never get here !");
|
throw new System.Exception("Should never get here !");
|
||||||
}
|
}
|
||||||
@@ -335,11 +336,18 @@ namespace YooAsset
|
|||||||
List<WeakReference<HandleBase>> tempers = _weakReferences.ToList();
|
List<WeakReference<HandleBase>> tempers = _weakReferences.ToList();
|
||||||
foreach (var weakRef in tempers)
|
foreach (var weakRef in tempers)
|
||||||
{
|
{
|
||||||
if (weakRef.TryGetTarget(out HandleBase target))
|
if (weakRef.TryGetTarget(out HandleBase handle))
|
||||||
{
|
{
|
||||||
if (target.IsValid)
|
if (handle.IsValid)
|
||||||
{
|
{
|
||||||
target.InvokeCallback();
|
try
|
||||||
|
{
|
||||||
|
handle.InvokeCallback();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
YooLogger.Error($"Exception in completion callback: {ex}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -351,7 +359,14 @@ namespace YooAsset
|
|||||||
{
|
{
|
||||||
if (handle.IsValid)
|
if (handle.IsValid)
|
||||||
{
|
{
|
||||||
handle.InvokeCallback();
|
try
|
||||||
|
{
|
||||||
|
handle.InvokeCallback();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
YooLogger.Error($"Exception in completion callback: {ex}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user