From 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 16:10:43 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/ResModule/AudioLoader.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Main/ResModule/AudioLoader.cs b/Main/ResModule/AudioLoader.cs
index 4b9b101..af8bab3 100644
--- a/Main/ResModule/AudioLoader.cs
+++ b/Main/ResModule/AudioLoader.cs
@@ -1,18 +1,25 @@
锘縰sing UnityEngine;
using System.Collections;
using System;
+using Cysharp.Threading.Tasks;
+using System.Threading;
public class AudioLoader
{
public static AudioClip LoadAudio(string _folderName, string _clipName)
{
- return ResManager.Instance.LoadAsset<AudioClip>("Audio/" + _folderName, _clipName);
+ return ResManager.Instance.LoadAsset<AudioClip>("Audio/" + _folderName, _clipName, false);
}
public static void LoadAudioAsync(string _folderName, string _clipName, Action<bool, UnityEngine.Object> _callBack)
{
- ResManager.Instance.LoadAssetAsync<AudioClip>("Audio/" + _folderName, _clipName, _callBack);
+ ResManager.Instance.LoadAssetAsync<AudioClip>("Audio/" + _folderName, _clipName, _callBack, false);
}
+ // US2: Async UniTask variant
+ public static UniTask<AudioClip> LoadAudioAsync(string _folderName, string _clipName, CancellationToken ct = default)
+ {
+ return ResManager.Instance.LoadAssetAsync<AudioClip>("Audio/" + _folderName, _clipName, false, ct);
+ }
}
--
Gitblit v1.8.0