From 1d042030678fd916f3abfe9f7e24c12ad682b679 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Sun, 14 May 2023 22:47:31 -0600 Subject: [PATCH 1/4] hide the "display" header in WebGL --- Assets/Scenes/Previewer.unity | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Assets/Scenes/Previewer.unity b/Assets/Scenes/Previewer.unity index 08543f70..18fc0dd8 100644 --- a/Assets/Scenes/Previewer.unity +++ b/Assets/Scenes/Previewer.unity @@ -20910,6 +20910,25 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3749009673405297043, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} m_PrefabInstance: {fileID: 1167571249} m_PrefabAsset: {fileID: 0} +--- !u!1 &1167571251 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3749009673405297052, guid: 9a2d63b4e91c5b240a97180206552818, type: 3} + m_PrefabInstance: {fileID: 1167571249} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1167571252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167571251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffab566fa4f64fc43882d49d2c751040, type: 3} + m_Name: + m_EditorClassIdentifier: + enableWebGL: 0 + enableDesktop: 1 --- !u!1 &1169124859 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4465115620828890657, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} From b934140453d1f5ca6101d95b57e519379ec9dd97 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Sun, 14 May 2023 23:21:44 -0600 Subject: [PATCH 2/4] optimize shader count finally some progress against these STUPID FRAME DROPS --- Assets/Scenes/Previewer.unity | 856 +------- Assets/Shaders/Objects/BombShader.shadergraph | 1900 ----------------- .../Objects/BombShader.shadergraph.meta | 10 - ...ergraph => SimpleObjectShader.shadergraph} | 370 +++- ...ta => SimpleObjectShader.shadergraph.meta} | 0 .../BombShader.shadervariants | 19 - .../BombShader.shadervariants.meta | 8 - ...ants => SimpleObjectShader.shadervariants} | 2 +- ...=> SimpleObjectShader.shadervariants.meta} | 0 Assets/_Materials/Environment/BeatLine.mat | 137 -- .../_Materials/Environment/BeatLine.mat.meta | 8 - .../_Materials/Environment/Lights/Laser.mat | 11 +- .../Environment/Lights/PersistentLaser.mat | 4 +- Assets/_Materials/Environment/Platform.mat | 8 +- Assets/_Materials/Objects/Bomb.mat | 14 +- Assets/_Materials/Objects/Notes/Arrow.mat | 10 +- .../_Materials/Objects/Notes/SimpleNote.mat | 12 +- Assets/_Materials/Objects/Obstacle.mat | 16 +- Assets/_Materials/Objects/ObstacleEdge.mat | 11 +- .../Platform/BeatLineSegment.prefab | 85 - .../Platform/BeatLineSegment.prefab.meta | 7 - .../MapControl/Objects/WallManager.cs | 2 + 22 files changed, 422 insertions(+), 3068 deletions(-) delete mode 100644 Assets/Shaders/Objects/BombShader.shadergraph delete mode 100644 Assets/Shaders/Objects/BombShader.shadergraph.meta rename Assets/Shaders/Objects/{SimpleNoteShader.shadergraph => SimpleObjectShader.shadergraph} (71%) rename Assets/Shaders/Objects/{SimpleNoteShader.shadergraph.meta => SimpleObjectShader.shadergraph.meta} (100%) delete mode 100644 Assets/Shaders/VariantCollections/BombShader.shadervariants delete mode 100644 Assets/Shaders/VariantCollections/BombShader.shadervariants.meta rename Assets/Shaders/VariantCollections/{SimpleNoteShader.shadervariants => SimpleObjectShader.shadervariants} (94%) rename Assets/Shaders/VariantCollections/{SimpleNoteShader.shadervariants.meta => SimpleObjectShader.shadervariants.meta} (100%) delete mode 100644 Assets/_Materials/Environment/BeatLine.mat delete mode 100644 Assets/_Materials/Environment/BeatLine.mat.meta delete mode 100644 Assets/_Prefabs/Environment/Platform/BeatLineSegment.prefab delete mode 100644 Assets/_Prefabs/Environment/Platform/BeatLineSegment.prefab.meta diff --git a/Assets/Scenes/Previewer.unity b/Assets/Scenes/Previewer.unity index 18fc0dd8..c2d52947 100644 --- a/Assets/Scenes/Previewer.unity +++ b/Assets/Scenes/Previewer.unity @@ -476,72 +476,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Text: Picks which sound effect to use for hit sounds ---- !u!1001 &25816418 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (3) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &25816419 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 25816418} - m_PrefabAsset: {fileID: 0} --- !u!1 &27197615 GameObject: m_ObjectHideFlags: 0 @@ -2698,72 +2632,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 914495321316648540, guid: 46f0cd36b4b4a9b449f7e221ecf8f485, type: 3} m_PrefabInstance: {fileID: 129841533} m_PrefabAsset: {fileID: 0} ---- !u!1001 &132356500 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (11) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &132356501 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 132356500} - m_PrefabAsset: {fileID: 0} --- !u!1 &133203990 GameObject: m_ObjectHideFlags: 0 @@ -7487,7 +7355,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 776929601} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &395449319 MonoBehaviour: @@ -7862,7 +7730,7 @@ MonoBehaviour: lightSaturation: 0.9 lightEmissionSaturation: 0.9 lightEmission: 5 - platformColor: {r: 0.19607843, g: 0.19607843, b: 0.3019608, a: 1} + platformColor: {r: 0.21176471, g: 0.21960784, b: 0.25490198, a: 1} --- !u!1001 &401327584 PrefabInstance: m_ObjectHideFlags: 0 @@ -8233,7 +8101,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 776929601} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &422520095 GameObject: @@ -9929,7 +9797,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 776929601} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 10, y: 10, z: 0} --- !u!114 &538061228 MonoBehaviour: @@ -10327,7 +10195,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 776929601} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &553573863 MonoBehaviour: @@ -11267,72 +11135,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2885256795046646389, guid: b01127f95fd44d64791e45e47ed781df, type: 3} m_PrefabInstance: {fileID: 588494413} m_PrefabAsset: {fileID: 0} ---- !u!1001 &588700588 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (10) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &588700589 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 588700588} - m_PrefabAsset: {fileID: 0} --- !u!1 &614529023 GameObject: m_ObjectHideFlags: 0 @@ -12182,7 +11984,7 @@ Transform: - {fileID: 726814133} - {fileID: 351017954} m_Father: {fileID: 776929601} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &653087962 GameObject: @@ -13417,7 +13219,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 776929601} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &716710649 MonoBehaviour: @@ -13486,72 +13288,6 @@ MonoBehaviour: AvailableObjects: [] ActiveObjects: [] prefab: {fileID: 8709649920834609584, guid: 3ee19022e09b8ec45bff5cac76ab3990, type: 3} ---- !u!1001 &728114970 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (2) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &728114971 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 728114970} - m_PrefabAsset: {fileID: 0} --- !u!1 &739633386 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4378467592763974619, guid: f476c7c88fc2a8c48b018512b982bb8b, type: 3} @@ -14538,7 +14274,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1479377159} - {fileID: 553573862} - {fileID: 415920784} - {fileID: 1101988758} @@ -18337,72 +18072,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 982307425} m_CullTransparentMesh: 1 ---- !u!1001 &988711614 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (5) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: -0.3 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 0.55 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &988711615 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 988711614} - m_PrefabAsset: {fileID: 0} --- !u!1001 &992707159 PrefabInstance: m_ObjectHideFlags: 0 @@ -19978,7 +19647,6 @@ MonoBehaviour: - {fileID: 20000000, guid: ddf6c0ce6655c92498a9345f531cb9e4, type: 2} - {fileID: 20000000, guid: ed149418bea37034b9bded9f6f0fb5bd, type: 2} - {fileID: 20000000, guid: da8a1b7762aa3034ba50f7324a0d91f5, type: 2} - - {fileID: 20000000, guid: 586412f92993b8b4a8b288de00c0a1fa, type: 2} - {fileID: 20000000, guid: 68d72bcf34617f74499e0403f5a8394a, type: 2} - {fileID: 20000000, guid: ca1f26319f48e7645a0747c6d97bb75c, type: 2} --- !u!1 &1101988757 @@ -20011,7 +19679,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 776929601} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1101988759 MonoBehaviour: @@ -20028,7 +19696,8 @@ MonoBehaviour: wallPool: {fileID: 1095058569} wallParent: {fileID: 1101988757} wallMaterial: {fileID: 2100000, guid: 4df8452f565dbf242ae5de0dca4cc133, type: 2} - wallLightness: 0.2 + wallLightness: 1 + wallEmission: 0.1 edgeSaturation: 0.85 edgeEmission: 6 --- !u!1 &1109140812 @@ -21370,72 +21039,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8916813011638624805, guid: b2a7710739665e04ea4657aae1a23f17, type: 3} m_PrefabInstance: {fileID: 1179619441} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1189173133 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (7) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 0.55 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &1189173134 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 1189173133} - m_PrefabAsset: {fileID: 0} --- !u!1 &1198761461 GameObject: m_ObjectHideFlags: 0 @@ -22586,72 +22189,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1293222102} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &1293457011 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (4) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: -0.9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 0.55 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &1293457012 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 1293457011} - m_PrefabAsset: {fileID: 0} --- !u!1 &1296040966 GameObject: m_ObjectHideFlags: 0 @@ -24412,72 +23949,6 @@ Transform: m_Father: {fileID: 1554155467} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1396653894 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (6) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 0.55 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &1396653895 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 1396653894} - m_PrefabAsset: {fileID: 0} --- !u!1 &1398062094 GameObject: m_ObjectHideFlags: 0 @@ -25352,49 +24823,6 @@ Transform: m_Father: {fileID: 1554155467} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1479377158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1479377159} - m_Layer: 9 - m_Name: BeatLine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1479377159 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1479377158} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1977914715} - - {fileID: 1704190899} - - {fileID: 728114971} - - {fileID: 25816419} - - {fileID: 1293457012} - - {fileID: 988711615} - - {fileID: 1396653895} - - {fileID: 1189173134} - - {fileID: 1565870731} - - {fileID: 1870714633} - - {fileID: 588700589} - - {fileID: 132356501} - m_Father: {fileID: 776929601} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1480015838 PrefabInstance: m_ObjectHideFlags: 0 @@ -27736,72 +27164,6 @@ MonoBehaviour: buttonImage: {fileID: 547325487} fullscreenSprite: {fileID: 21300000, guid: d72cd8ea97c2e8649b8e85484dbe8811, type: 3} noFullscreenSprite: {fileID: 21300000, guid: f6023440b8ddfcc409cc8b732b0c05f7, type: 3} ---- !u!1001 &1565870730 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (8) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: -0.9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &1565870731 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 1565870730} - m_PrefabAsset: {fileID: 0} --- !u!1 &1566149411 GameObject: m_ObjectHideFlags: 0 @@ -29695,72 +29057,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2885256795046646389, guid: b01127f95fd44d64791e45e47ed781df, type: 3} m_PrefabInstance: {fileID: 1697708211} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1704190898 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (1) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: -0.3 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &1704190899 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 1704190898} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1708280138 PrefabInstance: m_ObjectHideFlags: 0 @@ -33215,72 +32511,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868541276} m_CullTransparentMesh: 1 ---- !u!1001 &1870714632 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment (9) - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: -0.3 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} ---- !u!4 &1870714633 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 1870714632} - m_PrefabAsset: {fileID: 0} --- !u!224 &1880332898 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5454505267562301017, guid: a82a95f943c1ff64294a6b6f83897df9, type: 3} @@ -35707,11 +34937,6 @@ MonoBehaviour: m_EditorClassIdentifier: enableWebGL: 0 enableDesktop: 1 ---- !u!4 &1977914715 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - m_PrefabInstance: {fileID: 5060135074810795148} - m_PrefabAsset: {fileID: 0} --- !u!1 &1979990881 GameObject: m_ObjectHideFlags: 0 @@ -40646,67 +39871,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b7121a60be5d6f4fa3635c74fd4f47c, type: 3} ---- !u!1001 &5060135074810795148 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1479377159} - m_Modifications: - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Name - value: BeatLineSegment - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681750, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.x - value: -0.9 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5060135072979681751, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a0257aa0601abbc4680b01efb0fa46ce, type: 3} --- !u!1001 &5064760466081830766 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Shaders/Objects/BombShader.shadergraph b/Assets/Shaders/Objects/BombShader.shadergraph deleted file mode 100644 index 5af6d079..00000000 --- a/Assets/Shaders/Objects/BombShader.shadergraph +++ /dev/null @@ -1,1900 +0,0 @@ -{ - "m_SGVersion": 3, - "m_Type": "UnityEditor.ShaderGraph.GraphData", - "m_ObjectId": "f7d00b5b5ec8411183d75ee63d0a10dc", - "m_Properties": [ - { - "m_Id": "c3488ac13f6d4e7b811cf942576cb390" - }, - { - "m_Id": "b3851c7255974f83acde1b28fb512189" - }, - { - "m_Id": "784d126429234bac917a7f39a9b13de3" - }, - { - "m_Id": "00709a5d6d274f7fb6cd03ae18abe8b6" - }, - { - "m_Id": "53a233999ac74762a46cbd0ac9abdcc5" - }, - { - "m_Id": "94f0158ca8bf4976a1a484099308e2e7" - } - ], - "m_Keywords": [ - { - "m_Id": "8e6e8ece97524b3f9c24708ccab74522" - }, - { - "m_Id": "0044d729f8894828abbfa9471a1f1da9" - } - ], - "m_Dropdowns": [], - "m_CategoryData": [ - { - "m_Id": "e88f79e4a210477f999751aa5a2ce59f" - } - ], - "m_Nodes": [ - { - "m_Id": "56d0faa6416740e6986b9a9c38b71eff" - }, - { - "m_Id": "527d3231e5654adca9330534e2749e1c" - }, - { - "m_Id": "906e1469691146e0baee5e5ff143f625" - }, - { - "m_Id": "0a034d35360743ee856bc52a5ce972e1" - }, - { - "m_Id": "acafb99ec6824e2191bb2c543467f7d5" - }, - { - "m_Id": "8fb68f91d3ac4fe9848b9a1ae57b5624" - }, - { - "m_Id": "e01c9568a3d84b6d96f3852d4d6e7832" - }, - { - "m_Id": "1205bc17a65941e9941c36e2458f958c" - }, - { - "m_Id": "6b0a33f00237495aac35f177fa5ef67a" - }, - { - "m_Id": "052910962d014729974b08ae0fe7a5cf" - }, - { - "m_Id": "81268d1bb034492eaa5493afde15c350" - }, - { - "m_Id": "a0986eaca0404bf69bd58b3890b478a7" - }, - { - "m_Id": "4ce1048b0a8349efb86523867202e577" - }, - { - "m_Id": "dbfed5468a44409e98c30739b792a2a6" - }, - { - "m_Id": "d43cde685a6c47c39721dbace793ac62" - }, - { - "m_Id": "d939bf15657d4e75b2248b1cea8e5a22" - }, - { - "m_Id": "d31e3609f4f44ebf975692fbcdf52673" - }, - { - "m_Id": "74b812a80ee347e6b610ae2187748e06" - }, - { - "m_Id": "dd7aea15521445cca0e690e7c2ad9b77" - } - ], - "m_GroupDatas": [], - "m_StickyNoteDatas": [], - "m_Edges": [ - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "052910962d014729974b08ae0fe7a5cf" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "e01c9568a3d84b6d96f3852d4d6e7832" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "4ce1048b0a8349efb86523867202e577" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "d43cde685a6c47c39721dbace793ac62" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "74b812a80ee347e6b610ae2187748e06" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "8fb68f91d3ac4fe9848b9a1ae57b5624" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "81268d1bb034492eaa5493afde15c350" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "dbfed5468a44409e98c30739b792a2a6" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "d31e3609f4f44ebf975692fbcdf52673" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "dbfed5468a44409e98c30739b792a2a6" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "d43cde685a6c47c39721dbace793ac62" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "d31e3609f4f44ebf975692fbcdf52673" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "d939bf15657d4e75b2248b1cea8e5a22" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "d31e3609f4f44ebf975692fbcdf52673" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "dbfed5468a44409e98c30739b792a2a6" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "0a034d35360743ee856bc52a5ce972e1" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "dd7aea15521445cca0e690e7c2ad9b77" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "d43cde685a6c47c39721dbace793ac62" - }, - "m_SlotId": 4 - } - } - ], - "m_VertexContext": { - "m_Position": { - "x": 46.99999237060547, - "y": 1.9999991655349732 - }, - "m_Blocks": [ - { - "m_Id": "56d0faa6416740e6986b9a9c38b71eff" - }, - { - "m_Id": "527d3231e5654adca9330534e2749e1c" - }, - { - "m_Id": "906e1469691146e0baee5e5ff143f625" - } - ] - }, - "m_FragmentContext": { - "m_Position": { - "x": 46.9999885559082, - "y": 260.0 - }, - "m_Blocks": [ - { - "m_Id": "0a034d35360743ee856bc52a5ce972e1" - }, - { - "m_Id": "acafb99ec6824e2191bb2c543467f7d5" - }, - { - "m_Id": "8fb68f91d3ac4fe9848b9a1ae57b5624" - }, - { - "m_Id": "e01c9568a3d84b6d96f3852d4d6e7832" - }, - { - "m_Id": "1205bc17a65941e9941c36e2458f958c" - }, - { - "m_Id": "6b0a33f00237495aac35f177fa5ef67a" - }, - { - "m_Id": "a0986eaca0404bf69bd58b3890b478a7" - } - ] - }, - "m_PreviewData": { - "serializedMesh": { - "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", - "m_Guid": "" - }, - "preventRotation": false - }, - "m_Path": "Shader Graphs", - "m_GraphPrecision": 1, - "m_PreviewMode": 2, - "m_OutputNode": { - "m_Id": "" - }, - "m_ActiveTargets": [ - { - "m_Id": "be90647d8dec4bfdb6dce48119b3b980" - } - ] -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", - "m_ObjectId": "0044d729f8894828abbfa9471a1f1da9", - "m_Guid": { - "m_GuidSerialized": "cf1ab8a3-09b1-42ee-97ad-ed15909400bc" - }, - "m_Name": "_ENVIRONMENTREFLECTIONS_OFF", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "_ENVIRONMENTREFLECTIONS_OFF", - "m_DefaultReferenceName": "_ENVIRONMENTREFLECTIONS_OFF", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_KeywordType": 0, - "m_KeywordDefinition": 0, - "m_KeywordScope": 0, - "m_KeywordStages": 63, - "m_Entries": [], - "m_Value": 1, - "m_IsEditable": true -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.CubemapShaderProperty", - "m_ObjectId": "00709a5d6d274f7fb6cd03ae18abe8b6", - "m_Guid": { - "m_GuidSerialized": "7736ffda-ec15-48eb-8c66-f671b9617985" - }, - "m_Name": "Cubemap", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Cubemap", - "m_DefaultReferenceName": "_Cubemap", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": { - "m_SerializedCubemap": "{\"cubemap\":{\"fileID\":8900000,\"guid\":\"75129cf70d202274693290da8bd363ea\",\"type\":3}}", - "m_Guid": "" - }, - "m_Modifiable": true -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "04538c95fe6342f9b5a29cb18bb6478a", - "m_Id": 0, - "m_DisplayName": "Ambient Occlusion", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Occlusion", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "052910962d014729974b08ae0fe7a5cf", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -93.0, - "y": 412.0, - "width": 140.0, - "height": 34.0 - } - }, - "m_Slots": [ - { - "m_Id": "f97d62f18dba4212b5aeadaee568ffcd" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "c3488ac13f6d4e7b811cf942576cb390" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "0a034d35360743ee856bc52a5ce972e1", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.BaseColor", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 60.0, - "y": 285.0, - "width": 200.0, - "height": 41.0 - } - }, - "m_Slots": [ - { - "m_Id": "47a65953689d43628a75dc37a36338d1" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.BaseColor" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "1205bc17a65941e9941c36e2458f958c", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Emission", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "c3cfb36de32a4728897b79b97cbbe9e1" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Emission" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CubemapMaterialSlot", - "m_ObjectId": "172ec1866c3a4c4ba9e0235b54ef7bbd", - "m_Id": 0, - "m_DisplayName": "Cubemap", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_BareResource": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "1a98a7a3ce4d48c9ace08b2dd76a47af", - "m_Id": 0, - "m_DisplayName": "Specular Color", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Specular", - "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_ColorMode": 0, - "m_DefaultColor": { - "r": 0.5, - "g": 0.5, - "b": 0.5, - "a": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "287e31e087b3408e86a472c9baac6609", - "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.DynamicVectorMaterialSlot", - "m_ObjectId": "2c6f0ca93dcb4369b5467ca8e0b0db6f", - "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.Vector1MaterialSlot", - "m_ObjectId": "355cdcb661b2488888021507f587779b", - "m_Id": 0, - "m_DisplayName": "CubemapBlur", - "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.NormalMaterialSlot", - "m_ObjectId": "448d0a67be084c3a8a2a89833fb5256b", - "m_Id": 3, - "m_DisplayName": "Normal", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Normal", - "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_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", - "m_ObjectId": "468fc8e82bc24b088c6fe24dcc48b9e2", - "m_Id": 0, - "m_DisplayName": "Tangent", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Tangent", - "m_StageCapability": 1, - "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_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "47a65953689d43628a75dc37a36338d1", - "m_Id": 0, - "m_DisplayName": "Base Color", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "BaseColor", - "m_StageCapability": 2, - "m_Value": { - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_ColorMode": 0, - "m_DefaultColor": { - "r": 0.5, - "g": 0.5, - "b": 0.5, - "a": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "4ce1048b0a8349efb86523867202e577", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1192.0, - "y": 159.0000457763672, - "width": 129.0, - "height": 33.99998474121094 - } - }, - "m_Slots": [ - { - "m_Id": "172ec1866c3a4c4ba9e0235b54ef7bbd" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "00709a5d6d274f7fb6cd03ae18abe8b6" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "527d3231e5654adca9330534e2749e1c", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Normal", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "e83af5948a37429baa7ad3dba6927993" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Normal" -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "53a233999ac74762a46cbd0ac9abdcc5", - "m_Guid": { - "m_GuidSerialized": "d405178a-4af7-4fa5-b0d8-00ffcda55cd5" - }, - "m_Name": "CubemapStrength", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "CubemapStrength", - "m_DefaultReferenceName": "_CubemapStrength", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": 1.0, - "m_FloatType": 0, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "56d0faa6416740e6986b9a9c38b71eff", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Position", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "ae7e5e89a83f4dedba88cec1c3580f38" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Position" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "61b3d7606c154d979112b1585421df3b", - "m_Id": 0, - "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_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "6279786f2695491b97dd3e16731606ef", - "m_Id": 0, - "m_DisplayName": "Metallic", - "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.Vector4MaterialSlot", - "m_ObjectId": "6948ea4fbead455788ec603fb1c86b89", - "m_Id": 0, - "m_DisplayName": "Base Color", - "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.BlockNode", - "m_ObjectId": "6b0a33f00237495aac35f177fa5ef67a", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Occlusion", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "04538c95fe6342f9b5a29cb18bb6478a" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Occlusion" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "6bd2eb6204f746d98600c61bfa0f840a", - "m_Id": 0, - "m_DisplayName": "Smoothness", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Smoothness", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "74b812a80ee347e6b610ae2187748e06", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -69.0, - "y": 378.0, - "width": 116.0, - "height": 34.0 - } - }, - "m_Slots": [ - { - "m_Id": "6279786f2695491b97dd3e16731606ef" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "784d126429234bac917a7f39a9b13de3" - } -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "784d126429234bac917a7f39a9b13de3", - "m_Guid": { - "m_GuidSerialized": "87613acd-5ee3-4d05-954d-1ec99f797318" - }, - "m_Name": "Metallic", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Metallic", - "m_DefaultReferenceName": "_Metallic", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": 1.0, - "m_FloatType": 0, - "m_RangeValues": { - "x": -1.0, - "y": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "7e41d008dda54e84956338f8f7119e81", - "m_Id": 5, - "m_DisplayName": "Sampler", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3, - "m_BareResource": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "81268d1bb034492eaa5493afde15c350", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -520.0, - "y": 231.0, - "width": 133.99996948242188, - "height": 34.0 - } - }, - "m_Slots": [ - { - "m_Id": "6948ea4fbead455788ec603fb1c86b89" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "b3851c7255974f83acde1b28fb512189" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CubemapInputMaterialSlot", - "m_ObjectId": "882ef7f235ac498ea457ad21895d2701", - "m_Id": 1, - "m_DisplayName": "Cube", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Cube", - "m_StageCapability": 3, - "m_BareResource": false, - "m_Cubemap": { - "m_SerializedCubemap": "{\"cubemap\":{\"instanceID\":0}}", - "m_Guid": "" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8ab4e57928f54812baf4cc44c2d7c7c1", - "m_Id": 0, - "m_DisplayName": "Metallic", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Metallic", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", - "m_ObjectId": "8cc0b63750384f2cad99d33737f6e65c", - "m_Id": 0, - "m_DisplayName": "Normal (Tangent Space)", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "NormalTS", - "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_Space": 3 -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", - "m_ObjectId": "8e6e8ece97524b3f9c24708ccab74522", - "m_Guid": { - "m_GuidSerialized": "91c06fb5-85ea-4799-ae2e-87948a0fa2b2" - }, - "m_Name": "_SPECULARHIGHLIGHTS_OFF", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "_SPECULARHIGHLIGHTS_OFF", - "m_DefaultReferenceName": "_SPECULARHIGHLIGHTS_OFF", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_KeywordType": 0, - "m_KeywordDefinition": 0, - "m_KeywordScope": 0, - "m_KeywordStages": 63, - "m_Entries": [], - "m_Value": 1, - "m_IsEditable": true -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "8fb68f91d3ac4fe9848b9a1ae57b5624", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Metallic", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "8ab4e57928f54812baf4cc44c2d7c7c1" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Metallic" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "906e1469691146e0baee5e5ff143f625", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Tangent", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "468fc8e82bc24b088c6fe24dcc48b9e2" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Tangent" -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "94f0158ca8bf4976a1a484099308e2e7", - "m_Guid": { - "m_GuidSerialized": "f790a26d-c027-4b73-b35f-0773d3262fbc" - }, - "m_Name": "CubemapBlur", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "CubemapBlur", - "m_DefaultReferenceName": "_CubemapBlur", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": 0.0, - "m_FloatType": 0, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "a0986eaca0404bf69bd58b3890b478a7", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Specular", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "1a98a7a3ce4d48c9ace08b2dd76a47af" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Specular" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "a4c8a7c50d254a58b0759feba685c4f9", - "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.BlockNode", - "m_ObjectId": "acafb99ec6824e2191bb2c543467f7d5", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.NormalTS", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "8cc0b63750384f2cad99d33737f6e65c" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.NormalTS" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "ae5fadaa46d947dc8103c934ecd7ae93", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", - "m_ObjectId": "ae7e5e89a83f4dedba88cec1c3580f38", - "m_Id": 0, - "m_DisplayName": "Position", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Position", - "m_StageCapability": 1, - "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_Space": 0 -} - -{ - "m_SGVersion": 3, - "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", - "m_ObjectId": "b3851c7255974f83acde1b28fb512189", - "m_Guid": { - "m_GuidSerialized": "23920d83-0b51-45ee-91d7-b398c4e15656" - }, - "m_Name": "Base Color", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Base Color", - "m_DefaultReferenceName": "_Base_Color", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": { - "r": 0.12156862765550614, - "g": 0.11764705926179886, - "b": 0.11764705926179886, - "a": 1.0 - }, - "isMainColor": true, - "m_ColorMode": 0 -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", - "m_ObjectId": "be90647d8dec4bfdb6dce48119b3b980", - "m_ActiveSubTarget": { - "m_Id": "c446922c3eca472195de6c423474062a" - }, - "m_AllowMaterialOverride": false, - "m_SurfaceType": 0, - "m_ZTestMode": 4, - "m_ZWriteControl": 0, - "m_AlphaMode": 0, - "m_RenderFace": 2, - "m_AlphaClip": false, - "m_CastShadows": false, - "m_ReceiveShadows": false, - "m_CustomEditorGUI": "", - "m_SupportVFX": false -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", - "m_ObjectId": "c3488ac13f6d4e7b811cf942576cb390", - "m_Guid": { - "m_GuidSerialized": "b9fbe9a1-6ac3-455f-af08-b6dff4cd5a0e" - }, - "m_Name": "Smoothness", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Smoothness", - "m_DefaultReferenceName": "_Smoothness", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": 1.0, - "m_FloatType": 1, - "m_RangeValues": { - "x": 0.0, - "y": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "c3cfb36de32a4728897b79b97cbbe9e1", - "m_Id": 0, - "m_DisplayName": "Emission", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Emission", - "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_ColorMode": 1, - "m_DefaultColor": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", - "m_ObjectId": "c446922c3eca472195de6c423474062a", - "m_WorkflowMode": 1, - "m_NormalDropOffSpace": 0, - "m_ClearCoat": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "c664bfa609c5426f887c7fe965b342ea", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "e00": 0.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 0.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 0.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 0.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "d31e3609f4f44ebf975692fbcdf52673", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -728.0, - "y": 144.0, - "width": 208.0, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "ae5fadaa46d947dc8103c934ecd7ae93" - }, - { - "m_Id": "e89efb6dc98e4f149f431dd62e9354f9" - }, - { - "m_Id": "c664bfa609c5426f887c7fe965b342ea" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d3ff6dc2aea64d469ff41799ccc1fb7c", - "m_Id": 0, - "m_DisplayName": "CubemapStrength", - "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.SampleCubemapNode", - "m_ObjectId": "d43cde685a6c47c39721dbace793ac62", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Sample Reflected Cubemap", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1020.0, - "y": 159.0000457763672, - "width": 207.99993896484376, - "height": 374.0 - } - }, - "m_Slots": [ - { - "m_Id": "61b3d7606c154d979112b1585421df3b" - }, - { - "m_Id": "882ef7f235ac498ea457ad21895d2701" - }, - { - "m_Id": "f23777e488144a15b3f9672f2e7040fd" - }, - { - "m_Id": "448d0a67be084c3a8a2a89833fb5256b" - }, - { - "m_Id": "7e41d008dda54e84956338f8f7119e81" - }, - { - "m_Id": "d796f91cdab64b67a1e773aa433882c8" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 2, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d796f91cdab64b67a1e773aa433882c8", - "m_Id": 4, - "m_DisplayName": "LOD", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "LOD", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "d939bf15657d4e75b2248b1cea8e5a22", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -983.0, - "y": 110.00000762939453, - "width": 170.99993896484376, - "height": 33.99999237060547 - } - }, - "m_Slots": [ - { - "m_Id": "d3ff6dc2aea64d469ff41799ccc1fb7c" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "53a233999ac74762a46cbd0ac9abdcc5" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.AddNode", - "m_ObjectId": "dbfed5468a44409e98c30739b792a2a6", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Add", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -319.0, - "y": 143.99996948242188, - "width": 208.0, - "height": 302.0 - } - }, - "m_Slots": [ - { - "m_Id": "287e31e087b3408e86a472c9baac6609" - }, - { - "m_Id": "a4c8a7c50d254a58b0759feba685c4f9" - }, - { - "m_Id": "2c6f0ca93dcb4369b5467ca8e0b0db6f" - } - ], - "synonyms": [ - "addition", - "sum", - "plus" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "dd7aea15521445cca0e690e7c2ad9b77", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1230.0, - "y": 299.0, - "width": 146.0, - "height": 34.00006103515625 - } - }, - "m_Slots": [ - { - "m_Id": "355cdcb661b2488888021507f587779b" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "94f0158ca8bf4976a1a484099308e2e7" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "e01c9568a3d84b6d96f3852d4d6e7832", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Smoothness", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "6bd2eb6204f746d98600c61bfa0f840a" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Smoothness" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", - "m_ObjectId": "e83af5948a37429baa7ad3dba6927993", - "m_Id": 0, - "m_DisplayName": "Normal", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Normal", - "m_StageCapability": 1, - "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_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CategoryData", - "m_ObjectId": "e88f79e4a210477f999751aa5a2ce59f", - "m_Name": "", - "m_ChildObjectList": [ - { - "m_Id": "b3851c7255974f83acde1b28fb512189" - }, - { - "m_Id": "c3488ac13f6d4e7b811cf942576cb390" - }, - { - "m_Id": "784d126429234bac917a7f39a9b13de3" - }, - { - "m_Id": "00709a5d6d274f7fb6cd03ae18abe8b6" - }, - { - "m_Id": "8e6e8ece97524b3f9c24708ccab74522" - }, - { - "m_Id": "0044d729f8894828abbfa9471a1f1da9" - }, - { - "m_Id": "53a233999ac74762a46cbd0ac9abdcc5" - }, - { - "m_Id": "94f0158ca8bf4976a1a484099308e2e7" - } - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "e89efb6dc98e4f149f431dd62e9354f9", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "e00": 2.0, - "e01": 2.0, - "e02": 2.0, - "e03": 2.0, - "e10": 2.0, - "e11": 2.0, - "e12": 2.0, - "e13": 2.0, - "e20": 2.0, - "e21": 2.0, - "e22": 2.0, - "e23": 2.0, - "e30": 2.0, - "e31": 2.0, - "e32": 2.0, - "e33": 2.0 - }, - "m_DefaultValue": { - "e00": 1.0, - "e01": 0.0, - "e02": 0.0, - "e03": 0.0, - "e10": 0.0, - "e11": 1.0, - "e12": 0.0, - "e13": 0.0, - "e20": 0.0, - "e21": 0.0, - "e22": 1.0, - "e23": 0.0, - "e30": 0.0, - "e31": 0.0, - "e32": 0.0, - "e33": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ViewDirectionMaterialSlot", - "m_ObjectId": "f23777e488144a15b3f9672f2e7040fd", - "m_Id": 2, - "m_DisplayName": "ViewDir", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "ViewDir", - "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_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "f97d62f18dba4212b5aeadaee568ffcd", - "m_Id": 0, - "m_DisplayName": "Smoothness", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - diff --git a/Assets/Shaders/Objects/BombShader.shadergraph.meta b/Assets/Shaders/Objects/BombShader.shadergraph.meta deleted file mode 100644 index 107b5fe6..00000000 --- a/Assets/Shaders/Objects/BombShader.shadergraph.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: a4af4af1e37e0e1458b48051e4ec8856 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/Shaders/Objects/SimpleNoteShader.shadergraph b/Assets/Shaders/Objects/SimpleObjectShader.shadergraph similarity index 71% rename from Assets/Shaders/Objects/SimpleNoteShader.shadergraph rename to Assets/Shaders/Objects/SimpleObjectShader.shadergraph index 48a054a7..6c5ff7a9 100644 --- a/Assets/Shaders/Objects/SimpleNoteShader.shadergraph +++ b/Assets/Shaders/Objects/SimpleObjectShader.shadergraph @@ -50,6 +50,18 @@ }, { "m_Id": "33c10f6a68b7421aa9706a78c7c343bf" + }, + { + "m_Id": "cfc78f5c59254f3a9856430c495715f2" + }, + { + "m_Id": "b316f81ff4254fd4bbbad16ae1765086" + }, + { + "m_Id": "26a5e58c5ad14b6abf051ac8e74f79e8" + }, + { + "m_Id": "cb8f5b7b506040db99c66cd992172a8f" } ], "m_GroupDatas": [], @@ -69,6 +81,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "cb8f5b7b506040db99c66cd992172a8f" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "b316f81ff4254fd4bbbad16ae1765086" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -82,6 +108,20 @@ }, "m_SlotId": 0 } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "dd4d9bc3151e401581f1bc4b044ec35f" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "cb8f5b7b506040db99c66cd992172a8f" + }, + "m_SlotId": 0 + } } ], "m_VertexContext": { @@ -104,12 +144,18 @@ "m_FragmentContext": { "m_Position": { "x": 0.0, - "y": 200.0 + "y": 194.0 }, "m_Blocks": [ { "m_Id": "4b39b997a6e54b1aaff7e9cb3f60a6c9" }, + { + "m_Id": "b316f81ff4254fd4bbbad16ae1765086" + }, + { + "m_Id": "ec0713623c074fea9136b0f56f9126b3" + }, { "m_Id": "5edd3977de8f4d89a8375f2c3e1fed2a" }, @@ -120,10 +166,13 @@ "m_Id": "0d101e9eda1847a3ba4e29b3102fe553" }, { - "m_Id": "ec0713623c074fea9136b0f56f9126b3" + "m_Id": "7de5d2b3ffae49b5ac73ea5ceb55a42b" }, { - "m_Id": "7de5d2b3ffae49b5ac73ea5ceb55a42b" + "m_Id": "cfc78f5c59254f3a9856430c495715f2" + }, + { + "m_Id": "26a5e58c5ad14b6abf051ac8e74f79e8" } ] }, @@ -180,6 +229,36 @@ "m_SerializedDescriptor": "SurfaceDescription.Metallic" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0811e4ffe89d4a58a96ca8ece2e6a967", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0ae00f3fcb7947688e292033e99ab23c", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -233,10 +312,10 @@ "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 }, "isMainColor": false, "m_ColorMode": 0 @@ -291,6 +370,39 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "26a5e58c5ad14b6abf051ac8e74f79e8", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "90b64e34816d4a9dabe376f6fbbe92d1" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -343,8 +455,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -193.0, - "y": 402.0, + "x": -278.0, + "y": 342.0, "width": 151.0, "height": 34.0 } @@ -609,6 +721,66 @@ "m_SerializedDescriptor": "SurfaceDescription.Occlusion" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "87272124fdd34b4d8d314852893354c4", + "m_Id": 0, + "m_DisplayName": "Specular Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Specular", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "90b64e34816d4a9dabe376f6fbbe92d1", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "94dfb15540df405bb8d1fa46fe42ca6e", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -624,6 +796,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "98625d9661644bb59b10e247a4138730", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "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.CategoryData", @@ -639,6 +835,39 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "b316f81ff4254fd4bbbad16ae1765086", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 6.0, + "y": 262.0, + "width": 200.0, + "height": 41.0 + } + }, + "m_Slots": [ + { + "m_Id": "0811e4ffe89d4a58a96ca8ece2e6a967" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -720,6 +949,100 @@ "m_Space": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "cb8f5b7b506040db99c66cd992172a8f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": false, + "m_Position": { + "serializedVersion": "2", + "x": -246.0, + "y": 265.0, + "width": 119.0, + "height": 77.0 + } + }, + "m_Slots": [ + { + "m_Id": "98625d9661644bb59b10e247a4138730" + }, + { + "m_Id": "0ae00f3fcb7947688e292033e99ab23c" + }, + { + "m_Id": "e093b3c359024bb6beb397d295390a31" + }, + { + "m_Id": "d03d467e9ef94dfbacb2b9f8c80a1db3" + }, + { + "m_Id": "94dfb15540df405bb8d1fa46fe42ca6e" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "cfc78f5c59254f3a9856430c495715f2", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Specular", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "87272124fdd34b4d8d314852893354c4" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Specular" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "d03d467e9ef94dfbacb2b9f8c80a1db3", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 3, "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", @@ -756,7 +1079,7 @@ "m_ActiveSubTarget": { "m_Id": "54a4591c880e4e0ead60bf1f17d04692" }, - "m_AllowMaterialOverride": false, + "m_AllowMaterialOverride": true, "m_SurfaceType": 0, "m_ZTestMode": 4, "m_ZWriteControl": 0, @@ -781,8 +1104,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -173.0, - "y": 238.0, + "x": -395.0, + "y": 231.0, "width": 131.0, "height": 34.0 } @@ -804,6 +1127,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e093b3c359024bb6beb397d295390a31", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", @@ -816,10 +1154,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": 5.0, + "y": 301.0, + "width": 200.0, + "height": 41.0 } }, "m_Slots": [ diff --git a/Assets/Shaders/Objects/SimpleNoteShader.shadergraph.meta b/Assets/Shaders/Objects/SimpleObjectShader.shadergraph.meta similarity index 100% rename from Assets/Shaders/Objects/SimpleNoteShader.shadergraph.meta rename to Assets/Shaders/Objects/SimpleObjectShader.shadergraph.meta diff --git a/Assets/Shaders/VariantCollections/BombShader.shadervariants b/Assets/Shaders/VariantCollections/BombShader.shadervariants deleted file mode 100644 index f9c2b971..00000000 --- a/Assets/Shaders/VariantCollections/BombShader.shadervariants +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!200 &20000000 -ShaderVariantCollection: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BombShader - m_Shaders: - - first: {fileID: -6465566751694194690, guid: a4af4af1e37e0e1458b48051e4ec8856, type: 3} - second: - variants: - - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS _ADDITIONAL_LIGHT_SHADOWS _ENVIRONMENTREFLECTIONS_OFF - _MAIN_LIGHT_SHADOWS _SPECULARHIGHLIGHTS_OFF - passType: 13 - - keywords: FOG_LINEAR _ADDITIONAL_LIGHTS _ENVIRONMENTREFLECTIONS_OFF _MAIN_LIGHT_SHADOWS - _SPECULARHIGHLIGHTS_OFF - passType: 13 diff --git a/Assets/Shaders/VariantCollections/BombShader.shadervariants.meta b/Assets/Shaders/VariantCollections/BombShader.shadervariants.meta deleted file mode 100644 index 95d45d0a..00000000 --- a/Assets/Shaders/VariantCollections/BombShader.shadervariants.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 586412f92993b8b4a8b288de00c0a1fa -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 20000000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants b/Assets/Shaders/VariantCollections/SimpleObjectShader.shadervariants similarity index 94% rename from Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants rename to Assets/Shaders/VariantCollections/SimpleObjectShader.shadervariants index ba660a55..8b13b742 100644 --- a/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants +++ b/Assets/Shaders/VariantCollections/SimpleObjectShader.shadervariants @@ -6,7 +6,7 @@ ShaderVariantCollection: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: SimpleNoteShader + m_Name: SimpleObjectShader m_Shaders: - first: {fileID: -6465566751694194690, guid: 2e6764df4b8962b4083d4edbea4769e9, type: 3} second: diff --git a/Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants.meta b/Assets/Shaders/VariantCollections/SimpleObjectShader.shadervariants.meta similarity index 100% rename from Assets/Shaders/VariantCollections/SimpleNoteShader.shadervariants.meta rename to Assets/Shaders/VariantCollections/SimpleObjectShader.shadervariants.meta diff --git a/Assets/_Materials/Environment/BeatLine.mat b/Assets/_Materials/Environment/BeatLine.mat deleted file mode 100644 index cc50c045..00000000 --- a/Assets/_Materials/Environment/BeatLine.mat +++ /dev/null @@ -1,137 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7429386651610699050 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BeatLine - m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} - m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - 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} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - 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} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BlendOp: 0 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _EnvironmentReflections: 1 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossinessSource: 0 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 3 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _SampleGI: 0 - - _Shininess: 0 - - _Smoothness: 0.5 - - _SmoothnessSource: 0 - - _SmoothnessTextureChannel: 0 - - _SpecSource: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _Surface: 1 - - _UVSec: 0 - - _WorkflowMode: 1 - - _ZWrite: 0 - m_Colors: - - _BaseColor: {r: 0.012148449, g: 0.06064879, b: 0.066037714, a: 0.78039217} - - _Color: {r: 0.012148449, g: 0.06064879, b: 0.066037714, a: 0.78039217} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Environment/BeatLine.mat.meta b/Assets/_Materials/Environment/BeatLine.mat.meta deleted file mode 100644 index 024f7ada..00000000 --- a/Assets/_Materials/Environment/BeatLine.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c4d8e2fb61769df4095d8ee48b827019 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Materials/Environment/Lights/Laser.mat b/Assets/_Materials/Environment/Lights/Laser.mat index e8cb1e7c..2c63c91d 100644 --- a/Assets/_Materials/Environment/Lights/Laser.mat +++ b/Assets/_Materials/Environment/Lights/Laser.mat @@ -21,9 +21,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Laser - m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 2e6764df4b8962b4083d4edbea4769e9, type: 3} m_ValidKeywords: - - _EMISSION - _RECEIVE_SHADOWS_OFF - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -98,15 +97,16 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _Blend: 0 + - _Blend: 2 - _BumpScale: 1 + - _CastShadows: 0 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 1 - _EnvironmentReflections: 0 - _GlossMapScale: 0 - _Glossiness: 0 @@ -115,6 +115,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 0 - _Shininess: 0 @@ -126,7 +127,9 @@ Material: - _SrcBlend: 5 - _Surface: 1 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 0.1882353, g: 0.6745098, b: 1, a: 1} - _Color: {r: 0.1882353, g: 0.6745098, b: 1, a: 1} diff --git a/Assets/_Materials/Environment/Lights/PersistentLaser.mat b/Assets/_Materials/Environment/Lights/PersistentLaser.mat index 9bec1644..7bf48e8c 100644 --- a/Assets/_Materials/Environment/Lights/PersistentLaser.mat +++ b/Assets/_Materials/Environment/Lights/PersistentLaser.mat @@ -108,8 +108,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.19607843, g: 0.19607843, b: 0.3019608, a: 1} - - _Color: {r: 0.19607843, g: 0.19607843, b: 0.3019608, a: 1} + - _BaseColor: {r: 0.21176471, g: 0.21960784, b: 0.25490198, a: 1} + - _Color: {r: 0.21176471, g: 0.21960784, b: 0.25490198, a: 1} - _EmissionColor: {r: 0.8134779, g: 2.8942683, b: 4.281462, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Environment/Platform.mat b/Assets/_Materials/Environment/Platform.mat index 39244c7d..4b6a6d78 100644 --- a/Assets/_Materials/Environment/Platform.mat +++ b/Assets/_Materials/Environment/Platform.mat @@ -121,6 +121,7 @@ Material: - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.7 + - _GlossinessSource: 0 - _GlossyReflections: 1 - _Metallic: 0.5 - _Mode: 0 @@ -130,8 +131,11 @@ Material: - _ReceiveShadows: 0 - _ReflectionSteps: 16 - _ReflectionsSource: 0 + - _Shininess: 0 - _Smoothness: 0.8 + - _SmoothnessSource: 0 - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 @@ -140,8 +144,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.19508722, g: 0.19508722, b: 0.3018868, a: 1} - - _Color: {r: 0.19508722, g: 0.19508722, b: 0.3018868, a: 1} + - _BaseColor: {r: 0.21026167, g: 0.22122335, b: 0.254717, a: 1} + - _Color: {r: 0.21026167, g: 0.22122335, b: 0.254717, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _SubsurfaceColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/_Materials/Objects/Bomb.mat b/Assets/_Materials/Objects/Bomb.mat index 4b07a1c5..9a3527be 100644 --- a/Assets/_Materials/Objects/Bomb.mat +++ b/Assets/_Materials/Objects/Bomb.mat @@ -21,16 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Bomb - m_Shader: {fileID: -6465566751694194690, guid: a4af4af1e37e0e1458b48051e4ec8856, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 80258e4e9b4a5264ba5ec405f90e8db1, type: 3} m_ValidKeywords: - _ENVIRONMENTREFLECTIONS_OFF - _SPECULARHIGHLIGHTS_OFF - m_InvalidKeywords: - - _RECEIVE_SHADOWS_OFF + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: @@ -104,8 +103,8 @@ Material: - _CastShadows: 0 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - - _CubemapBlur: 0.5 - - _CubemapStrength: 1.8 + - _CubemapBlur: 1.4 + - _CubemapStrength: 5 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 @@ -113,6 +112,7 @@ Material: - _DstBlend: 0 - _ENVIRONMENTREFLECTIONS_OFF: 1 - _EnvironmentReflections: 1 + - _FresnelStrength: 0.25 - _GlossMapScale: 1 - _Glossiness: 0.7 - _GlossyReflections: 0 @@ -135,7 +135,7 @@ Material: - _ZWrite: 1 - _ZWriteControl: 0 m_Colors: - - _BaseColor: {r: 0.122641504, g: 0.11627803, b: 0.11627803, a: 1} + - _BaseColor: {r: 0.5, g: 0.48431373, b: 0.48431373, a: 1} - _Base_Color: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1} - _Color: {r: 0.122641504, g: 0.11627803, b: 0.11627803, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/_Materials/Objects/Notes/Arrow.mat b/Assets/_Materials/Objects/Notes/Arrow.mat index d32730da..412614fc 100644 --- a/Assets/_Materials/Objects/Notes/Arrow.mat +++ b/Assets/_Materials/Objects/Notes/Arrow.mat @@ -21,9 +21,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Arrow - m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 2e6764df4b8962b4083d4edbea4769e9, type: 3} m_ValidKeywords: - - _EMISSION - _RECEIVE_SHADOWS_OFF m_InvalidKeywords: [] m_LightmapFlags: 0 @@ -32,7 +31,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -97,6 +97,7 @@ Material: - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 + - _CastShadows: 0 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 @@ -113,6 +114,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 0 - _Shininess: 0 @@ -125,7 +127,9 @@ Material: - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 1, g: 0.7688679, b: 0.7688679, a: 1} - _Color: {r: 1, g: 0.7688679, b: 0.7688679, a: 1} diff --git a/Assets/_Materials/Objects/Notes/SimpleNote.mat b/Assets/_Materials/Objects/Notes/SimpleNote.mat index 529d5ae1..ab2e6174 100644 --- a/Assets/_Materials/Objects/Notes/SimpleNote.mat +++ b/Assets/_Materials/Objects/Notes/SimpleNote.mat @@ -22,14 +22,17 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: SimpleNote m_Shader: {fileID: -6465566751694194690, guid: 2e6764df4b8962b4083d4edbea4769e9, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _RECEIVE_SHADOWS_OFF m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -94,6 +97,7 @@ Material: - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 + - _CastShadows: 0 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 @@ -121,7 +125,9 @@ Material: - _SrcBlend: 1 - _Surface: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 0.78431374, g: 0.078431375, b: 0.078431375, a: 1} - _Color: {r: 0.78431374, g: 0.078431375, b: 0.078431375, a: 1} diff --git a/Assets/_Materials/Objects/Obstacle.mat b/Assets/_Materials/Objects/Obstacle.mat index b852c170..2425c511 100644 --- a/Assets/_Materials/Objects/Obstacle.mat +++ b/Assets/_Materials/Objects/Obstacle.mat @@ -21,14 +21,14 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Obstacle - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 2e6764df4b8962b4083d4edbea4769e9, type: 3} m_ValidKeywords: + - _RECEIVE_SHADOWS_OFF - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: - - _EMISSION + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 1 + m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent @@ -100,6 +100,7 @@ Material: - _Blend: 0 - _BlendOp: 0 - _BumpScale: 1 + - _CastShadows: 0 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 0 @@ -116,8 +117,9 @@ Material: - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - - _ReceiveShadows: 1 + - _ReceiveShadows: 0 - _SampleGI: 0 - _Shininess: 0 - _Smoothness: 0.186 @@ -129,9 +131,11 @@ Material: - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 0 + - _ZWriteControl: 0 m_Colors: - - _BaseColor: {r: 1, g: 0.18627447, b: 0.18627447, a: 0.5} + - _BaseColor: {r: 1, g: 0.18627447, b: 0.18627447, a: 0.5019608} - _Color: {r: 1, g: 0.18627447, b: 0.18627447, a: 0.5} - _EmissionColor: {r: 0.03137255, g: 0.0019607844, b: 0.0019607844, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 0.186} diff --git a/Assets/_Materials/Objects/ObstacleEdge.mat b/Assets/_Materials/Objects/ObstacleEdge.mat index 24288413..84394b7f 100644 --- a/Assets/_Materials/Objects/ObstacleEdge.mat +++ b/Assets/_Materials/Objects/ObstacleEdge.mat @@ -8,11 +8,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ObstacleEdge - m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 2e6764df4b8962b4083d4edbea4769e9, type: 3} m_ValidKeywords: - - _EMISSION - _RECEIVE_SHADOWS_OFF - - _SPECULAR_COLOR m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 1 @@ -20,7 +18,8 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: [] + disabledShaderPasses: + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,6 +84,7 @@ Material: - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 + - _CastShadows: 0 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 @@ -100,6 +100,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 0 - _Shininess: 0 @@ -111,7 +112,9 @@ Material: - _SrcBlend: 1 - _Surface: 0 - _WorkflowMode: 1 + - _ZTest: 4 - _ZWrite: 1 + - _ZWriteControl: 0 m_Colors: - _BaseColor: {r: 0.764151, g: 0.13336597, b: 0.13336597, a: 1} - _Color: {r: 0.764151, g: 0.13336597, b: 0.13336597, a: 1} diff --git a/Assets/_Prefabs/Environment/Platform/BeatLineSegment.prefab b/Assets/_Prefabs/Environment/Platform/BeatLineSegment.prefab deleted file mode 100644 index 06292a5e..00000000 --- a/Assets/_Prefabs/Environment/Platform/BeatLineSegment.prefab +++ /dev/null @@ -1,85 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &5060135072979681750 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5060135072979681751} - - component: {fileID: 5060135072979681746} - - component: {fileID: 5060135072979681745} - m_Layer: 3 - m_Name: BeatLineSegment - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5060135072979681751 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5060135072979681750} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0.9, y: -0.4, z: 0} - m_LocalScale: {x: 0.05, y: 1, z: 0.05} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!33 &5060135072979681746 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5060135072979681750} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5060135072979681745 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5060135072979681750} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 0 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: c4d8e2fb61769df4095d8ee48b827019, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/_Prefabs/Environment/Platform/BeatLineSegment.prefab.meta b/Assets/_Prefabs/Environment/Platform/BeatLineSegment.prefab.meta deleted file mode 100644 index fa9eb279..00000000 --- a/Assets/_Prefabs/Environment/Platform/BeatLineSegment.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a0257aa0601abbc4680b01efb0fa46ce -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/__Scripts/Previewer/MapControl/Objects/WallManager.cs b/Assets/__Scripts/Previewer/MapControl/Objects/WallManager.cs index ae711658..255e10ac 100644 --- a/Assets/__Scripts/Previewer/MapControl/Objects/WallManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/Objects/WallManager.cs @@ -12,6 +12,7 @@ public class WallManager : MonoBehaviour [Header("Parameters")] [SerializeField] private Material wallMaterial; [SerializeField, Range(0f, 1f)] private float wallLightness; + [SerializeField] private float wallEmission; [SerializeField, Range(0f, 1f)] private float edgeSaturation; [SerializeField] private float edgeEmission; @@ -42,6 +43,7 @@ public void UpdateMaterial() Color newColor = WallColor.SetValue(wallLightness * v); newColor.a = SettingsManager.GetFloat("wallopacity"); wallMaterialProperties.SetColor("_BaseColor", newColor); + wallMaterialProperties.SetColor("_EmissionColor", newColor.SetValue(wallEmission)); wallEdgeProperties.SetColor("_BaseColor", newColor.SetSaturation(s * edgeSaturation)); wallEdgeProperties.SetColor("_EmissionColor", newColor.SetHSV(h, s * edgeSaturation, edgeEmission, true)); From fa510d64a54e5fbdd7b0d32e7b6fef3f94992fbe Mon Sep 17 00:00:00 2001 From: AllPoland Date: Sun, 14 May 2023 23:37:14 -0600 Subject: [PATCH 3/4] fix colors not resetting when exiting the map --- Assets/__Scripts/Previewer/MapControl/BeatmapManager.cs | 2 +- Assets/__Scripts/UI/UIStateManager.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/__Scripts/Previewer/MapControl/BeatmapManager.cs b/Assets/__Scripts/Previewer/MapControl/BeatmapManager.cs index 3b5ce6b9..996f89ff 100644 --- a/Assets/__Scripts/Previewer/MapControl/BeatmapManager.cs +++ b/Assets/__Scripts/Previewer/MapControl/BeatmapManager.cs @@ -186,8 +186,8 @@ public void UpdateUIState(UIState newState) if(newState != UIState.Previewer) { Difficulties.Clear(); + Info = BeatmapInfo.Empty; CurrentDifficulty = Difficulty.Empty; - Info = new BeatmapInfo(); } } diff --git a/Assets/__Scripts/UI/UIStateManager.cs b/Assets/__Scripts/UI/UIStateManager.cs index 0195d2f2..5bf65156 100644 --- a/Assets/__Scripts/UI/UIStateManager.cs +++ b/Assets/__Scripts/UI/UIStateManager.cs @@ -1,4 +1,5 @@ using System; +using UnityEngine; public class UIStateManager { @@ -6,11 +7,11 @@ public class UIStateManager public static UIState CurrentState { get => _currentState; - set { _currentState = value; - OnUIStateChanged?.Invoke(value); + Debug.Log($"UI state {_currentState}"); + OnUIStateChanged?.Invoke(_currentState); } } From 41fed3812ff45c016ed024818a37dff9baff10d3 Mon Sep 17 00:00:00 2001 From: AllPoland Date: Sun, 14 May 2023 23:43:56 -0600 Subject: [PATCH 4/4] update version number --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2547bc88..df8bb4d0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.3.1 + bundleVersion: 0.3.2 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0