diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f6866cf..0e3785f 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -140,7 +140,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &22208186 RectTransform: m_ObjectHideFlags: 0 @@ -917,7 +917,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &219076562 RectTransform: m_ObjectHideFlags: 0 @@ -5467,6 +5467,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2002200564} m_CullTransparentMesh: 1 +--- !u!1 &2019534694 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2019534696} + - component: {fileID: 2019534695} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2019534695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019534694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7d6a699566d0234aae77a22105ba6b5, type: 3} + m_Name: + m_EditorClassIdentifier: + dialogueController: {fileID: 363264314} +--- !u!4 &2019534696 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2019534694} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2020681401 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 1c6702c..6d3d946 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -4,15 +4,20 @@ using UnityEngine; public class GameManager : MonoBehaviour { - // Start is called before the first frame update - void Start() + public static GameManager Instance; + + public DialogueController dialogueController; + private void Awake() { - + if (Instance == null) + { + Instance = this; + } + else + { + Debug.LogWarning("There can only be one instance of the CharacterManager class"); + } } - // Update is called once per frame - void Update() - { - - } + } diff --git a/Assets/Scripts/Journal.cs b/Assets/Scripts/Journal.cs index 90bf708..997512f 100644 --- a/Assets/Scripts/Journal.cs +++ b/Assets/Scripts/Journal.cs @@ -27,7 +27,12 @@ public class Journal : MonoBehaviour private void OnMouseDown() { - Debug.Log("MOUSE DOWN ON INVENTORY"); + if (GameManager.Instance.dialogueController.DialogueInProgress) + { + Debug.Log("Dialog in progress, not howing journal"); + return; + } + m_availableAdventurers.Clear(); foreach (var character in CharacterManager.Instance.CharacterDatas) {