From 213aaed426f093dab4eee0198d6c3b497fdbf020 Mon Sep 17 00:00:00 2001 From: Weekend <872285171@qq.com> Date: Wed, 15 Nov 2023 14:40:35 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E8=B5=84=E6=BA=90=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResourceModule/IResourceManager.cs | 3 ++- .../Modules/ResourceModule/ResourceManager.cs | 22 ++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/IResourceManager.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/IResourceManager.cs index 639a5226..b8f96b13 100644 --- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/IResourceManager.cs +++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/IResourceManager.cs @@ -86,8 +86,9 @@ namespace TEngine /// /// 初始化操作。 /// + /// 指定资源包的名称。不传使用默认资源包 /// - InitializationOperation InitPackage(); + InitializationOperation InitPackage(string packageName = ""); /// /// 卸载资源。 diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs index 9c172386..2bdb714a 100644 --- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs +++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceManager.cs @@ -15,7 +15,7 @@ namespace TEngine #region Propreties /// - /// 资源包名称。 + /// 默认资源包名称。 /// public string PackageName { get; set; } = "DefaultPackage"; @@ -332,18 +332,24 @@ namespace TEngine /// 初始化资源包裹。 /// /// 初始化资源包裹操作句柄。 - public InitializationOperation InitPackage() + public InitializationOperation InitPackage(string packageName = "") { // 创建默认的资源包 - string packageName = PackageName; - var package = YooAssets.TryGetPackage(packageName); + var targetPackageName = string.IsNullOrEmpty(packageName) || packageName.Equals(PackageName) + ? PackageName + : packageName; + var package = YooAssets.TryGetPackage(targetPackageName); if (package == null) { - package = YooAssets.CreatePackage(packageName); - YooAssets.SetDefaultPackage(package); + package = YooAssets.CreatePackage(targetPackageName); } - DefaultPackage = package; + // 设置默认资源包 + if (targetPackageName.Equals(PackageName)) + { + YooAssets.SetDefaultPackage(package); + DefaultPackage = package; + } #if UNITY_EDITOR //编辑器模式使用。 @@ -359,7 +365,7 @@ namespace TEngine if (playMode == EPlayMode.EditorSimulateMode) { var createParameters = new EditorSimulateModeParameters(); - createParameters.SimulateManifestFilePath = EditorSimulateModeHelper.SimulateBuild(packageName); + createParameters.SimulateManifestFilePath = EditorSimulateModeHelper.SimulateBuild(targetPackageName); initializationOperation = package.InitializeAsync(createParameters); }