Skip to content

Commit b9f9ea6

Browse files
amel-unityamel-unity
committed
Pushing cutscene placeholders to the different scenes
1 parent b3dd8df commit b9f9ea6

File tree

10 files changed

+1234
-838
lines changed

10 files changed

+1234
-838
lines changed

‎UOP1_Project/Assets/Cutscenes/BeachCandyCutscene.playable

Lines changed: 19 additions & 361 deletions
Large diffs are not rendered by default.

‎UOP1_Project/Assets/Cutscenes/SweetDishCutscene.playable

Lines changed: 3 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -211,25 +211,7 @@ MonoBehaviour:
211211
m_RotationOrder: 4
212212
m_MixOutCurve:
213213
serializedVersion: 2
214-
m_Curve:
215-
- serializedVersion: 3
216-
time: 0
217-
value: 1
218-
inSlope: 0
219-
outSlope: 0
220-
tangentMode: 0
221-
weightedMode: 0
222-
inWeight: 0
223-
outWeight: 0
224-
- serializedVersion: 3
225-
time: 1
226-
value: 0
227-
inSlope: 0
228-
outSlope: 0
229-
tangentMode: 0
230-
weightedMode: 0
231-
inWeight: 0
232-
outWeight: 0
214+
m_Curve: []
233215
m_PreInfinity: 2
234216
m_PostInfinity: 2
235217
m_RotationOrder: 4
@@ -1321,25 +1303,7 @@ MonoBehaviour:
13211303
m_RotationOrder: 4
13221304
m_MixOutCurve:
13231305
serializedVersion: 2
1324-
m_Curve:
1325-
- serializedVersion: 3
1326-
time: 0
1327-
value: 1
1328-
inSlope: 0
1329-
outSlope: 0
1330-
tangentMode: 0
1331-
weightedMode: 0
1332-
inWeight: 0
1333-
outWeight: 0
1334-
- serializedVersion: 3
1335-
time: 1
1336-
value: 0
1337-
inSlope: 0
1338-
outSlope: 0
1339-
tangentMode: 0
1340-
weightedMode: 0
1341-
inWeight: 0
1342-
outWeight: 0
1306+
m_Curve: []
13431307
m_PreInfinity: 2
13441308
m_PostInfinity: 2
13451309
m_RotationOrder: 4
@@ -1696,25 +1660,7 @@ MonoBehaviour:
16961660
m_BlendOutDuration: -1
16971661
m_MixInCurve:
16981662
serializedVersion: 2
1699-
m_Curve:
1700-
- serializedVersion: 3
1701-
time: 0
1702-
value: 0
1703-
inSlope: 0
1704-
outSlope: 0
1705-
tangentMode: 0
1706-
weightedMode: 0
1707-
inWeight: 0
1708-
outWeight: 0
1709-
- serializedVersion: 3
1710-
time: 1
1711-
value: 1
1712-
inSlope: 0
1713-
outSlope: 0
1714-
tangentMode: 0
1715-
weightedMode: 0
1716-
inWeight: 0
1717-
outWeight: 0
1663+
m_Curve: []
17181664
m_PreInfinity: 2
17191665
m_PostInfinity: 2
17201666
m_RotationOrder: 4

‎UOP1_Project/Assets/Cutscenes/TownCutscene.playable

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,25 @@ MonoBehaviour:
8282
m_BlendOutDuration: -1
8383
m_MixInCurve:
8484
serializedVersion: 2
85-
m_Curve: []
85+
m_Curve:
86+
- serializedVersion: 3
87+
time: 0
88+
value: 0
89+
inSlope: 0
90+
outSlope: 0
91+
tangentMode: 0
92+
weightedMode: 0
93+
inWeight: 0
94+
outWeight: 0
95+
- serializedVersion: 3
96+
time: 1
97+
value: 1
98+
inSlope: 0
99+
outSlope: 0
100+
tangentMode: 0
101+
weightedMode: 0
102+
inWeight: 0
103+
outWeight: 0
86104
m_PreInfinity: 2
87105
m_PostInfinity: 2
88106
m_RotationOrder: 4

‎UOP1_Project/Assets/Prefabs/Cutscenes/SlimeCritterCutscene.prefab

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ MonoBehaviour:
122122
ModeOverride: 0
123123
LensShift: {x: 0, y: 0}
124124
GateFit: 2
125-
m_SensorSize: {x: 2.6201751, y: 1}
125+
m_SensorSize: {x: 2.051332, y: 1}
126126
m_Transitions:
127127
m_BlendHint: 0
128128
m_InheritPosition: 0
@@ -254,7 +254,7 @@ MonoBehaviour:
254254
ModeOverride: 0
255255
LensShift: {x: 0, y: 0}
256256
GateFit: 2
257-
m_SensorSize: {x: 2.6201751, y: 1}
257+
m_SensorSize: {x: 2.051332, y: 1}
258258
m_Transitions:
259259
m_BlendHint: 0
260260
m_InheritPosition: 0
@@ -384,7 +384,7 @@ MonoBehaviour:
384384
ModeOverride: 0
385385
LensShift: {x: 0, y: 0}
386386
GateFit: 2
387-
m_SensorSize: {x: 2.6201751, y: 1}
387+
m_SensorSize: {x: 2.051332, y: 1}
388388
m_Transitions:
389389
m_BlendHint: 0
390390
m_InheritPosition: 0
@@ -418,7 +418,7 @@ Transform:
418418
m_PrefabInstance: {fileID: 0}
419419
m_PrefabAsset: {fileID: 0}
420420
m_GameObject: {fileID: 5844782855775829702}
421-
m_LocalRotation: {x: 0.103929155, y: 0.002229357, z: -0.00023295725, w: 0.99458224}
421+
m_LocalRotation: {x: 0.094302095, y: -0.04954059, z: 0.004698567, w: 0.9942992}
422422
m_LocalPosition: {x: 41.65, y: 6, z: -154.15}
423423
m_LocalScale: {x: 1, y: 1, z: 1}
424424
m_Children:
@@ -455,7 +455,7 @@ MonoBehaviour:
455455
ModeOverride: 0
456456
LensShift: {x: 0, y: 0}
457457
GateFit: 2
458-
m_SensorSize: {x: 2.6201751, y: 1}
458+
m_SensorSize: {x: 2.051332, y: 1}
459459
m_Transitions:
460460
m_BlendHint: 0
461461
m_InheritPosition: 0
@@ -1103,6 +1103,12 @@ PrefabInstance:
11031103
propertyPath: m_LocalEulerAnglesHint.z
11041104
value: 0
11051105
objectReference: {fileID: 0}
1106+
- target: {fileID: 4089327054249829692, guid: 062b3805bf6784e4d9c599ee60eaa002,
1107+
type: 3}
1108+
propertyPath: _gameState
1109+
value:
1110+
objectReference: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4,
1111+
type: 2}
11061112
- target: {fileID: 5557640735889932260, guid: 062b3805bf6784e4d9c599ee60eaa002,
11071113
type: 3}
11081114
propertyPath: m_Enabled
@@ -1271,10 +1277,14 @@ PrefabInstance:
12711277
value:
12721278
objectReference: {fileID: 11400000, guid: 68595a0d05249bb4bb9d087c07f2399a,
12731279
type: 2}
1280+
- target: {fileID: 1468852564, guid: 254bf66f87892c94985b0720d6497bd3, type: 3}
1281+
propertyPath: m_Enabled
1282+
value: 0
1283+
objectReference: {fileID: 0}
12741284
- target: {fileID: 244216481246938342, guid: 254bf66f87892c94985b0720d6497bd3,
12751285
type: 3}
12761286
propertyPath: m_Lens.m_SensorSize.x
1277-
value: 2.6201751
1287+
value: 2.051332
12781288
objectReference: {fileID: 0}
12791289
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
12801290
type: 3}

‎UOP1_Project/Assets/Prefabs/Cutscenes/SweetDishCutscene.prefab

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ MonoBehaviour:
6262
ModeOverride: 0
6363
LensShift: {x: 0, y: 0}
6464
GateFit: 2
65-
m_SensorSize: {x: 2.4439578, y: 1}
65+
m_SensorSize: {x: 2.051332, y: 1}
6666
m_Transitions:
6767
m_BlendHint: 0
6868
m_InheritPosition: 0
@@ -238,7 +238,7 @@ MonoBehaviour:
238238
ModeOverride: 0
239239
LensShift: {x: 0, y: 0}
240240
GateFit: 2
241-
m_SensorSize: {x: 2.4439578, y: 1}
241+
m_SensorSize: {x: 2.051332, y: 1}
242242
m_Transitions:
243243
m_BlendHint: 0
244244
m_InheritPosition: 0
@@ -367,7 +367,7 @@ MonoBehaviour:
367367
ModeOverride: 0
368368
LensShift: {x: 0, y: 0}
369369
GateFit: 2
370-
m_SensorSize: {x: 2.4439578, y: 1}
370+
m_SensorSize: {x: 2.051332, y: 1}
371371
m_Transitions:
372372
m_BlendHint: 0
373373
m_InheritPosition: 0
@@ -500,7 +500,7 @@ MonoBehaviour:
500500
ModeOverride: 0
501501
LensShift: {x: 0, y: 0}
502502
GateFit: 2
503-
m_SensorSize: {x: 2.4439578, y: 1}
503+
m_SensorSize: {x: 2.051332, y: 1}
504504
m_Transitions:
505505
m_BlendHint: 0
506506
m_InheritPosition: 0
@@ -805,7 +805,7 @@ MonoBehaviour:
805805
ModeOverride: 0
806806
LensShift: {x: 0, y: 0}
807807
GateFit: 2
808-
m_SensorSize: {x: 2.4439578, y: 1}
808+
m_SensorSize: {x: 2.051332, y: 1}
809809
m_Transitions:
810810
m_BlendHint: 0
811811
m_InheritPosition: 0
@@ -4428,6 +4428,10 @@ PrefabInstance:
44284428
value:
44294429
objectReference: {fileID: 11400000, guid: 4d7d2082d811bcb44bbbbd181f56c418,
44304430
type: 2}
4431+
- target: {fileID: 1468852564, guid: 254bf66f87892c94985b0720d6497bd3, type: 3}
4432+
propertyPath: m_Enabled
4433+
value: 0
4434+
objectReference: {fileID: 0}
44314435
- target: {fileID: 244216481246938342, guid: 254bf66f87892c94985b0720d6497bd3,
44324436
type: 3}
44334437
propertyPath: m_Lens.m_SensorSize.x

‎UOP1_Project/Assets/Prefabs/Cutscenes/TownCutscene.prefab

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ MonoBehaviour:
9393
ModeOverride: 0
9494
LensShift: {x: 0, y: 0}
9595
GateFit: 2
96-
m_SensorSize: {x: 2.4545455, y: 1}
96+
m_SensorSize: {x: 2.051332, y: 1}
9797
m_Transitions:
9898
m_BlendHint: 0
9999
m_InheritPosition: 0
@@ -157,6 +157,15 @@ PrefabInstance:
157157
value:
158158
objectReference: {fileID: 11400000, guid: 96aceb088027f75418664fec5c2e5e78,
159159
type: 2}
160+
- target: {fileID: 1468852564, guid: 254bf66f87892c94985b0720d6497bd3, type: 3}
161+
propertyPath: m_Enabled
162+
value: 0
163+
objectReference: {fileID: 0}
164+
- target: {fileID: 244216481246938342, guid: 254bf66f87892c94985b0720d6497bd3,
165+
type: 3}
166+
propertyPath: m_Lens.m_SensorSize.x
167+
value: 2.051332
168+
objectReference: {fileID: 0}
160169
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
161170
type: 3}
162171
propertyPath: m_RootOrder
@@ -165,37 +174,37 @@ PrefabInstance:
165174
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
166175
type: 3}
167176
propertyPath: m_LocalPosition.x
168-
value: 0
177+
value: 60.304
169178
objectReference: {fileID: 0}
170179
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
171180
type: 3}
172181
propertyPath: m_LocalPosition.y
173-
value: 0
182+
value: 8.096
174183
objectReference: {fileID: 0}
175184
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
176185
type: 3}
177186
propertyPath: m_LocalPosition.z
178-
value: 0
187+
value: -8.224
179188
objectReference: {fileID: 0}
180189
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
181190
type: 3}
182191
propertyPath: m_LocalRotation.w
183-
value: 1
192+
value: 0.8852043
184193
objectReference: {fileID: 0}
185194
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
186195
type: 3}
187196
propertyPath: m_LocalRotation.x
188-
value: 0
197+
value: -0
189198
objectReference: {fileID: 0}
190199
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
191200
type: 3}
192201
propertyPath: m_LocalRotation.y
193-
value: 0
202+
value: -0.46520254
194203
objectReference: {fileID: 0}
195204
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
196205
type: 3}
197206
propertyPath: m_LocalRotation.z
198-
value: 0
207+
value: -0
199208
objectReference: {fileID: 0}
200209
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
201210
type: 3}
@@ -205,7 +214,7 @@ PrefabInstance:
205214
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
206215
type: 3}
207216
propertyPath: m_LocalEulerAnglesHint.y
208-
value: 0
217+
value: -55.447
209218
objectReference: {fileID: 0}
210219
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
211220
type: 3}
@@ -240,6 +249,16 @@ PrefabInstance:
240249
value:
241250
objectReference: {fileID: -7243414920591819180, guid: 276c37a69cce1cb4db4c99e77fa97d32,
242251
type: 2}
252+
- target: {fileID: 303239861944462453, guid: 254bf66f87892c94985b0720d6497bd3,
253+
type: 3}
254+
propertyPath: m_ExposedReferences.m_References.Array.data[2].second
255+
value:
256+
objectReference: {fileID: 7436404615014278655}
257+
- target: {fileID: 303239861944462453, guid: 254bf66f87892c94985b0720d6497bd3,
258+
type: 3}
259+
propertyPath: m_ExposedReferences.m_References.Array.data[14].second
260+
value:
261+
objectReference: {fileID: 5202380681183604792}
243262
m_RemovedComponents: []
244263
m_SourcePrefab: {fileID: 100100000, guid: 254bf66f87892c94985b0720d6497bd3, type: 3}
245264
--- !u!4 &6946125178769591659 stripped
@@ -248,3 +267,15 @@ Transform:
248267
type: 3}
249268
m_PrefabInstance: {fileID: 7228500604820480281}
250269
m_PrefabAsset: {fileID: 0}
270+
--- !u!114 &7436404615014278655 stripped
271+
MonoBehaviour:
272+
m_CorrespondingSourceObject: {fileID: 244216481246938342, guid: 254bf66f87892c94985b0720d6497bd3,
273+
type: 3}
274+
m_PrefabInstance: {fileID: 7228500604820480281}
275+
m_PrefabAsset: {fileID: 0}
276+
m_GameObject: {fileID: 0}
277+
m_Enabled: 1
278+
m_EditorHideFlags: 0
279+
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
280+
m_Name:
281+
m_EditorClassIdentifier:

0 commit comments

Comments
 (0)