kawagiri/TH1
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1

Browse Source
This commit is contained in:
kawagiri 2026-01-13 15:57:24 +08:00
commit 05734dcc8f
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Unity/Assets/Scripts/TH1_Audio/AudioManager.cs
View File

@ -104,7 +104,21 @@ namespace Logic.Audio
public void PlayMusic(string musicName, float fadeIn, float fadeOut, bool isLoop, bool isContinue=true) public void PlayMusic(string musicName, float fadeIn, float fadeOut, bool isLoop, bool isContinue=true)
{ {
if (!_clips.ContainsKey(musicName) || _clips[musicName].Count == 0) return; if (!_clips.ContainsKey(musicName) || _clips[musicName].Count == 0) return;
if (_musicPlayer != null) StopMusic(); if (_musicPlayer != null)
{
if (_musicPlayer.MusicName == musicName)
{
if (_musicPlayer.State == PlayerState.Playing) return;
if (_musicPlayer.State == PlayerState.FadeIn) return;
if (_musicPlayer.State == PlayerState.FadeOut)
{
_musicPlayer.StartTime = Time.time - (_musicPlayer.FadeOutDuration - (Time.time - _musicPlayer.EndTime));
_musicPlayer.State = PlayerState.FadeIn;
return;
}
}
StopMusic();
}
else _musicPlayer = GetPlayer(); else _musicPlayer = GetPlayer();
_musicPlayer.Clip = _clips[musicName][0]; _musicPlayer.Clip = _clips[musicName][0];
if (!_musicPlayer.Clip) if (!_musicPlayer.Clip)