diff --git a/Assets/Animations/PlayerAnimationController.controller b/Assets/Animations/PlayerAnimationController.controller index 27937cd..226df22 100644 --- a/Assets/Animations/PlayerAnimationController.controller +++ b/Assets/Animations/PlayerAnimationController.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8793749239544201940 +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: Revive + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8582474753685269919} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6875 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-8582474753685269919 AnimatorState: serializedVersion: 6 @@ -80,7 +105,8 @@ AnimatorState: m_Name: Death m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -8793749239544201940} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -105,7 +131,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: bIsDeath + m_ConditionEvent: Die m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -6405359010994864473} @@ -232,8 +258,14 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: bIsDeath - m_Type: 4 + - m_Name: Die + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Revive + m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 diff --git a/Assets/Scripts/NetworkPlayerController.cs b/Assets/Scripts/NetworkPlayerController.cs index 49dcc90..022cb77 100644 --- a/Assets/Scripts/NetworkPlayerController.cs +++ b/Assets/Scripts/NetworkPlayerController.cs @@ -236,6 +236,7 @@ public class NetworkPlayerController : NetworkBehaviour, ITeamMember, IDamageabl transform.rotation = spawnPoint.transform.rotation; } + _animator.SetTrigger("Revive"); Debug.Log($"[Player] {gameObject.name} 리스폰!"); }