AlphaaeGameStudio/TEngine
1
0
Fork 0
mirror of https://github.com/Alex-Rachel/TEngine.git synced 2025-08-14 16:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

yoo2.2,9

Browse Source 
yoo2.2,9
This commit is contained in:
Alex-Rachel
2025-01-25 13:46:17 +08:00
parent 634a392a1f
commit 6166fd24c6
584 changed files with 15684 additions and 11714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
UnityProject/Packages/YooAsset/Runtime/ResourceManager/Handle/SceneHandle.cs
View File

@@ -7,7 +7,7 @@ namespace YooAsset
private System.Action<SceneHandle> _callback;
internal string PackageName { set; get; }
internal SceneHandle(ProviderBase provider) : base(provider)
internal SceneHandle(ProviderOperation provider) : base(provider)
{
}
internal override void InvokeCallback()
@@ -23,7 +23,7 @@ namespace YooAsset
add
{
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(SceneHandle)} is invalid");
throw new System.Exception($"{nameof(SceneHandle)} is invalid !");
if (Provider.IsDone)
value.Invoke(this);
else
@@ -32,7 +32,7 @@ namespace YooAsset
remove
{
if (IsValidWithWarning == false)
throw new System.Exception($"{nameof(SceneHandle)} is invalid");
throw new System.Exception($"{nameof(SceneHandle)} is invalid !");
_callback -= value;
}
}
@@ -100,14 +100,9 @@ namespace YooAsset
if (IsValidWithWarning == false)
return false;
if (Provider is DatabaseSceneProvider)
if (Provider is SceneProvider)
{
var provider = Provider as DatabaseSceneProvider;
provider.UnSuspendLoad();
}
else if (Provider is BundledSceneProvider)
{
var provider = Provider as BundledSceneProvider;
var provider = Provider as SceneProvider;
provider.UnSuspendLoad();
}
else
@@ -118,31 +113,8 @@ namespace YooAsset
}
/// <summary>
/// 是否为主场景
/// </summary>
public bool IsMainScene()
{
if (IsValidWithWarning == false)
return false;
if (Provider is DatabaseSceneProvider)
{
var temp = Provider as DatabaseSceneProvider;
return temp.SceneMode == LoadSceneMode.Single;
}
else if (Provider is BundledSceneProvider)
{
var temp = Provider as BundledSceneProvider;
return temp.SceneMode == LoadSceneMode.Single;
}
else
{
throw new System.NotImplementedException();
}
}
/// <summary>
/// 异步卸载子场景
/// 异步卸载场景对象
/// 注意：场景卸载成功后，会自动释放该handle的引用计数！
/// </summary>
public UnloadSceneOperation UnloadAsync()
{
@@ -157,24 +129,12 @@ namespace YooAsset
return operation;
}
// 如果是主场景
if (IsMainScene())
{
string error = $"Cannot unload main scene. Use {nameof(YooAssets.LoadSceneAsync)} method to change the main scene !";
YooLogger.Error(error);
var operation = new UnloadSceneOperation(error);
OperationSystem.StartOperation(packageName, operation);
return operation;
}
// 卸载子场景
// 注意：如果场景正在加载过程，必须等待加载完成后才可以卸载该场景。
{
var operation = new UnloadSceneOperation(Provider);
OperationSystem.StartOperation(packageName, operation);
return operation;
}
}
}
}