修复多个场景打进一个AB包时,卸载子场景时抛出异常。
This commit is contained in:
hevinci
2022-07-20 15:05:28 +08:00
parent d5a4b3365f
commit d64b31f6ce
12 changed files with 36 additions and 47 deletions
@@ -17,7 +17,7 @@ namespace YooAsset
}
}
public BundledAssetProvider(AssetInfo assetInfo) : base(assetInfo)
public BundledAssetProvider(string providerGUID, AssetInfo assetInfo) : base(providerGUID, assetInfo)
{
}
public override void Update()
@@ -8,7 +8,7 @@ namespace YooAsset
protected AssetBundleLoaderBase OwnerBundle { private set; get; }
protected DependAssetBundleGroup DependBundleGroup { private set; get; }
public BundledProvider(AssetInfo assetInfo) : base(assetInfo)
public BundledProvider(string providerGUID, AssetInfo assetInfo) : base(providerGUID, assetInfo)
{
OwnerBundle = AssetSystem.CreateOwnerAssetBundleLoader(assetInfo);
OwnerBundle.Reference();
@@ -23,7 +23,7 @@ namespace YooAsset
}
}
public BundledSceneProvider(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(assetInfo)
public BundledSceneProvider(string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(providerGUID, assetInfo)
{
SceneMode = sceneMode;
_sceneName = Path.GetFileNameWithoutExtension(assetInfo.AssetPath);
@@ -17,7 +17,7 @@ namespace YooAsset
}
}
public BundledSubAssetsProvider(AssetInfo assetInfo) : base(assetInfo)
public BundledSubAssetsProvider(string providerGUID, AssetInfo assetInfo) : base(providerGUID, assetInfo)
{
}
public override void Update()
@@ -14,7 +14,7 @@ namespace YooAsset
}
}
public CompletedProvider(AssetInfo assetInfo) : base(assetInfo)
public CompletedProvider(AssetInfo assetInfo) : base(string.Empty, assetInfo)
{
}
public override void Update()
@@ -17,7 +17,7 @@ namespace YooAsset
}
}
public DatabaseAssetProvider(AssetInfo assetInfo) : base(assetInfo)
public DatabaseAssetProvider(string providerGUID, AssetInfo assetInfo) : base(providerGUID, assetInfo)
{
}
public override void Update()
@@ -19,7 +19,7 @@ namespace YooAsset
}
}
public DatabaseSceneProvider(AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(assetInfo)
public DatabaseSceneProvider(string providerGUID, AssetInfo assetInfo, LoadSceneMode sceneMode, bool activateOnLoad, int priority) : base(providerGUID, assetInfo)
{
SceneMode = sceneMode;
_activateOnLoad = activateOnLoad;
@@ -17,7 +17,7 @@ namespace YooAsset
}
}
public DatabaseSubAssetsProvider(AssetInfo assetInfo) : base(assetInfo)
public DatabaseSubAssetsProvider(string providerGUID, AssetInfo assetInfo) : base(providerGUID, assetInfo)
{
}
public override void Update()
@@ -17,6 +17,11 @@ namespace YooAsset
Fail,
}
/// <summary>
/// 资源提供者唯一标识符
/// </summary>
public string ProviderGUID { private set; get; }
/// <summary>
/// 资源信息
/// </summary>
@@ -85,8 +90,9 @@ namespace YooAsset
private readonly List<OperationHandleBase> _handles = new List<OperationHandleBase>();
public ProviderBase(AssetInfo assetInfo)
public ProviderBase(string providerGUID, AssetInfo assetInfo)
{
ProviderGUID = providerGUID;
MainAssetInfo = assetInfo;
}