diff --git a/SSLR/Assets/Scripts/MenuButtons.cs b/SSLR/Assets/Scripts/MenuButtons.cs index 9695c6e..02b960c 100644 --- a/SSLR/Assets/Scripts/MenuButtons.cs +++ b/SSLR/Assets/Scripts/MenuButtons.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using Supabase.Gotrue; using UnityEngine; using TMPro; @@ -24,4 +25,14 @@ public class MenuButtons : MonoBehaviour Backend.instance.SignIn(loginEmailInput.text, loginPasswordInput.text); } + /// + /// Loads user profile from Supabase + /// + public void LoadProfileData() + { + /*Backend.instance.GetData(Session.User.Id);*/ + + + } + } diff --git a/SSLR/Assets/Scripts/NPCMovementRework.cs b/SSLR/Assets/Scripts/NPCMovementRework.cs index 43e9115..db2d00a 100644 --- a/SSLR/Assets/Scripts/NPCMovementRework.cs +++ b/SSLR/Assets/Scripts/NPCMovementRework.cs @@ -27,6 +27,7 @@ public class NpcMovementRework : MonoBehaviour if (agent.velocity.magnitude > 0.1) { animator.SetFloat(Speed, 1); + animator.SetBool(IsSitting, false); } else { @@ -70,11 +71,17 @@ public class NpcMovementRework : MonoBehaviour public IEnumerator SitDown() { - var i = Random.Range(0, NpcManager.instance.chairPositions.Length); - var pos = NpcManager.instance.chairPositions[i]; + var i = Random.Range(0, NpcManager.instance.Seats.Count); + var seat = NpcManager.instance.Seats[i]; + while (!seat.Available) + { + i = Random.Range(0, NpcManager.instance.Seats.Count); + seat = NpcManager.instance.Seats[i]; + + } + - - var sittingPosition = pos.transform.position; + var sittingPosition = seat.SeatObject.transform.position; sittingPosition.y = 0; agent.SetDestination(sittingPosition); @@ -86,7 +93,7 @@ public class NpcMovementRework : MonoBehaviour { agent.SetDestination(gameObject.transform.position); animator.SetBool(IsSitting, true); - gameObject.transform.rotation = pos.transform.rotation; + gameObject.transform.rotation = seat.SeatObject.transform.rotation; break; } yield return 0;