From cbcb4ac030413b4b6564adc407a03a1f31e4051f Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 11 Oct 2021 19:22:37 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=B3=A8=E6=96=87=E3=81=AE?= =?UTF-8?q?=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B=E8=A1=A8=E7=A4=BA=E5=BE=8C?= =?UTF-8?q?=E3=80=81=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=81=8C=E5=81=9C=E6=AD=A2=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Animation/Main_phone.controller | 32 +++++++++++++++++++ .../Main/Scripts/BulkOrderIndicatorView.cs | 5 +++ 2 files changed, 37 insertions(+) diff --git a/popcorn/Assets/MyGame/Resource/Animation/Main_phone.controller b/popcorn/Assets/MyGame/Resource/Animation/Main_phone.controller index 17258977..a7872a0a 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Main_phone.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Main_phone.controller @@ -18,6 +18,7 @@ AnimatorStateMachine: m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -2584151045959372554} + - {fileID: 507310708281167923} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -66,6 +67,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: Wait + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -79,6 +86,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &507310708281167923 +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: Wait + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8184852863273017017} + 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 &2349655529364603932 AnimatorState: serializedVersion: 5 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs index f9e24a2a..a7c852ed 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderIndicatorView.cs @@ -12,6 +12,7 @@ public class BulkOrderIndicatorView : MonoBehaviour [SerializeField] private GameObject balloonObject; private static readonly int Ring = Animator.StringToHash("Ring"); + private static readonly int Wait = Animator.StringToHash("Wait"); private static readonly int Speech = Animator.StringToHash("Speech"); public IObservable TappedPhone => button.OnClickAsObservable().TakeUntilDestroy(this); @@ -23,6 +24,10 @@ public class BulkOrderIndicatorView : MonoBehaviour phoneAnimator.SetTrigger(Ring); indicatorAnimator.SetTrigger(Speech); } + else + { + phoneAnimator.SetTrigger(Wait); + } button.interactable = receive || !achieved; titleObject.SetActive(!receive && !achieved); balloonObject.SetActive(receive);