mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

also grab from cache in this method

Browse source
This commit is contained in:
minenice55 2024-02-08 01:05:21 -05:00
parent 107aa527e2
commit aa1752953c
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Assets/Scripts/Util/SoundByte.cs
View file

@ -218,30 +218,41 @@ namespace HeavenStudio.Util
public static double GetClipLength(string name, float pitch = 1f, string game = null) public static double GetClipLength(string name, float pitch = 1f, string game = null)
{ {
AudioClip clip = null; AudioClip clip = null;
if (audioClips.ContainsKey(name)) string soundName = name.Split('/')[^1];
if (game != null)
{ {
clip = audioClips[name]; string cachedName = $"games/{game}/{soundName}";
} if (audioClips.ContainsKey(cachedName))
else if (game != null)
{
string soundName = name.Split('/')[2];
var inf = GameManager.instance.GetGameInfo(game);
//first try the game's common assetbundle
// Debug.Log("Jukebox loading sound " + soundName + " from common");
clip = inf.GetCommonAssetBundle()?.LoadAsset<AudioClip>(soundName);
//then the localized one
if (clip == null)
{ {
// Debug.Log("Jukebox loading sound " + soundName + " from locale"); clip = audioClips[cachedName];
clip = inf.GetLocalizedAssetBundle()?.LoadAsset<AudioClip>(soundName); }
else
{
var inf = GameManager.instance.GetGameInfo(game);
//first try the game's common assetbundle
// Debug.Log("Jukebox loading sound " + soundName + " from common");
clip = inf.GetCommonAssetBundle()?.LoadAsset<AudioClip>(soundName);
//then the localized one
if (clip == null)
{
// Debug.Log("Jukebox loading sound " + soundName + " from locale");
clip = inf.GetLocalizedAssetBundle()?.LoadAsset<AudioClip>(soundName);
}
} }
} }
//can't load from assetbundle, load from resources //can't load from assetbundle, load from resources
if (clip == null) if (clip == null)
{ {
// Debug.Log("Jukebox loading sound " + name + " from resources"); if (audioClips.ContainsKey(name))
clip = Resources.Load<AudioClip>($"Sfx/{name}"); {
clip = audioClips[name];
}
else
{
// Debug.Log("Jukebox loading sound " + name + " from resources");
clip = Resources.Load<AudioClip>($"Sfx/{name}");
}
} }
if (clip == null) if (clip == null)