Merge branch 'main' of http://10.27.17.121:3000/kawagiri/TH1
This commit is contained in:
commit
05734dcc8f
@ -104,7 +104,21 @@ namespace Logic.Audio
|
||||
public void PlayMusic(string musicName, float fadeIn, float fadeOut, bool isLoop, bool isContinue=true)
|
||||
{
|
||||
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();
|
||||
_musicPlayer.Clip = _clips[musicName][0];
|
||||
if (!_musicPlayer.Clip)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user