From 776c61db5ccf7b247a07b9ce7d65a306d03e70bb Mon Sep 17 00:00:00 2001 From: Edward Su Date: Sun, 22 Oct 2023 17:50:35 -0400 Subject: [PATCH 1/2] add overwritten merged stuff --- ferrous-game/Assets/Scenes/Main Scene.unity | 23 +++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/ferrous-game/Assets/Scenes/Main Scene.unity b/ferrous-game/Assets/Scenes/Main Scene.unity index 7d098c4..1c27604 100644 --- a/ferrous-game/Assets/Scenes/Main Scene.unity +++ b/ferrous-game/Assets/Scenes/Main Scene.unity @@ -1360,9 +1360,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 4 m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} + m_SelectOnUp: {fileID: 998389123} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} @@ -3109,10 +3109,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 4 m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} + m_SelectOnUp: {fileID: 1085654839} + m_SelectOnDown: {fileID: 649357723} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} m_Transition: 1 @@ -3440,10 +3440,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 4 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} + m_SelectOnDown: {fileID: 998389123} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} m_Transition: 1 @@ -4410,8 +4410,7 @@ LineRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: c429d017ef1a6cd4bb9a0cbb7364fe50, type: 2} - - {fileID: 2100000, guid: c148ed8948e3b8d4ea7f18d0d6c5dfbd, type: 2} - - {fileID: 2100000, guid: 44c4ce59a423f5943a00b8c506f4fe16, type: 2} + - {fileID: 2100000, guid: dad1f30ad4beee244b5a48c00aa36dca, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4508,10 +4507,8 @@ MonoBehaviour: m_EditorClassIdentifier: magnetRay: {fileID: 1374921690} raySpawnPoint: {fileID: 1222155249} + rayMaterials: [] maxLength: 40 - blueMaterial: {fileID: 2100000, guid: c429d017ef1a6cd4bb9a0cbb7364fe50, type: 2} - redMaterial: {fileID: 2100000, guid: dad1f30ad4beee244b5a48c00aa36dca, type: 2} - purpleMaterial: {fileID: 2100000, guid: 44c4ce59a423f5943a00b8c506f4fe16, type: 2} --- !u!54 &1374921692 Rigidbody: m_ObjectHideFlags: 0 @@ -4621,7 +4618,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 44c4ce59a423f5943a00b8c506f4fe16, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 From 95b7d190c7ff8f4937c54a7fceb593affebddda6 Mon Sep 17 00:00:00 2001 From: Edward Su Date: Sun, 22 Oct 2023 17:55:34 -0400 Subject: [PATCH 2/2] unity randomly decided to delete main scene stuff --- ferrous-game/Assets/Scenes/Main Scene.unity | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ferrous-game/Assets/Scenes/Main Scene.unity b/ferrous-game/Assets/Scenes/Main Scene.unity index 1c27604..75a3940 100644 --- a/ferrous-game/Assets/Scenes/Main Scene.unity +++ b/ferrous-game/Assets/Scenes/Main Scene.unity @@ -4507,8 +4507,10 @@ MonoBehaviour: m_EditorClassIdentifier: magnetRay: {fileID: 1374921690} raySpawnPoint: {fileID: 1222155249} - rayMaterials: [] maxLength: 40 + blueMaterial: {fileID: 2100000, guid: c429d017ef1a6cd4bb9a0cbb7364fe50, type: 2} + redMaterial: {fileID: 2100000, guid: dad1f30ad4beee244b5a48c00aa36dca, type: 2} + purpleMaterial: {fileID: 2100000, guid: 44c4ce59a423f5943a00b8c506f4fe16, type: 2} --- !u!54 &1374921692 Rigidbody: m_ObjectHideFlags: 0