Merge branch 'master' into LouDi_Quan

This commit is contained in:
shenjianxing 2024-12-31 13:16:30 +08:00
commit 6535662d13
2 changed files with 50 additions and 19 deletions

View File

@ -3,6 +3,7 @@ namespace QFramework
using UnityEngine; using UnityEngine;
using System.Collections; using System.Collections;
using UnityEngine.Networking; using UnityEngine.Networking;
using UnityEngine.Rendering;
public static class LocalAudioResUtil public static class LocalAudioResUtil
{ {
@ -192,9 +193,30 @@ namespace QFramework
} }
else else
{ {
// Convert the downloaded data to an AudioClip // 等待下载完成
while (!request.downloadHandler.isDone)
{
yield return null;
}
// 下载完成后,转换为 AudioClip
AudioClip clip = DownloadHandlerAudioClip.GetContent(request); AudioClip clip = DownloadHandlerAudioClip.GetContent(request);
mAsset = clip;
if (clip != null)
{
// 检查音频加载状态
while (clip.loadState != AudioDataLoadState.Loaded)
{
yield return null;
}
mAsset = clip; // 音频加载完成后赋值给 mAsset
}
else
{
Debug.LogError("Failed to load audio clip.");
}
} }
if (RefCount <= 0) if (RefCount <= 0)

View File

@ -45,6 +45,8 @@ namespace QFramework
{ {
GameObject obj = Utility.FindObj(path); GameObject obj = Utility.FindObj(path);
if (obj != null) if (obj != null)
{
try
{ {
anim = obj.GetComponent<Animation>(); anim = obj.GetComponent<Animation>();
@ -60,7 +62,7 @@ namespace QFramework
else else
{ {
float curSpeed = 1; float curSpeed = 1;
if (string.IsNullOrEmpty(speed)==false) if (string.IsNullOrEmpty(speed) == false)
{ {
float.TryParse(speed, out curSpeed); float.TryParse(speed, out curSpeed);
} }
@ -68,8 +70,15 @@ namespace QFramework
anim.Play(animName); anim.Play(animName);
} }
} }
catch (Exception)
{
Debug.LogError($"{path} 播放动画 {animName} 出错");
}
}
else else
{ {
Debug.LogError("未找到路径:" + path);
this.Finish(); this.Finish();
} }
} }