From cef5e20697fe3e89d6e77e2195ed0ac796656094 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Fri, 15 Dec 2023 19:40:11 +0000
Subject: [PATCH] Added UI and health display
---
Assets/Scripts/PlayerController.cs | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 16 deletions(-)
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index dea097f..4bf68d8 100644
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -1,3 +1,4 @@
+using System;
using System.ComponentModel.Design;
using UnityEngine;
using UnityEngine.InputSystem;
@@ -9,25 +10,66 @@
public float maxFallSpeed = -20f;
Vector2 moveInput;
- public bool IsMoving { get; private set; }
-
Rigidbody2D rb;
+ Animator animator;
+ Animator animator_rotor;
+ public GameObject rotorGO;
+ TouchingDirections touchingDirections;
+
+ [SerializeField]
+ private bool _isMoving;
+ public bool IsMoving
+ {
+ get { return _isMoving; }
+ private set
+ {
+ _isMoving = value;
+ animator.SetBool(AnimationStrings.Player.isMoving, value);
+ }
+ }
+
+ [SerializeField]
+ private bool _isFlying;
+ public bool IsFlying
+ {
+ get { return _isFlying; }
+ private set
+ {
+ _isFlying = value;
+ animator.SetBool(AnimationStrings.Player.isFlying, value);
+ animator_rotor.SetBool(AnimationStrings.Player.isFlying, value);
+ }
+ }
+
+ private bool _isFacingRight = true;
+
+ public bool IsFacingRight
+ {
+ get { return _isFacingRight; }
+ set
+ {
+ if (_isFacingRight != value)
+ {
+ transform.localScale *= new Vector2(-1, 1);
+ }
+ _isFacingRight = value;
+ }
+ }
+
+ public bool CanMove { get
+ {
+ return animator.GetBool(AnimationStrings.canMove);
+ }
+ }
+
+
private void Awake()
{
rb = GetComponent<Rigidbody2D>();
- }
-
- // Start is called before the first frame update
- void Start()
- {
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
+ animator = GetComponent<Animator>();
+ animator_rotor = rotorGO.GetComponent<Animator>();
+ touchingDirections = GetComponent<TouchingDirections>();
}
private void FixedUpdate()
@@ -62,9 +104,46 @@
public void OnMove(InputAction.CallbackContext context)
{
- moveInput = context.ReadValue<Vector2>();
+ if (CanMove)
+ {
+ moveInput = context.ReadValue<Vector2>();
- IsMoving = moveInput != Vector2.zero;
+ IsMoving = moveInput.x != 0;
+ IsFlying = (moveInput.y != 0);
+
+ SetFacingDirection(moveInput);
+ }
+ else
+ {
+ IsMoving = false;
+ IsFlying = false;
+ moveInput = Vector2.zero;
+ }
}
+
+ private void SetFacingDirection(Vector2 moveInput)
+ {
+ if (moveInput.x > 0 && !IsFacingRight)
+ {
+ IsFacingRight = true;
+ }
+ else if (moveInput.x < 0 && IsFacingRight)
+ {
+ IsFacingRight = false;
+ }
+ }
+
+ //public void OnRun(InputAction.CallbackContext context)
+ //{
+ // if (context.started) // Button pressed
+ // {
+ // _isRunning = true;
+ // }
+ // else if (context.canceled) // Button released
+ // {
+ // _isRunning = false;
+ // }
+
+ //}
}
--
Gitblit v1.9.3