diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs index be17ee65..91e12dbe 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs @@ -61,12 +61,12 @@ public class BrotherConversation : MonoBehaviour private void SetData(BrotherScriptData scriptData) { - brotherBlueAnimator.SetTrigger(scriptData.BlueFace.ToString()); - brotherPinkAnimator.SetTrigger(scriptData.PinkFace.ToString()); brotherText.text = scriptData.text; switch (scriptData.Brother) { case BrotherType.Blue: + brotherBlueAnimator.SetTrigger(scriptData.BlueFace.ToString()); + brotherPinkAnimator.SetTrigger(PinkFaceType.Normal.ToString()); brotherBlueAnimator.transform.localPosition = brotherBlueTarget.localPosition; brotherBlueAnimator.transform.SetLocalScale(1f); brotherPinkAnimator.transform.SetLocalScale(0f); @@ -75,6 +75,8 @@ public class BrotherConversation : MonoBehaviour bothNameObject.SetActive(false); break; case BrotherType.Pink: + brotherBlueAnimator.SetTrigger(BlueFaceType.Normal.ToString()); + brotherPinkAnimator.SetTrigger(scriptData.PinkFace.ToString()); brotherPinkAnimator.transform.localPosition = brotherPinkTarget.localPosition; brotherBlueAnimator.transform.SetLocalScale(0f); brotherPinkAnimator.transform.SetLocalScale(1f); @@ -83,6 +85,8 @@ public class BrotherConversation : MonoBehaviour bothNameObject.SetActive(false); break; case BrotherType.Both: + brotherBlueAnimator.SetTrigger(scriptData.BlueFace.ToString()); + brotherPinkAnimator.SetTrigger(scriptData.PinkFace.ToString()); brotherBlueAnimator.transform.localPosition = brotherBlueBothTarget.localPosition; brotherPinkAnimator.transform.localPosition = brotherPinkBothTarget.localPosition; brotherBlueAnimator.transform.SetLocalScale(1f);