Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added font, updated ui, fixed some code

Browse Source
This commit is contained in:
TAASONI3
2023-12-13 12:49:38 +01:00
parent 10ad860d3e
commit 17a0a22dd4
65 changed files with 1697 additions and 5019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Scripts/Controls.cs
View File

@@ -5,6 +5,7 @@ using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.InputSystem;
using UnityEngine.UI;
using Assets.Scripts.Player;
public class Controls : MonoBehaviour
{
@@ -61,7 +62,7 @@ public class Controls : MonoBehaviour
if(uihandler.state != UIState.GAME && playerInput.currentActionMap.name != "Menu"){
playerInput.SwitchCurrentActionMap("Menu");
}
if (!player.GetComponent<Player>().takeDamage(0))
if (!player.GetComponent<PlayerGameObject>().takeDamage(0))
{
if (!uihandler.isPlayerInFight())
{
@@ -73,13 +74,13 @@ public class Controls : MonoBehaviour
}
public void FixedUpdate(){
if (!player.GetComponent<Player>().takeDamage(0))
if (!player.GetComponent<PlayerGameObject>().takeDamage(0))
{
if (!uihandler.isPlayerInFight())
{
if (uihandler.canPlayerMove())
{
player.GetComponent<Player>().move(input);
player.GetComponent<PlayerGameObject>().move(input);
}
}
}
@@ -163,10 +164,6 @@ public class Controls : MonoBehaviour
}
}
public void OnCharsheet(){
uihandler.switchCharactersheet();
}
public void OnInventory(){
uihandler.switchInventory();
}