diff --git a/Assets/Act-1.unity b/Assets/Act-1.unity index c237ebb..d3f02ef 100644 --- a/Assets/Act-1.unity +++ b/Assets/Act-1.unity @@ -1251,7 +1251,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 0 + m_Intensity: 33447.707 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -1309,13 +1309,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 157207112} serializedVersion: 2 - m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956} + m_LocalRotation: {x: 0.121906914, y: 0.5086244, z: -0.11783483, w: 0.8441297} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1225025837} - m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 19.007, y: 61.38, z: -4.545} --- !u!114 &157207115 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1328,7 +1328,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Name: m_EditorClassIdentifier: - m_Intensity: 0 + m_Intensity: 33447.707 m_EnableSpotReflector: 0 m_LuxAtDistance: 1 m_InnerSpotPercent: 0 @@ -1579,7 +1579,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ExecuteInEditor: 1 - m_Bindings: [] + m_Bindings: + - {fileID: 238862309} m_VisualEffect: {fileID: 238862312} --- !u!73398921 &238862311 VFXRenderer: @@ -1589,7 +1590,7 @@ VFXRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 238862307} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -1770,7 +1771,7 @@ GameObject: - component: {fileID: 242219281} - component: {fileID: 242219280} m_Layer: 0 - m_Name: Spot Light (2) + m_Name: Dust Light TR m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1784,13 +1785,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242219278} serializedVersion: 2 - m_LocalRotation: {x: 0.41105366, y: 0.3103638, z: -0.62152964, w: 0.59026283} - m_LocalPosition: {x: 0.45, y: 6.12, z: -0.56} + m_LocalRotation: {x: 0.35360327, y: 0.36209506, z: -0.6559183, w: 0.56002074} + m_LocalPosition: {x: 0.45, y: 6.12, z: 0.02} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1225025837} - m_LocalEulerAnglesHint: {x: 60.582, y: -17.118, z: -103.005} + m_LocalEulerAnglesHint: {x: 60.582, y: -6.818, z: -103.004} --- !u!114 &242219280 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1925,7 +1926,7 @@ Light: m_Type: 0 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 507.44675 + m_Intensity: 301.3169 m_Range: 10 m_SpotAngle: 139.7 m_InnerSpotAngle: 21.80208 @@ -4166,6 +4167,9 @@ VisualEffect: - m_Value: 0.01 m_Name: Clamp Size Min m_Overridden: 1 + - m_Value: 0 + m_Name: Emissive + m_Overridden: 1 m_Vector2f: m_Array: [] m_Vector3f: @@ -11440,7 +11444,7 @@ GameObject: - component: {fileID: 872902551} - component: {fileID: 872902550} m_Layer: 0 - m_Name: Spot Light (1) + m_Name: Blue Light TL m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -11455,7 +11459,7 @@ Transform: m_GameObject: {fileID: 872902548} serializedVersion: 2 m_LocalRotation: {x: 0.31095037, y: -0.23292682, z: -0.12464471, w: 0.9129725} - m_LocalPosition: {x: 6.07, y: 7.4, z: -2.48} + m_LocalPosition: {x: 6.07, y: 6.74, z: -2.59} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -11595,7 +11599,7 @@ Light: m_Type: 0 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 4026.4678 + m_Intensity: 2386.3403 m_Range: 10 m_SpotAngle: 179 m_InnerSpotAngle: 21.80208 @@ -11638,7 +11642,7 @@ Light: m_LightShadowCasterMode: 2 m_AreaSize: {x: 0.5, y: 0.5} m_BounceIntensity: 0 - m_ColorTemperature: 10138 + m_ColorTemperature: 7423 m_UseColorTemperature: 1 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 @@ -13366,6 +13370,8 @@ PlayableDirector: value: {fileID: 256521889} - key: {fileID: 6629795049327489851, guid: 42435b3aeb3590d4590919ccbf032e1c, type: 2} value: {fileID: 368485479} + - key: {fileID: -6691445991689132819, guid: 42435b3aeb3590d4590919ccbf032e1c, type: 2} + value: {fileID: 1225025838} m_ExposedReferences: m_References: [] --- !u!4 &1041483980 @@ -16359,6 +16365,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1225025837} + - component: {fileID: 1225025838} m_Layer: 0 m_Name: Lighting m_TagString: Untagged @@ -16385,6 +16392,27 @@ Transform: - {fileID: 872902549} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1225025838 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1225025836} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f8f755560d0b6714e9d9723d5458579f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1279283825 GameObject: m_ObjectHideFlags: 0 @@ -21233,6 +21261,7 @@ MonoBehaviour: m_EditorClassIdentifier: target: {fileID: 0} smoothingTime: 0.5 + m_Div: 10 --- !u!1 &1834409050 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3377227274414714979, guid: 46166f60d4bee334aa2d365999edc8d6, @@ -22111,7 +22140,7 @@ GameObject: - component: {fileID: 2109183824} - component: {fileID: 2109183823} m_Layer: 0 - m_Name: Spot Light + m_Name: Initial_Light m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -22126,7 +22155,7 @@ Transform: m_GameObject: {fileID: 2109183821} serializedVersion: 2 m_LocalRotation: {x: 0.67829394, y: 0.61478513, z: -0.32351798, w: 0.23935911} - m_LocalPosition: {x: 3.73, y: 4.75, z: 1.76} + m_LocalPosition: {x: 3.73, y: 4.75, z: 4.84} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -22241,7 +22270,7 @@ MonoBehaviour: m_ShadowVariant: 0 m_ShadowPrecision: 0 useOldInspector: 0 - useVolumetric: 1 + useVolumetric: 0 featuresFoldout: 1 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 diff --git a/Assets/Animations/Act-1/1_Intro/Night Sky.anim b/Assets/Animations/Act-1/1_Intro/Night Sky.anim index 94d0039..c0ee6c8 100644 --- a/Assets/Animations/Act-1/1_Intro/Night Sky.anim +++ b/Assets/Animations/Act-1/1_Intro/Night Sky.anim @@ -60,6 +60,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 26.666666 + value: 0.5 + inSlope: 0.027309967 + outSlope: 0.027309967 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 60.216667 value: 1 @@ -78,9 +87,18 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 108.96667 + value: 10 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 111.53333 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -476,6 +494,45 @@ AnimationClip: classID: 2083052967 script: {fileID: 0} flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 34.85 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 120.51667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: float.Emissive + path: + classID: 2083052967 + script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -565,6 +622,15 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 92687922 + script: {fileID: 0} + typeID: 2083052967 + customType: 38 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -630,6 +696,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 26.666666 + value: 0.5 + inSlope: 0.027309967 + outSlope: 0.027309967 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 60.216667 value: 1 @@ -648,9 +723,18 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 108.96667 + value: 10 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 111.53333 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1046,6 +1130,45 @@ AnimationClip: classID: 2083052967 script: {fileID: 0} flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 34.85 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 120.51667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: float.Emissive + path: + classID: 2083052967 + script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/Act-1/2_Body/3 Bed Pulls.anim b/Assets/Animations/Act-1/2_Body/3 Bed Pulls.anim index 322fa7a..8d84dcd 100644 --- a/Assets/Animations/Act-1/2_Body/3 Bed Pulls.anim +++ b/Assets/Animations/Act-1/2_Body/3 Bed Pulls.anim @@ -268,7 +268,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 73.4 + time: 73.28333 value: 0.31 inSlope: 0 outSlope: 0 @@ -772,8 +772,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 73.4 - value: 1 + time: 73.28333 + value: 5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -781,7 +781,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 76.5 + time: 74.2 value: 0 inSlope: 0 outSlope: 0 @@ -1582,7 +1582,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 73.4 + time: 73.28333 value: 0.31 inSlope: 0 outSlope: 0 @@ -2086,8 +2086,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 73.4 - value: 1 + time: 73.28333 + value: 5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2095,7 +2095,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 76.5 + time: 74.2 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Animations/Act-1/4_Lights.meta b/Assets/Animations/Act-1/4_Lights.meta new file mode 100644 index 0000000..ef5eb83 --- /dev/null +++ b/Assets/Animations/Act-1/4_Lights.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89c8390f7b89b25499f625465828eb05 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Act-1/4_Lights/Lighting.anim b/Assets/Animations/Act-1/4_Lights/Lighting.anim new file mode 100644 index 0000000..1ece734 --- /dev/null +++ b/Assets/Animations/Act-1/4_Lights/Lighting.anim @@ -0,0 +1,350 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lighting + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 19.6 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 104.11667 + value: 4026.4678 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 654.56665 + value: 4026.4678 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 665.7 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Intensity + path: Blue Light TL + classID: 108 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 19.6 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 104.11667 + value: 507.44675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 654.56665 + value: 507.44675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 665.7 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Intensity + path: Dust Light TR + classID: 108 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 507.44675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 654.68335 + value: 507.44675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 665.7 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Intensity + path: Initial_Light + classID: 108 + script: {fileID: 0} + flags: 16 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1689635319 + attribute: 898800009 + script: {fileID: 0} + typeID: 108 + customType: 25 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2402802865 + attribute: 898800009 + script: {fileID: 0} + typeID: 108 + customType: 25 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 293756943 + attribute: 898800009 + script: {fileID: 0} + typeID: 108 + customType: 25 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 665.7 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 19.6 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 104.11667 + value: 4026.4678 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 654.56665 + value: 4026.4678 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 665.7 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Intensity + path: Blue Light TL + classID: 108 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 19.6 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 104.11667 + value: 507.44675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 654.56665 + value: 507.44675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 665.7 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Intensity + path: Dust Light TR + classID: 108 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 507.44675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 654.68335 + value: 507.44675 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 665.7 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Intensity + path: Initial_Light + classID: 108 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Act-1/4_Lights/Lighting.anim.meta b/Assets/Animations/Act-1/4_Lights/Lighting.anim.meta new file mode 100644 index 0000000..c34f657 --- /dev/null +++ b/Assets/Animations/Act-1/4_Lights/Lighting.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fece228de6cc66347abbe3008fa0dfba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Act-1/4_Lights/Lighting.controller b/Assets/Animations/Act-1/4_Lights/Lighting.controller new file mode 100644 index 0000000..77d1873 --- /dev/null +++ b/Assets/Animations/Act-1/4_Lights/Lighting.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-3871762142199264267 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 426591754258385228} + m_Position: {x: 418.16107, y: 100.159546, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 426591754258385228} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lighting + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3871762142199264267} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &426591754258385228 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Lighting + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fece228de6cc66347abbe3008fa0dfba, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animations/Act-1/4_Lights/Lighting.controller.meta b/Assets/Animations/Act-1/4_Lights/Lighting.controller.meta new file mode 100644 index 0000000..b567279 --- /dev/null +++ b/Assets/Animations/Act-1/4_Lights/Lighting.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f8f755560d0b6714e9d9723d5458579f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Act-1/Floor.anim b/Assets/Animations/Act-1/Floor.anim index d3f0fa5..b831df2 100644 --- a/Assets/Animations/Act-1/Floor.anim +++ b/Assets/Animations/Act-1/Floor.anim @@ -85,7 +85,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 79.13333 value: 0.012780666 inSlope: 0 outSlope: 0 @@ -94,10 +94,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 219.71666 + time: 113.933334 value: 0.99370223 - inSlope: 0.000042034106 - outSlope: 0.000042034106 + inSlope: 0.00004842879 + outSlope: 0.00004842879 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -280,7 +280,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 79.13333 value: 0.012780666 inSlope: 0 outSlope: 0 @@ -289,10 +289,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 219.71666 + time: 113.933334 value: 0.99370223 - inSlope: 0.000042034106 - outSlope: 0.000042034106 + inSlope: 0.00004842879 + outSlope: 0.00004842879 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 diff --git a/Assets/Settings/Act-1.asset b/Assets/Settings/Act-1.asset index 4cf7c8e..d2bb0c0 100644 --- a/Assets/Settings/Act-1.asset +++ b/Assets/Settings/Act-1.asset @@ -279,7 +279,7 @@ MonoBehaviour: m_Value: 1 color: m_OverrideState: 1 - m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_Value: {r: 0, g: 0, b: 0, a: 1} tint: m_OverrideState: 1 m_Value: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Timeline/Timeline_Act-1.playable b/Assets/Timeline/Timeline_Act-1.playable index 9da2aa7..dcb4cf7 100644 --- a/Assets/Timeline/Timeline_Act-1.playable +++ b/Assets/Timeline/Timeline_Act-1.playable @@ -584,6 +584,30 @@ 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 &-7438267705907262611 +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: d0fc6f5187a81dc47999eefade6f0935, type: 3} + m_Name: Lights + 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: + - {fileID: -6691445991689132819} + m_Clips: [] + m_Markers: + m_Objects: [] --- !u!114 &-7361038963747027062 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1125,6 +1149,116 @@ MonoBehaviour: m_Clips: [] m_Markers: m_Objects: [] +--- !u!114 &-6691445991689132819 +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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: -7438267705907262611} + m_Children: [] + m_Clips: + - m_Version: 1 + m_Start: 0 + m_ClipIn: 0 + m_Asset: {fileID: -539193821138705654} + m_Duration: 692.7 + m_TimeScale: 1 + m_ParentTrack: {fileID: -6691445991689132819} + m_EaseInDuration: 0 + m_EaseOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 + 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: 1 + m_PreExtrapolationMode: 1 + m_PostExtrapolationTime: Infinity + m_PreExtrapolationTime: 0 + m_DisplayName: Lighting + m_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 0 + m_InfiniteClipPostExtrapolation: 0 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: 0} + 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 &-6533552723534463735 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2224,6 +2358,30 @@ 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 &-4614028697958670338 +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: d0fc6f5187a81dc47999eefade6f0935, type: 3} + m_Name: Floor + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 4509307168074352277} + m_Children: + - {fileID: 6629795049327489851} + m_Clips: [] + m_Markers: + m_Objects: [] --- !u!114 &-4605082190737646937 MonoBehaviour: m_ObjectHideFlags: 1 @@ -4462,6 +4620,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &-539193821138705654 +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: 030f85c3f73729f4f976f66ffb23b875, type: 3} + m_Name: AnimationPlayableAsset + m_EditorClassIdentifier: + m_Clip: {fileID: 7400000, guid: fece228de6cc66347abbe3008fa0dfba, type: 2} + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_UseTrackMatchFields: 1 + m_MatchTargetFields: 63 + m_RemoveStartOffset: 1 + m_ApplyFootIK: 1 + m_Loop: 0 + m_Version: 1 + m_Rotation: {x: 0, y: 0, z: 0, w: 1} --- !u!114 &-446954444035551309 MonoBehaviour: m_ObjectHideFlags: 1 @@ -4526,7 +4706,7 @@ MonoBehaviour: - {fileID: 4509307168074352277} - {fileID: -7361038963747027062} - {fileID: 8143796622047199152} - - {fileID: 6629795049327489851} + - {fileID: -7438267705907262611} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -5892,6 +6072,7 @@ MonoBehaviour: - {fileID: 1411129146524879830} - {fileID: 4989314932430202829} - {fileID: -353583542165399514} + - {fileID: -4614028697958670338} m_Clips: [] m_Markers: m_Objects: [] @@ -6925,7 +7106,7 @@ MonoBehaviour: m_Muted: 0 m_CustomPlayableFullTypename: m_Curves: {fileID: 0} - m_Parent: {fileID: 11400000} + m_Parent: {fileID: -4614028697958670338} m_Children: [] m_Clips: - m_Version: 1 diff --git a/Assets/VFX/Night Sky.vfx b/Assets/VFX/Night Sky.vfx index 558686c..f90306f 100644 --- a/Assets/VFX/Night Sky.vfx +++ b/Assets/VFX/Night Sky.vfx @@ -295,7 +295,7 @@ MonoBehaviour: x: -4899 y: 523 width: 14391 - height: 3212 + height: 3269 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1 @@ -456,6 +456,8 @@ MonoBehaviour: - {fileID: 8926484042661616710} - {fileID: 8926484042661616712} - {fileID: 8926484042661616714} + - {fileID: 8926484042661616724} + - {fileID: 8926484042661616726} m_UIPosition: {x: 0, y: 0} m_UICollapsed: 1 m_UISuperCollapsed: 0 @@ -823,6 +825,20 @@ MonoBehaviour: max: Infinity enumValues: [] descendantCount: 0 + - name: Emissive + path: Emissive + 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: 0 + max: 1 + enumValues: [] + descendantCount: 0 - name: Line path: tooltip: @@ -7460,7 +7476,7 @@ MonoBehaviour: - {fileID: 8926484042661615073} m_ExposedName: VelocityMap m_Exposed: 1 - m_Order: 33 + m_Order: 37 m_Category: Data m_Min: m_Type: @@ -7540,7 +7556,7 @@ MonoBehaviour: - {fileID: 8926484042661615075} m_ExposedName: NormalMap m_Exposed: 1 - m_Order: 42 + m_Order: 46 m_Category: Data m_Min: m_Type: @@ -8122,7 +8138,7 @@ MonoBehaviour: - {fileID: 8926484042661615135} m_ExposedName: Normal Offset m_Exposed: 1 - m_Order: 10 + m_Order: 14 m_Category: Point m_Min: m_Type: @@ -8202,7 +8218,7 @@ MonoBehaviour: - {fileID: 8926484042661615137} m_ExposedName: Point Size Small m_Exposed: 1 - m_Order: 7 + m_Order: 10 m_Category: Point m_Min: m_Type: @@ -8282,7 +8298,7 @@ MonoBehaviour: - {fileID: 8926484042661615139} m_ExposedName: Point Size Big m_Exposed: 1 - m_Order: 8 + m_Order: 11 m_Category: Point m_Min: m_Type: @@ -8457,7 +8473,7 @@ MonoBehaviour: - {fileID: 8926484042661615247} m_ExposedName: Line Range m_Exposed: 1 - m_Order: 34 + m_Order: 38 m_Category: Line m_Min: m_Type: @@ -8537,7 +8553,7 @@ MonoBehaviour: - {fileID: 8926484042661615249} m_ExposedName: Line Thickness m_Exposed: 1 - m_Order: 36 + m_Order: 40 m_Category: Line m_Min: m_Type: @@ -11100,7 +11116,7 @@ MonoBehaviour: - {fileID: 8926484042661615421} m_ExposedName: Point Size Ratio m_Exposed: 1 - m_Order: 9 + m_Order: 13 m_Category: Point m_Min: m_Type: @@ -13407,7 +13423,7 @@ MonoBehaviour: - {fileID: 8926484042661615492} m_ExposedName: Turbulences m_Exposed: 1 - m_Order: 12 + m_Order: 17 m_Category: Point m_Min: m_Type: @@ -13495,7 +13511,7 @@ MonoBehaviour: - {fileID: 8926484042661615511} m_ExposedName: Turbulences Frequency m_Exposed: 1 - m_Order: 14 + m_Order: 20 m_Category: Point m_Min: m_Type: @@ -13583,7 +13599,7 @@ MonoBehaviour: - {fileID: 8926484042661615513} m_ExposedName: Turbulences Speed m_Exposed: 1 - m_Order: 13 + m_Order: 18 m_Category: Point m_Min: m_Type: @@ -14802,7 +14818,7 @@ MonoBehaviour: - {fileID: 8926484042661615551} m_ExposedName: Noise m_Exposed: 1 - m_Order: 11 + m_Order: 16 m_Category: Point m_Min: m_Type: @@ -15215,7 +15231,7 @@ MonoBehaviour: - {fileID: 8926484042661615615} m_ExposedName: Turbulences Ratio m_Exposed: 1 - m_Order: 15 + m_Order: 21 m_Category: Point m_Min: m_Type: @@ -16246,7 +16262,7 @@ MonoBehaviour: - {fileID: 8926484042661615658} m_ExposedName: Point Smoothness m_Exposed: 1 - m_Order: 4 + m_Order: 6 m_Category: Point m_Min: m_Type: @@ -16336,7 +16352,7 @@ MonoBehaviour: - {fileID: 8926484042661615660} m_ExposedName: Point Metallic m_Exposed: 1 - m_Order: 5 + m_Order: 7 m_Category: Point m_Min: m_Type: @@ -18491,7 +18507,7 @@ MonoBehaviour: - {fileID: 8926484042661615733} m_ExposedName: Line Color m_Exposed: 1 - m_Order: 29 + m_Order: 33 m_Category: Line m_Min: m_Type: @@ -18707,7 +18723,7 @@ MonoBehaviour: - {fileID: 8926484042661615739} m_ExposedName: Point Color m_Exposed: 1 - m_Order: 3 + m_Order: 5 m_Category: Point m_Min: m_Type: @@ -18723,9 +18739,7 @@ MonoBehaviour: m_Tooltip: m_Nodes: - m_Id: 0 - linkedSlots: - - outputSlot: {fileID: 8926484042661615739} - inputSlot: {fileID: 8926484042661615751} + linkedSlots: [] position: {x: -2278, y: 3350} expandedSlots: [] expanded: 0 @@ -18766,8 +18780,7 @@ MonoBehaviour: m_SerializableType: UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_Direction: 1 - m_LinkedSlots: - - {fileID: 8926484042661615751} + m_LinkedSlots: [] --- !u!114 &8926484042661615740 MonoBehaviour: m_ObjectHideFlags: 0 @@ -18923,7 +18936,7 @@ MonoBehaviour: - {fileID: 8926484042661615745} m_ExposedName: Line Point Color m_Exposed: 1 - m_Order: 31 + m_Order: 35 m_Category: Line m_Min: m_Type: @@ -19180,8 +19193,7 @@ MonoBehaviour: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_Direction: 0 - m_LinkedSlots: - - {fileID: 8926484042661615739} + m_LinkedSlots: [] --- !u!114 &8926484042661615752 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19537,7 +19549,7 @@ MonoBehaviour: - {fileID: 8926484042661615763} m_ExposedName: Line Smoothness m_Exposed: 1 - m_Order: 40 + m_Order: 44 m_Category: Line m_Min: m_Type: @@ -19627,7 +19639,7 @@ MonoBehaviour: - {fileID: 8926484042661615765} m_ExposedName: Line Metallic m_Exposed: 1 - m_Order: 43 + m_Order: 47 m_Category: Line m_Min: m_Type: @@ -19981,7 +19993,7 @@ MonoBehaviour: - {fileID: 8926484042661615775} m_ExposedName: Bubble Rate m_Exposed: 1 - m_Order: 32 + m_Order: 36 m_Category: Bubble m_Min: m_Type: @@ -20061,7 +20073,7 @@ MonoBehaviour: - {fileID: 8926484042661615777} m_ExposedName: Bubble Lifetime m_Exposed: 1 - m_Order: 35 + m_Order: 39 m_Category: Bubble m_Min: m_Type: @@ -20141,7 +20153,7 @@ MonoBehaviour: - {fileID: 8926484042661615779} m_ExposedName: Bubble Turbulences m_Exposed: 1 - m_Order: 37 + m_Order: 41 m_Category: Bubble m_Min: m_Type: @@ -20221,7 +20233,7 @@ MonoBehaviour: - {fileID: 8926484042661615781} m_ExposedName: Bubble Force m_Exposed: 1 - m_Order: 41 + m_Order: 45 m_Category: Bubble m_Min: m_Type: @@ -20601,7 +20613,7 @@ MonoBehaviour: - {fileID: 8926484042661615793} m_ExposedName: Line Point Size m_Exposed: 1 - m_Order: 38 + m_Order: 42 m_Category: Line m_Min: m_Type: @@ -20681,7 +20693,7 @@ MonoBehaviour: - {fileID: 8926484042661615802} m_ExposedName: Toggle Bubble m_Exposed: 1 - m_Order: 16 + m_Order: 22 m_Category: Bubble m_Min: m_Type: @@ -20859,7 +20871,7 @@ MonoBehaviour: - {fileID: 8926484042661615807} m_ExposedName: Bubble Turbulences Frequency m_Exposed: 1 - m_Order: 39 + m_Order: 43 m_Category: Bubble m_Min: m_Type: @@ -20939,7 +20951,7 @@ MonoBehaviour: - {fileID: 8926484042661615809} m_ExposedName: Toggle Line m_Exposed: 1 - m_Order: 23 + m_Order: 29 m_Category: Line m_Min: m_Type: @@ -21495,7 +21507,7 @@ MonoBehaviour: - {fileID: 8926484042661615827} m_ExposedName: Line Rate m_Exposed: 1 - m_Order: 26 + m_Order: 30 m_Category: Line m_Min: m_Type: @@ -25915,7 +25927,7 @@ MonoBehaviour: - {fileID: 8926484042661615986} m_ExposedName: Bubble Color m_Exposed: 1 - m_Order: 27 + m_Order: 31 m_Category: Bubble m_Min: m_Type: @@ -26131,7 +26143,7 @@ MonoBehaviour: - {fileID: 8926484042661615992} m_ExposedName: Bubble Size m_Exposed: 1 - m_Order: 30 + m_Order: 34 m_Category: Bubble m_Min: m_Type: @@ -26211,7 +26223,7 @@ MonoBehaviour: - {fileID: 8926484042661615994} m_ExposedName: Toggle Trail m_Exposed: 1 - m_Order: 2 + m_Order: 3 m_Category: Trail m_Min: m_Type: @@ -26427,7 +26439,7 @@ MonoBehaviour: - {fileID: 8926484042661616000} m_ExposedName: Trail Color m_Exposed: 1 - m_Order: 10 + m_Order: 15 m_Category: Trail m_Min: m_Type: @@ -33818,7 +33830,7 @@ MonoBehaviour: - {fileID: 8926484042661616384} m_ExposedName: Point Rate m_Exposed: 1 - m_Order: 2 + m_Order: 4 m_Category: Point m_Min: m_Type: @@ -33995,7 +34007,7 @@ MonoBehaviour: - {fileID: 8926484042661616389} m_ExposedName: Point Lifetime m_Exposed: 1 - m_Order: 6 + m_Order: 8 m_Category: Point m_Min: m_Type: @@ -34345,7 +34357,7 @@ MonoBehaviour: - {fileID: 8926484042661616404} m_ExposedName: Trail Lifetime m_Exposed: 1 - m_Order: 18 + m_Order: 25 m_Category: Trail m_Min: m_Type: @@ -34425,7 +34437,7 @@ MonoBehaviour: - {fileID: 8926484042661616406} m_ExposedName: Line Lifetime m_Exposed: 1 - m_Order: 28 + m_Order: 32 m_Category: Line m_Min: m_Type: @@ -34508,7 +34520,7 @@ MonoBehaviour: - {fileID: 8926484042661616408} m_ExposedName: Toggle Falling m_Exposed: 1 - m_Order: 6 + m_Order: 9 m_Category: Falling m_Min: m_Type: @@ -34724,7 +34736,7 @@ MonoBehaviour: - {fileID: 8926484042661616414} m_ExposedName: Toggle Antenna m_Exposed: 1 - m_Order: 8 + m_Order: 12 m_Category: Antenna m_Min: m_Type: @@ -34941,7 +34953,7 @@ MonoBehaviour: - {fileID: 8926484042661616420} m_ExposedName: Antenna Rate m_Exposed: 1 - m_Order: 13 + m_Order: 19 m_Category: Antenna m_Min: m_Type: @@ -37950,7 +37962,7 @@ MonoBehaviour: - {fileID: 8926484042661616509} m_ExposedName: Antenna Point Size m_Exposed: 1 - m_Order: 20 + m_Order: 28 m_Category: Antenna m_Min: m_Type: @@ -38224,7 +38236,7 @@ MonoBehaviour: - {fileID: 8926484042661616517} m_ExposedName: Bubble Alpha m_Exposed: 1 - m_Order: 44 + m_Order: 48 m_Category: Bubble m_Min: m_Type: @@ -38470,7 +38482,7 @@ MonoBehaviour: - {fileID: 8926484042661616548} m_ExposedName: Point Size m_Exposed: 1 - m_Order: 45 + m_Order: 49 m_Category: Trail m_Min: m_Type: @@ -38550,7 +38562,7 @@ MonoBehaviour: - {fileID: 8926484042661616550} m_ExposedName: Trail Count m_Exposed: 1 - m_Order: 46 + m_Order: 50 m_Category: Trail m_Min: m_Type: @@ -38763,7 +38775,7 @@ MonoBehaviour: - {fileID: 8926484042661616556} m_ExposedName: Pont Lifetime Min m_Exposed: 1 - m_Order: 0 + m_Order: 1 m_Category: Point m_Min: m_Type: @@ -38843,7 +38855,7 @@ MonoBehaviour: - {fileID: 8926484042661616558} m_ExposedName: Point Lifetime Max m_Exposed: 1 - m_Order: 1 + m_Order: 2 m_Category: Point m_Min: m_Type: @@ -39720,7 +39732,7 @@ MonoBehaviour: - {fileID: 8926484042661616593} m_ExposedName: Gravity Point m_Exposed: 1 - m_Order: 16 + m_Order: 23 m_Category: Point m_Min: m_Type: @@ -39930,7 +39942,7 @@ MonoBehaviour: - {fileID: 8926484042661616643} m_ExposedName: Mult Size Over Life m_Exposed: 1 - m_Order: 17 + m_Order: 24 m_Category: Point m_Min: m_Type: @@ -41822,7 +41834,7 @@ MonoBehaviour: - {fileID: 8926484042661616711} m_ExposedName: Clamp Size Min m_Exposed: 1 - m_Order: 19 + m_Order: 27 m_Category: Point m_Min: m_Type: @@ -41902,7 +41914,7 @@ MonoBehaviour: - {fileID: 8926484042661616713} m_ExposedName: Clamp Size Max m_Exposed: 1 - m_Order: 18 + m_Order: 26 m_Category: Point m_Min: m_Type: @@ -41982,7 +41994,7 @@ MonoBehaviour: - {fileID: 8926484042661616715} m_ExposedName: Clamp Toggle m_Exposed: 1 - m_Order: 47 + m_Order: 51 m_Category: Point m_Min: m_Type: @@ -42136,3 +42148,424 @@ MonoBehaviour: PublicKeyToken=b77a5c561934e089 m_Direction: 0 m_LinkedSlots: [] +--- !u!114 &8926484042661616724 +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: 8926484042661616725} + m_ExposedName: Emissive + m_Exposed: 1 + m_Order: 52 + m_Category: Point + m_Min: + m_Type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_SerializableObject: 0 + 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: 8926484042661616725} + inputSlot: {fileID: 8926484042661616728} + position: {x: -2582, y: 3741} + expandedSlots: [] + expanded: 0 +--- !u!114 &8926484042661616725 +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: 8926484042661616725} + m_MasterData: + m_Owner: {fileID: 8926484042661616724} + 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: 8926484042661616728} +--- !u!114 &8926484042661616726 +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: -2421, y: 3653} + m_UICollapsed: 0 + m_UISuperCollapsed: 0 + m_InputSlots: + - {fileID: 8926484042661616730} + - {fileID: 8926484042661616728} + m_OutputSlots: + - {fileID: 8926484042661616734} + m_Operands: + - name: a + type: + m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - name: b + type: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 +--- !u!114 &8926484042661616728 +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: 8926484042661616728} + m_MasterData: + m_Owner: {fileID: 8926484042661616726} + 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: 8926484042661616725} +--- !u!114 &8926484042661616730 +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: ac39bd03fca81b849929b9c966f1836a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: + - {fileID: 8926484042661616731} + - {fileID: 8926484042661616732} + - {fileID: 8926484042661616733} + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616730} + m_MasterData: + m_Owner: {fileID: 8926484042661616726} + m_Value: + m_Type: + m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_SerializableObject: '{"x":1.0,"y":1.0,"z":1.0}' + m_Space: 2147483647 + m_Property: + name: a + m_serializedType: + m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661616731 +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: 8926484042661616730} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616730} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: x + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661616732 +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: 8926484042661616730} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616730} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: y + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661616733 +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: 8926484042661616730} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616730} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: z + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 0 + m_LinkedSlots: [] +--- !u!114 &8926484042661616734 +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: ac39bd03fca81b849929b9c966f1836a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UIIgnoredErrors: [] + m_Parent: {fileID: 0} + m_Children: + - {fileID: 8926484042661616735} + - {fileID: 8926484042661616736} + - {fileID: 8926484042661616737} + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616734} + m_MasterData: + m_Owner: {fileID: 8926484042661616726} + m_Value: + m_Type: + m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: + m_serializedType: + m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_Direction: 1 + m_LinkedSlots: [] +--- !u!114 &8926484042661616735 +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: 8926484042661616734} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616734} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: x + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: [] +--- !u!114 &8926484042661616736 +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: 8926484042661616734} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616734} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: y + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: [] +--- !u!114 &8926484042661616737 +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: 8926484042661616734} + m_Children: [] + m_UIPosition: {x: 0, y: 0} + m_UICollapsed: 1 + m_UISuperCollapsed: 0 + m_MasterSlot: {fileID: 8926484042661616734} + m_MasterData: + m_Owner: {fileID: 0} + m_Value: + m_Type: + m_SerializableType: + m_SerializableObject: + m_Space: 2147483647 + m_Property: + name: z + m_serializedType: + m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + m_Direction: 1 + m_LinkedSlots: []