From 73a8fcf0bd4e43c672e2197ac97936511ecaf4bb Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Wed, 25 May 2022 23:50:15 +0800 Subject: [PATCH] Update ResMgr Update ResMgr --- Assets/TEngine/Runtime/Res/AssetConfig.cs | 5 ++++- Assets/TEngine/Runtime/Res/ResMgr.cs | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Assets/TEngine/Runtime/Res/AssetConfig.cs b/Assets/TEngine/Runtime/Res/AssetConfig.cs index b8a60647..48b5c54d 100644 --- a/Assets/TEngine/Runtime/Res/AssetConfig.cs +++ b/Assets/TEngine/Runtime/Res/AssetConfig.cs @@ -344,11 +344,14 @@ namespace TEngine if (_assetPath2BundleDatas.TryGetValue(path, out bundleName)) { if (!_bundleDatas.TryGetValue(bundleName, out assetBundleData)) + { TLogger.LogError($"Can not get AssetBundleData with AssetBundle '{bundleName}'!"); + } } else + { TLogger.LogError($"Can not find '{path}' in any AssetBundle!"); - + } return assetBundleData; } } diff --git a/Assets/TEngine/Runtime/Res/ResMgr.cs b/Assets/TEngine/Runtime/Res/ResMgr.cs index d5cc2d43..385a9c1e 100644 --- a/Assets/TEngine/Runtime/Res/ResMgr.cs +++ b/Assets/TEngine/Runtime/Res/ResMgr.cs @@ -72,7 +72,9 @@ namespace TEngine assetData.AddRef(); result = assetData.AssetObject as T; if (result != null && !_scriptableObjects.ContainsKey(result)) + { _scriptableObjects.Add(result, assetData); + } } } @@ -82,7 +84,9 @@ namespace TEngine public T Load(string path) where T:UnityEngine.Object { if (string.IsNullOrEmpty(path)) + { return null; + } T result = null; AssetData assetData = _assetConfig.GetAssetAtPath(path); @@ -112,7 +116,9 @@ namespace TEngine public GameObject GetGameObject(string path) { if (string.IsNullOrEmpty(path)) + { return null; + } GameObject go = null; AssetData assetData = _assetConfig.GetAssetAtPath(path); @@ -120,7 +126,9 @@ namespace TEngine if (assetData != null) { go = Object.Instantiate(assetData.AssetObject) as GameObject; - BindAssetData(go, assetData); + { + BindAssetData(go, assetData); + } } return go; @@ -139,7 +147,9 @@ namespace TEngine public byte[] GetBytesFromAsset(string path) { if (string.IsNullOrEmpty(path)) + { return null; + } byte[] result = null; AssetData assetData = _assetConfig.GetAssetAtPath(path);