Skip to content

Commit 1feccc7

Browse files
committed
Credits integration in final cutscene
1 parent 83079a8 commit 1feccc7

File tree

8 files changed

+822
-205
lines changed

8 files changed

+822
-205
lines changed

UOP1_Project/Assets/Cutscenes/BeachGameEndCutscene.playable

Lines changed: 164 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,25 @@ MonoBehaviour:
9090
m_RotationOrder: 4
9191
m_MixOutCurve:
9292
serializedVersion: 2
93-
m_Curve: []
93+
m_Curve:
94+
- serializedVersion: 3
95+
time: 0
96+
value: 1
97+
inSlope: 0
98+
outSlope: 0
99+
tangentMode: 0
100+
weightedMode: 0
101+
inWeight: 0
102+
outWeight: 0
103+
- serializedVersion: 3
104+
time: 1
105+
value: 0
106+
inSlope: 0
107+
outSlope: 0
108+
tangentMode: 0
109+
weightedMode: 0
110+
inWeight: 0
111+
outWeight: 0
94112
m_PreInfinity: 2
95113
m_PostInfinity: 2
96114
m_RotationOrder: 4
@@ -117,25 +135,7 @@ MonoBehaviour:
117135
m_BlendOutDuration: -1
118136
m_MixInCurve:
119137
serializedVersion: 2
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
138+
m_Curve: []
139139
m_PreInfinity: 2
140140
m_PostInfinity: 2
141141
m_RotationOrder: 4
@@ -168,13 +168,49 @@ MonoBehaviour:
168168
m_BlendOutDuration: 0.16666666666659147
169169
m_MixInCurve:
170170
serializedVersion: 2
171-
m_Curve: []
171+
m_Curve:
172+
- serializedVersion: 3
173+
time: 0
174+
value: 0
175+
inSlope: 0
176+
outSlope: 0
177+
tangentMode: 0
178+
weightedMode: 0
179+
inWeight: 0
180+
outWeight: 0
181+
- serializedVersion: 3
182+
time: 1
183+
value: 1
184+
inSlope: 0
185+
outSlope: 0
186+
tangentMode: 0
187+
weightedMode: 0
188+
inWeight: 0
189+
outWeight: 0
172190
m_PreInfinity: 2
173191
m_PostInfinity: 2
174192
m_RotationOrder: 4
175193
m_MixOutCurve:
176194
serializedVersion: 2
177-
m_Curve: []
195+
m_Curve:
196+
- serializedVersion: 3
197+
time: 0
198+
value: 1
199+
inSlope: 0
200+
outSlope: 0
201+
tangentMode: 0
202+
weightedMode: 0
203+
inWeight: 0
204+
outWeight: 0
205+
- serializedVersion: 3
206+
time: 1
207+
value: 0
208+
inSlope: 0
209+
outSlope: 0
210+
tangentMode: 0
211+
weightedMode: 0
212+
inWeight: 0
213+
outWeight: 0
178214
m_PreInfinity: 2
179215
m_PostInfinity: 2
180216
m_RotationOrder: 4
@@ -206,6 +242,18 @@ MonoBehaviour:
206242
m_Retroactive: 0
207243
m_EmitOnce: 0
208244
m_Asset: {fileID: 11400000, guid: 1550c0b25c64f074fab55878318a887c, type: 2}
245+
--- !u!114 &-4913486015515794019
246+
MonoBehaviour:
247+
m_ObjectHideFlags: 1
248+
m_CorrespondingSourceObject: {fileID: 0}
249+
m_PrefabInstance: {fileID: 0}
250+
m_PrefabAsset: {fileID: 0}
251+
m_GameObject: {fileID: 0}
252+
m_Enabled: 1
253+
m_EditorHideFlags: 0
254+
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
255+
m_Name: ActivationPlayableAsset
256+
m_EditorClassIdentifier:
209257
--- !u!114 &-2884299101615570253
210258
MonoBehaviour:
211259
m_ObjectHideFlags: 1
@@ -222,6 +270,99 @@ MonoBehaviour:
222270
m_Retroactive: 0
223271
m_EmitOnce: 0
224272
m_Asset: {fileID: 11400000, guid: 6856041049abbdc409693c6590918f76, type: 2}
273+
--- !u!114 &-2110839875583747334
274+
MonoBehaviour:
275+
m_ObjectHideFlags: 1
276+
m_CorrespondingSourceObject: {fileID: 0}
277+
m_PrefabInstance: {fileID: 0}
278+
m_PrefabAsset: {fileID: 0}
279+
m_GameObject: {fileID: 0}
280+
m_Enabled: 1
281+
m_EditorHideFlags: 0
282+
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
283+
m_Name: RollingCredits
284+
m_EditorClassIdentifier:
285+
m_Version: 3
286+
m_AnimClip: {fileID: 0}
287+
m_Locked: 0
288+
m_Muted: 0
289+
m_CustomPlayableFullTypename:
290+
m_Curves: {fileID: 0}
291+
m_Parent: {fileID: 11400000}
292+
m_Children: []
293+
m_Clips:
294+
- m_Version: 1
295+
m_Start: 2.2333333333333334
296+
m_ClipIn: 0
297+
m_Asset: {fileID: -4913486015515794019}
298+
m_Duration: 10.066666666666666
299+
m_TimeScale: 1
300+
m_ParentTrack: {fileID: -2110839875583747334}
301+
m_EaseInDuration: 0
302+
m_EaseOutDuration: 0
303+
m_BlendInDuration: 0
304+
m_BlendOutDuration: 0
305+
m_MixInCurve:
306+
serializedVersion: 2
307+
m_Curve:
308+
- serializedVersion: 3
309+
time: 0
310+
value: 0
311+
inSlope: 0
312+
outSlope: 0
313+
tangentMode: 0
314+
weightedMode: 0
315+
inWeight: 0
316+
outWeight: 0
317+
- serializedVersion: 3
318+
time: 1
319+
value: 1
320+
inSlope: 0
321+
outSlope: 0
322+
tangentMode: 0
323+
weightedMode: 0
324+
inWeight: 0
325+
outWeight: 0
326+
m_PreInfinity: 2
327+
m_PostInfinity: 2
328+
m_RotationOrder: 4
329+
m_MixOutCurve:
330+
serializedVersion: 2
331+
m_Curve:
332+
- serializedVersion: 3
333+
time: 0
334+
value: 1
335+
inSlope: 0
336+
outSlope: 0
337+
tangentMode: 0
338+
weightedMode: 0
339+
inWeight: 0
340+
outWeight: 0
341+
- serializedVersion: 3
342+
time: 1
343+
value: 0
344+
inSlope: 0
345+
outSlope: 0
346+
tangentMode: 0
347+
weightedMode: 0
348+
inWeight: 0
349+
outWeight: 0
350+
m_PreInfinity: 2
351+
m_PostInfinity: 2
352+
m_RotationOrder: 4
353+
m_BlendInCurveMode: 0
354+
m_BlendOutCurveMode: 0
355+
m_ExposedParameterNames: []
356+
m_AnimationCurves: {fileID: 0}
357+
m_Recordable: 0
358+
m_PostExtrapolationMode: 0
359+
m_PreExtrapolationMode: 0
360+
m_PostExtrapolationTime: 0
361+
m_PreExtrapolationTime: 0
362+
m_DisplayName: Active
363+
m_Markers:
364+
m_Objects: []
365+
m_PostPlaybackState: 3
225366
--- !u!74 &-1493331148938387632
226367
AnimationClip:
227368
m_ObjectHideFlags: 0
@@ -290,6 +431,7 @@ MonoBehaviour:
290431
- {fileID: -7243414920591819180}
291432
- {fileID: 3555833738414936371}
292433
- {fileID: 8130406774560472409}
434+
- {fileID: -2110839875583747334}
293435
m_FixedDuration: 0
294436
m_EditorSettings:
295437
m_Framerate: 60

0 commit comments

Comments
 (0)