diff --git a/TTCS_Prot/Assets/Scenes/SampleScene.unity b/TTCS_Prot/Assets/Scenes/SampleScene.unity
index c48f1c106d86d06d582a5987c204717b3ed71f35..e492e3cc6352651194d5f3ac19ff163919755d94 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:
@@ -508,7 +508,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- - m_Target: {fileID: 565321735}
+ - m_Target: {fileID: 0}
m_MethodName: completeTut
m_Mode: 1
m_Arguments:
@@ -1625,6 +1625,11 @@ PrefabInstance:
propertyPath: m_Center.z
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 2143891401098949981, guid: 88755a80ecaefc648948195518c0b381,
+ type: 3}
+ propertyPath: n
+ value:
+ objectReference: {fileID: 576700780}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88755a80ecaefc648948195518c0b381, type: 3}
--- !u!1 &170076733
@@ -5312,6 +5317,11 @@ PrefabInstance:
propertyPath: m_Center.z
value: 13
objectReference: {fileID: 0}
+ - target: {fileID: 2143891401098949981, guid: 88755a80ecaefc648948195518c0b381,
+ type: 3}
+ propertyPath: n
+ value:
+ objectReference: {fileID: 576700780}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88755a80ecaefc648948195518c0b381, type: 3}
--- !u!1 &534669902
@@ -5542,7 +5552,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.8625001, y: 1}
- m_AnchoredPosition: {x: 4.0999756, y: 0.6000061}
+ m_AnchoredPosition: {x: 4.1000977, y: 0.6000061}
m_SizeDelta: {x: -28.400024, y: -28.900002}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &553963904
@@ -5637,27 +5647,21 @@ GameObject:
- component: {fileID: 565321720}
- component: {fileID: 565321721}
- component: {fileID: 565321736}
- - component: {fileID: 565321733}
- - component: {fileID: 565321722}
- component: {fileID: 565321723}
- - component: {fileID: 565321732}
- component: {fileID: 565321731}
- component: {fileID: 565321730}
- - component: {fileID: 565321729}
- component: {fileID: 565321728}
- component: {fileID: 565321726}
- component: {fileID: 565321727}
- component: {fileID: 565321734}
- component: {fileID: 565321725}
- - component: {fileID: 565321735}
- - component: {fileID: 565321724}
m_Layer: 0
m_Name: TutorialHandler
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &565321720
RectTransform:
m_ObjectHideFlags: 0
@@ -5695,29 +5699,6 @@ MonoBehaviour:
statementsTab: {fileID: 1127874829}
evidenceTab: {fileID: 1609012036}
tutorialStage: 0
---- !u!114 &565321722
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 565321719}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 67af512733d18489d9df35676d8a843b, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- startText:
- endText: Good job. You can select multiple detectives and then moved them all to
- the same room at the same time.
- eventSetting: 0
- nextEvent: {fileID: 565321723}
- showBeginning: 0
- showEnding: 1
- selectionBox: {fileID: 1651543189}
- stopFlashing: {fileID: 208997529}
- detectiveCheck: {fileID: 734794670}
- moving: 0
--- !u!114 &565321723
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5730,13 +5711,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9707472b564464f84a43325841fcc622, type: 3}
m_Name:
m_EditorClassIdentifier:
- startText: Now that your detective has moved to this new room, we can start searching
- the room. This is done automatically once a detective enters a new room. When
- this starts, a timer will begin to count down, and the room will be considered
- searched once the timer finishes. Please wait for the timer to be completed.
- endText: Each room can contain any number of clues, and the designated time to search
- each room depends on the size of the room. Go and search a couple more rooms until
- you can get all the evidence together.
+ startText: Now that you've had a look around, you might have noticed some interactable
+ areas. These are areas where clues are hidden. Try going up to one, and pressing
+ the E key to get a closer look at what might be there.
+ endText: 'Each room can contain any number of clues, and they are an integral part
+ in solving the mystery. Make sure to get as many clues as you can find. '
eventSetting: 0
nextEvent: {fileID: 565321731}
showBeginning: 1
@@ -5744,28 +5723,6 @@ MonoBehaviour:
selectionBox: {fileID: 0}
stopFlashing: {fileID: 0}
notebookCheck: {fileID: 576700780}
---- !u!114 &565321724
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 565321719}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: cad646823466648808fc252fc8ef48a5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- startText: While you may deduce a story, be sure to keep it related to the case,
- your actions can have consequences.
- endText: You can only submit once, so be confident of your solution before you solve
- the case.
- eventSetting: 0
- nextEvent: {fileID: 0}
- showBeginning: 1
- showEnding: 1
- selectionBox: {fileID: 0}
- stopFlashing: {fileID: 0}
--- !u!114 &565321725
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5778,17 +5735,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a02bca5af9ef14b7a8131914ee81584a, type: 3}
m_Name:
m_EditorClassIdentifier:
- startText: 'Now that we have some evidence, let''s add them to the timeline. On
- the bottom of the screen there is the timeline, where you can put in your personal
- timeline of events. To edit the timeline, drag evidence from the corroborations
- page and drop it onto the timeline. You can add any corroborated evidence to any
- point in the timeline. Try adding that piece of evidence you created in now. '
+ startText: On the bottom of the screen is the timeline. This is what you will submit
+ as your solution to the crime. You can drag evidence into the timeline, and submit
+ it when you feel ready to. Now explore the level, collect evidence, and find out
+ what really happened to Kelso's rabbit.
endText:
eventSetting: 0
- nextEvent: {fileID: 565321735}
+ nextEvent: {fileID: 0}
showBeginning: 1
showEnding: 0
- selectionBox: {fileID: 617727770}
+ selectionBox: {fileID: 0}
stopFlashing: {fileID: 0}
--- !u!114 &565321726
MonoBehaviour:
@@ -5804,12 +5760,12 @@ MonoBehaviour:
m_EditorClassIdentifier:
startText: 'The final tab of the notebook is for the evidence page. Click on this
tab to view all your current pieces of evidence. '
- endText: Here, you'll see all the evidence you've deduced.
+ endText: This is where all of your corroborated evidence will be stored.
eventSetting: 0
nextEvent: {fileID: 565321727}
showBeginning: 1
showEnding: 1
- selectionBox: {fileID: 441017462}
+ selectionBox: {fileID: 0}
stopFlashing: {fileID: 0}
--- !u!114 &565321727
MonoBehaviour:
@@ -5824,17 +5780,15 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
startText: Let's add some evidence to this page. If you've collected enough clues
- and witness statements you'll have quite a few bits of information, some of which
- connect to eachother. Click on the corroborate button at the bottom of the page,
- and find some clues and statements that connect together to create some corroborated
- evidence. Click on any two clues, statements, or corroborations that are connected
- to create new corroborations.
+ and witness statements you'll have a lot of information, some of which connect
+ to eachother. Click on the corroborate button at the bottom of the page, and find
+ some clues and statements that connect together to create some evidence.
endText:
eventSetting: 0
nextEvent: {fileID: 565321734}
showBeginning: 1
showEnding: 0
- selectionBox: {fileID: 1816442109}
+ selectionBox: {fileID: 0}
stopFlashing: {fileID: 0}
--- !u!114 &565321728
MonoBehaviour:
@@ -5849,33 +5803,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
startText: The second tab on the side of the notebook is for the statments page.
- Click on this tab to open the page and view all the witness statements.
- endText: 'This is where you can access all of the current witness testimonies and
- statements, showing what the witness said at the time, and who said it. '
+ Click on this tab to open the page.
+ endText: This is where you can access all of the current witness testimonies and
+ statements.
eventSetting: 0
nextEvent: {fileID: 565321726}
showBeginning: 1
showEnding: 1
- selectionBox: {fileID: 585411774}
- stopFlashing: {fileID: 0}
---- !u!114 &565321729
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 565321719}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: b29912bf254ef40d2855cbb37482a953, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- startText: SKIPPED TUTORIAL WHILE WE DON'T HAVE A PEOPLE TAB FOR WITNESSES!!!!
- endText: SKIPPED TUTORIAL WHILE WE DON'T HAVE A PEOPLE TAB FOR WITNESSES!!!!
- eventSetting: 0
- nextEvent: {fileID: 565321728}
- showBeginning: 0
- showEnding: 0
selectionBox: {fileID: 0}
stopFlashing: {fileID: 0}
--- !u!114 &565321730
@@ -5890,17 +5824,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b2a457bf2f22e43dcbdfb7bcf06d4d17, type: 3}
m_Name:
m_EditorClassIdentifier:
- startText: Now you have some clues piling up, it's time to look at what you have
- discovered. Within the Notebook on the right hand side of the screen, there are
- 3 tabs, each correlating to a specific part of the notebook. For now, let's click
- on the Clues tab.
+ startText: On the right of your screen, you'll see the notebook. This is where all
+ the clues and statements that have been gathered so far can be found. Using the
+ tabs on the side, you can change pages. Click on the Clues tab now.
endText: This page will show you all the different clues you have accumulated throughout
your searching, as well as any other handy information that might be necessary.
eventSetting: 0
nextEvent: {fileID: 565321728}
showBeginning: 1
showEnding: 1
- selectionBox: {fileID: 1589979076}
+ selectionBox: {fileID: 0}
stopFlashing: {fileID: 0}
--- !u!114 &565321731
MonoBehaviour:
@@ -5914,66 +5847,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b5fb710c5b6f24d66a1ec10ef7095dc0, type: 3}
m_Name:
m_EditorClassIdentifier:
- startText: 'Now that we have some clues, let''s interrogate the only witness. As
- you interrogate a witness, you''ll learn more about their character. The more
- similar the interrogating detective is to the witness, the faster the interrogation.
- With a detective selected, right click on any witness you want to interrogate,
- and then wait for the timer to complete. '
+ startText: Now that we have clues, let's interrogate the witness. Right click on
+ a witness to start an interrogation. While interrogating, the witness will say
+ some possibly useful information, and if you think it is pertinent to the case
+ at hand, save it as a statement. Try interrogating Kelso now.
endText:
eventSetting: 0
nextEvent: {fileID: 565321730}
showBeginning: 1
showEnding: 0
- selectionBox: {fileID: 51112063}
- stopFlashing: {fileID: 0}
- notebookCheck: {fileID: 576700780}
---- !u!114 &565321732
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 565321719}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: e7b461227bf9e48d98ca93be229c99b7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- startText: 'SKIPPED TUTORIAL UNTIL ABILITIES CAN BE ACTIVATED!!!!
-
- set previous tutorial to be one panel, and then get the player to search another
- room with the search ability.'
- endText: SKIPPED TUTORIAL UNTIL ABILITIES CAN BE ACTIVATED!!!!
- eventSetting: 0
- nextEvent: {fileID: 565321731}
- showBeginning: 0
- showEnding: 0
selectionBox: {fileID: 0}
stopFlashing: {fileID: 0}
---- !u!114 &565321733
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 565321719}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8dc8c18fc20c44e3984b123f8438abe3, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- startText: Now that you've had a look around, let's have a closer look at one of
- those room. Move Penelope into the bedroom. To move, press left click and then
- drag the selection box over the detective. Once selected, right click on a new
- room in order to move that detective into the next room.
- endText:
- eventSetting: 0
- nextEvent: {fileID: 565321722}
- showBeginning: 1
- showEnding: 0
- selectionBox: {fileID: 361594285}
- stopFlashing: {fileID: 365595368}
- selection: {fileID: 1753735557}
+ notebookCheck: {fileID: 576700780}
--- !u!114 &565321734
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -5997,28 +5882,6 @@ MonoBehaviour:
selectionBox: {fileID: 0}
stopFlashing: {fileID: 0}
notebookCheck: {fileID: 576700780}
---- !u!114 &565321735
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 565321719}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d192d541abc3b44d7812bdca489cbba1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- startText:
- endText: The timeline is what you will be graded on when you try to solve this crime.
- You can remove evidence from the timeline by clicking on it in the timeline. Press
- 'submit' when you think you've solved the crime.
- eventSetting: 0
- nextEvent: {fileID: 565321724}
- showBeginning: 0
- showEnding: 1
- selectionBox: {fileID: 1816442109}
- stopFlashing: {fileID: 0}
--- !u!114 &565321736
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -6033,12 +5896,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
startText: Hello and welcome to A Totally True Crime Story! In this game you have
to solve the presented crime, in this case find Kelso's rabbit. First, let's have
- a look around the room. Use the arrow keys to move the camera around, and the
- mouse wheel to zoom the camera in and out. Try it now. Click this popup to hide
- it.
+ a look around the room. Use the WASD keys to move around. Try it now. Click this
+ popup to hide it.
endText:
eventSetting: 0
- nextEvent: {fileID: 565321733}
+ nextEvent: {fileID: 565321723}
showBeginning: 1
showEnding: 0
selectionBox: {fileID: 0}
@@ -6996,18 +6858,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speed: 5
---- !u!114 &734794670 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 3761742374809534361, guid: f4ad175d0facffa459f806cdddc12632,
- type: 3}
- m_PrefabInstance: {fileID: 1191658971}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 734794666}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8be98de2a01e3264daf5d67457842a0a, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!4 &734794673 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3761742374809534360, guid: f4ad175d0facffa459f806cdddc12632,
@@ -7807,7 +7657,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
- - m_Target: {fileID: 565321735}
+ - m_Target: {fileID: 0}
m_MethodName: completeTut
m_Mode: 1
m_Arguments:
@@ -8173,7 +8023,7 @@ MonoBehaviour:
dialogue: Sure... I'm gonna go clean up inside.
- thisEventType: 0
charName: T. Kelso
- character: {fileID: 734794666}
+ character: {fileID: 1997847393}
dialogueImage: {fileID: 0}
dialogueTime: 0
isStatement: 0
@@ -9069,6 +8919,11 @@ PrefabInstance:
propertyPath: m_Center.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2143891401098949981, guid: 88755a80ecaefc648948195518c0b381,
+ type: 3}
+ propertyPath: n
+ value:
+ objectReference: {fileID: 576700780}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88755a80ecaefc648948195518c0b381, type: 3}
--- !u!1 &863962176
@@ -9652,6 +9507,11 @@ PrefabInstance:
propertyPath: m_Radius
value: 2
objectReference: {fileID: 0}
+ - target: {fileID: 2143891401098949981, guid: 88755a80ecaefc648948195518c0b381,
+ type: 3}
+ propertyPath: n
+ value:
+ objectReference: {fileID: 576700780}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88755a80ecaefc648948195518c0b381, type: 3}
--- !u!4 &910299007 stripped
@@ -12696,6 +12556,11 @@ PrefabInstance:
propertyPath: m_Center.z
value: 2
objectReference: {fileID: 0}
+ - target: {fileID: 2143891401098949981, guid: 88755a80ecaefc648948195518c0b381,
+ type: 3}
+ propertyPath: n
+ value:
+ objectReference: {fileID: 576700780}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88755a80ecaefc648948195518c0b381, type: 3}
--- !u!1 &1186378608
@@ -15618,6 +15483,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
allowInspection: 0
+ n: {fileID: 576700780}
--- !u!114 &1595153869
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -18729,6 +18595,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
allowInspection: 0
+ n: {fileID: 576700780}
--- !u!114 &1941591563
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -20069,6 +19936,11 @@ PrefabInstance:
propertyPath: m_Radius
value: 2
objectReference: {fileID: 0}
+ - target: {fileID: 2143891401098949981, guid: 88755a80ecaefc648948195518c0b381,
+ type: 3}
+ propertyPath: n
+ value:
+ objectReference: {fileID: 576700780}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88755a80ecaefc648948195518c0b381, type: 3}
--- !u!1 &2079997973
@@ -20939,6 +20811,11 @@ PrefabInstance:
propertyPath: m_Color.a
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2143891401098949981, guid: 88755a80ecaefc648948195518c0b381,
+ type: 3}
+ propertyPath: n
+ value:
+ objectReference: {fileID: 576700780}
m_RemovedComponents:
- {fileID: 1900656119303573591, guid: 88755a80ecaefc648948195518c0b381, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 88755a80ecaefc648948195518c0b381, type: 3}
diff --git a/TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs b/TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs
index 2332f31b4f07ffe45e48fa8717624eb2f2966a37..34072d6e13432f4cd72b5ff4e9b6517e1ca1f933 100644
--- a/TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/CameraMove.cs
@@ -28,27 +28,31 @@ public class CameraMove : MonoBehaviour
// Update is called once per frame
void Update()
{
- if(Input.GetAxis("CameraVertical") != 0.0f || Input.GetAxis("CameraHorizontal") != 0.0f)
- {
- transform.Translate(Input.GetAxis("CameraHorizontal") * cameraSpeed * Time.deltaTime, 0.0f, Input.GetAxis("CameraVertical") * Time.deltaTime);
- tutMove = true;
- }
- if(Input.mouseScrollDelta.y != 0)
- {
- Camera.main.orthographicSize -= Input.mouseScrollDelta.y/20;
- tutZoom1 = true;
- }
- if(Camera.main.orthographicSize < minValue)
- {
- Camera.main.orthographicSize = minValue;
- }
- else if(Camera.main.orthographicSize > maxValue)
- {
- Camera.main.orthographicSize = maxValue;
- }
- if(tutZoom1 && Input.mouseScrollDelta.y == 0)
- {
- tutZoom = true;
+ //if(Input.GetAxis("CameraVertical") != 0.0f || Input.GetAxis("CameraHorizontal") != 0.0f)
+ //{
+ // //transform.Translate(Input.GetAxis("CameraHorizontal") * cameraSpeed * Time.deltaTime, 0.0f, Input.GetAxis("CameraVertical") * Time.deltaTime);
+ // tutMove = true;
+ //}
+ //if(Input.mouseScrollDelta.y != 0)
+ //{
+ // //Camera.main.orthographicSize -= Input.mouseScrollDelta.y/20;
+ // tutZoom1 = true;
+ //}
+ //if(Camera.main.orthographicSize < minValue)
+ //{
+ // //Camera.main.orthographicSize = minValue;
+ //}
+ //else if(Camera.main.orthographicSize > maxValue)
+ //{
+ // //Camera.main.orthographicSize = maxValue;
+ //}
+ //if(tutZoom1 && Input.mouseScrollDelta.y == 0)
+ //{
+ // //tutZoom = true;
+ //}
+ if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.D))
+ {
+ tutMove = true;
}
}
}
diff --git a/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs b/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
index cb434c473ec91df9d5cec46499eb1e066066101f..bfa1dae8c02c967541f3d7b9c4e8fb3877f3d0ad 100644
--- a/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
@@ -25,7 +25,11 @@ public class CutsceneManager : MonoBehaviour {
List<GameObject> ShutoffUIElements;
//bool to check if a cutscene is playing or not
public bool isPlaying = false;
- public void startCutscene(int cutsceneNumber) {
+ private void Start()
+ {
+ startCutscene(0);
+ }
+ public void startCutscene(int cutsceneNumber) {
isPlaying = true;
for(int i = 0; i < ShutoffUIElements.Count; i++)
{
@@ -37,6 +41,10 @@ public class CutsceneManager : MonoBehaviour {
"the number of cutscenes assigned to the cutscene manager.");
return;
}
+ if(tutorial != null)
+ {
+ tutorial.SetActive(false);
+ }
//starts to play the cutscene
StartCoroutine(playCutscene (cutscenes [cutsceneNumber], cutsceneNumber));
}
diff --git a/TTCS_Prot/Assets/Scripts/Classes/TutorialScripts/CameraTut.cs b/TTCS_Prot/Assets/Scripts/Classes/TutorialScripts/CameraTut.cs
index 305b64e72407d226653824623eee08e72a95539d..4d16a429fe5599b69e7cd548662d1e36f6977191 100644
--- a/TTCS_Prot/Assets/Scripts/Classes/TutorialScripts/CameraTut.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/TutorialScripts/CameraTut.cs
@@ -6,15 +6,32 @@ public class CameraTut : templateTut
{
[SerializeField]
CameraMove _camera;
+ bool _delay = false;
+ bool _delay2 = false;
private void Update()
{
if(eventSetting == TStatus.InProgress)
{
nextStage = 0;
- if(_camera.tutMove && _camera.tutZoom)
- {
- eventSetting = TStatus.Completing;
+ if(_camera.tutMove)
+ {
+
+ if(!_delay2)
+ {
+ StartCoroutine(delay());
+ }
+ if(_delay)
+ {
+ eventSetting = TStatus.Completing;
+ }
}
}
}
+ private IEnumerator delay()
+ {
+ _delay2 = true;
+ yield return new WaitForSeconds(2f);
+ _delay = true;
+ yield return 0;
+ }
}
diff --git a/TTCS_Prot/Assets/clueObject.cs b/TTCS_Prot/Assets/clueObject.cs
index 7869580bb5749ce0392c88bfc8ba42180e3ed2e3..95abc472b2967f83067bcee0da6cc52d207b29bd 100644
--- a/TTCS_Prot/Assets/clueObject.cs
+++ b/TTCS_Prot/Assets/clueObject.cs
@@ -9,6 +9,7 @@ public class clueObject : MonoBehaviour
bool searched = false;
private EvidenceHandler e;
+ [SerializeField]
private Notebook n;
private CutsceneManager c;
@@ -18,7 +19,7 @@ public class clueObject : MonoBehaviour
{
clues = this.gameObject.GetComponents<Evidence>();
e = FindObjectOfType<EvidenceHandler>();
- n = FindObjectOfType<Notebook>();
+ //n = FindObjectOfType<Notebook>();
c = FindObjectOfType<CutsceneManager>();
}