From 39fcb45dfcca4eb89788f86cf8b553d94be946f4 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Wed, 27 Oct 2021 16:45:49 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=81=E3=83=A5=E3=83=BC=E3=83=88=E3=83=AA?=
 =?UTF-8?q?=E3=82=A2=E3=83=AB=E3=83=9E=E3=82=B9=E3=82=AF=E3=81=AE=E7=9F=A2?=
 =?UTF-8?q?=E5=8D=B0=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Prefabs/TutorialObjectMask.prefab  |  8 +++-
 .../Animation/tutorial_Arrow.controller       | 38 +++++++++++++++++--
 .../MyGame/Scripts/TutorialObjectMask.cs      |  6 ++-
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/popcorn/Assets/MyGame/Prefabs/TutorialObjectMask.prefab b/popcorn/Assets/MyGame/Prefabs/TutorialObjectMask.prefab
index e4f7451c..c809443a 100644
--- a/popcorn/Assets/MyGame/Prefabs/TutorialObjectMask.prefab
+++ b/popcorn/Assets/MyGame/Prefabs/TutorialObjectMask.prefab
@@ -178,7 +178,7 @@ MonoBehaviour:
   unmask: {fileID: 4293843007976718248}
   unmaskArrow: {fileID: 5618796564699367770}
   unMaskImage: {fileID: 4293843007976718250}
-  arrowObject: {fileID: 0}
+  arrowAnimator: {fileID: 7626766843417898212}
 --- !u!223 &1057350325820014940
 Canvas:
   m_ObjectHideFlags: 0
@@ -532,3 +532,9 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 50163713045853166}
   m_PrefabAsset: {fileID: 0}
+--- !u!95 &7626766843417898212 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 7594634301536263946, guid: 4c15a47e1d920844fad7ca50f3885536,
+    type: 3}
+  m_PrefabInstance: {fileID: 50163713045853166}
+  m_PrefabAsset: {fileID: 0}
diff --git a/popcorn/Assets/MyGame/Resource/Animation/tutorial_Arrow.controller b/popcorn/Assets/MyGame/Resource/Animation/tutorial_Arrow.controller
index bb78c22d..78ca883a 100644
--- a/popcorn/Assets/MyGame/Resource/Animation/tutorial_Arrow.controller
+++ b/popcorn/Assets/MyGame/Resource/Animation/tutorial_Arrow.controller
@@ -11,12 +11,13 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -866435875316243364}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 290, y: 0, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 550545425516687585}
     m_Position: {x: 235, y: 65, z: 0}
   m_ChildStateMachines: []
-  m_AnyStateTransitions: []
+  m_AnyStateTransitions:
+  - {fileID: -1956972143789331074}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
@@ -25,6 +26,31 @@ AnimatorStateMachine:
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -866435875316243364}
+--- !u!1101 &-1956972143789331074
+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: Under
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 550545425516687585}
+  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!1102 &-866435875316243364
 AnimatorState:
   serializedVersion: 5
@@ -59,7 +85,13 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: tutorial_Arrow
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: Under
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
diff --git a/popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs b/popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs
index 5864209f..0cf43dad 100644
--- a/popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs
+++ b/popcorn/Assets/MyGame/Scripts/TutorialObjectMask.cs
@@ -9,6 +9,8 @@ namespace MyGame.Scripts
         [SerializeField] private Unmask unmask;
         [SerializeField] private Unmask unmaskArrow;
         [SerializeField] private Image unMaskImage;
+        [SerializeField] private Animator arrowAnimator;
+        private static readonly int Under = Animator.StringToHash("Under");
 
         public void SetTarget(RectTransform rectTransform)
         {
@@ -32,7 +34,7 @@ namespace MyGame.Scripts
             rt.rotation = target.rotation;
             if (isFlip)
             {
-                rt.rotation = Quaternion.Euler(Vector3.forward * 180);
+                arrowAnimator.SetTrigger(Under);
             }
 
             // var s1 = target.lossyScale;
@@ -54,7 +56,7 @@ namespace MyGame.Scripts
             rt.rotation = target.rotation;
             if (isFlip)
             {
-                rt.rotation = Quaternion.Euler(Vector3.forward * 180);
+                arrowAnimator.SetTrigger(Under);
             }
 
             var s1 = target.lossyScale;