From 3209f343e2ac3c60fcda0c37906e0ebb796bca7e Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 25 Aug 2021 13:53:34 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=8F=E3=83=BC=E3=83=88=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E5=87=A6=E7=90=86=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/Animation/heart.controller | 92 +------------------ .../marketing/Scripts/HeartAnimation.cs | 26 ++++++ .../marketing/Scripts/HeartAnimation.cs.meta | 3 + 3 files changed, 33 insertions(+), 88 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs.meta diff --git a/popcorn/Assets/MyGame/Resource/Animation/heart.controller b/popcorn/Assets/MyGame/Resource/Animation/heart.controller index d9c7781a..fd60627d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/heart.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/heart.controller @@ -1,27 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-917989621425119279 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 7770551281916087710} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -30,13 +8,7 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: heart serializedVersion: 5 - m_AnimatorParameters: - - m_Name: BigHeart - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -60,8 +32,7 @@ AnimatorState: m_Name: heart m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -917989621425119279} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -77,31 +48,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &6818666326688946123 -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: BigHeart - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 224529198616294665} - 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!1107 &7516647177462776758 AnimatorStateMachine: serializedVersion: 5 @@ -114,12 +60,8 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 224529198616294665} m_Position: {x: 270, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: 7770551281916087710} - m_Position: {x: 280, y: 120, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: 6818666326688946123} + m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -127,30 +69,4 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 7770551281916087710} ---- !u!1102 &7770551281916087710 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Wait - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 0} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: + m_DefaultState: {fileID: 224529198616294665} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs new file mode 100644 index 00000000..158693f0 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs @@ -0,0 +1,26 @@ +using UnityEngine; + +public class HeartAnimation : MonoBehaviour +{ + [SerializeField] private GameObject heart; + [SerializeField] private Transform target; + + public void GetHeart() + { + heart.SetActive(true); + this.CallWaitForSeconds(.35f, () => + { + var cacheTransform = heart.transform; + var beginPos = heart.transform.position; + cacheTransform.parent = null; + this.CallLerp(.5f, f => + { + cacheTransform.position = Vector3.Lerp(beginPos, target.position, f.EaseInQuadratic()); + }, () => + { + // 大きいハートアニメーションが再生しきったらハートメーターのレベルが書かれているところに飛んでいき + // 小さいハートのアニメーションが再生しきったら「Header」を消すのと同時にメーターが増える + }); + }); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs.meta new file mode 100644 index 00000000..9c052e79 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/HeartAnimation.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 786931d1da2c4b1c8ce9519c9b3c32fd +timeCreated: 1629863058 \ No newline at end of file