From be49cc48d3020a7ceb4ee290ce092f21b1726c32 Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Tue, 18 May 2021 13:24:25 +0100 Subject: [PATCH] added final sequence story --- game/Assets/Audio/VO/BAZ_0.wav | 4 +- game/Assets/Audio/VO/BAZ_1.wav | 4 +- game/Assets/Audio/VO/BAZ_10.wav | 4 +- game/Assets/Audio/VO/BAZ_11.wav | 4 +- game/Assets/Audio/VO/BAZ_11_0.wav | 4 +- game/Assets/Audio/VO/BAZ_11_1.wav | 4 +- game/Assets/Audio/VO/BAZ_12.wav | 4 +- game/Assets/Audio/VO/BAZ_13.wav | 4 +- game/Assets/Audio/VO/BAZ_14.wav | 4 +- game/Assets/Audio/VO/BAZ_15.wav | 4 +- game/Assets/Audio/VO/BAZ_16.wav | 4 +- game/Assets/Audio/VO/BAZ_2.wav | 4 +- game/Assets/Audio/VO/BAZ_3.wav | 4 +- game/Assets/Audio/VO/BAZ_4.wav | 4 +- game/Assets/Audio/VO/BAZ_5.wav | 4 +- game/Assets/Audio/VO/BAZ_6.wav | 4 +- game/Assets/Audio/VO/BAZ_7.wav | 4 +- game/Assets/Audio/VO/BAZ_8.wav | 4 +- game/Assets/Audio/VO/BAZ_9.wav | 4 +- game/Assets/Audio/VO/BAZ_IN.wav | 4 +- game/Assets/Audio/VO/BAZ_OUT.wav | 4 +- .../Puzzles/FinalLevel/FinalLevel.prefab | 610 ++++++++++++++++-- game/Assets/Scenes/Main.unity | 56 +- .../Scripts/Dialogue/BazFinalSequence.cs | 36 ++ game/FMOD Project/Build/Desktop/SFX.bank | 2 +- game/FMOD Project/Build/Desktop/VO.bank | 4 +- ...{601ea3ab-634e-4fd1-8e9e-44ed1f018ae4}.xml | 5 +- ...{886404c3-0312-4dc8-af6f-46f6ff1ed7a1}.xml | 3 + 28 files changed, 674 insertions(+), 126 deletions(-) diff --git a/game/Assets/Audio/VO/BAZ_0.wav b/game/Assets/Audio/VO/BAZ_0.wav index 40f3c3f..45b442b 100644 --- a/game/Assets/Audio/VO/BAZ_0.wav +++ b/game/Assets/Audio/VO/BAZ_0.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3f786910dc741ee2ee273fe1a4270087c40e6f549cdb595792effb2b3bf90c0 -size 604624 +oid sha256:6502da41b83a4ae3181215e58e81ede9875a9d1b2148155767c7d98bdeca30fa +size 906900 diff --git a/game/Assets/Audio/VO/BAZ_1.wav b/game/Assets/Audio/VO/BAZ_1.wav index 1794aef..687d51a 100644 --- a/game/Assets/Audio/VO/BAZ_1.wav +++ b/game/Assets/Audio/VO/BAZ_1.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417bcbfb08f7165fc3bac31ba7116f502fc676e95e506d1004940854de7a5d38 -size 1064672 +oid sha256:f8d2a1c7b31b244ce5faecf6f40ce7849196438a3410f6f40b0ba4aee1b4062b +size 1596972 diff --git a/game/Assets/Audio/VO/BAZ_10.wav b/game/Assets/Audio/VO/BAZ_10.wav index 76c01c9..da4c940 100644 --- a/game/Assets/Audio/VO/BAZ_10.wav +++ b/game/Assets/Audio/VO/BAZ_10.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:566ca4437d8ca412f6f7cbdfd28a66a5808bc6c5dbdf08b22172cc7e81b7839b -size 975960 +oid sha256:625da0bd6cd25f21f19971ea6200dee261a8cb8fc68d8e1fc0b6ec7b3f7df01d +size 947650 diff --git a/game/Assets/Audio/VO/BAZ_11.wav b/game/Assets/Audio/VO/BAZ_11.wav index 6e05b1a..6a30acd 100644 --- a/game/Assets/Audio/VO/BAZ_11.wav +++ b/game/Assets/Audio/VO/BAZ_11.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7c41068ded3419bcae2f09bef9aa9c87883743cad64c7bdcabc7c2d9c81348f -size 1922980 +oid sha256:39de580ef76980fbf453f70685b7a383ce345ea67e9d762eed34eabe5919675f +size 2884438 diff --git a/game/Assets/Audio/VO/BAZ_11_0.wav b/game/Assets/Audio/VO/BAZ_11_0.wav index cf50339..edfee64 100644 --- a/game/Assets/Audio/VO/BAZ_11_0.wav +++ b/game/Assets/Audio/VO/BAZ_11_0.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5685218c5ffb2ef4ee9c2ff7150ed4188b326bd744b8b8d10fc9dac9a286c33 -size 751956 +oid sha256:e9fa704c1ed8e17fe805c48b9ac64215d2fcd1eddf8abecd3266b09ba3a203fd +size 1127906 diff --git a/game/Assets/Audio/VO/BAZ_11_1.wav b/game/Assets/Audio/VO/BAZ_11_1.wav index 625d128..3a760b8 100644 --- a/game/Assets/Audio/VO/BAZ_11_1.wav +++ b/game/Assets/Audio/VO/BAZ_11_1.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac8f5854788e2da1e002c093f2e4db66da0887f5528da299dc1e4757ee99aeef -size 1162260 +oid sha256:4404d0c6951a841fc90aae4594ef364ba753ea5dabf4edd147bfd8d04414b8e0 +size 1518548 diff --git a/game/Assets/Audio/VO/BAZ_12.wav b/game/Assets/Audio/VO/BAZ_12.wav index 2cee1a6..40ea4ec 100644 --- a/game/Assets/Audio/VO/BAZ_12.wav +++ b/game/Assets/Audio/VO/BAZ_12.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:388000764f7c610f2433be5cdd4b3992a495db6cc27a9eea2cf1a31799af768c -size 1284240 +oid sha256:421619506a4bf97165b6eb0ce27e6d404b164e1577292351ff004ce99aa2f3a3 +size 1926328 diff --git a/game/Assets/Audio/VO/BAZ_13.wav b/game/Assets/Audio/VO/BAZ_13.wav index 402f93c..8ffd67c 100644 --- a/game/Assets/Audio/VO/BAZ_13.wav +++ b/game/Assets/Audio/VO/BAZ_13.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:781eef6fdd30a890252a541b05c3bbe3db66ac16d23ae4934f4367b154d37adc -size 1113464 +oid sha256:75a05025a1a2decccc969ae45097378e8ed4733cfa9df593043d2c32fd2db846 +size 1670164 diff --git a/game/Assets/Audio/VO/BAZ_14.wav b/game/Assets/Audio/VO/BAZ_14.wav index 5d9c413..eac1870 100644 --- a/game/Assets/Audio/VO/BAZ_14.wav +++ b/game/Assets/Audio/VO/BAZ_14.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a8901ca7eb4a0af5b05451b38e2c1ebe005f7d9413bac526b00ad58910cb1c1 -size 585620 +oid sha256:15b91cb704718481ac5d07d984aa84960fe04d1429d9f994d779421664f7cc5c +size 878398 diff --git a/game/Assets/Audio/VO/BAZ_15.wav b/game/Assets/Audio/VO/BAZ_15.wav index 60d0e7c..bf27d7c 100644 --- a/game/Assets/Audio/VO/BAZ_15.wav +++ b/game/Assets/Audio/VO/BAZ_15.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e896acd083bdcdb509f3afb761f9b6bd1c8f4624266c3fdc22b00f10d3c87c04 -size 909424 +oid sha256:995901091e6af3157dac2268152e393276cff7367f42a8e9c0b52bee494279dc +size 1364106 diff --git a/game/Assets/Audio/VO/BAZ_16.wav b/game/Assets/Audio/VO/BAZ_16.wav index 260b368..ae5e65a 100644 --- a/game/Assets/Audio/VO/BAZ_16.wav +++ b/game/Assets/Audio/VO/BAZ_16.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ddca62ad97dbb6b7015dfe2f74e26e85a0cc0ebf51e37f8eca2df5913a2f6f7 -size 1053584 +oid sha256:12ec5570d74f8ca1986629a94328de60fbc6b2f3d1045a0f07bb63afcbddb149 +size 1580346 diff --git a/game/Assets/Audio/VO/BAZ_2.wav b/game/Assets/Audio/VO/BAZ_2.wav index 195b77a..9f584ff 100644 --- a/game/Assets/Audio/VO/BAZ_2.wav +++ b/game/Assets/Audio/VO/BAZ_2.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c08b2d3f2175ee62fd7f84f00ba43cf877f06a6e68be75bbf8646b2e99e4c78 -size 951564 +oid sha256:3423584061ab06286d2f7a70460c60ce4b76ed6d55bb4d5f4476054c29bbc984 +size 1427314 diff --git a/game/Assets/Audio/VO/BAZ_3.wav b/game/Assets/Audio/VO/BAZ_3.wav index 2f45a62..f8eb3f2 100644 --- a/game/Assets/Audio/VO/BAZ_3.wav +++ b/game/Assets/Audio/VO/BAZ_3.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e887daec987b4e7052b21224a8a137772c6fb643b3735c7c0d14303572f4493e -size 1286456 +oid sha256:e061547bd0138586f4396317ed127b9b019880918d73b634bf918f49b45485fd +size 1929652 diff --git a/game/Assets/Audio/VO/BAZ_4.wav b/game/Assets/Audio/VO/BAZ_4.wav index b26603a..2026604 100644 --- a/game/Assets/Audio/VO/BAZ_4.wav +++ b/game/Assets/Audio/VO/BAZ_4.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:120139402afa67190d838d6b629a0e3a8cb56a2776d61bc80bc072bf181c0ab3 -size 1268716 +oid sha256:4d3bf1f30cc7c62c158d9f4aab13177439755d5a9b39aa29d3c9dba87bd821c1 +size 1903042 diff --git a/game/Assets/Audio/VO/BAZ_5.wav b/game/Assets/Audio/VO/BAZ_5.wav index 7fc2212..ac5dae5 100644 --- a/game/Assets/Audio/VO/BAZ_5.wav +++ b/game/Assets/Audio/VO/BAZ_5.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60b9847d07b0f216eaab7793b6057f1deec05822e60c79a9eabe33ed5ad5497b -size 1071328 +oid sha256:04ad83cb499ace940a05585714914c35785376955b2a57e08b18871943804e24 +size 1606960 diff --git a/game/Assets/Audio/VO/BAZ_6.wav b/game/Assets/Audio/VO/BAZ_6.wav index 34d7b01..41a4a02 100644 --- a/game/Assets/Audio/VO/BAZ_6.wav +++ b/game/Assets/Audio/VO/BAZ_6.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b15004fd463207a3647df51f278fa86180976b6c37952dc871f7c41d46eae02 -size 1663492 +oid sha256:41a2327c13fdff7d3817a7ffe647ad114c318f55f07f12bb0de104a6c23880c6 +size 2495206 diff --git a/game/Assets/Audio/VO/BAZ_7.wav b/game/Assets/Audio/VO/BAZ_7.wav index 509dd04..1d5b18b 100644 --- a/game/Assets/Audio/VO/BAZ_7.wav +++ b/game/Assets/Audio/VO/BAZ_7.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2298d5c5fe7b6b99b45e960bc0a5aa50d9355162fb4a88aa860004a1ab698a8 -size 1155604 +oid sha256:4fe23d2b8eca2f46d70eb9871df9c16bd349db44e4eb114e11a3c1d27f6a965d +size 1733374 diff --git a/game/Assets/Audio/VO/BAZ_8.wav b/game/Assets/Audio/VO/BAZ_8.wav index d9fa0a1..aaf701e 100644 --- a/game/Assets/Audio/VO/BAZ_8.wav +++ b/game/Assets/Audio/VO/BAZ_8.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87a377b8cb625689690322364f7b29201f7228be1e7c0b0a2dd7686b7b4f302b -size 998140 +oid sha256:3c0d774cba01498b18756618072a2eca81b0a4d4f45a8920d3e90f14da2ed4a2 +size 1497174 diff --git a/game/Assets/Audio/VO/BAZ_9.wav b/game/Assets/Audio/VO/BAZ_9.wav index 14b4259..60a92a9 100644 --- a/game/Assets/Audio/VO/BAZ_9.wav +++ b/game/Assets/Audio/VO/BAZ_9.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c01f187a4edc885727f46041eede1f8859f093dfc76e659d4cf23cd0135b7f53 -size 1324160 +oid sha256:1b73cd0b78f6b773cb5f0a47eaaaf3517d1398b0de71bc27b9be308a4e5762d0 +size 1986204 diff --git a/game/Assets/Audio/VO/BAZ_IN.wav b/game/Assets/Audio/VO/BAZ_IN.wav index 55a1f48..87b3b10 100644 --- a/game/Assets/Audio/VO/BAZ_IN.wav +++ b/game/Assets/Audio/VO/BAZ_IN.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7d696fe759e5b0c8fb6d6258f01703c2e58ab6c50ede1081bb45a72e7c7c80a -size 4506768 +oid sha256:4dd0736c4d59dd067508d1cac6b9737cb639f987a5759571b550e0544753c557 +size 6760122 diff --git a/game/Assets/Audio/VO/BAZ_OUT.wav b/game/Assets/Audio/VO/BAZ_OUT.wav index afb93b2..c1bbfdd 100644 --- a/game/Assets/Audio/VO/BAZ_OUT.wav +++ b/game/Assets/Audio/VO/BAZ_OUT.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9d85ba8653dc80b3af9b1179cb92ad736aadc6f8226629acbbe5bdf2f852e9b -size 2244564 +oid sha256:26fb6920cf9f4f1b0617f2a4ca780c1761c473c145116ace3f878b9e6bf5956c +size 3366818 diff --git a/game/Assets/Prefabs/Puzzles/FinalLevel/FinalLevel.prefab b/game/Assets/Prefabs/Puzzles/FinalLevel/FinalLevel.prefab index 2504eef..e74bfa6 100644 --- a/game/Assets/Prefabs/Puzzles/FinalLevel/FinalLevel.prefab +++ b/game/Assets/Prefabs/Puzzles/FinalLevel/FinalLevel.prefab @@ -8357,6 +8357,82 @@ Transform: m_Father: {fileID: 6623772862346398199} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &899451820664699606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6582456367340198248} + - component: {fileID: 219448737106731851} + - component: {fileID: 2468061496892785827} + - component: {fileID: 4094646197466585775} + m_Layer: 0 + m_Name: BazDialogue (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6582456367340198248 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899451820664699606} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 25.23, y: 84.66, z: 41.62} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6805754820831719713} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &219448737106731851 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899451820664699606} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &2468061496892785827 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899451820664699606} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 7, y: 7, z: 7} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &4094646197466585775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 899451820664699606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3} + m_Name: + m_EditorClassIdentifier: + _dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} + _speaker: 0 + _speakerTransform: {fileID: 0} + _key: + _keys: + - BAZ_11_1 + _onDialogueFinish: + m_PersistentCalls: + m_Calls: [] + _log: 0 --- !u!1 &919688868128978515 GameObject: m_ObjectHideFlags: 0 @@ -15280,6 +15356,39 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.010000027, y: 0.012711738, z: 0.009999999} m_Center: {x: -0.000000014202668, y: 0.007661277, z: 0} +--- !u!1 &1608875478780495041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6805754820831719713} + m_Layer: 0 + m_Name: StoryTriggers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6805754820831719713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1608875478780495041} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -21.005516, y: -109.91867, z: -22.70253} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5369597465703448005} + - {fileID: 8819609556152050244} + - {fileID: 6582456367340198248} + m_Father: {fileID: 2318864476246067792} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1656576190618714014 GameObject: m_ObjectHideFlags: 0 @@ -21791,6 +21900,82 @@ Transform: m_Father: {fileID: 9000083465643028579} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &2153058158026898834 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8819609556152050244} + - component: {fileID: 2952058877017876169} + - component: {fileID: 2765958056837839352} + - component: {fileID: 2854163616107178683} + m_Layer: 0 + m_Name: BazDialogue (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8819609556152050244 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153058158026898834} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.66, y: 71.19, z: 24.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6805754820831719713} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2952058877017876169 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153058158026898834} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &2765958056837839352 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153058158026898834} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 7, y: 7, z: 7} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &2854163616107178683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2153058158026898834} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3} + m_Name: + m_EditorClassIdentifier: + _dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} + _speaker: 0 + _speakerTransform: {fileID: 0} + _key: + _keys: + - BAZ_11_0 + _onDialogueFinish: + m_PersistentCalls: + m_Calls: [] + _log: 0 --- !u!1 &2155774663833105675 GameObject: m_ObjectHideFlags: 0 @@ -22144,12 +22329,16 @@ MonoBehaviour: m_EditorClassIdentifier: _dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} _speaker: 1 + _speakerTransform: {fileID: 0} _key: _keys: - BAZ_0 - BAZ_1 - BAZ_2 - BAZ_3 + _onDialogueFinish: + m_PersistentCalls: + m_Calls: [] _log: 0 --- !u!1 &2210971417290385433 GameObject: @@ -69776,6 +69965,8 @@ Transform: - {fileID: 9090119018190625207} - {fileID: 2484902550674094796} - {fileID: 781594746895772220} + - {fileID: 7699200384992946272} + - {fileID: 6805754820831719713} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -73528,6 +73719,86 @@ Transform: m_Father: {fileID: 5286795573223295930} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &6140321933574028274 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7215599481383197467} + - component: {fileID: 8819324209738053127} + - component: {fileID: 4149395922248899326} + m_Layer: 0 + m_Name: TriggieMcTrigFace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7215599481383197467 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6140321933574028274} + 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: 6653282482889623508} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8819324209738053127 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6140321933574028274} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 0 + serializedVersion: 2 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &4149395922248899326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6140321933574028274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3} + m_Name: + m_EditorClassIdentifier: + _dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} + _speaker: 1 + _speakerTransform: {fileID: 6653282482889623508} + _key: + _keys: + - BAZ_15 + - BAZ_16 + _onDialogueFinish: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8970661641880688120} + m_TargetAssemblyTypeName: BazFinalSequence, Assembly-CSharp + m_MethodName: CrashGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _log: 0 --- !u!1 &6147091506146328671 GameObject: m_ObjectHideFlags: 0 @@ -75413,6 +75684,8 @@ GameObject: m_Component: - component: {fileID: 6653282483057969720} - component: {fileID: 1653393992380780363} + - component: {fileID: 406653513098738984} + - component: {fileID: 2307969808721926139} m_Layer: 0 m_Name: baz m_TagString: Untagged @@ -75451,6 +75724,55 @@ MonoBehaviour: _amplitude: 0.1 _period: 2 _objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2} +--- !u!114 &406653513098738984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6653282483057969721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3} + m_Name: + m_EditorClassIdentifier: + _dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} + _speaker: 1 + _speakerTransform: {fileID: 6653282482889623508} + _key: + _keys: + - BAZ_12 + - BAZ_13 + - BAZ_14 + _onDialogueFinish: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8970661641880688120} + m_TargetAssemblyTypeName: BazFinalSequence, Assembly-CSharp + m_MethodName: FinishOff + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + _log: 0 +--- !u!65 &2307969808721926139 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6653282483057969721} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 0 + serializedVersion: 2 + m_Size: {x: 10, y: 10, z: 10} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &6654422787803602249 GameObject: m_ObjectHideFlags: 0 @@ -80649,6 +80971,11 @@ MonoBehaviour: _flickers: intensity: 10 period: 5 + _endDialogue: {fileID: 2307969808721926139} + _finishEvent: + m_PersistentCalls: + m_Calls: [] + _finishDialogue: {fileID: 8819324209738053127} --- !u!1 &6756169649922779274 GameObject: m_ObjectHideFlags: 0 @@ -94830,6 +95157,83 @@ Transform: m_Father: {fileID: 6098284104625574277} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &7954189213627979821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5369597465703448005} + - component: {fileID: 7182079296656828473} + - component: {fileID: 478074536965360134} + - component: {fileID: 1915378663830930164} + m_Layer: 0 + m_Name: BazDialogue (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5369597465703448005 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7954189213627979821} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.4, y: 57.09, z: 60.06} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6805754820831719713} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7182079296656828473 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7954189213627979821} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &478074536965360134 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7954189213627979821} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 7, y: 7, z: 7} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1915378663830930164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7954189213627979821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3} + m_Name: + m_EditorClassIdentifier: + _dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} + _speaker: 0 + _speakerTransform: {fileID: 0} + _key: + _keys: + - BAZ_9 + - BAZ_10 + _onDialogueFinish: + m_PersistentCalls: + m_Calls: [] + _log: 0 --- !u!1 &7987593091825714855 GameObject: m_ObjectHideFlags: 0 @@ -96841,6 +97245,82 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &8661594265520831196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7699200384992946272} + - component: {fileID: 1996175060189045780} + - component: {fileID: 641314004365086204} + - component: {fileID: 1536658941421839343} + m_Layer: 0 + m_Name: BazDialogue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7699200384992946272 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661594265520831196} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -13.3155155, y: -63.35867, z: -25.162523} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2318864476246067792} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1996175060189045780 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661594265520831196} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &641314004365086204 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661594265520831196} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 7, y: 7, z: 7} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1536658941421839343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8661594265520831196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3} + m_Name: + m_EditorClassIdentifier: + _dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} + _speaker: 0 + _speakerTransform: {fileID: 0} + _key: + _keys: + - BAZ_8 + _onDialogueFinish: + m_PersistentCalls: + m_Calls: [] + _log: 0 --- !u!1 &8674837491808164786 GameObject: m_ObjectHideFlags: 0 @@ -99033,16 +99513,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!4 &391007228865768814 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 209305772505041541} - m_PrefabAsset: {fileID: 0} --- !u!1 &1019770287309666260 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 209305772505041541} m_PrefabAsset: {fileID: 0} +--- !u!4 &391007228865768814 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 209305772505041541} + m_PrefabAsset: {fileID: 0} --- !u!1001 &218671318215821122 PrefabInstance: m_ObjectHideFlags: 0 @@ -103587,16 +104067,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!1 &1999828352351672367 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 1657809116353013118} - m_PrefabAsset: {fileID: 0} --- !u!4 &1192048617534079637 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 1657809116353013118} m_PrefabAsset: {fileID: 0} +--- !u!1 &1999828352351672367 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 1657809116353013118} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1659060400432820358 PrefabInstance: m_ObjectHideFlags: 0 @@ -108093,16 +108573,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!4 &3439339990095321689 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 2895889339501264306} - m_PrefabAsset: {fileID: 0} --- !u!1 &2661959239984808163 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 2895889339501264306} m_PrefabAsset: {fileID: 0} +--- !u!4 &3439339990095321689 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 2895889339501264306} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2932527249536351728 PrefabInstance: m_ObjectHideFlags: 0 @@ -110347,16 +110827,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!1 &2531090062122242105 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 3450132049042369896} - m_PrefabAsset: {fileID: 0} --- !u!4 &2912682910603610755 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 3450132049042369896} m_PrefabAsset: {fileID: 0} +--- !u!1 &2531090062122242105 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 3450132049042369896} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3480400550044617361 PrefabInstance: m_ObjectHideFlags: 0 @@ -112241,16 +112721,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!1 &3872871411671636680 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 4142851882902693785} - m_PrefabAsset: {fileID: 0} --- !u!4 &4536502147956883570 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 4142851882902693785} m_PrefabAsset: {fileID: 0} +--- !u!1 &3872871411671636680 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 4142851882902693785} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4145638492521861482 PrefabInstance: m_ObjectHideFlags: 0 @@ -112912,16 +113392,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!4 &4275514168512466994 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 4386246581052553177} - m_PrefabAsset: {fileID: 0} --- !u!1 &3467347126917630600 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 4386246581052553177} m_PrefabAsset: {fileID: 0} +--- !u!4 &4275514168512466994 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 4386246581052553177} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4421935458126254625 PrefabInstance: m_ObjectHideFlags: 0 @@ -117915,16 +118395,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!4 &6326157735947016146 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 5783114008740196409} - m_PrefabAsset: {fileID: 0} --- !u!1 &6665563143940754792 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 5783114008740196409} m_PrefabAsset: {fileID: 0} +--- !u!4 &6326157735947016146 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 5783114008740196409} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5813053379885058668 PrefabInstance: m_ObjectHideFlags: 0 @@ -121091,26 +121571,26 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 5c1e0a9891c82fe47b8a865d33ee4330, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3} ---- !u!4 &6653282482889623540 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400020, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3} - m_PrefabInstance: {fileID: 6653282482889235808} - m_PrefabAsset: {fileID: 0} --- !u!4 &6653282482889623508 stripped Transform: m_CorrespondingSourceObject: {fileID: 400052, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3} m_PrefabInstance: {fileID: 6653282482889235808} m_PrefabAsset: {fileID: 0} ---- !u!1 &6653282482889202612 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100052, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3} - m_PrefabInstance: {fileID: 6653282482889235808} - m_PrefabAsset: {fileID: 0} --- !u!95 &6653282482879850496 stripped Animator: m_CorrespondingSourceObject: {fileID: 9500000, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3} m_PrefabInstance: {fileID: 6653282482889235808} m_PrefabAsset: {fileID: 0} +--- !u!4 &6653282482889623540 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400020, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3} + m_PrefabInstance: {fileID: 6653282482889235808} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6653282482889202612 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100052, guid: efe3dfc3f160a0b4a8cc79f6ce386fbc, type: 3} + m_PrefabInstance: {fileID: 6653282482889235808} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6658263290371394843 PrefabInstance: m_ObjectHideFlags: 0 @@ -122487,6 +122967,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 077e7025077de9f489adff0b8094a2ae, type: 3} +--- !u!4 &4427068402638363896 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6996056622029946206, guid: 077e7025077de9f489adff0b8094a2ae, type: 3} + m_PrefabInstance: {fileID: 6658263292307349926} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5778458176337327819 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 889410586990417773, guid: 077e7025077de9f489adff0b8094a2ae, type: 3} + m_PrefabInstance: {fileID: 6658263292307349926} + m_PrefabAsset: {fileID: 0} --- !u!114 &3729622057609587809 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8044731510911618503, guid: 077e7025077de9f489adff0b8094a2ae, type: 3} @@ -122498,16 +122988,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c79d6b66286a2ac41b41321a95dfcc00, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &4427068402638363896 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6996056622029946206, guid: 077e7025077de9f489adff0b8094a2ae, type: 3} - m_PrefabInstance: {fileID: 6658263292307349926} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5778458176337327819 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 889410586990417773, guid: 077e7025077de9f489adff0b8094a2ae, type: 3} - m_PrefabInstance: {fileID: 6658263292307349926} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6683979289655420216 PrefabInstance: m_ObjectHideFlags: 0 @@ -129204,16 +129684,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!4 &8075831957684891707 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 8618103108187412432} - m_PrefabAsset: {fileID: 0} --- !u!1 &8888081240809171585 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 8618103108187412432} m_PrefabAsset: {fileID: 0} +--- !u!4 &8075831957684891707 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 8618103108187412432} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8641694924835006140 PrefabInstance: m_ObjectHideFlags: 0 @@ -129443,16 +129923,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} ---- !u!4 &9161270130454668405 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} - m_PrefabInstance: {fileID: 8694735471984034718} - m_PrefabAsset: {fileID: 0} --- !u!1 &8388110478296350415 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 8694735471984034718} m_PrefabAsset: {fileID: 0} +--- !u!4 &9161270130454668405 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} + m_PrefabInstance: {fileID: 8694735471984034718} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8715433862524680334 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index b22f7ac..ddc42f2 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -1435,6 +1435,38 @@ PrefabInstance: propertyPath: _player value: objectReference: {fileID: 2118141528} + - target: {fileID: 8970661641880688120, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} + propertyPath: _finishEvent.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8970661641880688120, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} + propertyPath: _finishEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8970661641880688120, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} + propertyPath: _finishEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1353502087} + - target: {fileID: 8970661641880688120, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} + propertyPath: _finishEvent.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8970661641880688120, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} + propertyPath: _finishEvent.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetTrigger + objectReference: {fileID: 0} + - target: {fileID: 8970661641880688120, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} + propertyPath: _finishEvent.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.Animator, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8970661641880688120, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} + propertyPath: _finishEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument + value: fadeToBlack + objectReference: {fileID: 0} + - target: {fileID: 8970661641880688120, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} + propertyPath: _finishEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1e0e2f5e5749a93499760c30aa5325ec, type: 3} --- !u!4 &1854234303 stripped @@ -1747,11 +1779,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.12180066 + value: 0.121800646 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.075853094 + value: 0.07585309 objectReference: {fileID: 0} - target: {fileID: 4676633831388223330, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_RendererIndex @@ -1775,11 +1807,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.14692453 + value: -0.14692448 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.12074837 + value: 0.12074834 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y @@ -1843,15 +1875,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831598614294, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: _cheatBlink - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4676633831598614294, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: _cheatBoost - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4676633831598614294, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: _cheatFreeze - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4676633831945762664, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_IsActive @@ -1911,15 +1943,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.61647433 + value: -0.6164744 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.021313526 + value: -0.021313444 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.008242488 + value: -0.008242458 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -2023,11 +2055,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.14692448 + value: -0.14692453 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.12074834 + value: 0.12074837 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y diff --git a/game/Assets/Scripts/Dialogue/BazFinalSequence.cs b/game/Assets/Scripts/Dialogue/BazFinalSequence.cs index d84599d..1813b30 100644 --- a/game/Assets/Scripts/Dialogue/BazFinalSequence.cs +++ b/game/Assets/Scripts/Dialogue/BazFinalSequence.cs @@ -4,6 +4,8 @@ using Cinemachine; using DG.Tweening; using Google.Apis.Util; using UnityEngine; +using UnityEngine.Diagnostics; +using UnityEngine.Events; using UnityEngine.InputSystem; public class BazFinalSequence : MonoBehaviour @@ -33,10 +35,20 @@ public class BazFinalSequence : MonoBehaviour [SerializeField] private Baz _baz; [SerializeField] private GameObject _statue; [SerializeField] private Flickers _flickers; + + [SerializeField] + private BoxCollider _endDialogue; private WaitForSeconds _bazPauseForEffect; private WaitForSeconds _bazWalk; + private bool _finished = false; + + [SerializeField] + private UnityEvent _finishEvent; + [SerializeField] + private BoxCollider _finishDialogue; + private void Awake() { _bazPauseForEffect = new WaitForSeconds(_baz.pauseTime); @@ -47,6 +59,16 @@ public class BazFinalSequence : MonoBehaviour { StartCoroutine(BazCR()); } + + public void FinishOff() + { + _finished = true; + } + + public void CrashGame() + { + Utils.ForceCrash( ForcedCrashCategory.AccessViolation ); + } private IEnumerator BazCR() { @@ -96,5 +118,19 @@ public class BazFinalSequence : MonoBehaviour _baz.scaleTarget.LookAt(playerPos + _baz.hoverHeight * Vector3.up); // roll credits! + + yield return new WaitForSecondsRealtime( 1f ); + _endDialogue.enabled = true; + + while ( !_finished ) + { + yield return null; + } + + _finishEvent.Invoke(); + + yield return new WaitForSecondsRealtime( 1f ); + + _finishDialogue.enabled = true; } } diff --git a/game/FMOD Project/Build/Desktop/SFX.bank b/game/FMOD Project/Build/Desktop/SFX.bank index 796e677..20831a3 100644 --- a/game/FMOD Project/Build/Desktop/SFX.bank +++ b/game/FMOD Project/Build/Desktop/SFX.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2e88b7bba9d58410379979406bb0c93aadd10815b01174637683490350c7228 +oid sha256:12185b3c812b0e3aec990abd319da15aa37ce3746570e0b56a326a13a62afbed size 4184608 diff --git a/game/FMOD Project/Build/Desktop/VO.bank b/game/FMOD Project/Build/Desktop/VO.bank index 86e6ad6..5db0406 100644 --- a/game/FMOD Project/Build/Desktop/VO.bank +++ b/game/FMOD Project/Build/Desktop/VO.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7483eae9352ac335df40043e34ccfdf5e6e3ed45f43e0c8773c21b553690a14a -size 3122400 +oid sha256:fdb357aa09fb428ccd17492fc8cc2918466b0a0eeeb28136d4f1c9327000b6f6 +size 3157952 diff --git a/game/FMOD Project/Metadata/Event/{601ea3ab-634e-4fd1-8e9e-44ed1f018ae4}.xml b/game/FMOD Project/Metadata/Event/{601ea3ab-634e-4fd1-8e9e-44ed1f018ae4}.xml index 327e232..9cef459 100644 --- a/game/FMOD Project/Metadata/Event/{601ea3ab-634e-4fd1-8e9e-44ed1f018ae4}.xml +++ b/game/FMOD Project/Metadata/Event/{601ea3ab-634e-4fd1-8e9e-44ed1f018ae4}.xml @@ -143,14 +143,11 @@ - - 2 - 2.79999995 - 45 + 35 8000 diff --git a/game/FMOD Project/Metadata/Event/{886404c3-0312-4dc8-af6f-46f6ff1ed7a1}.xml b/game/FMOD Project/Metadata/Event/{886404c3-0312-4dc8-af6f-46f6ff1ed7a1}.xml index e596095..0fcfdce 100644 --- a/game/FMOD Project/Metadata/Event/{886404c3-0312-4dc8-af6f-46f6ff1ed7a1}.xml +++ b/game/FMOD Project/Metadata/Event/{886404c3-0312-4dc8-af6f-46f6ff1ed7a1}.xml @@ -105,6 +105,9 @@ https://soundcloud.com/nasa + + -12 + {70ec0f3f-81b6-4925-a9bd-974170a1b219}