diff --git a/TTCS_Prot/Assets/Scenes/SampleScene.unity b/TTCS_Prot/Assets/Scenes/SampleScene.unity
index 900e1833275291d749abb978ad6ca09ae322d929..2b2a1072b1024636bb6551c62f3fe223d196de1e 100644
--- a/TTCS_Prot/Assets/Scenes/SampleScene.unity
+++ b/TTCS_Prot/Assets/Scenes/SampleScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.4366757, g: 0.48427194, b: 0.5645252, a: 1}
+ m_IndirectSpecularColor: {r: 0.43667564, g: 0.48427135, b: 0.5645232, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3814,7 +3814,7 @@ MonoBehaviour:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
- m_BoolArgument: 1
+ m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 939894409}
m_MethodName: SetActive
@@ -6392,6 +6392,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 2
endLocation: {x: 0, y: 0, z: 0}
speed: 0
zoomSpeed: 0
@@ -6402,6 +6403,7 @@ MonoBehaviour:
charName: Kelso
character: {fileID: 738989159}
dialogueImage: {fileID: 2800000, guid: a38aa040d428a454e91143c33ee40a92, type: 3}
+ dialogueTime: 2
endLocation: {x: 0, y: 7.7, z: 1}
speed: -1
zoomSpeed: 1
@@ -6412,6 +6414,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 0}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 2
endLocation: {x: 3, y: 7.7, z: 1}
speed: 1
zoomSpeed: 1
@@ -6422,6 +6425,7 @@ MonoBehaviour:
charName: T. Kelso
character: {fileID: 738989159}
dialogueImage: {fileID: 2800000, guid: 9c12962af14cc5d4cb0d6fa9951857cb, type: 3}
+ dialogueTime: 2
endLocation: {x: 3, y: 7.7, z: -2}
speed: 1
zoomSpeed: 1
@@ -6432,6 +6436,7 @@ MonoBehaviour:
charName: T. Kelso
character: {fileID: 738989159}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 2, y: 0, z: 0.4}
speed: 1
zoomSpeed: 1
@@ -6442,6 +6447,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 2
endLocation: {x: 3.75, y: 7.7, z: -1.16}
speed: -1
zoomSpeed: 1
@@ -6454,6 +6460,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 0, y: 0, z: 0}
speed: 0
zoomSpeed: 0
@@ -6464,6 +6471,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 7.7, z: 1}
speed: -1
zoomSpeed: 1
@@ -6474,6 +6482,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 3, y: 7.7, z: 1}
speed: 1
zoomSpeed: 1
@@ -6484,6 +6493,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 3, y: 7.7, z: -2}
speed: 1
zoomSpeed: 1
@@ -6494,6 +6504,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 7.7, z: -2}
speed: 1
zoomSpeed: 1
@@ -6504,6 +6515,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 3.75, y: 7.7, z: -1.16}
speed: -1
zoomSpeed: 1
@@ -6514,6 +6526,7 @@ MonoBehaviour:
charName: Detective 1
character: {fileID: 734794666}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 1, z: 0}
speed: 1
zoomSpeed: 1
@@ -6524,6 +6537,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 3.75, y: 7.7, z: -1.16}
speed: -1
zoomSpeed: 1
@@ -6536,6 +6550,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 0, y: 0, z: 0}
speed: 0
zoomSpeed: 0
@@ -6546,6 +6561,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 7.7, z: 1}
speed: -1
zoomSpeed: 1
@@ -6556,6 +6572,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 3, y: 7.7, z: 1}
speed: 1
zoomSpeed: 1
@@ -6566,6 +6583,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 3, y: 7.7, z: -2}
speed: 1
zoomSpeed: 1
@@ -6576,6 +6594,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 7.7, z: -2}
speed: 1
zoomSpeed: 1
@@ -6586,6 +6605,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 3.75, y: 7.7, z: -1.16}
speed: -1
zoomSpeed: 1
@@ -6596,6 +6616,7 @@ MonoBehaviour:
charName: Detective 1
character: {fileID: 734794666}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 1, z: 0}
speed: 1
zoomSpeed: 1
@@ -6606,6 +6627,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 3.75, y: 7.7, z: -1.16}
speed: -1
zoomSpeed: 1
@@ -6618,6 +6640,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 0, y: 0, z: 0}
speed: 0
zoomSpeed: 0
@@ -6628,6 +6651,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 7.7, z: 1}
speed: -1
zoomSpeed: 1
@@ -6638,6 +6662,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 3, y: 7.7, z: 1}
speed: 1
zoomSpeed: 1
@@ -6648,6 +6673,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 3, y: 7.7, z: -2}
speed: 1
zoomSpeed: 1
@@ -6658,6 +6684,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 7.7, z: -2}
speed: 1
zoomSpeed: 1
@@ -6668,6 +6695,7 @@ MonoBehaviour:
charName: Detective1
character: {fileID: 0}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 3.75, y: 7.7, z: -1.16}
speed: -1
zoomSpeed: 1
@@ -6678,6 +6706,7 @@ MonoBehaviour:
charName: Detective 1
character: {fileID: 734794666}
dialogueImage: {fileID: 0}
+ dialogueTime: 0
endLocation: {x: 0, y: 1, z: 0}
speed: 1
zoomSpeed: 1
@@ -6688,6 +6717,7 @@ MonoBehaviour:
charName: Penelope
character: {fileID: 734794666}
dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ dialogueTime: 0
endLocation: {x: 3.75, y: 7.7, z: -1.16}
speed: -1
zoomSpeed: 1
@@ -6698,6 +6728,7 @@ MonoBehaviour:
movementEvent: {fileID: 848200921}
dialogueEvent: {fileID: 848200920}
cameraEvent: {fileID: 848200919}
+ tutorial: {fileID: 565321719}
ShutoffUIElements:
- {fileID: 426045721}
- {fileID: 576700776}
diff --git a/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs b/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
index c970c1473a3bda9a8de061a12c68c63e40d80896..270a326aa82124d988017f8ec5d3ec09d71c217b 100644
--- a/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
@@ -16,6 +16,9 @@ public class CutsceneManager : MonoBehaviour {
//A link to the camera event script that is attached to the cutscene manager
[SerializeField]
CameraEvent cameraEvent;
+ //A link to the tutorial manager that I will open on awake once the opening cutscene is done
+ [SerializeField]
+ GameObject tutorial;
[SerializeField]
List<GameObject> ShutoffUIElements;
//temporary bool to check if a cutscene is playing or not
@@ -62,6 +65,10 @@ public class CutsceneManager : MonoBehaviour {
{
ShutoffUIElements[i].SetActive(true);
}
+ if(tutorial != null)
+ {
+ tutorial.SetActive(true);
+ }
//resets the camera position and zoom
Camera.main.transform.position = new Vector3(3.75f, 7.7f, -1.16f);
Camera.main.orthographicSize = 4.143829f;