foldcc/YooAsset
1
0
Fork 0
mirror of https://github.com/tuyoogame/YooAsset.git synced 2026-05-28 11:38:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update asset system

Browse Source
This commit is contained in:
hevinci
2022-10-14 11:20:14 +08:00
parent 72a49d0ed8
commit e9af0c7042
3 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Assets/YooAsset/Runtime/AssetSystem/Handles/AssetOperationHandle.cs
View File

@@ -87,7 +87,7 @@ namespace YooAsset
/// <returns></returns>
public GameObject InstantiateSync(Transform parent = null)
{
return InstantiateSyncInternal(Vector3.zero, Quaternion.identity, parent, false);
return InstantiateSyncInternal(Vector3.zero, Quaternion.identity, parent);
}
/// <summary>
@@ -98,7 +98,7 @@ namespace YooAsset
/// <param name="parent">父类对象</param>
public GameObject InstantiateSync(Vector3 position, Quaternion rotation, Transform parent = null)
{
return InstantiateSyncInternal(position, rotation, parent, true);
return InstantiateSyncInternal(position, rotation, parent);
}
/// <summary>
@@ -107,7 +107,7 @@ namespace YooAsset
/// <param name="parent">父类对象</param>
public InstantiateOperation InstantiateAsync(Transform parent = null)
{
return InstantiateAsyncInternal(Vector3.zero, Quaternion.identity, parent, false);
return InstantiateAsyncInternal(Vector3.zero, Quaternion.identity, parent);
}
/// <summary>
@@ -118,37 +118,23 @@ namespace YooAsset
/// <param name="parent">父类对象</param>
public InstantiateOperation InstantiateAsync(Vector3 position, Quaternion rotation, Transform parent = null)
{
return InstantiateAsyncInternal(position, rotation, parent, true);
return InstantiateAsyncInternal(position, rotation, parent);
}
private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
private GameObject InstantiateSyncInternal(Vector3 position, Quaternion rotation, Transform parent)
{
if (IsValid == false)
return null;
if (Provider.AssetObject == null)
return null;
GameObject result;
if (setPositionRotation)
{
if (parent == null)
result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation);
else
result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation, parent);
}
else
{
if (parent == null)
result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject);
else
result = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, parent);
}
return result;
GameObject clone = UnityEngine.Object.Instantiate(Provider.AssetObject as GameObject, position, rotation, parent);
return clone;
}
private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent, bool setPositionRotation)
private InstantiateOperation InstantiateAsyncInternal(Vector3 position, Quaternion rotation, Transform parent)
{
InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent, setPositionRotation);
InstantiateOperation operation = new InstantiateOperation(this, position, rotation, parent);
OperationSystem.StartOperation(operation);
return operation;
}