From cf4dee27c1f1f24a47ba5d29bd3e9f0d8fb13f16 Mon Sep 17 00:00:00 2001 From: Cailean Finn Date: Fri, 27 Oct 2023 17:46:42 +0100 Subject: [PATCH] Act3 Structure Completed --- Assets/Act-3.unity | 364 ++++++++++++++++-- .../4_Rain/Intial_Rain_Camera.controller | 2 +- .../Act-3/Wave Cameras/Wave Cameras.anim | 52 +-- Assets/Timeline/Timeline_Act-3.playable | 114 +++++- Assets/VFX/PointCloud.vfx | 10 +- Assets/VFX/Rain.vfx | 241 +++++++++++- 6 files changed, 716 insertions(+), 67 deletions(-) diff --git a/Assets/Act-3.unity b/Assets/Act-3.unity index 26a4ca2..117765e 100644 --- a/Assets/Act-3.unity +++ b/Assets/Act-3.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 1569.3462, g: 1695.1938, b: 1966.3734, a: 1} + m_IndirectSpecularColor: {r: 1570.1599, g: 1695.074, b: 1965.7693, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -3159,37 +3159,37 @@ VisualEffect: - m_Value: {x: 0.0000076293945, y: 7.0167104e-15, z: 7.0167096e-15} m_Name: Avatar_Position_angles m_Overridden: 1 - - m_Value: {x: 33.539925, y: 57.86418, z: 268.35358} + - m_Value: {x: 29.583721, y: 69.07812, z: 273.2064} m_Name: Avatar_RHand_angles m_Overridden: 1 - - m_Value: {x: -57.418552, y: 3.9696772, z: 36.646923} + - m_Value: {x: -57.483185, y: 3.9128323, z: 36.691555} m_Name: Avatar_RHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_RHand_scale m_Overridden: 1 - - m_Value: {x: 357.82413, y: 254.84474, z: 351.67715} + - m_Value: {x: 0.16106717, y: 256.17474, z: 355.0387} m_Name: Avatar_LHand_angles m_Overridden: 1 - - m_Value: {x: -57.012848, y: 3.7364533, z: 36.979248} + - m_Value: {x: -57.024242, y: 3.686331, z: 37.023746} m_Name: Avatar_LHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LHand_scale m_Overridden: 1 - - m_Value: {x: 34.981655, y: 175.82814, z: 36.758026} + - m_Value: {x: 24.00508, y: 168.33122, z: 27.596867} m_Name: Avatar_LFoot_angles m_Overridden: 1 - - m_Value: {x: -57.513004, y: 3.6372702, z: 36.729633} + - m_Value: {x: -57.557243, y: 3.567755, z: 36.764187} m_Name: Avatar_LFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LFoot_scale m_Overridden: 1 - - m_Value: {x: 25.296143, y: 158.6287, z: 11.40302} + - m_Value: {x: 49.53348, y: 293.20636, z: 57.12205} m_Name: Avatar_RFoot_angles m_Overridden: 1 - - m_Value: {x: -57.65075, y: 3.6794548, z: 36.4529} + - m_Value: {x: -57.930565, y: 3.6578515, z: 37.33519} m_Name: Avatar_RFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} @@ -3198,7 +3198,7 @@ VisualEffect: - m_Value: {x: -55.18705, y: 3.54, z: 40.65} m_Name: Center m_Overridden: 1 - - m_Value: {x: -57.682217, y: 4.0126386, z: 36.612072} + - m_Value: {x: -57.848583, y: 3.9961483, z: 36.809494} m_Name: EffectorPosition m_Overridden: 1 - m_Value: {x: 0, y: 0, z: 0} @@ -3216,13 +3216,13 @@ VisualEffect: - m_Value: {x: 0, y: 0, z: 0} m_Name: Wave Offset m_Overridden: 1 - - m_Value: {x: 355.73273, y: 156.34506, z: 39.508133} + - m_Value: {x: 356.35388, y: 170.93289, z: 38.897377} m_Name: Center1_angles m_Overridden: 1 - - m_Value: {x: -57.35552, y: 4.051544, z: 36.918438} + - m_Value: {x: -57.40751, y: 4.046693, z: 37.04977} m_Name: Center1_position m_Overridden: 1 - - m_Value: {x: 1.0377274, y: 1.0377274, z: 1.0377274} + - m_Value: {x: 1.1652565, y: 1.1652565, z: 1.1652565} m_Name: Center1_scale m_Overridden: 1 m_Vector4f: @@ -3941,6 +3941,7 @@ Transform: m_Children: - {fileID: 1981300503} - {fileID: 994417480} + - {fileID: 1500806756} m_Father: {fileID: 1242563878} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &549603138 @@ -7504,13 +7505,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1252140245} serializedVersion: 2 - m_LocalRotation: {x: -0.06905871, y: 0.644993, z: -0.17278816, w: -0.74118775} - m_LocalPosition: {x: -55.61, y: 8.29, z: 35.3} + m_LocalRotation: {x: -0.07246278, y: 0.63020676, z: -0.17138843, w: -0.7538001} + m_LocalPosition: {x: -55.61, y: 8.29, z: 36.73} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1149297072} - m_LocalEulerAnglesHint: {x: 18.982, y: -440.355, z: 10.175} + m_LocalEulerAnglesHint: {x: 18.982, y: -438.088, z: 10.175} --- !u!1 &1282733571 GameObject: m_ObjectHideFlags: 0 @@ -8531,6 +8532,311 @@ Transform: m_Children: [] m_Father: {fileID: 1796379515} m_LocalEulerAnglesHint: {x: -1.5166066e-21, y: -1.21328526e-20, z: 6.0664263e-21} +--- !u!1 &1500806755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1500806756} + - component: {fileID: 1500806763} + - component: {fileID: 1500806762} + - component: {fileID: 1500806761} + - component: {fileID: 1500806760} + - component: {fileID: 1500806759} + - component: {fileID: 1500806758} + - component: {fileID: 1500806757} + m_Layer: 0 + m_Name: Rain_Init (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1500806756 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500806755} + serializedVersion: 2 + m_LocalRotation: {x: 0.39900962, y: 0.5160066, z: 0.6176774, w: -0.4393213} + m_LocalPosition: {x: -42.8, y: -37, z: 34.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 531262882} + m_LocalEulerAnglesHint: {x: -98.871, y: 194.854, z: 58.11} +--- !u!114 &1500806757 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500806755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdfea1f838247c40921a07afedde962, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Property: + m_Name: Avatar_RFoot + Target: {fileID: 8972683569266531370} +--- !u!114 &1500806758 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500806755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdfea1f838247c40921a07afedde962, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Property: + m_Name: Avatar_RHand + Target: {fileID: 8370944965629776454} +--- !u!114 &1500806759 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500806755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdfea1f838247c40921a07afedde962, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Property: + m_Name: Avatar_LFoot + Target: {fileID: 7358530051144475028} +--- !u!114 &1500806760 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500806755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7fdfea1f838247c40921a07afedde962, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Property: + m_Name: Avatar_LHand + Target: {fileID: 298523315428330631} +--- !u!114 &1500806761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500806755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cdafc37f32b176349b1684c4455b98e9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExecuteInEditor: 1 + m_Bindings: + - {fileID: 1500806760} + - {fileID: 1500806759} + - {fileID: 1500806758} + - {fileID: 1500806757} + m_VisualEffect: {fileID: 1500806763} +--- !u!73398921 &1500806762 +VFXRenderer: + serializedVersion: 1 + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500806755} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 257 + m_RendererPriority: 0 + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!2083052967 &1500806763 +VisualEffect: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500806755} + m_Enabled: 1 + m_Asset: {fileID: 8926484042661614526, guid: 8b592923090e0b94796845b9cc1a4efd, type: 3} + m_InitialEventName: OnPlay + m_InitialEventNameOverriden: 0 + m_StartSeed: 0 + m_ResetSeedOnPlay: 1 + m_AllowInstancing: 1 + m_ResourceVersion: 1 + m_PropertySheet: + m_Float: + m_Array: + - m_Value: 0.2 + m_Name: Radius + m_Overridden: 1 + - m_Value: 5 + m_Name: Bounce + m_Overridden: 1 + - m_Value: 1 + m_Name: Friction + m_Overridden: 1 + - m_Value: 0.226 + m_Name: Lifetime Loss + m_Overridden: 1 + - m_Value: 0 + m_Name: Roughness + m_Overridden: 1 + - m_Value: 0.1 + m_Name: Point Size + m_Overridden: 1 + - m_Value: 1 + m_Name: Min Life + m_Overridden: 1 + - m_Value: 40 + m_Name: Max Life + m_Overridden: 1 + - m_Value: 0 + m_Name: Sine Speed + m_Overridden: 1 + - m_Value: 0 + m_Name: Sine Wave Freq + m_Overridden: 1 + - m_Value: 0 + m_Name: Sine Wave Min + m_Overridden: 1 + - m_Value: 0 + m_Name: Sine Wave Max + m_Overridden: 1 + - m_Value: 0 + m_Name: Turbulence Intensity + m_Overridden: 1 + - m_Value: 6.74 + m_Name: Turbulence Drag + m_Overridden: 1 + - m_Value: 0.1 + m_Name: Turbulence Frequency + m_Overridden: 1 + - m_Value: 1000000 + m_Name: Point Count + m_Overridden: 1 + - m_Value: 3.93 + m_Name: Force + m_Overridden: 1 + - m_Value: -1 + m_Name: Invert Gravity + m_Overridden: 1 + m_Vector2f: + m_Array: [] + m_Vector3f: + m_Array: + - m_Value: {x: -57.14382, y: 4.4493146, z: 40.677822} + m_Name: Avatar_Position_position + m_Overridden: 1 + - m_Value: {x: 1, y: 1, z: 1} + m_Name: Avatar_Position_scale + m_Overridden: 1 + - m_Value: {x: 0.0000076293945, y: 7.0167104e-15, z: 7.0167096e-15} + m_Name: Avatar_Position_angles + m_Overridden: 1 + - m_Value: {x: 24.768019, y: 307.7611, z: 269.30176} + m_Name: Avatar_RHand_angles + m_Overridden: 1 + - m_Value: {x: -56.37481, y: 3.7180555, z: 38.80754} + m_Name: Avatar_RHand_position + m_Overridden: 1 + - m_Value: {x: 1, y: 1, z: 1} + m_Name: Avatar_RHand_scale + m_Overridden: 1 + - m_Value: {x: 352.179, y: 8.543175, z: 1.9051342} + m_Name: Avatar_LHand_angles + m_Overridden: 1 + - m_Value: {x: -57.051376, y: 3.7624118, z: 38.745224} + m_Name: Avatar_LHand_position + m_Overridden: 1 + - m_Value: {x: 1, y: 1, z: 1} + m_Name: Avatar_LHand_scale + m_Overridden: 1 + - m_Value: {x: 6.1891403, y: 336.55554, z: 25.702326} + m_Name: Avatar_LFoot_angles + m_Overridden: 1 + - m_Value: {x: -57.12405, y: 3.5797327, z: 39.559235} + m_Name: Avatar_LFoot_position + m_Overridden: 1 + - m_Value: {x: 1, y: 1, z: 1} + m_Name: Avatar_LFoot_scale + m_Overridden: 1 + - m_Value: {x: 357.0301, y: 342.08554, z: 342.3588} + m_Name: Avatar_RFoot_angles + m_Overridden: 1 + - m_Value: {x: -56.84166, y: 3.6396925, z: 39.684517} + m_Name: Avatar_RFoot_position + m_Overridden: 1 + - m_Value: {x: 1, y: 1, z: 1} + m_Name: Avatar_RFoot_scale + m_Overridden: 1 + m_Vector4f: + m_Array: [] + m_Uint: + m_Array: [] + m_Int: + m_Array: [] + m_Matrix4x4f: + m_Array: [] + m_AnimationCurve: + m_Array: [] + m_Gradient: + m_Array: [] + m_NamedObject: + m_Array: + - m_Value: {fileID: 6918954641851045129, guid: ca1aa21c6151b4c45823d49435a377b9, + type: 3} + m_Name: PositionMap + m_Overridden: 1 + - m_Value: {fileID: -2231058418007342408, guid: ca1aa21c6151b4c45823d49435a377b9, + type: 3} + m_Name: ColorMap + m_Overridden: 1 + m_Bool: + m_Array: + - m_Value: 0 + m_Name: Sine Wave Toggle + m_Overridden: 0 --- !u!1 &1512911019 GameObject: m_ObjectHideFlags: 0 @@ -9134,6 +9440,8 @@ PlayableDirector: value: {fileID: 1149297070} - key: {fileID: 588539760457074149, guid: d23ec55b21fcc67428703b23bf714fac, type: 2} value: {fileID: 367655559} + - key: {fileID: -6658328827876625762, guid: d23ec55b21fcc67428703b23bf714fac, type: 2} + value: {fileID: 1500806755} m_ExposedReferences: m_References: [] --- !u!1 &1746937693 @@ -9526,37 +9834,37 @@ VisualEffect: - m_Value: {x: 0.0000076293945, y: 7.0167104e-15, z: 7.0167096e-15} m_Name: Avatar_Position_angles m_Overridden: 1 - - m_Value: {x: 33.539925, y: 57.86418, z: 268.35358} + - m_Value: {x: 29.583721, y: 69.07812, z: 273.2064} m_Name: Avatar_RHand_angles m_Overridden: 1 - - m_Value: {x: -57.418552, y: 3.9696772, z: 36.646923} + - m_Value: {x: -57.483185, y: 3.9128323, z: 36.691555} m_Name: Avatar_RHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_RHand_scale m_Overridden: 1 - - m_Value: {x: 357.82413, y: 254.84474, z: 351.67715} + - m_Value: {x: 0.16106717, y: 256.17474, z: 355.0387} m_Name: Avatar_LHand_angles m_Overridden: 1 - - m_Value: {x: -57.012848, y: 3.7364533, z: 36.979248} + - m_Value: {x: -57.024242, y: 3.686331, z: 37.023746} m_Name: Avatar_LHand_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LHand_scale m_Overridden: 1 - - m_Value: {x: 34.981655, y: 175.82814, z: 36.758026} + - m_Value: {x: 24.00508, y: 168.33122, z: 27.596867} m_Name: Avatar_LFoot_angles m_Overridden: 1 - - m_Value: {x: -57.513004, y: 3.6372702, z: 36.729633} + - m_Value: {x: -57.557243, y: 3.567755, z: 36.764187} m_Name: Avatar_LFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} m_Name: Avatar_LFoot_scale m_Overridden: 1 - - m_Value: {x: 25.296143, y: 158.6287, z: 11.40302} + - m_Value: {x: 49.53348, y: 293.20636, z: 57.12205} m_Name: Avatar_RFoot_angles m_Overridden: 1 - - m_Value: {x: -57.65075, y: 3.6794548, z: 36.4529} + - m_Value: {x: -57.930565, y: 3.6578515, z: 37.33519} m_Name: Avatar_RFoot_position m_Overridden: 1 - m_Value: {x: 1, y: 1, z: 1} @@ -9565,7 +9873,7 @@ VisualEffect: - m_Value: {x: -55.18705, y: 3.54, z: 40.65} m_Name: Center m_Overridden: 1 - - m_Value: {x: -57.682217, y: 4.0126386, z: 36.612072} + - m_Value: {x: -57.848583, y: 3.9961483, z: 36.809494} m_Name: EffectorPosition m_Overridden: 1 - m_Value: {x: 0, y: 0, z: 0} @@ -9583,13 +9891,13 @@ VisualEffect: - m_Value: {x: 0, y: 1, z: 0} m_Name: Wave Offset m_Overridden: 1 - - m_Value: {x: 355.73273, y: 156.34506, z: 39.508133} + - m_Value: {x: 356.35388, y: 170.93289, z: 38.897377} m_Name: Center1_angles m_Overridden: 1 - - m_Value: {x: -57.35552, y: 4.051544, z: 36.918438} + - m_Value: {x: -57.40751, y: 4.046693, z: 37.04977} m_Name: Center1_position m_Overridden: 1 - - m_Value: {x: 1.0377274, y: 1.0377274, z: 1.0377274} + - m_Value: {x: 1.1652565, y: 1.1652565, z: 1.1652565} m_Name: Center1_scale m_Overridden: 1 m_Vector4f: diff --git a/Assets/Animations/4_Rain/Intial_Rain_Camera.controller b/Assets/Animations/4_Rain/Intial_Rain_Camera.controller index 4aa00ef..268d9da 100644 --- a/Assets/Animations/4_Rain/Intial_Rain_Camera.controller +++ b/Assets/Animations/4_Rain/Intial_Rain_Camera.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 944056217072413814} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 380, y: 290, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Animations/Act-3/Wave Cameras/Wave Cameras.anim b/Assets/Animations/Act-3/Wave Cameras/Wave Cameras.anim index 6223abc..82d7519 100644 --- a/Assets/Animations/Act-3/Wave Cameras/Wave Cameras.anim +++ b/Assets/Animations/Act-3/Wave Cameras/Wave Cameras.anim @@ -96,19 +96,19 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 47.583332 - value: {x: -65.81, y: 39.28, z: 46.66} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + time: 48.033333 + value: {x: -67, y: 39.59, z: 47} + inSlope: {x: -0.07072388, y: 0.021979416, z: 0} + outSlope: {x: -0.07072388, y: 0.021979416, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 54.966667 - value: {x: -67, y: 39.59, z: 47} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + time: 56.416668 + value: {x: -69.8, y: 42.3, z: 46.994457} + inSlope: {x: 0, y: 0, z: -0.00030807348} + outSlope: {x: 0, y: 0, z: -0.00030807348} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -1555,17 +1555,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 47.583332 - value: -65.81 - inSlope: 0 - outSlope: 0 + time: 48.033333 + value: -67 + inSlope: -0.07072388 + outSlope: -0.07072388 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 54.966667 - value: -67 + time: 56.416668 + value: -69.8 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1603,17 +1603,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 47.583332 - value: 39.28 - inSlope: 0 - outSlope: 0 + time: 48.033333 + value: 39.59 + inSlope: 0.021979416 + outSlope: 0.021979416 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 54.966667 - value: 39.59 + time: 56.416668 + value: 42.3 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1651,8 +1651,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 47.583332 - value: 46.66 + time: 48.033333 + value: 47 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1660,10 +1660,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 54.966667 - value: 47 - inSlope: 0 - outSlope: 0 + time: 56.416668 + value: 46.994457 + inSlope: -0.00030807348 + outSlope: -0.00030807348 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 diff --git a/Assets/Timeline/Timeline_Act-3.playable b/Assets/Timeline/Timeline_Act-3.playable index 690ee6f..26b3f49 100644 --- a/Assets/Timeline/Timeline_Act-3.playable +++ b/Assets/Timeline/Timeline_Act-3.playable @@ -276,6 +276,99 @@ MonoBehaviour: m_Markers: m_Objects: [] m_PostPlaybackState: 3 +--- !u!114 &-6658328827876625762 +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 (2) + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: -419457854300647495} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 500.5 + m_ClipIn: 0 + m_Asset: {fileID: -496218101434220374} + m_Duration: 61.5 + m_TimeScale: 1 + m_ParentTrack: {fileID: -6658328827876625762} + 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 &-4885789195495792208 MonoBehaviour: m_ObjectHideFlags: 1 @@ -725,7 +818,7 @@ MonoBehaviour: m_Start: 380.74999999999994 m_ClipIn: 0 m_Asset: {fileID: 6145864015414691018} - m_Duration: 181.25 + m_Duration: 90.55000000000001 m_TimeScale: 1 m_ParentTrack: {fileID: -2244496936252574955} m_EaseInDuration: 0 @@ -920,6 +1013,18 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &-496218101434220374 +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 &-419457854300647495 MonoBehaviour: m_ObjectHideFlags: 1 @@ -946,6 +1051,7 @@ MonoBehaviour: - {fileID: 321175097217867745} - {fileID: -4231278620546648534} - {fileID: 588539760457074149} + - {fileID: -6658328827876625762} m_Clips: [] m_Markers: m_Objects: [] @@ -1021,7 +1127,7 @@ MonoBehaviour: m_Start: 473.7799999999999 m_ClipIn: 0 m_Asset: {fileID: -2979222298370509899} - m_Duration: 244.200016123124 + m_Duration: 88.22000000000008 m_TimeScale: 1 m_ParentTrack: {fileID: 321175097217867745} m_EaseInDuration: 0 @@ -1356,7 +1462,7 @@ MonoBehaviour: m_Start: 380.74999999999994 m_ClipIn: 0 m_Asset: {fileID: -3732194075671857097} - m_Duration: 110.14999999999998 + m_Duration: 90.55000000000001 m_TimeScale: 1 m_ParentTrack: {fileID: 763496428374194588} m_EaseInDuration: 0 @@ -1449,7 +1555,7 @@ MonoBehaviour: m_Start: 380.74999999999994 m_ClipIn: 0 m_Asset: {fileID: 7635435063596826306} - m_Duration: 181.25 + m_Duration: 90.55000000000001 m_TimeScale: 1 m_ParentTrack: {fileID: 1157170932482136187} m_EaseInDuration: 0 diff --git a/Assets/VFX/PointCloud.vfx b/Assets/VFX/PointCloud.vfx index 90a1365..b5de12f 100644 --- a/Assets/VFX/PointCloud.vfx +++ b/Assets/VFX/PointCloud.vfx @@ -14737,7 +14737,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: False + m_SerializableObject: True m_Space: 2147483647 m_Property: name: _vfx_enabled @@ -16395,7 +16395,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: False + m_SerializableObject: True m_Space: 2147483647 m_Property: name: _vfx_enabled @@ -17075,7 +17075,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: False + m_SerializableObject: True m_Space: 2147483647 m_Property: name: _vfx_enabled @@ -17755,7 +17755,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: False + m_SerializableObject: True m_Space: 2147483647 m_Property: name: _vfx_enabled @@ -18435,7 +18435,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: False + m_SerializableObject: True m_Space: 2147483647 m_Property: name: _vfx_enabled diff --git a/Assets/VFX/Rain.vfx b/Assets/VFX/Rain.vfx index 4108176..d02f93c 100644 --- a/Assets/VFX/Rain.vfx +++ b/Assets/VFX/Rain.vfx @@ -127,7 +127,7 @@ MonoBehaviour: stickyNoteInfos: [] categories: - name: Points - collapsed: 1 + collapsed: 0 - name: Collision collapsed: 0 - name: Data @@ -224,11 +224,27 @@ MonoBehaviour: - {fileID: 8926484042661616591} - {fileID: 8926484042661616597} - {fileID: 8926484042661616602} + - {fileID: 8926484042661616627} + - {fileID: 8926484042661616629} m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 m_UIInfos: {fileID: 114340500867371532} m_ParameterInfo: + - name: Invert Gravity + path: Invert Gravity + tooltip: + sheetType: m_Float + realType: Single + defaultValue: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + min: -1 + max: 1 + enumValues: [] + descendantCount: 0 - name: Points path: tooltip: @@ -20814,7 +20830,7 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: - - {fileID: 8926484042661616512} + - {fileID: 8926484042661616632} --- !u!114 &8926484042661616467 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21369,7 +21385,7 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 1 m_LinkedSlots: - - {fileID: 8926484042661616466} + - {fileID: 8926484042661616631} --- !u!114 &8926484042661616513 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24630,3 +24646,222 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] +--- !u!114 &8926484042661616627 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 330e0fca1717dde4aaa144f48232aa64, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 114350483966674976} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 0 + m_UISuperCollapsed: 0 + m_InputSlots: [] + m_OutputSlots: + - {fileID: 8926484042661616628} + m_ExposedName: Invert Gravity + m_Exposed: 1 + m_Order: 29 + m_Category: + m_Min: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: -1 + m_Max: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + m_IsOutput: 0 + m_EnumValues: [] + m_ValueFilter: 1 + m_Tooltip: + m_Nodes: + - m_Id: 0 + linkedSlots: + - outputSlot: {fileID: 8926484042661616628} + inputSlot: {fileID: 8926484042661616630} + position: {x: 608.5389, y: 2311.5015} + expandedSlots: [] + expanded: 0 +--- !u!114 &8926484042661616628 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616628} + m_MasterData: + m_Owner: {fileID: 8926484042661616627} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + m_Space: 2147483647 + m_Property: + name: o + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: + - {fileID: 8926484042661616630} +--- !u!114 &8926484042661616629 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: b8ee8a7543fa09e42a7c8616f60d2ad7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 114350483966674976} + m_Children: [] + m_UIPosition: {x: 772.7715, y: 2279.0222} + m_UICollapsed: 0 + m_UISuperCollapsed: 0 + m_InputSlots: + - {fileID: 8926484042661616630} + - {fileID: 8926484042661616631} + m_OutputSlots: + - {fileID: 8926484042661616632} + m_Operands: + - name: a + type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + - name: b + type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 +--- !u!114 &8926484042661616630 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616630} + m_MasterData: + m_Owner: {fileID: 8926484042661616629} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + m_Space: 2147483647 + m_Property: + name: a + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: + - {fileID: 8926484042661616628} +--- !u!114 &8926484042661616631 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616631} + m_MasterData: + m_Owner: {fileID: 8926484042661616629} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 1 + m_Space: 2147483647 + m_Property: + name: b + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: + - {fileID: 8926484042661616512} +--- !u!114 &8926484042661616632 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: f780aa281814f9842a7c076d436932e7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616632} + m_MasterData: + m_Owner: {fileID: 8926484042661616629} + m_Value: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: + - {fileID: 8926484042661616466}