Merge systems #5

Closed
JanGross wants to merge 13 commits from managers into master
4 changed files with 2088 additions and 6 deletions
Showing only changes of commit fab8aa77d7 - Show all commits

File diff suppressed because it is too large Load Diff

View File

@@ -8,6 +8,7 @@ public class PlayerController : MonoBehaviour
public Camera playerCam;
public float xLimit = 45;
public float yLimit = 25;
public bool cameraMovement = true;
// Start is called before the first frame update
void Start()
{
@@ -16,6 +17,8 @@ public class PlayerController : MonoBehaviour
// Update is called once per frame
void Update()
{
if (cameraMovement)
{
float mouseX = 2 * (Input.mousePosition.x / playerCam.pixelWidth) - 1;
float mouseY = -(2 * (Input.mousePosition.y / playerCam.pixelHeight) - 1);
@@ -24,3 +27,4 @@ public class PlayerController : MonoBehaviour
playerCam.transform.rotation = rotation;
}
}
}

View File

@@ -0,0 +1,35 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class QuestLogInteractable : MonoBehaviour
{
public GameObject journal;
public PlayerController playerController;
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
private void OnMouseDown()
{
Debug.Log("MOUSE DOWN ON INVENTORY");
journal.SetActive(true);
playerController.cameraMovement = false;
}
public void CloseJournal()
{
Cursor.lockState = CursorLockMode.Locked;
journal.SetActive(false);
playerController.cameraMovement = true;
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c0493f659bb4e67428b686920758641b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: