Merge branch 'feat/animations-through-eventsystem' into 'main'

Add playerevents and playermanager

See merge request alsunj/loputoo!4

Assets/_Game/Code/Managers.meta

+fileFormatVersion: 2
+guid: 23fcdd66d3df00742b5f0d64d933c372
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Code/Managers/PlayerAnimatorEventManager.cs

+using UnityEngine;
+
+public class PlayerAnimatorEventManager : MonoBehaviour
+{
+}
\ No newline at end of file

Assets/_Game/Code/Managers/PlayerAnimatorEventManager.cs.meta

+fileFormatVersion: 2
+guid: 07e9d1c54bd8feb41954ed530671ed66
\ No newline at end of file

Assets/_Game/Code/Managers/PlayerEvents.cs

+using System;
+
+public class PlayerEvents
+{
+    public event Action<bool> onPlayerWalk;
+    public event Action<bool> onPlayerRun;
+    public event Action onPlayerInteract;
+
+
+    public void PlayerWalk(bool state)
+    {
+        if (onPlayerWalk != null)
+        {
+            onPlayerWalk(state);
+        }
+    }
+
+    public void PlayerRun(bool state)
+    {
+        if (onPlayerRun != null)
+        {
+            onPlayerRun(state);
+        }
+    }
+
+    public void PlayerInteract()
+    {
+        if (onPlayerInteract != null)
+        {
+            onPlayerInteract();
+        }
+    }
+}
\ No newline at end of file

Assets/_Game/Code/Managers/PlayerEvents.cs.meta

+fileFormatVersion: 2
+guid: 7a3211199332d574ca6a12ab22db19f0
\ No newline at end of file

Assets/_Game/Code/Managers/PlayerManager.cs

+using UnityEngine;
+
+public class PlayerManager : MonoBehaviour
+{
+    public PlayerEvents playerEvents;
+
+    public void Initialize()
+    {
+        playerEvents = new PlayerEvents();
+    }
+}
\ No newline at end of file

Assets/_Game/Code/Managers/PlayerManager.cs.meta

+fileFormatVersion: 2
+guid: c5e28a848c1e15846a459b682cc64164
\ No newline at end of file

Assets/_Game/Code/Player/PlayerAnimator.cs

@@ -5,7 +5,10 @@ using UnityEngine;
 public class PlayerAnimator : NetworkBehaviour
 {
     private const string IS_WALKING = "IsWalking";
-    [SerializeField] private PlayerController _playerController;
+    private const string IS_RUNNING = "IsRunning";
+    private const string IS_INTERACTING = "Interact";
+
+    private PlayerEvents _playerEvents;
     private Animator _animator;
 
     private void Awake()
@@ -13,13 +16,48 @@ public class PlayerAnimator : NetworkBehaviour
         _animator = GetComponentInChildren<Animator>();
     }
 
+
+    private void OnDisable()
+    {
+        if (_playerEvents != null)
+        {
+            _playerEvents.onPlayerWalk -= SetPlayerWalkBool;
+            _playerEvents.onPlayerRun -= SetPlayerRunBool;
+            _playerEvents.onPlayerInteract -= SetPlayerInteract;
+        }
+    }
+
+    public void InitializeEvents(PlayerEvents playerEvents)
+    {
+        this._playerEvents = playerEvents;
+        if (_playerEvents != null)
+        {
+            _playerEvents.onPlayerWalk += SetPlayerWalkBool;
+            _playerEvents.onPlayerRun += SetPlayerRunBool;
+            _playerEvents.onPlayerInteract += SetPlayerInteract;
+        }
+    }
+
     private void Update()
     {
-        // if (!IsOwner)
-        // {
-        //     return;
-        // }
+        if (!IsOwner)
+        {
+            return;
+        }
+    }
 
-        _animator.SetBool(IS_WALKING, _playerController.IsWalking());
+    private void SetPlayerRunBool(bool obj)
+    {
+        _animator.SetBool(IS_RUNNING, obj);
+    }
+
+    private void SetPlayerWalkBool(bool obj)
+    {
+        _animator.SetBool(IS_WALKING, obj);
+    }
+
+    private void SetPlayerInteract()
+    {
+        _animator.SetTrigger(IS_INTERACTING);
     }
 }
\ No newline at end of file

Assets/_Game/Code/Player/PlayerController.cs

@@ -8,12 +8,14 @@ public class PlayerController : NetworkBehaviour
     [SerializeField] private PlayerInteractionSettings playerInteractionSettings;
     [SerializeField] private float speed = 2f;
     [SerializeField] private InputReader _inputReader;
+
+    private PlayerManager _playerManager;
+    private PlayerAnimator _playerAnimator;
     private Rigidbody _rb;
-    [SerializeField] private Camera _camera;
+    private Camera _camera;
 
     public Vector3 offset = new Vector3(0, 7.4f, -6.4f);
-
-    //camera public Vector3 eulerAngles = new Vector3(40.45f, 0, 0);
+    public Vector3 cameraAngle = new Vector3(40.45f, 0, 0);
     private Vector2 _movementInput;
     public float fov = 60;
 
@@ -74,10 +76,47 @@ public class PlayerController : NetworkBehaviour
 
     private void Start()
     {
-        _camera = GetComponentInChildren<Camera>();
+        _sprintRemaining = sprintDuration;
+        _playerManager = GetComponent<PlayerManager>();
+
+        if (_playerManager == null)
+        {
+            Debug.LogError("PlayerManager is null");
+        }
+        else
+        {
+            _playerManager.Initialize();
+        }
+
+        _playerAnimator = GetComponentInChildren<PlayerAnimator>();
+
+        if (_playerAnimator == null)
+        {
+            Debug.LogError("PlayerAnimator is null");
+        }
+        else
+        {
+            _playerAnimator.InitializeEvents(_playerManager.playerEvents);
+        }
+
+
+        _camera = FindFirstObjectByType<Camera>();
+        if (_camera == null)
+        {
+            Debug.LogError("Camera is null");
+        }
+        else
+        {
+            _camera.transform.rotation = Quaternion.Euler(40.45f, 0, 0);
+        }
+
+
         _inputReader.InitializeInput();
         _rb = GetComponent<Rigidbody>();
-        _rb.isKinematic = false; // Ensure isKinematic is false
+        if (_rb == null)
+        {
+            Debug.LogError("Rigidbody is null");
+        }
     }
 
     private void OnSprint(bool state)
@@ -92,6 +131,11 @@ public class PlayerController : NetworkBehaviour
 
     private void Update()
     {
+        if (!IsOwner)
+        {
+            return;
+        }
+
         if (enableSprint)
         {
             if (_isSprinting && !_isSprintCooldown)
@@ -153,12 +197,20 @@ public class PlayerController : NetworkBehaviour
 
     private void FixedUpdate()
     {
+        if (!IsOwner)
+        {
+            return;
+        }
+
         #region Movement
 
         if (playerCanMove)
         {
             // Use the input from _movementInput to determine movement
-            Vector3 targetVelocity = new Vector3(_movementInput.x, 0, _movementInput.y);
+            //Vector3 targetVelocity = new Vector3(_movementInput.x, 0, _movementInput.y);
+            //the line below doesn't let the player move backwards
+            Vector3 targetVelocity = new Vector3(_movementInput.x, 0, Mathf.Max(0, _movementInput.y));
+            targetVelocity = transform.TransformDirection(targetVelocity);
 
             // Checks if player is walking and is grounded
             if (targetVelocity.x != 0 || targetVelocity.z != 0)
@@ -187,31 +239,21 @@ public class PlayerController : NetworkBehaviour
                 _isWalking = false;
             }
 
+
             // All movement calculations while sprint is active
             if (enableSprint && _isSprinting && _sprintRemaining > 0f && !_isSprintCooldown)
             {
-                targetVelocity = transform.TransformDirection(targetVelocity) * sprintSpeed;
-
-                Vector3 velocity = _rb.linearVelocity;
-                Vector3 velocityChange = (targetVelocity - velocity);
-                velocityChange.x = Mathf.Clamp(velocityChange.x, -maxVelocityChange, maxVelocityChange);
-                velocityChange.z = Mathf.Clamp(velocityChange.z, -maxVelocityChange, maxVelocityChange);
-                velocityChange.y = 0;
-
-                if (velocityChange.x != 0 || velocityChange.z != 0)
-                {
-                    _isSprinting = true;
-                }
-
-                _rb.AddForce(velocityChange, ForceMode.VelocityChange);
+                targetVelocity *= sprintSpeed;
             }
-            // All movement calculations while walking
             else
             {
-                _isSprinting = false;
+                targetVelocity *= walkSpeed;
+            }
+
+            _playerManager.playerEvents.PlayerRun(_isSprinting);
+            _playerManager.playerEvents.PlayerWalk(_isWalking);
 
 
-                targetVelocity = transform.TransformDirection(targetVelocity) * walkSpeed;
             Vector3 velocity = _rb.linearVelocity;
             Vector3 velocityChange = (targetVelocity - velocity);
             velocityChange.x = Mathf.Clamp(velocityChange.x, -maxVelocityChange, maxVelocityChange);
@@ -219,12 +261,11 @@ public class PlayerController : NetworkBehaviour
             velocityChange.y = 0;
 
             _rb.AddForce(velocityChange, ForceMode.VelocityChange);
-            }
-
+            // this check doesn't rotate player if he's not moving 
             if (targetVelocity != Vector3.zero)
             {
                 Quaternion targetRotation = Quaternion.LookRotation(targetVelocity);
-                transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, speed * Time.fixedDeltaTime);
+                transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, 0.1f);
             }
         }
 
@@ -242,8 +283,7 @@ public class PlayerController : NetworkBehaviour
 
     private void UpdateCamera()
     {
-        _camera.transform.localPosition = offset;
-        _camera.transform.localRotation = Quaternion.Euler(40.45f, 0, 0);
+        _camera.transform.position = offset + gameObject.transform.position;
     }
 
     private void CheckForInteractableCollision()
@@ -256,7 +296,9 @@ public class PlayerController : NetworkBehaviour
             switch (hitCollider.GetComponent<IInteractable>())
             {
                 case Chest chest:
+                    _playerManager.playerEvents.PlayerInteract();
                     chest.Interact();
+
                     break;
             }
         }

Assets/_Game/Prefabs/Player/Animations/PlayerAnimation.controller

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8598755992833856667
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsRunning
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5824969481171216955}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.6875
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-7829200255183543722
+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: Interact
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1994921182856151451}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.765625
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &-6917854663193515141
 AnimatorState:
   serializedVersion: 6
@@ -12,6 +62,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 2561986876081676319}
+  - {fileID: -7829200255183543722}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -38,10 +89,16 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -6917854663193515141}
-    m_Position: {x: 40, y: 120, z: 0}
+    m_Position: {x: 40, y: 110, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 5824969481171216955}
-    m_Position: {x: 310, y: 120, z: 0}
+    m_Position: {x: 320, y: 120, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1994921182856151451}
+    m_Position: {x: -260, y: 240, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1041689816694880610}
+    m_Position: {x: 310, y: 220, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -49,9 +106,34 @@ AnimatorStateMachine:
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: 30, y: -160, z: 0}
   m_EntryPosition: {x: 50, y: -20, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ExitPosition: {x: 1020, y: -20, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -6917854663193515141}
+--- !u!1101 &-317027022489812209
+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: IsRunning
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1041689816694880610}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.84375
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -67,6 +149,18 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 9100000}
+  - m_Name: IsRunning
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
+  - m_Name: Interact
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -80,6 +174,33 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1102 &1041689816694880610
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Running_B
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -8598755992833856667}
+  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: -1640158340307531623, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &1650228226128826245
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -105,6 +226,32 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &1994921182856151451
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Interact
+  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: 1701519168366769839, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &2561986876081676319
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -142,6 +289,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1650228226128826245}
+  - {fileID: -317027022489812209}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

Assets/_Game/Prefabs/Player/Player.prefab

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2384773562426129059
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8461244633268646950}
-  - component: {fileID: 8179956988822885627}
-  - component: {fileID: 5922330782451965788}
-  - component: {fileID: 6622998177254555274}
-  m_Layer: 0
-  m_Name: Main Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8461244633268646950
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2384773562426129059}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.34570765, y: 0, z: 0, w: 0.93834233}
-  m_LocalPosition: {x: 0.07, y: 7.4, z: -6.38}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2637631208202168134}
-  m_LocalEulerAnglesHint: {x: 40.45, y: 0, z: 0}
---- !u!20 &8179956988822885627
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2384773562426129059}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 75
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: -1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!81 &5922330782451965788
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2384773562426129059}
-  m_Enabled: 1
---- !u!114 &6622998177254555274
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2384773562426129059}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 1
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_AllowHDROutput: 1
-  m_UseScreenCoordOverride: 0
-  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
-  m_TaaSettings:
-    m_Quality: 3
-    m_FrameInfluence: 0.1
-    m_JitterScale: 1
-    m_MipBias: 0
-    m_VarianceClampScale: 0.9
-    m_ContrastAdaptiveSharpening: 0
 --- !u!1 &3702991396873574320
 GameObject:
   m_ObjectHideFlags: 0
@@ -273,6 +136,7 @@ GameObject:
   - component: {fileID: 1490898689994747714}
   - component: {fileID: 5977278119335250016}
   - component: {fileID: -5431455483652452085}
+  - component: {fileID: 6323309021802201727}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -293,7 +157,6 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8461244633268646950}
   - {fileID: 5412238459298192479}
   - {fileID: 6791121256323726822}
   m_Father: {fileID: 0}
@@ -363,10 +226,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ShowTopMostFoldoutHeaderGroup: 1
-  _playerInteractionSettings: {fileID: 11400000, guid: 1bc75bcaab451a44d8a71f0189dc90f8, type: 2}
-  _speed: 4
+  playerInteractionSettings: {fileID: 11400000, guid: 1bc75bcaab451a44d8a71f0189dc90f8, type: 2}
+  speed: 2
+  _inputReader: {fileID: 11400000, guid: fae963ae99ce6d14d8bbcd54becb58d7, type: 2}
   offset: {x: 0, y: 7.4, z: -6.4}
-  eulerAngles: {x: 40.45, y: 0, z: 0}
+  cameraAngle: {x: 40.45, y: 0, z: 0}
+  fov: 60
+  enableSprint: 1
+  unlimitedSprint: 0
+  sprintSpeed: 12
+  sprintDuration: 5
+  sprintCooldown: 0.5
+  sprintFOV: 80
+  sprintFOVStepTime: 10
+  zoomStepTime: 5
+  playerCanMove: 1
+  walkSpeed: 9
+  _isWalking: 0
+  maxVelocityChange: 10
 --- !u!136 &1490898689994747714
 CapsuleCollider:
   m_ObjectHideFlags: 0
@@ -443,6 +320,18 @@ MonoBehaviour:
   UseRigidBodyForMotion: 0
   AutoUpdateKinematicState: 1
   AutoSetKinematicOnDespawn: 1
+--- !u!114 &6323309021802201727
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7039287367920326276}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5e28a848c1e15846a459b682cc64164, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &9074470363064250575
 GameObject:
   m_ObjectHideFlags: 0
@@ -586,7 +475,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ShowTopMostFoldoutHeaderGroup: 1
-  _playerController: {fileID: 4346266333506682639}
 --- !u!114 &3606536086790041357
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -600,5 +488,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ShowTopMostFoldoutHeaderGroup: 1
-  TransitionStateInfoList: []
+  TransitionStateInfoList:
+  - IsCrossFadeExit: 0
+    Layer: 0
+    OriginatingState: 2081823275
+    DestinationState: -662453572
+    TransitionDuration: 0.25
+    TriggerNameHash: -662453572
+    TransitionIndex: 1
   m_Animator: {fileID: 6949535474896224677}

Assets/_Game/Prefabs/Player/Skeleton_Minion.fbx.meta

@@ -1608,7 +1608,7 @@ ModelImporter:
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 0
+      loopTime: 1
       loopBlend: 0
       loopBlendOrientation: 0
       loopBlendPositionY: 0

Assets/_Game/Scenes/SC.unity

@@ -219,15 +219,19 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 1294522714}
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: ceca936363ca6f446a07531901199ca9, type: 3}
       propertyPath: m_LocalScale.x
-      value: 5
+      value: 9.47
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ceca936363ca6f446a07531901199ca9, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.894
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ceca936363ca6f446a07531901199ca9, type: 3}
       propertyPath: m_LocalScale.z
-      value: 5
+      value: 9.47
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ceca936363ca6f446a07531901199ca9, type: 3}
       propertyPath: m_LocalPosition.x
@@ -235,7 +239,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ceca936363ca6f446a07531901199ca9, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.77
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ceca936363ca6f446a07531901199ca9, type: 3}
       propertyPath: m_LocalPosition.z
@@ -271,7 +275,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ceca936363ca6f446a07531901199ca9, type: 3}
       propertyPath: m_ConstrainProportionsScale
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: ceca936363ca6f446a07531901199ca9, type: 3}
       propertyPath: m_Name
@@ -285,6 +289,11 @@ PrefabInstance:
       insertIndex: -1
       addedObject: {fileID: 1862223210}
   m_SourcePrefab: {fileID: 100100000, guid: ceca936363ca6f446a07531901199ca9, type: 3}
+--- !u!4 &98077556 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ceca936363ca6f446a07531901199ca9, type: 3}
+  m_PrefabInstance: {fileID: 98077555}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &199878365
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -360,7 +369,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &303522003
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1104,102 +1113,10 @@ Transform:
   m_LocalPosition: {x: 0, y: -0.77, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
+  m_Children:
+  - {fileID: 98077556}
+  m_Father: {fileID: 1591624653}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1302162792
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0.31110024
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.71455526
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0.017542608
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2637631208202168134, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3519263382209774307, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: GlobalObjectIdHash
-      value: 1048055298
-      objectReference: {fileID: 0}
-    - target: {fileID: 3702991396873574320, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: fov
-      value: 74.36
-      objectReference: {fileID: 0}
-    - target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: speed
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: walkSpeed
-      value: 10.14
-      objectReference: {fileID: 0}
-    - target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: _inputReader
-      value: 
-      objectReference: {fileID: 11400000, guid: fae963ae99ce6d14d8bbcd54becb58d7, type: 2}
-    - target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: unlimitedSprint
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4346266333506682639, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: playerInteractionSettings
-      value: 
-      objectReference: {fileID: 11400000, guid: 1bc75bcaab451a44d8a71f0189dc90f8, type: 2}
-    - target: {fileID: 7039287367920326276, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_Name
-      value: Player
-      objectReference: {fileID: 0}
-    - target: {fileID: 7039287367920326276, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
 --- !u!1 &1504492729
 GameObject:
   m_ObjectHideFlags: 0
@@ -1356,7 +1273,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1294522714}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1623128583
@@ -1408,7 +1326,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &1687222683
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1678,7 +1596,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &1909091470
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1730,7 +1648,7 @@ AudioListener:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1909091469}
-  m_Enabled: 1
+  m_Enabled: 0
 --- !u!20 &1909091472
 Camera:
   m_ObjectHideFlags: 0
@@ -1805,10 +1723,7 @@ SceneRoots:
   - {fileID: 796216487}
   - {fileID: 1909091473}
   - {fileID: 1591624653}
-  - {fileID: 1294522714}
-  - {fileID: 98077555}
   - {fileID: 1623128584}
   - {fileID: 1687222685}
   - {fileID: 303522006}
   - {fileID: 865924118}
-  - {fileID: 1302162792}

Assets/_Game/conf/PlayerInteractionSettings.asset

@@ -15,4 +15,4 @@ MonoBehaviour:
   interactableLayer:
     serializedVersion: 2
     m_Bits: 64
-  interactableRadius: 0.5
+  interactableRadius: 2