优化卸载逻辑
All checks were successful
Plugin Library CI / publish (00.ARMazTools) (push) Successful in 3s
Plugin Library CI / publish (00.BuildOriginality) (push) Successful in 3s
Plugin Library CI / publish (00.StaryEvo) (push) Successful in 6s
Plugin Library CI / publish (00.StaryEvoTools) (push) Successful in 19s
Plugin Library CI / publish (01.HybridCLR) (push) Successful in 5s
Plugin Library CI / publish (02.InformationSave) (push) Successful in 3s
Plugin Library CI / publish (03.YooAsset) (push) Successful in 34s
Plugin Library CI / publish (04.AudioCore) (push) Successful in 3s
Plugin Library CI / publish (05.TableTextConversion) (push) Successful in 4s
Plugin Library CI / publish (06.UIFarme) (push) Successful in 16s
Plugin Library CI / publish (07.RKTools) (push) Successful in 3s
Plugin Library CI / publish (08.UniTask) (push) Successful in 3s
Plugin Library CI / publish (09.CodeChecker) (push) Successful in 17s
Plugin Library CI / publish (10.StoryEditor) (push) Successful in 3s
Plugin Library CI / publish (10.XNode) (push) Successful in 3s
Plugin Library CI / publish (11.PointCloudTools) (push) Successful in 3s
All checks were successful
Plugin Library CI / publish (00.ARMazTools) (push) Successful in 3s
Plugin Library CI / publish (00.BuildOriginality) (push) Successful in 3s
Plugin Library CI / publish (00.StaryEvo) (push) Successful in 6s
Plugin Library CI / publish (00.StaryEvoTools) (push) Successful in 19s
Plugin Library CI / publish (01.HybridCLR) (push) Successful in 5s
Plugin Library CI / publish (02.InformationSave) (push) Successful in 3s
Plugin Library CI / publish (03.YooAsset) (push) Successful in 34s
Plugin Library CI / publish (04.AudioCore) (push) Successful in 3s
Plugin Library CI / publish (05.TableTextConversion) (push) Successful in 4s
Plugin Library CI / publish (06.UIFarme) (push) Successful in 16s
Plugin Library CI / publish (07.RKTools) (push) Successful in 3s
Plugin Library CI / publish (08.UniTask) (push) Successful in 3s
Plugin Library CI / publish (09.CodeChecker) (push) Successful in 17s
Plugin Library CI / publish (10.StoryEditor) (push) Successful in 3s
Plugin Library CI / publish (10.XNode) (push) Successful in 3s
Plugin Library CI / publish (11.PointCloudTools) (push) Successful in 3s
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using Cysharp.Threading.Tasks;
|
||||
using Main;
|
||||
@@ -118,16 +119,36 @@ namespace Stary.Evo
|
||||
hotfixInstance.OnEnterAsync("");
|
||||
}
|
||||
|
||||
public static async UniTask UnloadDomainAsset()
|
||||
public static async UniTask RemoveDomain(DomainConfig domainConfig)
|
||||
{
|
||||
bool isQuit = (domainConfig.loadResType == DomainConfig.LoadResType.Prefab &&
|
||||
domainConfig.domainLoadType == DomainConfig.DomainLoadType.Single) ||
|
||||
(domainConfig.loadResType == DomainConfig.LoadResType.Scene &&
|
||||
domainConfig.loadSceneMode == LoadSceneMode.Single);
|
||||
if (isQuit)
|
||||
return;
|
||||
foreach (var entity in _domainNameEntities)
|
||||
{
|
||||
if (entity.loadResType == DomainConfig.LoadResType.Prefab)
|
||||
{
|
||||
await DomainAssetSystem.UnloadDomainAsset(entity);
|
||||
}
|
||||
else if (entity.loadResType == DomainConfig.LoadResType.Scene)
|
||||
{
|
||||
await DomainAssetSystem.UnloadSceneAsset(entity);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public static async UniTask UnloadDomainAsset(DomainConfig config)
|
||||
{
|
||||
if (HybridClREntrance.Global.stage == StageType.Developer)
|
||||
{
|
||||
var mainPrefab = GameObject.Find(entity.domain);
|
||||
var mainPrefab = GameObject.Find(config.domain);
|
||||
if (mainPrefab == null)
|
||||
{
|
||||
Debug.LogError($"UnityEvo:{entity.domain}不存在,无法卸载");
|
||||
Debug.LogError($"UnityEvo:{config.domain}不存在,无法卸载");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -147,15 +168,15 @@ namespace Stary.Evo
|
||||
await ForceUnloadAllAssets(domainBase.DomainNameRaw);
|
||||
}
|
||||
|
||||
Debug.Log($"UnityEvo:{entity.domain} 退出成功...");
|
||||
Debug.Log($"UnityEvo:{config.domain} 退出成功...");
|
||||
}
|
||||
else if (HybridClREntrance.Global.stage == StageType.Originality)
|
||||
{
|
||||
await ForceUnloadAllAssets(entity.domain);
|
||||
await ForceUnloadAllAssets(config.domain);
|
||||
AppConfig.PackageDomainName = "";
|
||||
Debug.Log("UnityEvo:Domain退出...");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static async UniTask UnloadSceneAsset(DomainConfig config)
|
||||
|
||||
Reference in New Issue
Block a user