From 2627df6e76889371da1bd3e408913db96830bc32 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 04 六月 2025 19:54:21 +0800
Subject: [PATCH] 18 子 2D卡牌客户端搭建 / 2D卡牌客户端搭建 资源加载接口统一（遗漏
---
Main/ResModule/AudioLoader.cs | 44 ++------------------------------------------
1 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/Main/ResModule/AudioLoader.cs b/Main/ResModule/AudioLoader.cs
index f250808..027eb64 100644
--- a/Main/ResModule/AudioLoader.cs
+++ b/Main/ResModule/AudioLoader.cs
@@ -8,52 +8,12 @@
public static AudioClip LoadAudio(string _folderName, string _clipName)
{
- AudioClip audioClip = null;
- if (AssetSource.audioFromEditor)
- {
-#if UNITY_EDITOR
- var fileName = StringUtility.Contact("/", _clipName, AUDIO_EXTERSION);
- var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, ResourcesPath.AUDIO_SUFFIX, _folderName, fileName);
-
- audioClip = UnityEditor.AssetDatabase.LoadAssetAtPath<AudioClip>(path);
-#endif
- }
- else
- {
- var assetInfo = new AssetInfo(StringUtility.Contact("audio/", _folderName), _clipName);
- audioClip = AssetBundleUtility.Instance.Sync_LoadAsset(assetInfo) as AudioClip;
- }
-
- if (audioClip == null)
- {
- Debug.LogErrorFormat("AudioLoader.LoadSkillAudio() => 鍔犺浇涓嶅埌璧勬簮: {0}.", _clipName);
- }
-
- return audioClip;
+ return ResManager.Instance.LoadAsset<AudioClip>("Audio/" + _folderName, _clipName);
}
public static void LoadAudioAsync(string _folderName, string _clipName, Action<bool, UnityEngine.Object> _callBack)
{
- AudioClip audioClip = null;
- if (AssetSource.audioFromEditor)
- {
-#if UNITY_EDITOR
- var fileName = StringUtility.Contact("/", _clipName, AUDIO_EXTERSION);
- var path = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, ResourcesPath.AUDIO_SUFFIX, _folderName, fileName);
- audioClip = UnityEditor.AssetDatabase.LoadAssetAtPath<AudioClip>(path);
-
- if (_callBack != null)
- {
- _callBack(true, audioClip);
- }
-#endif
- }
- else
- {
- var assetInfo = new AssetInfo(StringUtility.Contact("audio/", _folderName).ToLower(), _clipName);
- AssetBundleUtility.Instance.Co_LoadAsset(assetInfo, _callBack);
- }
-
+ ResManager.Instance.LoadAssetAsync<AudioClip>("Audio/" + _folderName, _clipName, _callBack);
}
}
--
Gitblit v1.8.0