Merge branch 'main' of https://github.com/Metaverse-Crowdsource/DarkFlow

# Conflicts: # DarkFlow/Assets/Characters/2_Erika/Erika.prefab # DarkFlow/Assets/Scenes/Gameplay.unity # DarkFlow/Assets/Scripts/InputSystem/ThirdPersonController.cs
Metaverse-Crowdsource · Dec 26, 2023 · a903dee · a903dee
2 parents f0f10fc + 0b6b3e4
commit a903dee
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/DarkFlow/Assets/Scripts/InputSystem/ThirdPersonController.cs b/DarkFlow/Assets/Scripts/InputSystem/ThirdPersonController.cs
@@ -150,9 +150,15 @@ private void Start()
         {
 
             _cinemachineTargetYaw = CinemachineCameraTarget.transform.rotation.eulerAngles.y;
+
             _hasAnimator = TryGetComponent(out _animator);
             _controller = GetComponent<CharacterController>();
             _input = GetComponent<StarterAssetsInputs>();
+#if ENABLE_INPUT_SYSTEM 
+            _playerInput = GetComponent<PlayerInput>();
+#else
+			Debug.LogError( "Starter Assets package is missing dependencies. Please use Tools/Starter Assets/Reinstall Dependencies to fix it");
+#endif
 
             AssignAnimationIDs();
 
@@ -412,4 +418,4 @@ private void OnLand(AnimationEvent animationEvent)
             }
         }
     }
-}
+}