Skip to content

Fix: When playing start animation with sound and then outcome without sound it was still playing #6477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QThund wants to merge 1 commit into
base: dev
Choose a base branch
from
+5 −2
Open

Fix: When playing start animation with sound and then outcome without sound it was still playing #6477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Explorer/Assets/DCL/AvatarRendering/Emotes/Systems/Play/CharacterEmoteSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,11 +551,14 @@ private void PlayNewEmote(Entity entity, ref CharacterEmoteComponent emoteCompon
if (emoteComponent.Metadata.IsSocialEmote &&
emoteIntent.TriggerSource != TriggerSource.PREVIEW &&
emoteComponent.SocialEmote.IsPlayingOutcome &&
emote.SocialEmoteOutcomeAudioAssetResults != null && emote.SocialEmoteOutcomeAudioAssetResults[emoteComponent.SocialEmote.CurrentOutcome].HasValue)
emote.SocialEmoteOutcomeAudioAssetResults != null)
{
ReportHub.Log(ReportCategory.SOCIAL_EMOTE, "PlayNewEmote() AUDIO for outcome " + emoteComponent.SocialEmote.CurrentOutcome);

audioClip = emote.SocialEmoteOutcomeAudioAssetResults[emoteComponent.SocialEmote.CurrentOutcome]!.Value.Asset;
if (emote.SocialEmoteOutcomeAudioAssetResults[emoteComponent.SocialEmote.CurrentOutcome].HasValue)
audioClip = emote.SocialEmoteOutcomeAudioAssetResults[emoteComponent.SocialEmote.CurrentOutcome]!.Value.Asset;
else
audioClip = null; // Playing outcome animation without sound after a start animation that had a sound
}

bool playedSuccessfully = emotePlayer.Play(mainAsset, audioClip, emote.IsLooping(), emoteIntent.Spatial, in avatarView, ref emoteComponent);
Expand Down
Loading