From 8c7b7c9990b506e384c6b0e29e81f35e7bf5cd5a Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Fri, 6 Aug 2021 14:33:41 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E3=81=AE=E8=83=8C=E6=99=AF=E3=82=A2=E3=83=8B=E3=83=A1?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resource/Animation/background.controller  | 74 +++++++++++++++++--
 .../Scenes/recipe/Scripts/RecipeDetailView.cs | 10 ++-
 2 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/popcorn/Assets/MyGame/Resource/Animation/background.controller b/popcorn/Assets/MyGame/Resource/Animation/background.controller
index e7b4a317..62a4a427 100644
--- a/popcorn/Assets/MyGame/Resource/Animation/background.controller
+++ b/popcorn/Assets/MyGame/Resource/Animation/background.controller
@@ -34,7 +34,19 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: background
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: CloseTrigger
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: OpenTrigger
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -59,16 +71,18 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 4195247245938458414}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 250, y: 50, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -547162755097718829}
-    m_Position: {x: 235, y: 65, z: 0}
+    m_Position: {x: 250, y: -30, z: 0}
   m_ChildStateMachines: []
-  m_AnyStateTransitions: []
+  m_AnyStateTransitions:
+  - {fileID: 4488732903850140810}
+  - {fileID: 8164900940917987307}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_AnyStatePosition: {x: 70, y: -200, z: 0}
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
@@ -99,3 +113,53 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &4488732903850140810
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: CloseTrigger
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -547162755097718829}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &8164900940917987307
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: OpenTrigger
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4195247245938458414}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
index 4c6f29cb..6f2df912 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
@@ -6,7 +6,11 @@ using UnityEngine.UI;
 public class RecipeDetailView : MonoBehaviour
 {
     public static readonly string DetailRecipeTag = "RecipeData";
+    private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger");
+    private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger");
     
+
+    [SerializeField] private Animator backgroundAnimator;
     [SerializeField] private Button cancelButton;
     [SerializeField] private Button nextButton;
     [SerializeField] private Text flavorName;
@@ -23,7 +27,11 @@ public class RecipeDetailView : MonoBehaviour
     {
         cancelButton.OnClickAsObservable().Subscribe(_ =>
         {
-            TransitionManager.Instance.UnloadScene(GameScenes.RecipeChoice);
+            backgroundAnimator.SetTrigger(CloseTrigger);
+            this.CallWaitForSeconds(.25f, () =>
+            {
+                TransitionManager.Instance.UnloadScene(GameScenes.RecipeChoice);
+            });
         }).AddTo(this);
         nextButton.OnClickAsObservable().Subscribe(_ =>
         {