diff --git a/Assets/Art/Materials/PlayMode/Note_Metal.mat b/Assets/Art/Materials/PlayMode/Note_Metal.mat index 5b30eca3c..f34d4f5e1 100644 --- a/Assets/Art/Materials/PlayMode/Note_Metal.mat +++ b/Assets/Art/Materials/PlayMode/Note_Metal.mat @@ -22,9 +22,10 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Note_Metal m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 6 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -106,13 +107,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 1 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.288 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.3 + - _Smoothness: 0.79 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -123,6 +124,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.025261942, g: 0.025261942, b: 0.025261942, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Materials/PlayMode/Note_Middle.mat b/Assets/Art/Materials/PlayMode/Note_Middle.mat index c4027d073..ca8e9565c 100644 --- a/Assets/Art/Materials/PlayMode/Note_Middle.mat +++ b/Assets/Art/Materials/PlayMode/Note_Middle.mat @@ -26,7 +26,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseTexture: - m_Texture: {fileID: 2800000, guid: a41ac8340d2ec134d98edeabf7a11631, type: 3} + m_Texture: {fileID: 2800000, guid: c2387eea6ceed41499291b7bef47673d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -103,7 +103,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _Emission: 1.5 + - _Emission: 3 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 diff --git a/Assets/Prefabs/AbstractTrack.prefab b/Assets/Prefabs/AbstractTrack.prefab index 0ad688ab2..89bb6632c 100644 --- a/Assets/Prefabs/AbstractTrack.prefab +++ b/Assets/Prefabs/AbstractTrack.prefab @@ -5993,8 +5993,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7963833488365731104} - m_LocalRotation: {x: 0.28172323, y: -0, z: -0, w: 0.9594957} - m_LocalPosition: {x: 0, y: 2.44, z: -3.78} + m_LocalRotation: {x: 0.28172323, y: -0, z: -0, w: 0.95949566} + m_LocalPosition: {x: 0, y: 2.782, z: -3.7870002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6213,7 +6213,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4405145901572709445 Transform: m_ObjectHideFlags: 0 @@ -6222,7 +6222,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9101641622012883722} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0.0025, z: -1.75} + m_LocalPosition: {x: 0, y: 0.002, z: -1.539} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Prefabs/DrumsTrack.prefab b/Assets/Prefabs/DrumsTrack.prefab index 5256c583c..13f3d4fd5 100644 --- a/Assets/Prefabs/DrumsTrack.prefab +++ b/Assets/Prefabs/DrumsTrack.prefab @@ -272,22 +272,22 @@ PrefabInstance: - target: {fileID: 4405145901572709445, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.z - value: -1.55 + value: -1.434 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.y - value: 2.895 + value: 2.782 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.z - value: -3.963 + value: -3.7870002 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalRotation.w - value: 0.9594957 + value: 0.95949566 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} diff --git a/Assets/Prefabs/FiveFretTrack.prefab b/Assets/Prefabs/FiveFretTrack.prefab index 125b6902e..08b800ad6 100644 --- a/Assets/Prefabs/FiveFretTrack.prefab +++ b/Assets/Prefabs/FiveFretTrack.prefab @@ -9927,12 +9927,12 @@ PrefabInstance: - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.y - value: 2.895 + value: 2.782 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.z - value: -3.963 + value: -3.787 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} @@ -10195,6 +10195,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 13 objectReference: {fileID: 0} + - target: {fileID: 9101641622012883722, guid: ba68df35237e09f4abcf788160c15375, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ba68df35237e09f4abcf788160c15375, type: 3} --- !u!4 &1584337011342833613 stripped diff --git a/Assets/Prefabs/GHDrumsTrack.prefab b/Assets/Prefabs/GHDrumsTrack.prefab index f6380d263..db955bc6d 100644 --- a/Assets/Prefabs/GHDrumsTrack.prefab +++ b/Assets/Prefabs/GHDrumsTrack.prefab @@ -121,17 +121,17 @@ PrefabInstance: - target: {fileID: 4405145901572709445, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.z - value: -1.55 + value: -1.434 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.y - value: 2.895 + value: 2.782 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.z - value: -3.963 + value: -3.7870002 objectReference: {fileID: 0} - target: {fileID: 5381973405940680030, guid: ba68df35237e09f4abcf788160c15375, type: 3} diff --git a/Assets/Prefabs/Note.prefab b/Assets/Prefabs/Note.prefab index 2273707d2..dbfe85776 100644 --- a/Assets/Prefabs/Note.prefab +++ b/Assets/Prefabs/Note.prefab @@ -75,7 +75,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2485029377005370073 Transform: m_ObjectHideFlags: 0 @@ -107,7 +107,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3676109393068581280 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/RealGuitarTrack.prefab b/Assets/Prefabs/RealGuitarTrack.prefab index ec46cb668..a1b469177 100644 --- a/Assets/Prefabs/RealGuitarTrack.prefab +++ b/Assets/Prefabs/RealGuitarTrack.prefab @@ -2298,15 +2298,20 @@ PrefabInstance: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} + - target: {fileID: 4405145901572709445, guid: ba68df35237e09f4abcf788160c15375, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.434 + objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.y - value: 2.895 + value: 2.782 objectReference: {fileID: 0} - target: {fileID: 4431318561618230466, guid: ba68df35237e09f4abcf788160c15375, type: 3} propertyPath: m_LocalPosition.z - value: -3.963 + value: -3.7870002 objectReference: {fileID: 0} - target: {fileID: 6218306474702809455, guid: ba68df35237e09f4abcf788160c15375, type: 3}