Merge branch 'master' into h5version

yyl

2026-02-11 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec

 Main/ResModule/AudioLoader.cs

@@ -1,18 +1,25 @@
using 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);
    }
}