diff --git a/TTCS_Prot/Assets/CaseResult.cs b/TTCS_Prot/Assets/CaseResult.cs
index 5b4f2e6b4f3ebae71ce1abbbee514415d9db2e30..7dfa3f521ce9fee1d6b0d0609e335dc53e7f99bc 100644
--- a/TTCS_Prot/Assets/CaseResult.cs
+++ b/TTCS_Prot/Assets/CaseResult.cs
@@ -6,6 +6,8 @@ public class CaseResult : MonoBehaviour
{
public List<string> EvidenceIDOrderForPerfectResult;
+ public int endCutsceneID;
+
public string solutionDescription;
public bool isDefault;
diff --git a/TTCS_Prot/Assets/Scenes/SampleScene.unity b/TTCS_Prot/Assets/Scenes/SampleScene.unity
index 4d1c1cf5c4034f8e7662e897df2cec7db7b0bcf1..e1086fc182d03dccfa32b7783a4b25cb9d00ae15 100644
--- a/TTCS_Prot/Assets/Scenes/SampleScene.unity
+++ b/TTCS_Prot/Assets/Scenes/SampleScene.unity
@@ -990,6 +990,42 @@ Transform:
m_Father: {fileID: 367328162}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!1 &186678050
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 186678051}
+ m_Layer: 5
+ m_Name: Sliding Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &186678051
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 186678050}
+ 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_Children:
+ - {fileID: 1847348916}
+ m_Father: {fileID: 221490960}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -20, y: -20}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &193758840
GameObject:
m_ObjectHideFlags: 0
@@ -1156,6 +1192,129 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 208997529}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &221490959
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 221490960}
+ - component: {fileID: 221490963}
+ - component: {fileID: 221490962}
+ - component: {fileID: 221490961}
+ m_Layer: 5
+ m_Name: Scrollbar
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &221490960
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 221490959}
+ m_LocalRotation: {x: 0, y: -0, z: 0.7071068, w: -0.7071068}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.1823, y: 1, z: 1}
+ m_Children:
+ - {fileID: 186678051}
+ m_Father: {fileID: 1132042695}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 100, y: 3}
+ m_SizeDelta: {x: 160, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &221490961
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 221490959}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1847348917}
+ m_HandleRect: {fileID: 1847348916}
+ m_Direction: 0
+ m_Value: 0
+ m_Size: 1
+ m_NumberOfSteps: 0
+ m_OnValueChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!114 &221490962
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 221490959}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!222 &221490963
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 221490959}
+ m_CullTransparentMesh: 0
--- !u!1 &234521553
GameObject:
m_ObjectHideFlags: 0
@@ -3214,7 +3373,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 4, y: 0.000022888184}
+ m_AnchoredPosition: {x: 4, y: 0}
m_SizeDelta: {x: -8, y: -205.00003}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &465874858
@@ -6096,7 +6255,7 @@ MonoBehaviour:
- thisEventType: 1
charName: Detective1
character: {fileID: 0}
- dialogueImage: {fileID: 0}
+ dialogueImage: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
endLocation: {x: 3, y: 7.7, z: 1}
speed: 1
zoomSpeed: 1
@@ -6153,6 +6312,7 @@ MonoBehaviour:
wait: 1
size: 4.143829
dialogue: Time to figure out what happened in here
+ description: Beginning Cutscene
movementEvent: {fileID: 848200921}
dialogueEvent: {fileID: 848200920}
cameraEvent: {fileID: 848200919}
@@ -7031,7 +7191,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.000009724342, y: 0}
+ m_AnchoredPosition: {x: -0.0000075255166, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1011405299
@@ -7955,6 +8115,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 465874857}
+ - {fileID: 221490960}
m_Father: {fileID: 616912026}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7997,7 +8158,7 @@ MonoBehaviour:
m_ScrollSensitivity: 1
m_Viewport: {fileID: 1132042695}
m_HorizontalScrollbar: {fileID: 0}
- m_VerticalScrollbar: {fileID: 0}
+ m_VerticalScrollbar: {fileID: 221490961}
m_HorizontalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 0
m_HorizontalScrollbarSpacing: 0
@@ -9349,12 +9510,12 @@ PrefabInstance:
- target: {fileID: 6234366999821549424, guid: b5ef0efdb0bf73f418065fcd255e530c,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -235
+ value: 565
objectReference: {fileID: 0}
- target: {fileID: 6234366999821549424, guid: b5ef0efdb0bf73f418065fcd255e530c,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -29
+ value: 221
objectReference: {fileID: 0}
- target: {fileID: 6234366999821549424, guid: b5ef0efdb0bf73f418065fcd255e530c,
type: 3}
@@ -9369,22 +9530,22 @@ PrefabInstance:
- target: {fileID: 6234366999821549424, guid: b5ef0efdb0bf73f418065fcd255e530c,
type: 3}
propertyPath: m_AnchorMin.x
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6234366999821549424, guid: b5ef0efdb0bf73f418065fcd255e530c,
type: 3}
propertyPath: m_AnchorMin.y
- value: 0.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6234366999821549424, guid: b5ef0efdb0bf73f418065fcd255e530c,
type: 3}
propertyPath: m_AnchorMax.x
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6234366999821549424, guid: b5ef0efdb0bf73f418065fcd255e530c,
type: 3}
propertyPath: m_AnchorMax.y
- value: 0.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6234366999821549424, guid: b5ef0efdb0bf73f418065fcd255e530c,
type: 3}
@@ -9777,6 +9938,12 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1428298216 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3761742375179795615, guid: f4ad175d0facffa459f806cdddc12632,
+ type: 3}
+ m_PrefabInstance: {fileID: 1191658971}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1432361389
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10150,6 +10317,7 @@ MonoBehaviour:
- 1e07
- 1e08
- 1e05
+ endCutsceneID: 0
solutionDescription: Path of break-in
isDefault: 0
requiredScoreToPass: 10
@@ -11587,6 +11755,7 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
+ cutsceneManager: {fileID: 0}
allCaseResults: []
evidenceList: []
foundClues: []
@@ -11727,7 +11896,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Texture: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3}
+ m_Texture: {fileID: 10900, guid: 0000000000000000f000000000000000, type: 0}
m_UVRect:
serializedVersion: 2
x: 0
@@ -11985,10 +12154,10 @@ RectTransform:
m_Father: {fileID: 1619997474}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0.5}
- m_AnchorMax: {x: 0, y: 0.5}
- m_AnchoredPosition: {x: 184.2002, y: 1.5}
- m_SizeDelta: {x: 325.3, y: 412.6}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -215.7998, y: 1.5}
+ m_SizeDelta: {x: -474.7, y: -37.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1774480791
MonoBehaviour:
@@ -12452,6 +12621,80 @@ Transform:
m_Father: {fileID: 442836974}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1847348915
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1847348916}
+ - component: {fileID: 1847348918}
+ - component: {fileID: 1847348917}
+ m_Layer: 5
+ m_Name: Handle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1847348916
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847348915}
+ 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_Children: []
+ m_Father: {fileID: 186678051}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 20, y: 20}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1847348917
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847348915}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!222 &1847348918
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847348915}
+ m_CullTransparentMesh: 0
--- !u!1 &1861087636
GameObject:
m_ObjectHideFlags: 0
@@ -12537,6 +12780,7 @@ MonoBehaviour:
- 1e02
- 1e03
- 1e04
+ endCutsceneID: 0
solutionDescription: Discovered path of rabbit.
isDefault: 0
requiredScoreToPass: 40
@@ -12983,7 +13227,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 2bcac4a8fa937465792326476e296c88, type: 3}
propertyPath: m_LocalPosition.z
- value: 0.41
+ value: 0.431
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 2bcac4a8fa937465792326476e296c88, type: 3}
propertyPath: m_LocalRotation.x
diff --git a/TTCS_Prot/Assets/Scenes/example.meta b/TTCS_Prot/Assets/Scenes/example.meta
deleted file mode 100644
index 2938a2cad0bab059ab6924f712eacddea4253a87..0000000000000000000000000000000000000000
--- a/TTCS_Prot/Assets/Scenes/example.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bebd874866a254106aae17e52a06ac6e
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs b/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
old mode 100755
new mode 100644
index 752a40cb6a57b4eaf43b5cc0407c1d60ca7f9529..c970c1473a3bda9a8de061a12c68c63e40d80896
--- a/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/CutsceneManager.cs
@@ -82,4 +82,7 @@ public class CutsceneManager : MonoBehaviour {
public struct Cutscene {
[SerializeField]
public List<CutsceneEvent> cutsceneActions;
+
+ [SerializeField]
+ public string description;
}
\ No newline at end of file
diff --git a/TTCS_Prot/Assets/Scripts/Classes/DetectiveScript.cs b/TTCS_Prot/Assets/Scripts/Classes/DetectiveScript.cs
old mode 100755
new mode 100644
index a64ffab5922141fd51e9fea19b23eb8cc05c1433..67e86644ae4bbca8bedc8591e2714c7a425af200
--- a/TTCS_Prot/Assets/Scripts/Classes/DetectiveScript.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/DetectiveScript.cs
@@ -40,8 +40,6 @@ public class DetectiveScript : MonoBehaviour
_handler = FindObjectOfType<EvidenceHandler>() as EvidenceHandler;
_agent = GetComponent<NavMeshAgent>();
-
- //_notebook = FindObjectOfType<Notebook>() as Notebook;
}
// Update is called once per frame
diff --git a/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs b/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs
old mode 100755
new mode 100644
index f6e2b54f953229a04eefb2c9b0dfb141be0086ec..c1cdcfc9688aab5ed2b6b8475576c047ddf2396e
--- a/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs
+++ b/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs
@@ -9,6 +9,8 @@ public class EvidenceHandler : MonoBehaviour {
public List<Evidence> allStatements;
public List<Evidence> allCorroborations;
+ public CutsceneManager cutsceneManager;
+
//List to reference all the possible case solutions.
public List<CaseResult> allCaseResults;
@@ -33,6 +35,7 @@ public class EvidenceHandler : MonoBehaviour {
// Use this for initialization
void Start ()
{
+ cutsceneManager = FindObjectOfType<CutsceneManager>() as CutsceneManager;
defaultResult = this.GetComponent<CaseResult>();
@@ -255,6 +258,6 @@ public class EvidenceHandler : MonoBehaviour {
finalResult = potentialResults[finalScoreIndex];
- Debug.Log(finalResult.solutionDescription);
+ cutsceneManager.startCutscene(finalResult.endCutsceneID);
}
}
diff --git a/TTCS_Prot/Assets/example.meta b/TTCS_Prot/Assets/example.meta
deleted file mode 100644
index 2cb0640099e2dab509e40ee97df215b3b2419557..0000000000000000000000000000000000000000
--- a/TTCS_Prot/Assets/example.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1c66af92d50784d799545bc86c9b8590
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant: