From 69cf35b05d7e69894acc32a081ae9fb548091aff Mon Sep 17 00:00:00 2001 From: marcin Date: Mon, 17 Mar 2025 08:54:45 +0100 Subject: [PATCH] modified shaders - added dissolve to InvisibleShader, added example item Barrel_destruction_CUT --- .../Lever_wheel_mat_invisible 1.mat | 28 +- .../Lever_wheel_mat_invisible 2.mat | 15 +- .../Barrel_destruction_CUT Variant.prefab | 126 +++ ...Barrel_destruction_CUT Variant.prefab.meta | 7 + Assets/Prefabs/Items/Weapons/bSword_v2.prefab | 2 +- Assets/Shaders/BeyondLitFade.shadergraph | 98 +- .../Shaders/BeyondLitTransparent.shadergraph | 119 +- Assets/Shaders/Dissolve.shadersubgraph | 83 +- Assets/Shaders/InvisibleMat.mat | 20 + Assets/Shaders/InvisibleMat.shadergraph | 1007 ++++++++++++++++- Packages/packages-lock.json | 12 +- ProjectSettings/ProjectVersion.txt | 4 +- 12 files changed, 1458 insertions(+), 63 deletions(-) create mode 100644 Assets/Prefabs/Destructable/Barrel_destruction_CUT Variant.prefab create mode 100644 Assets/Prefabs/Destructable/Barrel_destruction_CUT Variant.prefab.meta diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat index 917942422..aba74e733 100644 --- a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 1.mat @@ -13,9 +13,12 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - USEDISSOLVE_WITHOUT_ALPHA_CUTOUT - USEFRESNEL + - _ALPHATEST_ON - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -61,6 +64,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Dissolve_6c880463713a41b3a5e9578c486d051d_NoiseMask_2224857806_Texture2D: + m_Texture: {fileID: 2800000, guid: 6cf5abd30715dea4aa1b2fcf187546a6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -115,9 +122,10 @@ Material: - USEDISSOLVE: 1 - USEDISSOLVEMASK: 0 - USEFRESNEL: 1 - - Vector1_473704f964214ae2bc68475022d1524b: 0 - - _AOStrength: 0.489 - - _AlphaClip: 0 + - Vector1_473704f964214ae2bc68475022d1524b: 0.0378 + - _AOStrength: 1.1 + - _AlphaClip: 1 + - _AlphaClipThreshold: 0.51 - _AlphaToMask: 0 - _BendEffect: 0 - _BendMaxDistance: 1 @@ -134,19 +142,21 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DissolveNoiseScale: 251.9 - _DstBlend: 10 + - _EffectStrenght: 0.03 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 - _FarFadeDistance: 500 - - _FresnelPower: 1.97 + - _FresnelPower: 2.06 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _InverseFadeRange: 1 - _InverseFarFadeRange: 0.5 - _Metallic: 0 - - _NormalStrength: 1.876 + - _NormalStrength: 2.04 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 @@ -158,6 +168,8 @@ Material: - _SrcBlend: 5 - _Surface: 1 - _Threshold: 0 + - _USEDISSOLVE: 1 + - _USEDISSOLVEMASK: 0 - _USEDISTANCEFADE: 0 - _USESCANWAVE: 0 - _WaveTrail: 4 @@ -165,10 +177,10 @@ Material: - _ZTest: 4 - _ZWrite: 1 - _ZWriteControl: 1 - - _alpha: 0.9 + - _alpha: 1 m_Colors: - BaseColor: {r: 0.4245283, g: 0.4245283, b: 0.4245283, a: 0} - - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} + - Color_613d1588816440ec9b17710effb7528b: {r: 766.99615, g: 79.98592, b: 0, a: 0} - EmissiveColor: {r: 0, g: 0, b: 0, a: 0} - _AdditionalColor: {r: 4.597549, g: 0.36867145, b: 0.5674405, a: 0} - _BaseColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat index 6f1889534..35218cf18 100644 --- a/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat +++ b/Assets/Meshes/Props/Wajcha_Kolo/Lever_wheel_mat_invisible 2.mat @@ -13,9 +13,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - USEDISSOLVE_WITHOUT_ALPHA_CUTOUT - USEFRESNEL - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] + m_InvalidKeywords: + - _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -61,6 +63,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Dissolve_6c880463713a41b3a5e9578c486d051d_NoiseMask_2224857806_Texture2D: + m_Texture: {fileID: 2800000, guid: 6cf5abd30715dea4aa1b2fcf187546a6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -115,9 +121,10 @@ Material: - USEDISSOLVE: 1 - USEDISSOLVEMASK: 0 - USEFRESNEL: 1 - - Vector1_473704f964214ae2bc68475022d1524b: 0 + - Vector1_473704f964214ae2bc68475022d1524b: 0.0131 - _AOStrength: 1.2 - _AlphaClip: 0 + - _AlphaClipThreshold: 0.591 - _AlphaToMask: 0 - _BendEffect: 0 - _BendMaxDistance: 1 @@ -134,7 +141,9 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DissolveNoiseScale: 25 - _DstBlend: 10 + - _EffectStrenght: 1 - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FadeDistance: 0 @@ -158,6 +167,8 @@ Material: - _SrcBlend: 5 - _Surface: 1 - _Threshold: 0 + - _USEDISSOLVE: 1 + - _USEDISSOLVEMASK: 0 - _USEDISTANCEFADE: 0 - _USESCANWAVE: 0 - _WaveTrail: 4 diff --git a/Assets/Prefabs/Destructable/Barrel_destruction_CUT Variant.prefab b/Assets/Prefabs/Destructable/Barrel_destruction_CUT Variant.prefab new file mode 100644 index 000000000..83d3efa3d --- /dev/null +++ b/Assets/Prefabs/Destructable/Barrel_destruction_CUT Variant.prefab @@ -0,0 +1,126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7175605022821847227 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2049911772785384197, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_key + value: Barrel_destruction1_151712 + objectReference: {fileID: 0} + - target: {fileID: 5902290343441514530, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_Name + value: Barrel_destruction_CUT Variant + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_RootOrder + value: 156 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalPosition.x + value: 202.766 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalPosition.y + value: 29.132 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalPosition.z + value: -110.46 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6531052233054526104, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5902290343441514530, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8539554886877293329} + m_SourcePrefab: {fileID: 100100000, guid: 5200b3e50470f2b429132041250b6210, type: 3} +--- !u!1 &3638340101395894425 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5902290343441514530, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + m_PrefabInstance: {fileID: 7175605022821847227} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8539554886877293329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3638340101395894425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd39910b59b4d8a48bebea6c7987c440, type: 3} + m_Name: + m_EditorClassIdentifier: + openCloseEvents: 0 + openCloseWindow: 0 + selectedToolbar: 0 + isInit: 0 + getHealthMethod: 0 + modifiers: + - name: Cut + filterMethod: 2 + damageTypes: + - Cut + value: -100 + percentage: 1 + destructible: 0 + resistance: 0 + maxResistance: 0 + onChangeResistance: + m_PersistentCalls: + m_Calls: [] + onBroken: + m_PersistentCalls: + m_Calls: [] + onAllModifiersIsBroken: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Prefabs/Destructable/Barrel_destruction_CUT Variant.prefab.meta b/Assets/Prefabs/Destructable/Barrel_destruction_CUT Variant.prefab.meta new file mode 100644 index 000000000..afc9c6e2f --- /dev/null +++ b/Assets/Prefabs/Destructable/Barrel_destruction_CUT Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 893c4bb8a0b55425ea8be1b55ec567fd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Items/Weapons/bSword_v2.prefab b/Assets/Prefabs/Items/Weapons/bSword_v2.prefab index 5a9cce804..adfc7446d 100644 --- a/Assets/Prefabs/Items/Weapons/bSword_v2.prefab +++ b/Assets/Prefabs/Items/Weapons/bSword_v2.prefab @@ -628,7 +628,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d07167fb051e9ab47902bfaf96475cf4, type: 3} m_Name: m_EditorClassIdentifier: - openCloseEvents: 0 + openCloseEvents: 1 openCloseWindow: 0 selectedToolbar: 0 onEquip: diff --git a/Assets/Shaders/BeyondLitFade.shadergraph b/Assets/Shaders/BeyondLitFade.shadergraph index 2f440ef4f..e3aa85d93 100644 --- a/Assets/Shaders/BeyondLitFade.shadergraph +++ b/Assets/Shaders/BeyondLitFade.shadergraph @@ -1022,6 +1022,7 @@ "m_OutputNode": { "m_Id": "" }, + "m_SubDatas": [], "m_ActiveTargets": [ { "m_Id": "d0629dbcf57c4c49bc343047b5fd6fc6" @@ -1109,6 +1110,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1187,6 +1189,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 1, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -1227,6 +1230,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1265,6 +1269,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1301,7 +1306,7 @@ "m_StageCapability": 2, "m_BareResource": false, "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, "m_DefaultType": 0 @@ -1375,6 +1380,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1574,6 +1580,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1612,6 +1619,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1654,6 +1662,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1716,6 +1725,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1757,6 +1767,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1807,6 +1818,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1855,6 +1867,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1882,6 +1895,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 0, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -1903,9 +1917,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 994.0, - "y": 172.0, - "width": 208.0, + "x": 1039.0001220703125, + "y": 171.99998474121095, + "width": 207.9998779296875, "height": 302.0 } }, @@ -1923,6 +1937,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1955,6 +1970,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2081,6 +2097,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2158,6 +2175,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2224,6 +2242,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2291,6 +2310,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2359,6 +2379,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2397,6 +2418,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2430,6 +2452,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2466,6 +2489,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2498,6 +2522,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2531,6 +2556,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2589,6 +2615,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2624,6 +2651,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2672,6 +2700,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2710,6 +2739,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2815,6 +2845,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2855,6 +2886,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2920,6 +2952,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2944,6 +2977,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2987,6 +3021,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3056,6 +3091,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3083,6 +3119,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3195,6 +3232,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3287,6 +3325,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3391,6 +3430,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3415,6 +3455,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3519,6 +3560,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3579,6 +3621,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3644,6 +3687,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3722,6 +3766,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 1, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -3871,6 +3916,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3893,6 +3939,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3931,6 +3978,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4072,6 +4120,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4134,6 +4183,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4245,6 +4295,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4313,6 +4364,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4385,6 +4437,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4544,6 +4597,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4568,6 +4622,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 0, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -4663,6 +4718,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4671,12 +4727,13 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", "m_ObjectId": "c8523a25fa014d318fc12ee8ab40f4e3", "m_WorkflowMode": 1, "m_NormalDropOffSpace": 0, - "m_ClearCoat": false + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": false } { @@ -4691,7 +4748,7 @@ "m_StageCapability": 2, "m_BareResource": false, "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"19e759af85a7a82478f570012d958e04\",\"type\":3}}", + "m_SerializedTexture": "", "m_Guid": "" }, "m_DefaultType": 0 @@ -4723,6 +4780,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4756,6 +4814,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4789,6 +4848,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4802,6 +4862,7 @@ "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", "m_ObjectId": "d0629dbcf57c4c49bc343047b5fd6fc6", + "m_Datas": [], "m_ActiveSubTarget": { "m_Id": "c8523a25fa014d318fc12ee8ab40f4e3" }, @@ -4814,6 +4875,10 @@ "m_AlphaClip": true, "m_CastShadows": true, "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, "m_CustomEditorGUI": "", "m_SupportVFX": false } @@ -4883,6 +4948,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4907,6 +4973,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4934,6 +5001,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4985,6 +5053,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5025,6 +5094,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5063,6 +5133,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5128,6 +5199,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5167,6 +5239,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5282,6 +5355,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5344,12 +5418,13 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"19e759af85a7a82478f570012d958e04\",\"type\":3}}", + "m_SerializedTexture": "", "m_Guid": "" }, "isMainTexture": false, @@ -5384,6 +5459,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5467,6 +5543,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5521,6 +5598,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 1, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -5561,6 +5639,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5611,6 +5690,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5683,6 +5763,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5756,6 +5837,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, diff --git a/Assets/Shaders/BeyondLitTransparent.shadergraph b/Assets/Shaders/BeyondLitTransparent.shadergraph index c918ba153..4b520d435 100644 --- a/Assets/Shaders/BeyondLitTransparent.shadergraph +++ b/Assets/Shaders/BeyondLitTransparent.shadergraph @@ -1034,6 +1034,7 @@ "m_OutputNode": { "m_Id": "" }, + "m_SubDatas": [], "m_ActiveTargets": [ { "m_Id": "d0629dbcf57c4c49bc343047b5fd6fc6" @@ -1177,6 +1178,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1198,6 +1200,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 1, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -1258,6 +1261,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] @@ -1290,6 +1294,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] @@ -1351,6 +1356,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1389,6 +1395,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1427,6 +1434,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1570,6 +1578,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1680,6 +1689,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1776,7 +1786,7 @@ "m_DefaultValue": { "x": 0.0, "y": 0.0, - "z": 0.0 + "z": 1.0 }, "m_Labels": [] } @@ -1861,6 +1871,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1951,6 +1962,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2019,6 +2031,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2081,6 +2094,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2113,6 +2127,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2146,6 +2161,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2187,6 +2203,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2385,6 +2402,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2428,6 +2446,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2484,13 +2503,15 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, "m_NormalMapSpace": 0, - "m_EnableGlobalMipBias": true + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 } { @@ -2508,6 +2529,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2546,6 +2568,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2582,6 +2605,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2614,6 +2638,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2697,6 +2722,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2735,6 +2761,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2787,6 +2814,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2811,9 +2839,9 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 146.5, - "y": -119.5, - "width": 233.0, + "x": 247.0, + "y": -161.00001525878907, + "width": 232.0, "height": 326.0 } }, @@ -2834,6 +2862,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2875,6 +2904,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2968,6 +2998,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3008,6 +3039,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3032,6 +3064,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3076,12 +3109,13 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, "isMainTexture": false, @@ -3262,6 +3296,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3325,7 +3360,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.ViewDirectionNode", "m_ObjectId": "63427a11bbca4fcf8a39b1b859d04b24", "m_Group": { @@ -3336,10 +3371,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -105.00006866455078, - "y": 1593.4998779296875, - "width": 208.00018310546876, - "height": 314.5001220703125 + "x": -105.0, + "y": 1594.0001220703125, + "width": 208.0, + "height": 314.0 } }, "m_Slots": [ @@ -3350,6 +3385,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] @@ -3510,6 +3546,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3720,6 +3757,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3843,6 +3881,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4039,6 +4078,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4074,6 +4114,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4110,6 +4151,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4258,6 +4300,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4302,6 +4345,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4337,6 +4381,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4411,6 +4456,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 0, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -4446,6 +4492,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4481,6 +4528,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4527,6 +4575,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4646,6 +4695,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4821,6 +4871,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4859,6 +4910,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4955,6 +5007,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5014,6 +5067,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5135,6 +5189,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5194,6 +5249,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5253,6 +5309,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5286,6 +5343,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5484,6 +5542,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 0, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -5505,7 +5564,7 @@ "m_StageCapability": 3, "m_BareResource": false, "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, "m_DefaultType": 0 @@ -5556,6 +5615,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 0, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -5626,6 +5686,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5688,6 +5749,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5743,7 +5805,7 @@ "m_SlotType": 0, "m_Hidden": false, "m_ShaderOutputName": "UV", - "m_StageCapability": 3, + "m_StageCapability": 2, "m_Value": { "x": 0.0, "y": 0.0 @@ -5781,6 +5843,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5789,12 +5852,13 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", "m_ObjectId": "c8523a25fa014d318fc12ee8ab40f4e3", "m_WorkflowMode": 1, "m_NormalDropOffSpace": 0, - "m_ClearCoat": false + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": false } { @@ -5823,6 +5887,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5856,6 +5921,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5927,6 +5993,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6000,6 +6067,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6010,6 +6078,7 @@ "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", "m_ObjectId": "d0629dbcf57c4c49bc343047b5fd6fc6", + "m_Datas": [], "m_ActiveSubTarget": { "m_Id": "c8523a25fa014d318fc12ee8ab40f4e3" }, @@ -6022,6 +6091,10 @@ "m_AlphaClip": false, "m_CastShadows": true, "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, "m_CustomEditorGUI": "", "m_SupportVFX": false } @@ -6096,6 +6169,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6147,6 +6221,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6276,6 +6351,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6314,6 +6390,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6338,6 +6415,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6408,6 +6486,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6432,6 +6511,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6476,6 +6556,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6508,6 +6589,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6617,6 +6699,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6737,6 +6820,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6758,6 +6842,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 1, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -6798,6 +6883,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6870,6 +6956,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6918,6 +7005,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -6964,6 +7052,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] diff --git a/Assets/Shaders/Dissolve.shadersubgraph b/Assets/Shaders/Dissolve.shadersubgraph index 2a4ee02e4..4ec6aeb83 100644 --- a/Assets/Shaders/Dissolve.shadersubgraph +++ b/Assets/Shaders/Dissolve.shadersubgraph @@ -1075,6 +1075,7 @@ "m_OutputNode": { "m_Id": "29584710d70d4f0ca735c7ad9640844c" }, + "m_SubDatas": [], "m_ActiveTargets": [] } @@ -1221,6 +1222,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1271,6 +1273,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1292,6 +1295,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1336,6 +1340,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1417,6 +1422,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1452,6 +1458,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1512,6 +1519,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1649,6 +1657,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 1, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -1778,6 +1787,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1840,6 +1850,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1902,6 +1913,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2235,6 +2247,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2276,6 +2289,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2362,6 +2376,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2400,6 +2415,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2442,6 +2458,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2546,6 +2563,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2680,6 +2698,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2821,6 +2840,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2845,12 +2865,13 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, "isMainTexture": false, @@ -2891,6 +2912,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3115,6 +3137,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3150,6 +3173,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3188,6 +3212,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3282,6 +3307,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3368,6 +3394,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3406,6 +3433,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3413,7 +3441,7 @@ } { - "m_SGVersion": 0, + "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.NoiseNode", "m_ObjectId": "5d6e3b32db4a43679da7cc2337aab1ff", "m_Group": { @@ -3444,10 +3472,12 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - } + }, + "m_HashType": 1 } { @@ -3500,6 +3530,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3562,6 +3593,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3802,6 +3834,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3843,6 +3876,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3875,6 +3909,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3923,6 +3958,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3969,6 +4005,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4010,6 +4047,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4128,6 +4166,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_KeywordType": 0, "m_KeywordDefinition": 0, "m_KeywordScope": 0, @@ -4321,6 +4360,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4440,13 +4480,15 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, "m_NormalMapSpace": 0, - "m_EnableGlobalMipBias": true + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 } { @@ -4550,6 +4592,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4606,6 +4649,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4732,6 +4776,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4819,6 +4864,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4960,6 +5006,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4996,6 +5043,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5037,6 +5085,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5075,6 +5124,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5110,6 +5160,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5187,6 +5238,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5250,6 +5302,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5274,7 +5327,7 @@ "m_StageCapability": 3, "m_BareResource": false, "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, "m_DefaultType": 0 @@ -5387,6 +5440,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5455,6 +5509,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5487,6 +5542,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5526,6 +5582,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5638,9 +5695,9 @@ "m_Position": { "serializedVersion": "2", "x": 296.0, - "y": -98.00001525878906, + "y": -98.0, "width": 208.0, - "height": 301.99993896484377 + "height": 302.0 } }, "m_Slots": [ @@ -5661,6 +5718,7 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5699,6 +5757,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5720,6 +5779,7 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -5893,6 +5953,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6048,6 +6109,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6089,6 +6151,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6174,6 +6237,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -6189,8 +6253,8 @@ "m_ObjectId": "e72492cea22443c78c24cffbda7b593f", "m_Title": "EffectThreshold", "m_Position": { - "x": -81.00000762939453, - "y": 827.9999389648438 + "x": -49.0, + "y": 828.0 } } @@ -6413,6 +6477,7 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, + "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] diff --git a/Assets/Shaders/InvisibleMat.mat b/Assets/Shaders/InvisibleMat.mat index e37339650..c97c89161 100644 --- a/Assets/Shaders/InvisibleMat.mat +++ b/Assets/Shaders/InvisibleMat.mat @@ -15,6 +15,7 @@ Material: m_ValidKeywords: - USEFRESNEL - _SURFACE_TYPE_TRANSPARENT + - _USEDISSOLVE_WITHOUT_ALPHA_CUTOUT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -49,6 +50,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Dissolve_6c880463713a41b3a5e9578c486d051d_NoiseMask_2224857806_Texture2D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -61,6 +66,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NOSMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -88,7 +97,10 @@ Material: m_Ints: [] m_Floats: - USEFRESNEL: 1 + - Vector1_473704f964214ae2bc68475022d1524b: 0.05 + - _AOStrength: 1 - _AlphaClip: 0 + - _AlphaClipThreshold: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BumpScale: 1 @@ -99,13 +111,17 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 + - _DissolveNoiseScale: 25 - _DstBlend: 10 + - _EffectStrenght: 1 + - _EffectThreshold: 0 - _EnvironmentReflections: 1 - _FresnelPower: 4 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _Metallic: 0 + - _NormalStrength: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 @@ -116,18 +132,22 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 5 - _Surface: 1 + - _Threshold: 0 + - _USEDISSOLVE: 1 - _WorkflowMode: 1 - _ZTest: 4 - _ZWrite: 0 - _ZWriteControl: 0 - _alpha: 1 m_Colors: + - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} - _AdditionalColor: {r: 0, g: 2.1960785, b: 2.9960785, a: 0} - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FresnelColor: {r: 0.041162338, g: 0.094103545, b: 0.23584908, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UVMul: {r: 0.02, g: 0.03, b: 0, a: 0} m_BuildTextureStacks: [] m_AllowLocking: 1 --- !u!114 &4524747146536467053 diff --git a/Assets/Shaders/InvisibleMat.shadergraph b/Assets/Shaders/InvisibleMat.shadergraph index 43199bc5a..1b53dd0b6 100644 --- a/Assets/Shaders/InvisibleMat.shadergraph +++ b/Assets/Shaders/InvisibleMat.shadergraph @@ -3,9 +3,21 @@ "m_Type": "UnityEditor.ShaderGraph.GraphData", "m_ObjectId": "fbf3dcea73f94d18b6a40dca18a49299", "m_Properties": [ + { + "m_Id": "44af42756f5c475dbbe8ac0dde6b9ffd" + }, + { + "m_Id": "0df04129e9f44e2f90b16d54fe90c0ef" + }, + { + "m_Id": "349b469480c8459289dcdecd6a9d81bd" + }, { "m_Id": "9dfbaf24537d4590b214ae056b857d00" }, + { + "m_Id": "fdd8f0fd6c634b3fb88cdf630d5abd40" + }, { "m_Id": "f67fee1477524978877156768f39426b" }, @@ -34,12 +46,21 @@ "m_Keywords": [ { "m_Id": "0b4bb5176d584bbcbec453fc60abbfcd" + }, + { + "m_Id": "b308512e46fc4309826ecb7d1b20448c" + }, + { + "m_Id": "169e7e330990459b8cd705fd66e3b4a6" } ], "m_Dropdowns": [], "m_CategoryData": [ { "m_Id": "87e2309558804cfaa7590e2139d86e72" + }, + { + "m_Id": "e5b65d4879464005bc4cf4efc6dd90b2" } ], "m_Nodes": [ @@ -165,6 +186,24 @@ }, { "m_Id": "0322205f789b402ea7b3cc2c35ec0b17" + }, + { + "m_Id": "6c880463713a41b3a5e9578c486d051d" + }, + { + "m_Id": "a3522523457c4e6b96359e43970436f2" + }, + { + "m_Id": "e7fff2cd77be4f2f8420ca094be8dd6c" + }, + { + "m_Id": "841e163ebae14f7ba565dccd175ce31e" + }, + { + "m_Id": "55ba28275c2f470d947f3d2c6fb633ed" + }, + { + "m_Id": "98ba1bc5ebac4a9c9e65a3c244619107" } ], "m_GroupDatas": [ @@ -351,9 +390,9 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "faf7df678f6b4bbe8872e3c713c9c402" + "m_Id": "6c880463713a41b3a5e9578c486d051d" }, - "m_SlotId": 0 + "m_SlotId": -60136978 } }, { @@ -370,6 +409,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "55ba28275c2f470d947f3d2c6fb633ed" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6c880463713a41b3a5e9578c486d051d" + }, + "m_SlotId": 1857327021 + } + }, { "m_OutputSlot": { "m_Node": { @@ -398,6 +451,48 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6c880463713a41b3a5e9578c486d051d" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "98ba1bc5ebac4a9c9e65a3c244619107" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6c880463713a41b3a5e9578c486d051d" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "faf7df678f6b4bbe8872e3c713c9c402" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "6c880463713a41b3a5e9578c486d051d" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5d184e2f083a4f6d86c1d10d287430b4" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -421,7 +516,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "2d546da5f6f34173b0d42f372707ba16" + "m_Id": "98ba1bc5ebac4a9c9e65a3c244619107" }, "m_SlotId": 0 } @@ -440,6 +535,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "841e163ebae14f7ba565dccd175ce31e" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6c880463713a41b3a5e9578c486d051d" + }, + "m_SlotId": 1317330309 + } + }, { "m_OutputSlot": { "m_Node": { @@ -510,6 +619,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "98ba1bc5ebac4a9c9e65a3c244619107" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2d546da5f6f34173b0d42f372707ba16" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -538,6 +661,20 @@ "m_SlotId": 1 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a3522523457c4e6b96359e43970436f2" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6c880463713a41b3a5e9578c486d051d" + }, + "m_SlotId": 1168401364 + } + }, { "m_OutputSlot": { "m_Node": { @@ -608,6 +745,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e7fff2cd77be4f2f8420ca094be8dd6c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "6c880463713a41b3a5e9578c486d051d" + }, + "m_SlotId": -1137840076 + } + }, { "m_OutputSlot": { "m_Node": { @@ -681,8 +832,8 @@ ], "m_VertexContext": { "m_Position": { - "x": 254.0, - "y": -32.999969482421878 + "x": 883.999755859375, + "y": -118.0000228881836 }, "m_Blocks": [ { @@ -698,8 +849,8 @@ }, "m_FragmentContext": { "m_Position": { - "x": 254.0, - "y": 164.5 + "x": 883.999755859375, + "y": 79.99994659423828 }, "m_Blocks": [ { @@ -1054,6 +1205,24 @@ "m_IsEditable": true } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "0cb6562bcb234a4cb8713daa18e714d4", + "m_Id": -2070109490, + "m_DisplayName": "NoiseMask", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NoiseMask", + "m_StageCapability": 2, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"6cf5abd30715dea4aa1b2fcf187546a6\",\"type\":3}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.KeywordNode", @@ -1120,6 +1289,34 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "0df04129e9f44e2f90b16d54fe90c0ef", + "m_Guid": { + "m_GuidSerialized": "df283ec1-b843-43ad-bc27-74431a2fbcf6" + }, + "m_Name": "DissolveThreshold", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DissolveThreshold", + "m_DefaultReferenceName": "_DissolveThreshold", + "m_OverrideReferenceName": "_Threshold", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.0, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -1150,11 +1347,26 @@ "m_ObjectId": "0ee583451d984067b9fc332bf09f761e", "m_Title": "Distortion", "m_Position": { - "x": -1924.5001220703125, - "y": -844.9999389648438 + "x": -1924.0001220703125, + "y": -845.0 } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0f32ff5fd01e4d09b27e74f992b3406e", + "m_Id": -326063842, + "m_DisplayName": "EffectThreshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "EffectThreshold", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -1272,6 +1484,31 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "169e7e330990459b8cd705fd66e3b4a6", + "m_Guid": { + "m_GuidSerialized": "e09bc715-7a20-499b-9da7-87011577a512" + }, + "m_Name": "UseDissolveMask", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "UseDissolveMask", + "m_DefaultReferenceName": "_USEDISSOLVEMASK", + "m_OverrideReferenceName": "USEDISSOLVEMASK", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_KeywordType": 0, + "m_KeywordDefinition": 0, + "m_KeywordScope": 0, + "m_KeywordStages": 63, + "m_Entries": [], + "m_Value": 0, + "m_IsEditable": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", @@ -1934,6 +2171,21 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "2cc81bd212a4421a9325c7ff69536b3a", + "m_Id": 1317330309, + "m_DisplayName": "Width", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Width", + "m_StageCapability": 2, + "m_Value": 0.05000000074505806, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -2011,6 +2263,34 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "349b469480c8459289dcdecd6a9d81bd", + "m_Guid": { + "m_GuidSerialized": "d2f7b0de-1dd7-40e7-9a30-1fccf9952535" + }, + "m_Name": "DissolveNoiseScale", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DissolveNoiseScale", + "m_DefaultReferenceName": "_DissolveNoiseScale", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 25.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TimeNode", @@ -2098,10 +2378,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.5001220703125, - "y": 482.50006103515627, - "width": 103.4998779296875, - "height": 33.9998779296875 + "x": -29.9999942779541, + "y": 306.9999694824219, + "width": 104.0, + "height": 34.0 } }, "m_Slots": [ @@ -2161,6 +2441,34 @@ "m_Labels": [] } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "44af42756f5c475dbbe8ac0dde6b9ffd", + "m_Guid": { + "m_GuidSerialized": "5e2c9e13-78c0-40f5-9442-55d86901bfb1" + }, + "m_Name": "DissolveEdgeWidth", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DissolveEdgeWidth", + "m_DefaultReferenceName": "_DissolveEdgeWidth", + "m_OverrideReferenceName": "Vector1_473704f964214ae2bc68475022d1524b", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.05000000074505806, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 0.20000000298023225 + } +} + { "m_SGVersion": 2, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", @@ -2279,6 +2587,29 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "4d76df9fb5594d33be24bc847771d610", + "m_Id": 1, + "m_DisplayName": "EmissiveColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "EmissiveColor", + "m_StageCapability": 2, + "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.FresnelNode", @@ -2360,6 +2691,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "55ba28275c2f470d947f3d2c6fb633ed", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 113.99998474121094, + "y": 289.9999694824219, + "width": 175.00001525878907, + "height": 33.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "9416bc346ec04882bd3f3d686cd5c408" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "fdd8f0fd6c634b3fb88cdf630d5abd40" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2423,6 +2790,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "57bb8dc4c8a442e7b2391f3e46dd235a", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "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_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "597d313224f941509edc342484f9b69a", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2577,6 +2992,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "6497930601454b119e32561c71f8357a", + "m_Id": -2064407810, + "m_DisplayName": "AlphaClipThreshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -2598,6 +3028,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "69ab9817ff1240569a8d845d57ee7964", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "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_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AddNode", @@ -2641,6 +3095,97 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "6c880463713a41b3a5e9578c486d051d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Dissolve", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 340.0, + "y": 161.0, + "width": 303.0, + "height": 471.0 + } + }, + "m_Slots": [ + { + "m_Id": "7c4d3a00e99b4250a254e73db966282e" + }, + { + "m_Id": "7dfb8bbd845a4baf8be87ebf45264902" + }, + { + "m_Id": "2cc81bd212a4421a9325c7ff69536b3a" + }, + { + "m_Id": "b5911fa6862c48d5aea324c756e72be3" + }, + { + "m_Id": "d15e0b9a035144929b809917dadf9ef6" + }, + { + "m_Id": "6497930601454b119e32561c71f8357a" + }, + { + "m_Id": "0cb6562bcb234a4cb8713daa18e714d4" + }, + { + "m_Id": "0f32ff5fd01e4d09b27e74f992b3406e" + }, + { + "m_Id": "d5d0e9d5789e43af84f8d63cd57aff0c" + }, + { + "m_Id": "4d76df9fb5594d33be24bc847771d610" + }, + { + "m_Id": "c708cb2ce1fd423d9bbf601a64473c6d" + }, + { + "m_Id": "e1353fc4aa714ba58b7da60f6568c0f5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"4faa3dd2da3f98e41a38f4643ee76391\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "0eeb8d19-c0cf-469f-9ba8-418d99869180", + "8106752d-cc97-411f-bd37-e1ce337ed5b2", + "a0dd918e-63be-40a6-8dd0-20da38ffdf74", + "6a29e060-6aab-4184-a062-3219c6672b5c", + "579ae7fe-24f1-42d3-8c18-ee4f6dbacda6", + "6da52060-c5bf-4ea3-aa7d-ebe28b3a1e45", + "7809fbd4-e1c8-4838-a1cb-ada87373001c", + "827ef9bb-c619-4793-b43e-c9b608a8b49f", + "0a4d515a-0d6e-45ef-9b1a-9341f8380a0c" + ], + "m_PropertyIds": [ + 1168401364, + -1137840076, + 1317330309, + 1857327021, + -60136978, + -2064407810, + -2070109490, + -326063842, + 37453399 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2751,6 +3296,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "70d9e294e18a484d82f4a0b775a964a3", + "m_Id": 0, + "m_DisplayName": "DissolveNoiseScale", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -2830,6 +3390,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "78d48868522948fd82df4e2c339b528f", + "m_Id": 0, + "m_DisplayName": "DissolveThreshold", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2913,6 +3488,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7c4d3a00e99b4250a254e73db966282e", + "m_Id": 1168401364, + "m_DisplayName": "NoiseScale", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NoiseScale", + "m_StageCapability": 2, + "m_Value": 100.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.AddNode", @@ -2990,6 +3580,21 @@ "m_SerializedDescriptor": "VertexDescription.Normal" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "7dfb8bbd845a4baf8be87ebf45264902", + "m_Id": -1137840076, + "m_DisplayName": "Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Threshold", + "m_StageCapability": 2, + "m_Value": 0.05999999865889549, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3146,6 +3751,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "841e163ebae14f7ba565dccd175ce31e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 113.99998474121094, + "y": 250.9999237060547, + "width": 176.0000762939453, + "height": 34.00007629394531 + } + }, + "m_Slots": [ + { + "m_Id": "eda2479116df46afaa314df364fc06f8" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "44af42756f5c475dbbe8ac0dde6b9ffd" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -3489,6 +4130,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "9416bc346ec04882bd3f3d686cd5c408", + "m_Id": 0, + "m_DisplayName": "DissolveEdgeColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "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.DynamicVectorMaterialSlot", @@ -3567,6 +4233,49 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "98ba1bc5ebac4a9c9e65a3c244619107", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 667.0, + "y": 9.0, + "width": 130.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "597d313224f941509edc342484f9b69a" + }, + { + "m_Id": "69ab9817ff1240569a8d845d57ee7964" + }, + { + "m_Id": "57bb8dc4c8a442e7b2391f3e46dd235a" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -3835,6 +4544,42 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a3522523457c4e6b96359e43970436f2", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 113.99998474121094, + "y": 183.0, + "width": 177.00010681152345, + "height": 33.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "70d9e294e18a484d82f4a0b775a964a3" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "349b469480c8459289dcdecd6a9d81bd" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -4097,6 +4842,47 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", + "m_ObjectId": "b308512e46fc4309826ecb7d1b20448c", + "m_Guid": { + "m_GuidSerialized": "cd6bb1ed-3917-48b4-8a6f-423538f4ec3f" + }, + "m_Name": "UseDissolve", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "UseDissolve", + "m_DefaultReferenceName": "_USEDISSOLVE", + "m_OverrideReferenceName": "USEDISSOLVE", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_KeywordType": 1, + "m_KeywordDefinition": 0, + "m_KeywordScope": 0, + "m_KeywordStages": 63, + "m_Entries": [ + { + "id": 1, + "displayName": "DONT_USE", + "referenceName": "DONT_USE" + }, + { + "id": 2, + "displayName": "WITHOUT_ALPHA_CUTOUT", + "referenceName": "WITHOUT_ALPHA_CUTOUT" + }, + { + "id": 3, + "displayName": "WITH_ALPHA_CUTOUT", + "referenceName": "WITH_ALPHA_CUTOUT" + } + ], + "m_Value": 1, + "m_IsEditable": true +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SubtractNode", @@ -4141,6 +4927,31 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "b5911fa6862c48d5aea324c756e72be3", + "m_Id": 1857327021, + "m_DisplayName": "Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "_Color", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.6387535333633423, + "z": 0.8235294222831726, + "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.DynamicValueMaterialSlot", @@ -4437,6 +5248,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "c708cb2ce1fd423d9bbf601a64473c6d", + "m_Id": 2, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4545,6 +5371,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d15e0b9a035144929b809917dadf9ef6", + "m_Id": -60136978, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.ClampNode", @@ -4589,6 +5430,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d5d0e9d5789e43af84f8d63cd57aff0c", + "m_Id": 37453399, + "m_DisplayName": "EffectStrenght", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "EffectStrenght", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4618,7 +5474,7 @@ "m_ZWriteControl": 0, "m_AlphaMode": 0, "m_RenderFace": 2, - "m_AlphaClip": false, + "m_AlphaClip": true, "m_CastShadows": true, "m_ReceiveShadows": true, "m_DisableTint": false, @@ -4728,6 +5584,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e1353fc4aa714ba58b7da60f6568c0f5", + "m_Id": 3, + "m_DisplayName": "AlphaClipThreshold", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -4767,6 +5638,69 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "e5b65d4879464005bc4cf4efc6dd90b2", + "m_Name": "Dissolve", + "m_ChildObjectList": [ + { + "m_Id": "b308512e46fc4309826ecb7d1b20448c" + }, + { + "m_Id": "169e7e330990459b8cd705fd66e3b4a6" + }, + { + "m_Id": "349b469480c8459289dcdecd6a9d81bd" + }, + { + "m_Id": "0df04129e9f44e2f90b16d54fe90c0ef" + }, + { + "m_Id": "44af42756f5c475dbbe8ac0dde6b9ffd" + }, + { + "m_Id": "fdd8f0fd6c634b3fb88cdf630d5abd40" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "e7fff2cd77be4f2f8420ca094be8dd6c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 119.99999237060547, + "y": 216.99996948242188, + "width": 171.00009155273438, + "height": 33.99995422363281 + } + }, + "m_Slots": [ + { + "m_Id": "78d48868522948fd82df4e2c339b528f" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "0df04129e9f44e2f90b16d54fe90c0ef" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -4827,6 +5761,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "eda2479116df46afaa314df364fc06f8", + "m_Id": 0, + "m_DisplayName": "DissolveEdgeWidth", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -5173,6 +6122,36 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "fdd8f0fd6c634b3fb88cdf630d5abd40", + "m_Guid": { + "m_GuidSerialized": "a08dfed8-68e3-4212-bde3-887dd3195b4b" + }, + "m_Name": "DissolveEdgeColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "DissolveEdgeColor", + "m_DefaultReferenceName": "_DissolveEdgeColor", + "m_OverrideReferenceName": "Color_613d1588816440ec9b17710effb7528b", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 13.986806869506836, + "b": 714.867919921875, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 1 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 07c413366..f614f0477 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -10,16 +10,17 @@ "hash": "02cf05485ac0bbd9f61e7b829dd6526db7c9dba5" }, "com.unity.addressables": { - "version": "2.2.2", + "version": "2.3.16", "depth": 1, "source": "registry", "dependencies": { "com.unity.profiling.core": "1.0.2", + "com.unity.test-framework": "1.4.5", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "2.1.4", + "com.unity.scriptablebuildpipeline": "2.2.11", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" @@ -161,10 +162,13 @@ } }, "com.unity.scriptablebuildpipeline": { - "version": "2.1.4", + "version": "2.2.11", "depth": 2, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.4.5", + "com.unity.modules.assetbundle": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.searcher": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a1aff48dd..92cbd95bf 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.40f1 -m_EditorVersionWithRevision: 6000.0.40f1 (157d81624ddf) +m_EditorVersion: 6000.0.42f1 +m_EditorVersionWithRevision: 6000.0.42f1 (feb9a7235030)