Commit merge

This commit is contained in:
haitem
2022-01-29 13:51:01 +01:00
52 changed files with 4935 additions and 227 deletions

View File

@@ -33,6 +33,10 @@ public class PlayerController : MonoBehaviour
void Start()
{
rb = GetComponent<Rigidbody>();
}
public void disableCursor()
{
Cursor.lockState = CursorLockMode.Locked;
Cursor.visible = false;
}
@@ -133,9 +137,9 @@ public class PlayerController : MonoBehaviour
|| other.GetContact(0).normal == -other.transform.forward
|| (
other.GetContact(0).normal != -other.transform.up
&& other.GetContact(0).normal != other.transform.up
&& other.GetContact(0).normal != -other.transform.right
&& other.GetContact(0).normal != other.transform.right
&& other.GetContact(0).normal != other.transform.up
&& other.GetContact(0).normal != -other.transform.right
&& other.GetContact(0).normal != other.transform.right
)
)
{
@@ -154,8 +158,9 @@ public class PlayerController : MonoBehaviour
Vector3 gDirection;
PlatformManager platform = other.gameObject.GetComponent<PlatformManager>();
gDirection = -other.GetContact(0).normal;
if (platform == null){
gDirection = -transform.up;
if (platform == null)
{
// FIXME: remove
this.downDirection = -transform.up;
return;

View File

@@ -16,6 +16,8 @@ public class UiController : MonoBehaviour
void Start()
{
startPosition = this.player.transform.position;
Cursor.lockState = CursorLockMode.None;
Cursor.visible = true;
}
// Update is called once per frame
@@ -25,8 +27,14 @@ public class UiController : MonoBehaviour
distance = Vector3.Distance(this.startPosition, this.playerPosition);
if (oldDistance < distance)
{
uiDistance.text = "Score : " + distance.ToString("0");
uiDistance.text = "Distance : " + distance.ToString("0");
oldDistance = distance;
}
}
//MENU
public void exitGame()
{
Application.Quit();
}
}