diff --git a/popcorn/Assets/MyGame/Resource/Animation/Customize_Selection.controller b/popcorn/Assets/MyGame/Resource/Animation/Customize_Selection.controller index 2a130403..a9d5e027 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Customize_Selection.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Customize_Selection.controller @@ -26,6 +26,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-1364378145768127398 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Stay + 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: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -59,7 +85,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -4692104023465534683} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 320, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1364378145768127398} + m_Position: {x: 310, y: 110, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -69,4 +98,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: -4692104023465534683} + m_DefaultState: {fileID: -1364378145768127398} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketView.cs index a0112bf6..4cc2eac7 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketView.cs @@ -14,6 +14,15 @@ namespace MyGame.Scenes.marketing.Scripts [SerializeField] private Transform decoration2Target; [SerializeField] private Transform category6Target; + public void SetHighlight(ShopCustomizeCategory category, bool active) + { + var stateName = active ? "Customize_Selection" : "Stay"; + foreach (var animator in GetTarget(category).GetComponentsInChildren()) + { + animator.Play(stateName); + } + } + public void SetItem(ShopCustomizeData customizeData) { var target = GetTarget(customizeData.Category);