diff --git a/Assets/Scenes/Cutscene01.unity b/Assets/Scenes/Cutscene01.unity
index a010a62c2477f1d1f8e150b732ebd35806712796..59532028a0bca991dbe4370f08c6780f62094e79 100644
--- a/Assets/Scenes/Cutscene01.unity
+++ b/Assets/Scenes/Cutscene01.unity
@@ -337,7 +337,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 3a106aa02d381be4a9f8bc2453ed97f7, type: 3}
+ m_Sprite: {fileID: 21300000, guid: c07fffec3d343ff4e9dba06b8232d4c1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -457,7 +457,7 @@ GameObject:
m_Component:
- component: {fileID: 1048390941}
m_Layer: 5
- m_Name: Background
+ m_Name: Background1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -483,6 +483,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -796, y: -420}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1287938080
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1287938081}
+ - component: {fileID: 1287938083}
+ - component: {fileID: 1287938082}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1287938081
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1287938080}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1892923723}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 2040, y: 1000}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1287938082
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1287938080}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.8617277, b: 0.63836473, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 3a106aa02d381be4a9f8bc2453ed97f7, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1287938083
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1287938080}
+ m_CullTransparentMesh: 1
--- !u!1 &1449083821
GameObject:
m_ObjectHideFlags: 0
@@ -779,6 +854,10 @@ PlayableDirector:
value: {fileID: 192952287}
- key: {fileID: 568482636345763445, guid: fbd32a8e77467434390a0bb2bc27dad9, type: 2}
value: {fileID: 1939514713}
+ - key: {fileID: 8984846709375654472, guid: fbd32a8e77467434390a0bb2bc27dad9, type: 2}
+ value: {fileID: 1048390940}
+ - key: {fileID: -1711578561358945306, guid: fbd32a8e77467434390a0bb2bc27dad9, type: 2}
+ value: {fileID: 1892923722}
m_ExposedReferences:
m_References: []
--- !u!114 &1717725237
@@ -857,6 +936,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1048390941}
+ - {fileID: 1892923723}
- {fileID: 1539342327}
- {fileID: 192952291}
m_Father: {fileID: 0}
@@ -866,6 +946,42 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &1892923722
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1892923723}
+ m_Layer: 5
+ m_Name: Background2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1892923723
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1892923722}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1287938081}
+ m_Father: {fileID: 1717725240}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -796, y: -420}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1939514713
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Cutscene02.unity b/Assets/Scenes/Cutscene02.unity
index ae91205cf4e88c13d7af84d4a41e1886ba26a608..08ae2bd3e5e188aeef01e63c4f34352a1fb2d8a7 100644
--- a/Assets/Scenes/Cutscene02.unity
+++ b/Assets/Scenes/Cutscene02.unity
@@ -280,6 +280,42 @@ RectTransform:
m_AnchoredPosition: {x: -1.3202515, y: -1.3544159}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &221484540
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 221484541}
+ m_Layer: 5
+ m_Name: Background3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &221484541
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 221484540}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 652061754}
+ m_Father: {fileID: 1717725240}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: -0.000030517578}
+ m_SizeDelta: {x: -796, y: -420}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &595227443
GameObject:
m_ObjectHideFlags: 0
@@ -292,7 +328,7 @@ GameObject:
- component: {fileID: 595227446}
- component: {fileID: 595227445}
m_Layer: 5
- m_Name: Image
+ m_Name: Image1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -355,6 +391,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 595227443}
m_CullTransparentMesh: 1
+--- !u!1 &652061753
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 652061754}
+ - component: {fileID: 652061756}
+ - component: {fileID: 652061755}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &652061754
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 652061753}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 221484541}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 2040, y: 1000}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &652061755
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 652061753}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.8617277, b: 0.63836473, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 6c51a294f42369c4c8fb8ac94477427f, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &652061756
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 652061753}
+ m_CullTransparentMesh: 1
--- !u!1 &688163777
GameObject:
m_ObjectHideFlags: 0
@@ -447,6 +558,117 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &846240950
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 846240951}
+ - component: {fileID: 846240953}
+ - component: {fileID: 846240952}
+ m_Layer: 5
+ m_Name: Image2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &846240951
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 846240950}
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 927779855}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 2040, y: 1000}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &846240952
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 846240950}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 0.8617277, b: 0.63836473, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 8431c7f5dac6c3248b72acffaffd3ffd, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &846240953
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 846240950}
+ m_CullTransparentMesh: 1
+--- !u!1 &927779854
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 927779855}
+ m_Layer: 5
+ m_Name: Background2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &927779855
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 927779854}
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 846240951}
+ m_Father: {fileID: 1717725240}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -796, y: -420}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1048390940
GameObject:
m_ObjectHideFlags: 0
@@ -457,7 +679,7 @@ GameObject:
m_Component:
- component: {fileID: 1048390941}
m_Layer: 5
- m_Name: Background
+ m_Name: Background1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1113,6 +1335,12 @@ PlayableDirector:
value: {fileID: 1500528272}
- key: {fileID: 5413049159077412055, guid: 981fa61621224e543aa322a0817b2d6a, type: 2}
value: {fileID: 1939514713}
+ - key: {fileID: -1072804772517611936, guid: 981fa61621224e543aa322a0817b2d6a, type: 2}
+ value: {fileID: 927779854}
+ - key: {fileID: -3364128421395627812, guid: 981fa61621224e543aa322a0817b2d6a, type: 2}
+ value: {fileID: 1048390940}
+ - key: {fileID: 8244056328883187425, guid: 981fa61621224e543aa322a0817b2d6a, type: 2}
+ value: {fileID: 221484540}
m_ExposedReferences:
m_References: []
--- !u!114 &1717725237
@@ -1191,6 +1419,8 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1048390941}
+ - {fileID: 927779855}
+ - {fileID: 221484541}
- {fileID: 1539342327}
- {fileID: 192952291}
- {fileID: 1061203995}
diff --git a/Assets/Scenes/CutsceneCanvasTimeline 2.playable b/Assets/Scenes/CutsceneCanvasTimeline 2.playable
index 72e65f0da65c7f71ea2dd6cd804d21ed1318e005..1c3098b4e1a16e2f0cace9a04f62e157865338fa 100644
--- a/Assets/Scenes/CutsceneCanvasTimeline 2.playable
+++ b/Assets/Scenes/CutsceneCanvasTimeline 2.playable
@@ -295,6 +295,18 @@ MonoBehaviour:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-7770302456054834729
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
+--- !u!114 &-7137980134837825668
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -318,7 +330,217 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
+--- !u!114 &-5112093058377935480
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
+--- !u!114 &-3364128421395627812
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (7)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 20.833333333333332
+ m_ClipIn: 0
+ m_Asset: {fileID: -7137980134837825668}
+ m_Duration: 35
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: -3364128421395627812}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
+--- !u!114 &-1072804772517611936
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (6)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 0
+ m_ClipIn: 0
+ m_Asset: {fileID: -167652029090678558}
+ m_Duration: 20.833333333333332
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: -1072804772517611936}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
--- !u!114 &-371273019374581009
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
+--- !u!114 &-167652029090678558
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -351,6 +573,9 @@ MonoBehaviour:
- {fileID: 9220462361926288203}
- {fileID: 7061713664170658098}
- {fileID: 5413049159077412055}
+ - {fileID: -1072804772517611936}
+ - {fileID: -3364128421395627812}
+ - {fileID: 8244056328883187425}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
@@ -567,6 +792,99 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
+--- !u!114 &8244056328883187425
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (8)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 55.833333333333336
+ m_ClipIn: 0
+ m_Asset: {fileID: -5112093058377935480}
+ m_Duration: 9.666666666666664
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 8244056328883187425}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
--- !u!114 &8296852180825488924
MonoBehaviour:
m_ObjectHideFlags: 1
diff --git a/Assets/Scenes/CutsceneCanvasTimeline.playable b/Assets/Scenes/CutsceneCanvasTimeline.playable
index a7556a7153f89aa83121056c567e4faed04cceb1..5377d8a0e914a7859f41b84bbb480e6d68bbe3af 100644
--- a/Assets/Scenes/CutsceneCanvasTimeline.playable
+++ b/Assets/Scenes/CutsceneCanvasTimeline.playable
@@ -96,6 +96,18 @@ MonoBehaviour:
volume: 1
stereoPan: 0
spatialBlend: 0
+--- !u!114 &-6149129247038497438
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
--- !u!114 &-5959130087813254073
MonoBehaviour:
m_ObjectHideFlags: 1
@@ -213,6 +225,111 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
+--- !u!114 &-4377167826298030224
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+ m_Name: ActivationPlayableAsset
+ m_EditorClassIdentifier:
+--- !u!114 &-1711578561358945306
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (4)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 9.166666666666666
+ m_ClipIn: 0
+ m_Asset: {fileID: -6149129247038497438}
+ m_Duration: 12.166666666666666
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: -1711578561358945306}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -231,6 +348,8 @@ MonoBehaviour:
- {fileID: -5959130087813254073}
- {fileID: 568482636345763445}
- {fileID: -9092383234624188320}
+ - {fileID: 8984846709375654472}
+ - {fileID: -1711578561358945306}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
@@ -452,3 +571,96 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
+--- !u!114 &8984846709375654472
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+ m_Name: Activation Track (3)
+ m_EditorClassIdentifier:
+ m_Version: 3
+ m_AnimClip: {fileID: 0}
+ m_Locked: 0
+ m_Muted: 0
+ m_CustomPlayableFullTypename:
+ m_Curves: {fileID: 0}
+ m_Parent: {fileID: 11400000}
+ m_Children: []
+ m_Clips:
+ - m_Version: 1
+ m_Start: 0
+ m_ClipIn: 0
+ m_Asset: {fileID: -4377167826298030224}
+ m_Duration: 9.166666666666666
+ m_TimeScale: 1
+ m_ParentTrack: {fileID: 8984846709375654472}
+ m_EaseInDuration: 0
+ m_EaseOutDuration: 0
+ m_BlendInDuration: 0
+ m_BlendOutDuration: 0
+ m_MixInCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_MixOutCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ m_BlendInCurveMode: 0
+ m_BlendOutCurveMode: 0
+ m_ExposedParameterNames: []
+ m_AnimationCurves: {fileID: 0}
+ m_Recordable: 0
+ m_PostExtrapolationMode: 0
+ m_PreExtrapolationMode: 0
+ m_PostExtrapolationTime: 0
+ m_PreExtrapolationTime: 0
+ m_DisplayName: Active
+ m_Markers:
+ m_Objects: []
+ m_PostPlaybackState: 3