diff --git a/Assets/Art/Meshes/Fret.blend b/Assets/Art/Meshes/Fret.blend index df54c5dae..e0668b69a 100644 Binary files a/Assets/Art/Meshes/Fret.blend and b/Assets/Art/Meshes/Fret.blend differ diff --git a/Assets/Art/Meshes/Notes.blend b/Assets/Art/Meshes/Notes.blend index 2c7476d94..3557a7fbd 100644 Binary files a/Assets/Art/Meshes/Notes.blend and b/Assets/Art/Meshes/Notes.blend differ diff --git a/Assets/Art/Meshes/Notes_HOPO.prefab b/Assets/Art/Meshes/Notes_HOPO.prefab index ac697ff67..c655f7286 100644 --- a/Assets/Art/Meshes/Notes_HOPO.prefab +++ b/Assets/Art/Meshes/Notes_HOPO.prefab @@ -94,8 +94,8 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: e5f1d6b381e448e44b28a4a2825c0343, type: 2} - - {fileID: 2100000, guid: 0e410b84cdc264544a6ba5b805c80fb3, type: 2} - {fileID: 2100000, guid: 8427df3402388ca4e80f4411ae8ee82e, type: 2} + - {fileID: 2100000, guid: 0e410b84cdc264544a6ba5b805c80fb3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Art/Meshes/Pickup.prefab b/Assets/Art/Meshes/Pickup.prefab index 549728ee0..8caba9046 100644 --- a/Assets/Art/Meshes/Pickup.prefab +++ b/Assets/Art/Meshes/Pickup.prefab @@ -40,7 +40,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2604729629126270415} - m_Mesh: {fileID: -5495902117074765545, guid: 67f04293ea77d414d8f050362bac57be, type: 3} + m_Mesh: {fileID: 8310260808387721200, guid: 67f04293ea77d414d8f050362bac57be, type: 3} --- !u!23 &9215642700547676378 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/DrumsNote.prefab b/Assets/Prefabs/DrumsNote.prefab index 6a73716b1..cf93c2f7d 100644 --- a/Assets/Prefabs/DrumsNote.prefab +++ b/Assets/Prefabs/DrumsNote.prefab @@ -116,7 +116,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4634473573192609450} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.028} + m_LocalPosition: {x: 0, y: 0, z: 0.042} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Prefabs/Note.prefab b/Assets/Prefabs/Note.prefab index 11020a5b9..90ea20084 100644 --- a/Assets/Prefabs/Note.prefab +++ b/Assets/Prefabs/Note.prefab @@ -54,7 +54,7 @@ MonoBehaviour: - {fileID: 4571971630462908758} - {fileID: 6846950644507852135} - {fileID: 7147253800328892818} - meshRendererMiddleIndices: 020000000200000001000000 + meshRendererMiddleIndices: 020000000100000001000000 noteGroup: {fileID: 1397812567785855241} hopoGroup: {fileID: 1294466957868725440} fullGroup: {fileID: 4634473573192609450} @@ -148,7 +148,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4634473573192609450} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.0279, z: 0.028} + m_LocalPosition: {x: 0, y: -0.0279, z: 0.037} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Prefabs/SlimDrumsNote.prefab b/Assets/Prefabs/SlimDrumsNote.prefab index 76fce729a..4e441ce97 100644 --- a/Assets/Prefabs/SlimDrumsNote.prefab +++ b/Assets/Prefabs/SlimDrumsNote.prefab @@ -102,6 +102,11 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 4634473573192609450, guid: db78dd29efd83c7479ab64f090489636, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5329876324991789564, guid: db78dd29efd83c7479ab64f090489636, type: 3} propertyPath: m_Layer diff --git a/Assets/Settings/Localization/Settings Shared Data.asset b/Assets/Settings/Localization/Settings Shared Data.asset index d0f1c5b2d..d2841b786 100644 --- a/Assets/Settings/Localization/Settings Shared Data.asset +++ b/Assets/Settings/Localization/Settings Shared Data.asset @@ -143,6 +143,10 @@ MonoBehaviour: m_Key: useChipmunkSpeed m_Metadata: m_Items: [] + - m_Id: 9486234872569856 + m_Key: highFovCamera + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Settings_en-US.asset b/Assets/Settings/Localization/Settings_en-US.asset index be697ad48..8937cba3e 100644 --- a/Assets/Settings/Localization/Settings_en-US.asset +++ b/Assets/Settings/Localization/Settings_en-US.asset @@ -150,6 +150,10 @@ MonoBehaviour: m_Localized: Chipmunk Speedups m_Metadata: m_Items: [] + - m_Id: 9486234872569856 + m_Localized: Use High FOV Camera + m_Metadata: + m_Items: [] references: version: 2 RefIds: []