Skip to content

Commit b41e992

Browse files
committed
Beach night final cutscene now starts main menu in the end
1 parent 32a381d commit b41e992

File tree

5 files changed

+531
-617
lines changed

5 files changed

+531
-617
lines changed

UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ MonoBehaviour:
2121
m_Address: Assets/Scenes/Examples/CutsceneExample.unity
2222
m_ReadOnly: 0
2323
m_SerializedLabels: []
24-
- m_GUID: 2b208cb05dafb3a4cbeca8c493e4a6e2
25-
m_Address: Assets/Scenes/Locations/Beach_Final.unity
26-
m_ReadOnly: 0
27-
m_SerializedLabels: []
2824
m_ReadOnly: 0
2925
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
3026
m_SchemaSet:

UOP1_Project/Assets/AddressableAssetsData/AssetGroups/LocationScenes.asset

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ MonoBehaviour:
5353
m_Address: Assets/Scenes/Locations/Mountain_Cave.unity
5454
m_ReadOnly: 0
5555
m_SerializedLabels: []
56+
- m_GUID: 2b208cb05dafb3a4cbeca8c493e4a6e2
57+
m_Address: Assets/Scenes/Locations/Beach_Final.unity
58+
m_ReadOnly: 0
59+
m_SerializedLabels: []
5660
m_ReadOnly: 0
5761
m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
5862
m_SchemaSet:

UOP1_Project/Assets/Cutscenes/BeachGameEndCutscene.playable

Lines changed: 67 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@ MonoBehaviour:
1616
m_Retroactive: 0
1717
m_EmitOnce: 0
1818
m_Asset: {fileID: 11400000, guid: 0adbeca7680ed10409bd106de57f5b70, type: 2}
19-
--- !u!114 &-7966737117111517117
20-
MonoBehaviour:
21-
m_ObjectHideFlags: 1
22-
m_CorrespondingSourceObject: {fileID: 0}
23-
m_PrefabInstance: {fileID: 0}
24-
m_PrefabAsset: {fileID: 0}
25-
m_GameObject: {fileID: 0}
26-
m_Enabled: 1
27-
m_EditorHideFlags: 0
28-
m_Script: {fileID: 11500000, guid: 90fb794a295e73545af71bcdb7375791, type: 3}
29-
m_Name: CinemachineShot
30-
m_EditorClassIdentifier:
31-
DisplayName:
32-
VirtualCamera:
33-
exposedName: 8213f3d66248ce24d9b00f3873b7720e
34-
defaultValue: {fileID: 0}
3519
--- !u!114 &-7582400587491240516
3620
MonoBehaviour:
3721
m_ObjectHideFlags: 1
@@ -69,39 +53,6 @@ MonoBehaviour:
6953
m_Parent: {fileID: 11400000}
7054
m_Children: []
7155
m_Clips:
72-
- m_Version: 1
73-
m_Start: 0.4166666666666667
74-
m_ClipIn: 0
75-
m_Asset: {fileID: -7966737117111517117}
76-
m_Duration: 5.383333333333333
77-
m_TimeScale: 1
78-
m_ParentTrack: {fileID: -7243414920591819180}
79-
m_EaseInDuration: 0
80-
m_EaseOutDuration: 0
81-
m_BlendInDuration: 0.9333333333333333
82-
m_BlendOutDuration: -1
83-
m_MixInCurve:
84-
serializedVersion: 2
85-
m_Curve: []
86-
m_PreInfinity: 2
87-
m_PostInfinity: 2
88-
m_RotationOrder: 4
89-
m_MixOutCurve:
90-
serializedVersion: 2
91-
m_Curve: []
92-
m_PreInfinity: 2
93-
m_PostInfinity: 2
94-
m_RotationOrder: 4
95-
m_BlendInCurveMode: 0
96-
m_BlendOutCurveMode: 0
97-
m_ExposedParameterNames: []
98-
m_AnimationCurves: {fileID: 0}
99-
m_Recordable: 0
100-
m_PostExtrapolationMode: 0
101-
m_PreExtrapolationMode: 0
102-
m_PostExtrapolationTime: 0
103-
m_PreExtrapolationTime: 0
104-
m_DisplayName: CM vcam2
10556
- m_Version: 1
10657
m_Start: 0
10758
m_ClipIn: 0
@@ -112,7 +63,7 @@ MonoBehaviour:
11263
m_EaseInDuration: 0
11364
m_EaseOutDuration: 0
11465
m_BlendInDuration: -1
115-
m_BlendOutDuration: 0.9333333333333333
66+
m_BlendOutDuration: 0.28333333333333344
11667
m_MixInCurve:
11768
serializedVersion: 2
11869
m_Curve:
@@ -162,11 +113,29 @@ MonoBehaviour:
162113
m_ParentTrack: {fileID: -7243414920591819180}
163114
m_EaseInDuration: 0
164115
m_EaseOutDuration: 0
165-
m_BlendInDuration: 0.7666666666665911
116+
m_BlendInDuration: 0.16666666666659147
166117
m_BlendOutDuration: -1
167118
m_MixInCurve:
168119
serializedVersion: 2
169-
m_Curve: []
120+
m_Curve:
121+
- serializedVersion: 3
122+
time: 0
123+
value: 0
124+
inSlope: 0
125+
outSlope: 0
126+
tangentMode: 0
127+
weightedMode: 0
128+
inWeight: 0
129+
outWeight: 0
130+
- serializedVersion: 3
131+
time: 1
132+
value: 1
133+
inSlope: 0
134+
outSlope: 0
135+
tangentMode: 0
136+
weightedMode: 0
137+
inWeight: 0
138+
outWeight: 0
170139
m_PreInfinity: 2
171140
m_PostInfinity: 2
172141
m_RotationOrder: 4
@@ -187,37 +156,19 @@ MonoBehaviour:
187156
m_PreExtrapolationTime: 0
188157
m_DisplayName: Fade VCam
189158
- m_Version: 1
190-
m_Start: 5.8
159+
m_Start: 1.0666666666666667
191160
m_ClipIn: 0
192161
m_Asset: {fileID: 3186172763714848773}
193-
m_Duration: 8.2
162+
m_Duration: 12.333333333333334
194163
m_TimeScale: 1
195164
m_ParentTrack: {fileID: -7243414920591819180}
196165
m_EaseInDuration: 0
197166
m_EaseOutDuration: 0
198-
m_BlendInDuration: -1
199-
m_BlendOutDuration: 0.7666666666665911
167+
m_BlendInDuration: 0.28333333333333344
168+
m_BlendOutDuration: 0.16666666666659147
200169
m_MixInCurve:
201170
serializedVersion: 2
202-
m_Curve:
203-
- serializedVersion: 3
204-
time: 0
205-
value: 0
206-
inSlope: 0
207-
outSlope: 0
208-
tangentMode: 0
209-
weightedMode: 0
210-
inWeight: 0
211-
outWeight: 0
212-
- serializedVersion: 3
213-
time: 1
214-
value: 1
215-
inSlope: 0
216-
outSlope: 0
217-
tangentMode: 0
218-
weightedMode: 0
219-
inWeight: 0
220-
outWeight: 0
171+
m_Curve: []
221172
m_PreInfinity: 2
222173
m_PostInfinity: 2
223174
m_RotationOrder: 4
@@ -239,6 +190,22 @@ MonoBehaviour:
239190
m_DisplayName: CM vcam Hamlet
240191
m_Markers:
241192
m_Objects: []
193+
--- !u!114 &-5856335729128937355
194+
MonoBehaviour:
195+
m_ObjectHideFlags: 1
196+
m_CorrespondingSourceObject: {fileID: 0}
197+
m_PrefabInstance: {fileID: 0}
198+
m_PrefabAsset: {fileID: 0}
199+
m_GameObject: {fileID: 0}
200+
m_Enabled: 1
201+
m_EditorHideFlags: 0
202+
m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
203+
m_Name: Signal Emitter
204+
m_EditorClassIdentifier:
205+
m_Time: 14.5
206+
m_Retroactive: 0
207+
m_EmitOnce: 0
208+
m_Asset: {fileID: 11400000, guid: 1550c0b25c64f074fab55878318a887c, type: 2}
242209
--- !u!114 &-2884299101615570253
243210
MonoBehaviour:
244211
m_ObjectHideFlags: 1
@@ -322,6 +289,7 @@ MonoBehaviour:
322289
m_Tracks:
323290
- {fileID: -7243414920591819180}
324291
- {fileID: 3555833738414936371}
292+
- {fileID: 8130406774560472409}
325293
m_FixedDuration: 0
326294
m_EditorSettings:
327295
m_Framerate: 60
@@ -424,3 +392,27 @@ MonoBehaviour:
424392
m_Clips: []
425393
m_Markers:
426394
m_Objects: []
395+
--- !u!114 &8130406774560472409
396+
MonoBehaviour:
397+
m_ObjectHideFlags: 1
398+
m_CorrespondingSourceObject: {fileID: 0}
399+
m_PrefabInstance: {fileID: 0}
400+
m_PrefabAsset: {fileID: 0}
401+
m_GameObject: {fileID: 0}
402+
m_Enabled: 1
403+
m_EditorHideFlags: 0
404+
m_Script: {fileID: 11500000, guid: b46e36075dd1c124a8422c228e75e1fb, type: 3}
405+
m_Name: Signal Track
406+
m_EditorClassIdentifier:
407+
m_Version: 3
408+
m_AnimClip: {fileID: 0}
409+
m_Locked: 0
410+
m_Muted: 0
411+
m_CustomPlayableFullTypename:
412+
m_Curves: {fileID: 0}
413+
m_Parent: {fileID: 11400000}
414+
m_Children: []
415+
m_Clips: []
416+
m_Markers:
417+
m_Objects:
418+
- {fileID: -5856335729128937355}

0 commit comments

Comments
 (0)