Skip to content

Commit 8421cbe

Browse files
committed
Fixing beach cutscenes timeline binding confusion
1 parent bda93f4 commit 8421cbe

File tree

2 files changed

+28
-23
lines changed

2 files changed

+28
-23
lines changed

UOP1_Project/Assets/Prefabs/Cutscenes/BeachCandyCutscene.prefab

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ MonoBehaviour:
173173
ModeOverride: 0
174174
LensShift: {x: 0, y: 0}
175175
GateFit: 2
176-
m_SensorSize: {x: 2.743028, y: 1}
176+
m_SensorSize: {x: 2.7445052, y: 1}
177177
m_Transitions:
178178
m_BlendHint: 0
179179
m_InheritPosition: 0
@@ -428,7 +428,7 @@ MonoBehaviour:
428428
ModeOverride: 0
429429
LensShift: {x: 0, y: 0}
430430
GateFit: 2
431-
m_SensorSize: {x: 2.743028, y: 1}
431+
m_SensorSize: {x: 2.7445052, y: 1}
432432
m_Transitions:
433433
m_BlendHint: 0
434434
m_InheritPosition: 0
@@ -507,7 +507,7 @@ PrefabInstance:
507507
m_Modifications:
508508
- target: {fileID: 56426689, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
509509
propertyPath: m_Lens.m_SensorSize.x
510-
value: 2.743028
510+
value: 2.7445052
511511
objectReference: {fileID: 0}
512512
- target: {fileID: 153355930, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
513513
propertyPath: m_Waypoints.Array.data[1].tangent.x
@@ -523,7 +523,7 @@ PrefabInstance:
523523
objectReference: {fileID: 0}
524524
- target: {fileID: 206388949, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
525525
propertyPath: m_Lens.m_SensorSize.x
526-
value: 2.743028
526+
value: 2.7445052
527527
objectReference: {fileID: 0}
528528
- target: {fileID: 246703619, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
529529
propertyPath: m_Name
@@ -539,7 +539,7 @@ PrefabInstance:
539539
objectReference: {fileID: 6221957862608795791}
540540
- target: {fileID: 246703622, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
541541
propertyPath: m_Lens.m_SensorSize.x
542-
value: 2.743028
542+
value: 2.7445052
543543
objectReference: {fileID: 0}
544544
- target: {fileID: 671156767, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
545545
propertyPath: m_Name
@@ -555,15 +555,15 @@ PrefabInstance:
555555
objectReference: {fileID: 6221957862608795791}
556556
- target: {fileID: 671156770, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
557557
propertyPath: m_Lens.m_SensorSize.x
558-
value: 2.743028
558+
value: 2.7445052
559559
objectReference: {fileID: 0}
560560
- target: {fileID: 1468852564, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
561561
propertyPath: m_Enabled
562-
value: 0
562+
value: 1
563563
objectReference: {fileID: 0}
564564
- target: {fileID: 1513022028, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
565565
propertyPath: m_Lens.m_SensorSize.x
566-
value: 2.743028
566+
value: 2.7445052
567567
objectReference: {fileID: 0}
568568
- target: {fileID: 2027215994, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
569569
propertyPath: m_Follow
@@ -575,7 +575,7 @@ PrefabInstance:
575575
objectReference: {fileID: 6221957862608795791}
576576
- target: {fileID: 2027215994, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
577577
propertyPath: m_Lens.m_SensorSize.x
578-
value: 2.743028
578+
value: 2.7445052
579579
objectReference: {fileID: 0}
580580
- target: {fileID: 2027215995, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
581581
propertyPath: m_LocalPosition.x
@@ -591,24 +591,24 @@ PrefabInstance:
591591
objectReference: {fileID: 0}
592592
- target: {fileID: 2027215995, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
593593
propertyPath: m_LocalRotation.w
594-
value: 0.95245284
594+
value: 0.98213977
595595
objectReference: {fileID: 0}
596596
- target: {fileID: 2027215995, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
597597
propertyPath: m_LocalRotation.x
598-
value: -0.07368229
598+
value: 0.15780146
599599
objectReference: {fileID: 0}
600600
- target: {fileID: 2027215995, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
601601
propertyPath: m_LocalRotation.y
602-
value: 0.27934992
602+
value: 0.08549549
603603
objectReference: {fileID: 0}
604604
- target: {fileID: 2027215995, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
605605
propertyPath: m_LocalRotation.z
606-
value: 0.09678952
606+
value: 0.0564865
607607
objectReference: {fileID: 0}
608608
- target: {fileID: 244216481246938342, guid: 45f676b6d31fd8f47983557f12803a82,
609609
type: 3}
610610
propertyPath: m_Lens.m_SensorSize.x
611-
value: 2.2484744
611+
value: 2.7445052
612612
objectReference: {fileID: 0}
613613
- target: {fileID: 303239861944462450, guid: 45f676b6d31fd8f47983557f12803a82,
614614
type: 3}
@@ -1063,37 +1063,37 @@ PrefabInstance:
10631063
- target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
10641064
type: 3}
10651065
propertyPath: m_LocalPosition.x
1066-
value: -144.49167
1066+
value: -147.13861
10671067
objectReference: {fileID: 0}
10681068
- target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
10691069
type: 3}
10701070
propertyPath: m_LocalPosition.y
1071-
value: -3.2886946
1071+
value: -5.0408173
10721072
objectReference: {fileID: 0}
10731073
- target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
10741074
type: 3}
10751075
propertyPath: m_LocalPosition.z
1076-
value: -324.0888
1076+
value: -327.19824
10771077
objectReference: {fileID: 0}
10781078
- target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
10791079
type: 3}
10801080
propertyPath: m_LocalRotation.w
1081-
value: 0.66120684
1081+
value: 0.99755186
10821082
objectReference: {fileID: 0}
10831083
- target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
10841084
type: 3}
10851085
propertyPath: m_LocalRotation.x
1086-
value: -0.06215419
1086+
value: -0
10871087
objectReference: {fileID: 0}
10881088
- target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
10891089
type: 3}
10901090
propertyPath: m_LocalRotation.y
1091-
value: 0.7454093
1091+
value: -0
10921092
objectReference: {fileID: 0}
10931093
- target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
10941094
type: 3}
10951095
propertyPath: m_LocalRotation.z
1096-
value: 0.05750927
1096+
value: 0.06993057
10971097
objectReference: {fileID: 0}
10981098
- target: {fileID: 1580905619381638858, guid: 52c033c430890f944ba94b26f85b071c,
10991099
type: 3}

UOP1_Project/Assets/Prefabs/Cutscenes/BeachIntroCutscene.prefab

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ MonoBehaviour:
104104
ModeOverride: 0
105105
LensShift: {x: 0, y: 0}
106106
GateFit: 2
107-
m_SensorSize: {x: 2.7463381, y: 1}
107+
m_SensorSize: {x: 2.7445052, y: 1}
108108
m_Transitions:
109109
m_BlendHint: 0
110110
m_InheritPosition: 0
@@ -362,6 +362,11 @@ PrefabInstance:
362362
propertyPath: m_Name
363363
value: Boat
364364
objectReference: {fileID: 0}
365+
- target: {fileID: 4840105154277814776, guid: 647ea42d84b3f17469f1992b976ab5bb,
366+
type: 3}
367+
propertyPath: m_IsActive
368+
value: 0
369+
objectReference: {fileID: 0}
365370
- target: {fileID: 5215257785267415874, guid: 647ea42d84b3f17469f1992b976ab5bb,
366371
type: 3}
367372
propertyPath: m_RootOrder
@@ -622,7 +627,7 @@ PrefabInstance:
622627
- target: {fileID: 244216481246938342, guid: 254bf66f87892c94985b0720d6497bd3,
623628
type: 3}
624629
propertyPath: m_Lens.m_SensorSize.x
625-
value: 2.75
630+
value: 2.7445052
626631
objectReference: {fileID: 0}
627632
- target: {fileID: 303239861944462450, guid: 254bf66f87892c94985b0720d6497bd3,
628633
type: 3}

0 commit comments

Comments
 (0)