scene transition fixes

Assets/Scenes/SampleScene.unity

@@ -1703,7 +1703,7 @@ GameObject:
   - component: {fileID: 343477994}
   m_Layer: 5
   m_Name: NameTextBox
-  m_TagString: Untagged
+  m_TagString: DialogNameText
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2035,7 +2035,7 @@ GameObject:
   - component: {fileID: 434479293}
   m_Layer: 5
   m_Name: ItemNameBox
-  m_TagString: Untagged
+  m_TagString: DialogItemText
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4216,7 +4216,7 @@ GameObject:
   - component: {fileID: 1047025328}
   - component: {fileID: 1047025330}
   - component: {fileID: 1047025329}
-  m_Layer: 5
+  m_Layer: 0
   m_Name: BlackScreen
   m_TagString: BlackScreen
   m_Icon: {fileID: 0}
@@ -4256,7 +4256,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 0}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -4870,7 +4870,7 @@ GameObject:
   - component: {fileID: 1187986794}
   m_Layer: 0
   m_Name: Dialogue
-  m_TagString: Untagged
+  m_TagString: DialogContainer
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5660,11 +5660,11 @@ GameObject:
   - component: {fileID: 1475998730}
   m_Layer: 5
   m_Name: PickupText
-  m_TagString: Untagged
+  m_TagString: ItemPickupText
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1475998729
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5704,7 +5704,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Press "E" to pick up
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -7585,7 +7585,7 @@ GameObject:
   - component: {fileID: 2063514703}
   m_Layer: 5
   m_Name: DialogTextBox
-  m_TagString: Untagged
+  m_TagString: DialogMessageText
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

Assets/Scenes/TestScene2.unity

@@ -903,7 +903,7 @@ GameObject:
   - component: {fileID: 343477994}
   m_Layer: 5
   m_Name: NameTextBox
-  m_TagString: Untagged
+  m_TagString: DialogNameText
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1235,7 +1235,7 @@ GameObject:
   - component: {fileID: 434479293}
   m_Layer: 5
   m_Name: ItemNameBox
-  m_TagString: Untagged
+  m_TagString: DialogItemText
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2684,6 +2684,114 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 902781401}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &954594189
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 954594194}
+  - component: {fileID: 954594193}
+  - component: {fileID: 954594192}
+  - component: {fileID: 954594191}
+  - component: {fileID: 954594190}
+  m_Layer: 0
+  m_Name: GameManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &954594190
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 954594189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 40e5d5183cb59cf4d8603dca70c1a9b5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Inventory
+  itemSlots:
+  - quantity: 0
+    item: 0
+  - quantity: 0
+    item: 0
+  - quantity: 0
+    item: 0
+  - quantity: 0
+    item: 0
+  - quantity: 0
+    item: 0
+  - quantity: 0
+    item: 0
+  - quantity: 0
+    item: 0
+  - quantity: 0
+    item: 0
+  ownedBackpackType: 0
+--- !u!114 &954594191
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 954594189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cf9658f7202522245b3ac80235b98b50, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CompletedQuests: 
+  ActiveQuests: 
+--- !u!114 &954594192
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 954594189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9741c059777b7a74681122aa761e2dee, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  nameText: {fileID: 0}
+  dialogueText: {fileID: 0}
+  itemText: {fileID: 0}
+  pickupHint: {fileID: 0}
+  animator: {fileID: 0}
+--- !u!114 &954594193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 954594189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 65dc1a5d5b17b874087eb45227f838f2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &954594194
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 954594189}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 595.15234, y: 0.00001, z: -129.2475}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &986462055
 GameObject:
   m_ObjectHideFlags: 0
@@ -2947,7 +3055,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 0}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -3561,7 +3669,7 @@ GameObject:
   - component: {fileID: 1187986794}
   m_Layer: 0
   m_Name: Dialogue
-  m_TagString: Untagged
+  m_TagString: DialogContainer
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4054,11 +4162,11 @@ GameObject:
   - component: {fileID: 1475998730}
   m_Layer: 5
   m_Name: PickupText
-  m_TagString: Untagged
+  m_TagString: ItemPickupText
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1475998729
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4098,7 +4206,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Press "E" to pick up
+  m_text: 
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -5514,7 +5622,7 @@ GameObject:
   - component: {fileID: 2063514703}
   m_Layer: 5
   m_Name: DialogTextBox
-  m_TagString: Untagged
+  m_TagString: DialogMessageText
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5793,6 +5901,7 @@ CanvasRenderer:
 SceneRoots:
   m_ObjectHideFlags: 0
   m_Roots:
+  - {fileID: 954594194}
   - {fileID: 410087041}
   - {fileID: 1704696510}
   - {fileID: 832575519}

Assets/Scripts/Dialogue/DialogueManager.cs

@@ -11,8 +11,8 @@ public class DialogueManager : MonoBehaviour
     public TextMeshProUGUI nameText;
     public TextMeshProUGUI dialogueText;
 
-    public TextMeshProUGUI itemText;
+    public TextMeshProUGUI itemText; // displays name of nearby item
-    public GameObject pickupHint;
+    public TextMeshProUGUI pickupHint; // tells the player to press 'E' to pickup
 
     public Animator animator;
 
@@ -22,6 +22,15 @@ void Start()
         sentences = new Queue<string>();
     }
 
+    public void ReloadReferences()
+    {
+        nameText = GameObject.FindWithTag("DialogNameText").GetComponent<TextMeshProUGUI>();
+        dialogueText = GameObject.FindWithTag("DialogMessageText").GetComponent<TextMeshProUGUI>();
+        itemText = GameObject.FindWithTag("DialogItemText").GetComponent<TextMeshProUGUI>();
+        pickupHint = GameObject.FindWithTag("ItemPickupText").GetComponent<TextMeshProUGUI>();
+        animator = GameObject.FindWithTag("DialogContainer").GetComponent<Animator>();
+    }
+
     public void StartDialogue(Dialogue dialogue)
     {
         animator.SetBool("IsOpen", true);
@@ -75,12 +84,12 @@ IEnumerator TypeSentence(string sentence)
     public void ShowItemText(string itemName)
     {
         itemText.text = itemName;
-        pickupHint.SetActive(true);
+        pickupHint.text = "Press \"E\" to pick up";
     }
 
     public void HideItemText()
     {
         itemText.text = "";
-        pickupHint.SetActive(false);
+        pickupHint.text = "";
     }
 }

Assets/Scripts/GameManager.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using Unity.VectorGraphics;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -46,7 +47,10 @@ private void ReloadReferences()
         blackScreen = GameObject.FindWithTag("BlackScreen").GetComponent<Image>();
         playerController = GameObject.FindWithTag("Player").GetComponent<PlayerController>();
         DialogueManager = GetComponent<DialogueManager>();
+        DialogueManager.ReloadReferences();
+
         Inventory = GetComponent<Inventory>();
+        
     }
 
     /// <summary>

Assets/_Recovery.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c92e544ba1ce93f418e530158b07b9aa
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Recovery/0.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a911286bccad50e4fa6af668a36cd249
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/TagManager.asset

@@ -8,6 +8,11 @@ TagManager:
   - InventorySlots
   - Door
   - BlackScreen
+  - DialogNameText
+  - DialogMessageText
+  - DialogItemText
+  - ItemPickupText
+  - DialogContainer
   layers:
   - Default
   - TransparentFX