yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兄弟非表示中もSEが鳴っていたのを修正

This commit is contained in:
kimura 2021-10-15 15:51:40 +09:00
parent eaa3ec3f04
commit aa005b6e42
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs
View File

@ -61,12 +61,12 @@ public class BrotherConversation : MonoBehaviour
private void SetData(BrotherScriptData scriptData) private void SetData(BrotherScriptData scriptData)
{ {
brotherBlueAnimator.SetTrigger(scriptData.BlueFace.ToString());
brotherPinkAnimator.SetTrigger(scriptData.PinkFace.ToString());
brotherText.text = scriptData.text; brotherText.text = scriptData.text;
switch (scriptData.Brother) switch (scriptData.Brother)
{ {
case BrotherType.Blue: case BrotherType.Blue:
brotherBlueAnimator.SetTrigger(scriptData.BlueFace.ToString());
brotherPinkAnimator.SetTrigger(PinkFaceType.Normal.ToString());
brotherBlueAnimator.transform.localPosition = brotherBlueTarget.localPosition; brotherBlueAnimator.transform.localPosition = brotherBlueTarget.localPosition;
brotherBlueAnimator.transform.SetLocalScale(1f); brotherBlueAnimator.transform.SetLocalScale(1f);
brotherPinkAnimator.transform.SetLocalScale(0f); brotherPinkAnimator.transform.SetLocalScale(0f);
@ -75,6 +75,8 @@ public class BrotherConversation : MonoBehaviour
bothNameObject.SetActive(false); bothNameObject.SetActive(false);
break; break;
case BrotherType.Pink: case BrotherType.Pink:
brotherBlueAnimator.SetTrigger(BlueFaceType.Normal.ToString());
brotherPinkAnimator.SetTrigger(scriptData.PinkFace.ToString());
brotherPinkAnimator.transform.localPosition = brotherPinkTarget.localPosition; brotherPinkAnimator.transform.localPosition = brotherPinkTarget.localPosition;
brotherBlueAnimator.transform.SetLocalScale(0f); brotherBlueAnimator.transform.SetLocalScale(0f);
brotherPinkAnimator.transform.SetLocalScale(1f); brotherPinkAnimator.transform.SetLocalScale(1f);
@ -83,6 +85,8 @@ public class BrotherConversation : MonoBehaviour
bothNameObject.SetActive(false); bothNameObject.SetActive(false);
break; break;
case BrotherType.Both: case BrotherType.Both:
brotherBlueAnimator.SetTrigger(scriptData.BlueFace.ToString());
brotherPinkAnimator.SetTrigger(scriptData.PinkFace.ToString());
brotherBlueAnimator.transform.localPosition = brotherBlueBothTarget.localPosition; brotherBlueAnimator.transform.localPosition = brotherBlueBothTarget.localPosition;
brotherPinkAnimator.transform.localPosition = brotherPinkBothTarget.localPosition; brotherPinkAnimator.transform.localPosition = brotherPinkBothTarget.localPosition;
brotherBlueAnimator.transform.SetLocalScale(1f); brotherBlueAnimator.transform.SetLocalScale(1f);