From bc1cb6da854cb2e9144f10ed55330a537ecdca16 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 04 三月 2026 14:35:57 +0800
Subject: [PATCH] 466 h5版本 资源规则修改 打包修改(未完成 勿拉取)
---
Main/System/Battle/Sound/BattleSoundManager.cs | 32 ++++++--------------------------
1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/Main/System/Battle/Sound/BattleSoundManager.cs b/Main/System/Battle/Sound/BattleSoundManager.cs
index e52c232..ee5f0aa 100644
--- a/Main/System/Battle/Sound/BattleSoundManager.cs
+++ b/Main/System/Battle/Sound/BattleSoundManager.cs
@@ -122,19 +122,19 @@
/// 鎾斁鐗规晥闊虫晥
/// </summary>
/// <param name="audioId">闊虫晥ID</param>
- public void PlayEffectSound(int audioId, bool pitchControl = true)
+ public async UniTask PlayEffectSound(int audioId, bool pitchControl = true)
{
if (audioId <= 0)
{
return;
}
- PlaySound(audioId, pitchControl);
+ await PlaySound(audioId, pitchControl);
}
/// <summary>
/// 鏍稿績鎾斁鏂规硶
/// </summary>
- private void PlaySound(int audioId, bool pitchControl)
+ private async UniTask PlaySound(int audioId, bool pitchControl)
{
// 妫�鏌ユ槸鍚︽湁鐒︾偣锛屾棤鐒︾偣鏃朵笉鎾斁
if (!hasFocus)
@@ -150,7 +150,7 @@
return;
}
- var audioClip = GetAudioClip(audioId);
+ var audioClip = await GetAudioClip(audioId);
if (audioClip == null)
{
Debug.Log($"<color=red>BattleSoundManager [{battleField.guid}]: 鏃犳硶鍔犺浇闊虫晥 {audioId}</color>");
@@ -203,11 +203,11 @@
/// <summary>
/// 鑾峰彇闊抽鍓緫锛堟瘡娆′粠ResManager鍔犺浇锛屼緷璧栧叾鍐呴儴缂撳瓨锛�
/// </summary>
- private AudioClip GetAudioClip(int audioId)
+ private async UniTask<AudioClip> GetAudioClip(int audioId)
{
// 涓嶅湪姝ゅ缂撳瓨锛岀洿鎺ヤ粠 ResManager 鍔犺浇
// ResManager 鍐呴儴浼氬鐞嗙紦瀛橈紝杩欐牱鍙互閬垮厤 AudioClip 澶辨晥闂
- return LoadAudioClip(audioId);
+ return await LoadAudioClipAsync(audioId);
}
/// <summary>
@@ -226,26 +226,6 @@
// 妫�鏌ュ悓鏃舵挱鏀剧殑鏁伴噺
return sources.Count < MAX_SAME_AUDIO_COUNT;
- }
-
- /// <summary>
- /// 鍔犺浇闊抽鍓緫
- /// </summary>
- private AudioClip LoadAudioClip(int audioId)
- {
- var config = AudioConfig.Get(audioId);
- if (config == null)
- return null;
-
- #pragma warning disable CS0618 // Obsolete 鈥� sync legacy fallback, use LoadAudioClipAsync
- AudioClip audioClip = ResManager.Instance.LoadAsset<AudioClip>(
- "Audio/" + config.Folder,
- config.Audio,
- false
- );
- #pragma warning restore CS0618
-
- return audioClip;
}
/// <summary>
--
Gitblit v1.8.0