diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother.controller b/popcorn/Assets/MyGame/Resource/Animation/Brother.controller index 37ba39ca..0d7100f6 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother.controller +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-5014450189308824145 +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: -3568928167266774065} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.875 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-3734040722917284177 AnimatorStateMachine: serializedVersion: 5 @@ -11,12 +33,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -3568928167266774065} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 300, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: 8164371926150459515} - m_Position: {x: 240, y: 70, z: 0} + m_Position: {x: 290, y: 30, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 6442717320784534736} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -59,7 +82,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Brother serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Sell + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -73,6 +102,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &6442717320784534736 +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: Sell + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8164371926150459515} + 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 &8164371926150459515 AnimatorState: serializedVersion: 5 @@ -83,7 +137,8 @@ AnimatorState: m_Name: Brother_blue_sell m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -5014450189308824145} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherBlueView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherBlueView.cs new file mode 100644 index 00000000..cd0561af --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherBlueView.cs @@ -0,0 +1,12 @@ +using UnityEngine; + +public class BrotherBlueView : MonoBehaviour +{ + [SerializeField] private Animator animator; + private static readonly int Sell = Animator.StringToHash("Sell"); + + public void SellAction() + { + animator.SetTrigger(Sell); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherBlueView.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherBlueView.cs.meta new file mode 100644 index 00000000..05515436 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherBlueView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: bd193a44e53642d38087d1bc9e9d4071 +timeCreated: 1629963579 \ No newline at end of file