diff --git a/Assets/_Content/Models/VFX/Ray/Materials/M_ray.mat b/Assets/_Content/Models/VFX/Ray/Materials/M_ray.mat index 7b05f935..113abb80 100644 --- a/Assets/_Content/Models/VFX/Ray/Materials/M_ray.mat +++ b/Assets/_Content/Models/VFX/Ray/Materials/M_ray.mat @@ -37,6 +37,10 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _SampleTexture2D_45427f0cc3994257be048fc580e65bba_Texture_1_Texture2D: + m_Texture: {fileID: 2800000, guid: dffef66376be4fa480fb02b19edbe903, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -54,12 +58,17 @@ Material: - _Debug: 0 - _Demo: 0 - _IgnoreAtten: 1 + - _Intendity: 0.828 + - _Intensity: 1 - _Noise: 0.786 - _QueueControl: 0 - _QueueOffset: 0 + - _Size: 1 + - _Speed: 2 - _Stop: 1 + - _UV: 0 m_Colors: - - _Color: {r: 11.984315, g: 8.690491, b: 3.2428153, a: 0.07058824} + - _Color: {r: 2, g: 1.3822709, b: 0.7329843, a: 0.09803922} - _Direction: {r: 0, g: 0, b: 1, a: 0} - _Size: {r: 3, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/_Content/Models/VFX/Ray/Shaders/Ray.shadergraph b/Assets/_Content/Models/VFX/Ray/Shaders/Ray.shadergraph index 138fa294..fb6a67c3 100644 --- a/Assets/_Content/Models/VFX/Ray/Shaders/Ray.shadergraph +++ b/Assets/_Content/Models/VFX/Ray/Shaders/Ray.shadergraph @@ -6,14 +6,17 @@ { "m_Id": "f8301001f4f843788881d0078777ce68" }, - { - "m_Id": "8a28df9d1561478482d9af21d72de413" - }, { "m_Id": "4ece9f9dc77f4d469f3db3131c0109dc" }, { - "m_Id": "99de54e49b4f4f7b90d1932906f606d5" + "m_Id": "ebfe67686dc842aa822a2147e26034ee" + }, + { + "m_Id": "6451829393b04d229406825b3a8d8170" + }, + { + "m_Id": "53d5afff3c3f4a9db8281850eee533f8" } ], "m_Keywords": [], @@ -21,6 +24,12 @@ "m_CategoryData": [ { "m_Id": "0c68e1832a5a41a383c27a8e920b8c08" + }, + { + "m_Id": "6bb56ff93f144f478b747aa5a9a42edd" + }, + { + "m_Id": "6f56d7a5099b4f51b7694f8ef9d656df" } ], "m_Nodes": [ @@ -156,9 +165,6 @@ { "m_Id": "f83ab15ba99e436cb304f2d00d943b46" }, - { - "m_Id": "8bd92b63df634ce0a575d45d9947a6b5" - }, { "m_Id": "e12190bfe8584f2f8d8a5a42ccab9ae9" }, @@ -221,6 +227,21 @@ }, { "m_Id": "2027158d1653482996678059362a1de2" + }, + { + "m_Id": "2138b925846845808d9dadc4847cfe20" + }, + { + "m_Id": "ace9fc3bc9b44a8184f445498cac04d0" + }, + { + "m_Id": "c49bcf7a6e4c4532a472e46e207e63dd" + }, + { + "m_Id": "1cc17a65f01f4f79a83d56e2ccaa3481" + }, + { + "m_Id": "b2bb364d532b4dd999f4ffc8d39b09be" } ], "m_GroupDatas": [ @@ -387,6 +408,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1cc17a65f01f4f79a83d56e2ccaa3481" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8c33db14052d44f58d122f6121da5b71" + }, + "m_SlotId": 16 + } + }, { "m_OutputSlot": { "m_Node": { @@ -401,6 +436,20 @@ "m_SlotId": 12 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2138b925846845808d9dadc4847cfe20" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8c33db14052d44f58d122f6121da5b71" + }, + "m_SlotId": 14 + } + }, { "m_OutputSlot": { "m_Node": { @@ -709,20 +758,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "8bd92b63df634ce0a575d45d9947a6b5" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "f83ab15ba99e436cb304f2d00d943b46" - }, - "m_SlotId": 2 - } - }, { "m_OutputSlot": { "m_Node": { @@ -877,6 +912,34 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ace9fc3bc9b44a8184f445498cac04d0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f83ab15ba99e436cb304f2d00d943b46" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "b2bb364d532b4dd999f4ffc8d39b09be" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8c33db14052d44f58d122f6121da5b71" + }, + "m_SlotId": 17 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1045,6 +1108,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c49bcf7a6e4c4532a472e46e207e63dd" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8c33db14052d44f58d122f6121da5b71" + }, + "m_SlotId": 15 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1713,15 +1790,6 @@ "m_ChildObjectList": [ { "m_Id": "f8301001f4f843788881d0078777ce68" - }, - { - "m_Id": "99de54e49b4f4f7b90d1932906f606d5" - }, - { - "m_Id": "8a28df9d1561478482d9af21d72de413" - }, - { - "m_Id": "4ece9f9dc77f4d469f3db3131c0109dc" } ] } @@ -2200,6 +2268,22 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "15d2a4cf87f0439aa55f20cffd3e59dd", + "m_Id": 0, + "m_DisplayName": "Intensity", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2447,6 +2531,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "1cc17a65f01f4f79a83d56e2ccaa3481", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1269.9998779296875, + "y": -208.99998474121095, + "width": 121.0, + "height": 33.99998474121094 + } + }, + "m_Slots": [ + { + "m_Id": "15d2a4cf87f0439aa55f20cffd3e59dd" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "53d5afff3c3f4a9db8281850eee533f8" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2475,10 +2595,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1281.9998779296875, - "y": -204.99998474121095, + "x": 1254.9998779296875, + "y": -162.99998474121095, "width": 105.0, - "height": 34.0 + "height": 33.99998474121094 } }, "m_Slots": [ @@ -2643,6 +2763,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2138b925846845808d9dadc4847cfe20", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1353.9998779296875, + "y": -299.9999694824219, + "width": 97.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "8729fa037a3845acb061b632bfadf8db" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "ebfe67686dc842aa822a2147e26034ee" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3193,10 +3349,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1256.9998779296875, - "y": -0.000011444091796875, + "x": 1231.9998779296875, + "y": 46.99999237060547, "width": 145.0, - "height": 127.99998474121094 + "height": 127.9999771118164 } }, "m_Slots": [ @@ -3254,6 +3410,22 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "36ebdf350f1a4422a0d0806b2fc38108", + "m_Id": 14, + "m_DisplayName": "Size", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Size", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", @@ -3940,10 +4112,10 @@ "promotedFromAssetID": "", "promotedFromCategoryName": "", "promotedOrdering": -1, - "m_Name": "Debug", + "m_Name": "UV", "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Debug", - "m_DefaultReferenceName": "_Debug", + "m_RefNameGeneratedByDisplayName": "UV", + "m_DefaultReferenceName": "_UV", "m_OverrideReferenceName": "", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, @@ -4174,6 +4346,50 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "53d5afff3c3f4a9db8281850eee533f8", + "m_Guid": { + "m_GuidSerialized": "9fb38f49-48aa-49ce-9643-edf0ab5a2fea" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "Intensity", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Intensity", + "m_DefaultReferenceName": "_Intensity", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 0.0, + "m_FloatType": 1, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4785,6 +5001,50 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "6451829393b04d229406825b3a8d8170", + "m_Guid": { + "m_GuidSerialized": "d3795f8f-fb88-4014-a44c-8621f07f028f" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "Speed", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Speed", + "m_DefaultReferenceName": "_Speed", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 1.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GroupData", @@ -4833,10 +5093,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1180.9998779296875, - "y": -153.99998474121095, + "x": 1153.9998779296875, + "y": -106.9999771118164, "width": 206.0, - "height": 129.99998474121095 + "height": 129.99996948242188 } }, "m_Slots": [ @@ -4917,29 +5177,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "6962c8bfbbf54b1b8108c2ccda854ecb", - "m_Id": 12, - "m_DisplayName": "Color", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Color", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5042,6 +5279,24 @@ "m_SerializedDescriptor": "VertexDescription.Tangent" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "6bb56ff93f144f478b747aa5a9a42edd", + "m_Name": "Noise", + "m_ChildObjectList": [ + { + "m_Id": "53d5afff3c3f4a9db8281850eee533f8" + }, + { + "m_Id": "ebfe67686dc842aa822a2147e26034ee" + }, + { + "m_Id": "6451829393b04d229406825b3a8d8170" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -5085,6 +5340,18 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "6f56d7a5099b4f51b7694f8ef9d656df", + "m_Name": "Debug", + "m_ChildObjectList": [ + { + "m_Id": "4ece9f9dc77f4d469f3db3131c0109dc" + } + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5547,6 +5814,22 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7ec1359c52ff4769a1a604ffaa6239a5", + "m_Id": 17, + "m_DisplayName": "UvDebug", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UvDebug", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -5933,6 +6216,22 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8729fa037a3845acb061b632bfadf8db", + "m_Id": 0, + "m_DisplayName": "Size", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.GradientMaterialSlot", @@ -6016,50 +6315,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "8a28df9d1561478482d9af21d72de413", - "m_Guid": { - "m_GuidSerialized": "a85185c6-068a-46f4-b8ea-fe7d56addf65" - }, - "promotedFromAssetID": "", - "promotedFromCategoryName": "", - "promotedOrdering": -1, - "m_Name": "Noise", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Noise", - "m_DefaultReferenceName": "_Noise", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_PerRendererData": false, - "m_customAttributes": [], - "m_Value": 1.0, - "m_FloatType": 1, - "m_LiteralFloatMode": false, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - }, - "m_SliderType": 0, - "m_SliderPower": 3.0, - "m_EnumType": 0, - "m_CSharpEnumString": "", - "m_EnumNames": [ - "Default" - ], - "m_EnumValues": [ - 0 - ] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -6092,42 +6347,6 @@ "m_LiteralMode": false } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "8bd92b63df634ce0a575d45d9947a6b5", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -356.0, - "y": 47.99999237060547, - "width": 104.99989318847656, - "height": 34.000038146972659 - } - }, - "m_Slots": [ - { - "m_Id": "f9b68195b9e046b9911356353d3e7973" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "8a28df9d1561478482d9af21d72de413" - } -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.CustomFunctionNode", @@ -6140,15 +6359,24 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 1553.0001220703125, - "y": -81.00000762939453, + "x": 1553.9998779296875, + "y": -82.99998474121094, "width": 215.0, - "height": 166.0 + "height": 165.99993896484376 } }, "m_Slots": [ { - "m_Id": "6962c8bfbbf54b1b8108c2ccda854ecb" + "m_Id": "36ebdf350f1a4422a0d0806b2fc38108" + }, + { + "m_Id": "90f25ca418774ee4bf0e000dc1df90f4" + }, + { + "m_Id": "f2e020c992e94587b27d109c7426db73" + }, + { + "m_Id": "a23a43c134e14d08a46c6e593e67910e" }, { "m_Id": "d85f7a35cf404fd2b6d9bd9391c30446" @@ -6159,6 +6387,9 @@ { "m_Id": "4087f03500c74575947fac907d28ba80" }, + { + "m_Id": "7ec1359c52ff4769a1a604ffaa6239a5" + }, { "m_Id": "0ad976f39cdb4bc78db45e87a169cbf8" }, @@ -6328,6 +6559,22 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "90f25ca418774ee4bf0e000dc1df90f4", + "m_Id": 15, + "m_DisplayName": "Speed", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Speed", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", @@ -6678,39 +6925,6 @@ "m_LiteralMode": false } -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector2ShaderProperty", - "m_ObjectId": "99de54e49b4f4f7b90d1932906f606d5", - "m_Guid": { - "m_GuidSerialized": "4e2b665d-e6cc-4aaf-bb9f-2d59017967b7" - }, - "promotedFromAssetID": "", - "promotedFromCategoryName": "", - "promotedOrdering": -1, - "m_Name": "Size", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Size", - "m_DefaultReferenceName": "_Size", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_PerRendererData": false, - "m_customAttributes": [], - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -7015,6 +7229,31 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "a23a43c134e14d08a46c6e593e67910e", + "m_Id": 12, + "m_DisplayName": "Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Color", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVNode", @@ -7254,6 +7493,44 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SliderNode", + "m_ObjectId": "ace9fc3bc9b44a8184f445498cac04d0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Slider", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -356.0, + "y": 47.99999237060547, + "width": 104.99989318847656, + "height": 34.000038146972659 + } + }, + "m_Slots": [ + { + "m_Id": "ee42e697113d4222a6a45a2b0bec336b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Value": { + "x": 1.0, + "y": 0.0, + "z": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -7389,6 +7666,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "b2bb364d532b4dd999f4ffc8d39b09be", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1299.9998779296875, + "y": 195.0, + "width": 91.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "f5247902b27c46fd95adab4b7af04916" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "4ece9f9dc77f4d469f3db3131c0109dc" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -7899,6 +8212,22 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c04346c2fe754aaa9cc5a76b0423260a", + "m_Id": 0, + "m_DisplayName": "Speed", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SplitNode", @@ -7962,6 +8291,42 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "c49bcf7a6e4c4532a472e46e207e63dd", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 1304.9998779296875, + "y": -257.9999694824219, + "width": 109.0, + "height": 33.99998474121094 + } + }, + "m_Slots": [ + { + "m_Id": "c04346c2fe754aaa9cc5a76b0423260a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "6451829393b04d229406825b3a8d8170" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -8491,7 +8856,7 @@ "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", "m_ObjectId": "d2695c87f71644a59a2fdcadab6a4fb6", "m_Id": 0, - "m_DisplayName": "Debug", + "m_DisplayName": "UV", "m_SlotType": 1, "m_Hidden": false, "m_ShaderOutputName": "Out", @@ -9340,6 +9705,50 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "ebfe67686dc842aa822a2147e26034ee", + "m_Guid": { + "m_GuidSerialized": "7944a4fa-b8e2-4afb-b1c7-3884edf10c0f" + }, + "promotedFromAssetID": "", + "promotedFromCategoryName": "", + "promotedOrdering": -1, + "m_Name": "Size", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Size", + "m_DefaultReferenceName": "_Size", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_PerRendererData": false, + "m_customAttributes": [], + "m_Value": 1.0, + "m_FloatType": 0, + "m_LiteralFloatMode": false, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + }, + "m_SliderType": 0, + "m_SliderPower": 3.0, + "m_EnumType": 0, + "m_CSharpEnumString": "", + "m_EnumNames": [ + "Default" + ], + "m_EnumValues": [ + 0 + ] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -9529,6 +9938,22 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ee42e697113d4222a6a45a2b0bec336b", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -9554,6 +9979,22 @@ "m_LiteralMode": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f2e020c992e94587b27d109c7426db73", + "m_Id": 16, + "m_DisplayName": "Intensity", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Intensity", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -9577,6 +10018,22 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f5247902b27c46fd95adab4b7af04916", + "m_Id": 0, + "m_DisplayName": "UV", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [], + "m_LiteralMode": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -9791,22 +10248,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "f9b68195b9e046b9911356353d3e7973", - "m_Id": 0, - "m_DisplayName": "Noise", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [], - "m_LiteralMode": false -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", diff --git a/Assets/_Content/Models/VFX/Ray/Shaders/include/Ray.hlsl b/Assets/_Content/Models/VFX/Ray/Shaders/include/Ray.hlsl index 2fd070dc..6be43019 100644 --- a/Assets/_Content/Models/VFX/Ray/Shaders/include/Ray.hlsl +++ b/Assets/_Content/Models/VFX/Ray/Shaders/include/Ray.hlsl @@ -25,7 +25,7 @@ float3 GetBillboardPositionWS(float3 PositionOS, float3 PivotWS, float3 ViewDirW float3 ApplayerTaperAndScale(float3 PositionOS, float3 Scale) { - float taper = lerp(Scale.z, 1, saturate(PositionOS.y)); + float taper = lerp(1, Scale.z, saturate(PositionOS.y)); float3 p = PositionOS; p.xy *= Scale.xy; @@ -36,10 +36,14 @@ float3 ApplayerTaperAndScale(float3 PositionOS, float3 Scale) void Ray_float ( - float3 Color, + float Size, + float Speed, + float Intensity, + float4 Color, float3 PositionOS, float4 ScreenPos, uint Orthographic, + float UvDebug, out float3 OutPosition, out float3 OutColor ) @@ -69,6 +73,24 @@ void Ray_float float2 uv = float2(distance(pSC_0.x, pSC_2.x) / distance(pSC_1.x, pSC_2.x), pOS_0.y / scale.y); + float mask = smoothstep(1, .2, abs(uv.x * 2 - 1)); + mask *= smoothstep(0, .1, uv.y); + mask *= pow(smoothstep(1, .3, uv.y * .95), 2); + mask *= smoothstep(1, .98, dot(-viewDir, normalize(TransformObjectToWorldDir(float3(0, 1, 0))))); + + float noise = 1; + if (Intensity > 0) + { + float3 noisePos = pivot; + noisePos += float3(uv.x - .5, 0 /*uv.y * .05 / scale.x*/, _Time.y / scale.x / scale.z / Size * Speed * .2); + + noise = SimplexNoise3D(noisePos, scale.x * scale.z * Size); + noise = lerp(1, noise, Intensity); + } + OutPosition = TransformWorldToObject(pWS_0); - OutColor = float3(uv, 0); + OutColor = saturate(noise * mask) * Color.rgb * Color.a; + + if (UvDebug > 0) + OutColor = lerp(OutColor, float3(uv, 0), UvDebug); } \ No newline at end of file diff --git a/Assets/_Content/Scenes/Theatre.unity b/Assets/_Content/Scenes/Theatre.unity index 75c4784e..3bf93873 100644 --- a/Assets/_Content/Scenes/Theatre.unity +++ b/Assets/_Content/Scenes/Theatre.unity @@ -468,13 +468,20 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.08 objectReference: {fileID: 0} + - target: {fileID: 8169463877996365380, guid: 10e5caa37a9610f419d5423bb0c48bdf, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8346567618426696702, guid: 10e5caa37a9610f419d5423bb0c48bdf, type: 3} propertyPath: m_Name value: Spotlight_Scene (1) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2748288515858975761, guid: 10e5caa37a9610f419d5423bb0c48bdf, type: 3} + insertIndex: -1 + addedObject: {fileID: 1344583548} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 10e5caa37a9610f419d5423bb0c48bdf, type: 3} --- !u!1 &26640980 stripped @@ -3583,6 +3590,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 992638687589661580, guid: 8a998c00fc583a54082d05343d747b99, type: 3} m_PrefabInstance: {fileID: 384491237} m_PrefabAsset: {fileID: 0} +--- !u!1001 &385027834 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 183848955} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 0.185 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 0.065 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0006447506 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0019585716 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 0.011543444 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: 0.11569242 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: 0.031424962 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: -0.26023668 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: -0.9580734 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &385027835 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 385027834} + m_PrefabAsset: {fileID: 0} --- !u!1 &394176023 GameObject: m_ObjectHideFlags: 0 @@ -4319,7 +4400,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3536043452013451972, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5076702307752754631, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} propertyPath: m_LocalPosition.x @@ -4415,7 +4496,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7621580971741510096, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} + insertIndex: -1 + addedObject: {fileID: 385027835} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} --- !u!4 &525442567 stripped @@ -8895,6 +8979,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 992638687589661580, guid: 8a998c00fc583a54082d05343d747b99, type: 3} m_PrefabInstance: {fileID: 989960145} m_PrefabAsset: {fileID: 0} +--- !u!1001 &998048163 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 948225105} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 0.185 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 0.065 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: -0.002220174 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 0.011419364 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: 0.021062111 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: 0.008432294 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: -0.24024057 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: -0.97044826 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &998048164 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 998048163} + m_PrefabAsset: {fileID: 0} --- !u!1 &1005038676 GameObject: m_ObjectHideFlags: 0 @@ -9866,7 +10024,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3536043452013451972, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5076702307752754631, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} propertyPath: m_LocalPosition.x @@ -9978,7 +10136,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7621580971741510096, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1678203110} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} --- !u!1 &1124903725 @@ -11710,6 +11871,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1307462940} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1318582373 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1943910777} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 0.185 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 0.065 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: -0.000018032788 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0019798959 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 0.011657392 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: -0.04364643 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: -0.016952198 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: -0.24231741 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: -0.9690665 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &1318582374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 1318582373} + m_PrefabAsset: {fileID: 0} --- !u!1 &1323932845 GameObject: m_ObjectHideFlags: 0 @@ -11839,6 +12074,80 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &1344583547 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1984523224} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 21.160004 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 3.3200002 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: 0.029999813 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5899996 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 0.07999891 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: -0.000000014901159 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: -9.3132246e-10 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: -0.57618785 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: -0.8173173 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &1344583548 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 1344583547} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1362197218 PrefabInstance: m_ObjectHideFlags: 0 @@ -11943,13 +12252,20 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.09 objectReference: {fileID: 0} + - target: {fileID: 8169463877996365380, guid: 10e5caa37a9610f419d5423bb0c48bdf, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8346567618426696702, guid: 10e5caa37a9610f419d5423bb0c48bdf, type: 3} propertyPath: m_Name value: Spotlight_Scene objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2748288515858975761, guid: 10e5caa37a9610f419d5423bb0c48bdf, type: 3} + insertIndex: -1 + addedObject: {fileID: 1933296414} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 10e5caa37a9610f419d5423bb0c48bdf, type: 3} --- !u!1 &1367066787 @@ -12210,7 +12526,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3536043452013451972, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5076702307752754631, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} propertyPath: m_LocalPosition.x @@ -12330,7 +12646,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7621580971741510096, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} + insertIndex: -1 + addedObject: {fileID: 998048164} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} --- !u!1 &1403556196 @@ -14301,6 +14620,80 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -8697944735082660400, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3} +--- !u!1001 &1678203109 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2029459265} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 0.185 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 0.065 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: -0.00028645038 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0020966828 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 0.011391946 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: -0.10011826 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: -0.02500478 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: -0.24101552 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: -0.96501946 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &1678203110 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 1678203109} + m_PrefabAsset: {fileID: 0} --- !u!4 &1697748829 stripped Transform: m_CorrespondingSourceObject: {fileID: 5645125359245243090, guid: 026d90e6b31bf0f47b6072ba92aef39a, type: 3} @@ -18518,7 +18911,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3536043452013451972, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5076702307752754631, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} propertyPath: m_LocalPosition.x @@ -18626,7 +19019,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7621580971741510096, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1318582374} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3} --- !u!1 &1843195560 @@ -19154,6 +19550,80 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1142282166} m_SourcePrefab: {fileID: 100100000, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3} +--- !u!1001 &1933296413 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 920731359} + m_Modifications: + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.y + value: 21.160004 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalScale.z + value: 3.3200002 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.x + value: 0.029999785 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.y + value: 0.59000015 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalPosition.z + value: 0.09000097 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.x + value: 0.0000000018626451 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.y + value: -0.57618785 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalRotation.z + value: -0.8173173 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2541733693143394657, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + propertyPath: m_Name + value: Ray + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} +--- !u!4 &1933296414 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 688462554248565909, guid: 2db7add660a81a342a80b1ba7a331929, type: 3} + m_PrefabInstance: {fileID: 1933296413} + m_PrefabAsset: {fileID: 0} --- !u!4 &1943910777 stripped Transform: m_CorrespondingSourceObject: {fileID: 7621580971741510096, guid: 65124df6e07fe0f438cd845f948aac8c, type: 3}