From aa005b6e421d09f5b189cc0f61dafe129f49908e Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 15 Oct 2021 15:51:40 +0900 Subject: [PATCH] =?UTF-8?q?=E5=85=84=E5=BC=9F=E9=9D=9E=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E4=B8=AD=E3=82=82SE=E3=81=8C=E9=B3=B4=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/marketing/Scripts/BrotherConversation.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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);