From 497d5fdac48dd6faa9330d5022486d89042ddad9 Mon Sep 17 00:00:00 2001 From: FlorianSpeicher Date: Thu, 17 Jul 2025 21:28:41 +0200 Subject: [PATCH] Fix ColorSelector reset --- vr-configurator/Assets/Scenes/SampleScene.unity | 4 ++-- vr-configurator/Assets/Scripts/Managing/StateManager.cs | 2 +- vr-configurator/Assets/Scripts/UI/ColorSelector.cs | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/vr-configurator/Assets/Scenes/SampleScene.unity b/vr-configurator/Assets/Scenes/SampleScene.unity index 3b0829b..35cbd92 100644 --- a/vr-configurator/Assets/Scenes/SampleScene.unity +++ b/vr-configurator/Assets/Scenes/SampleScene.unity @@ -27574,7 +27574,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1591058970} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} m_Name: @@ -27635,7 +27635,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1591058970} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2518c50cb3fc6a6458d4b743c2f69c7d, type: 3} m_Name: diff --git a/vr-configurator/Assets/Scripts/Managing/StateManager.cs b/vr-configurator/Assets/Scripts/Managing/StateManager.cs index 262fbf2..669e927 100644 --- a/vr-configurator/Assets/Scripts/Managing/StateManager.cs +++ b/vr-configurator/Assets/Scripts/Managing/StateManager.cs @@ -15,7 +15,7 @@ public class StateManager : MonoBehaviour //root GO = goot foreach (var goot in SceneManager.GetActiveScene().GetRootGameObjects()) { - Resettables.AddRange(goot.GetComponentsInChildren()); + Resettables.AddRange(goot.GetComponentsInChildren(true)); } } diff --git a/vr-configurator/Assets/Scripts/UI/ColorSelector.cs b/vr-configurator/Assets/Scripts/UI/ColorSelector.cs index bdad0eb..64f2789 100644 --- a/vr-configurator/Assets/Scripts/UI/ColorSelector.cs +++ b/vr-configurator/Assets/Scripts/UI/ColorSelector.cs @@ -29,18 +29,16 @@ public class ColorSelector : MonoBehaviour, IResettable { Vector3 off = i * offset; GameObject go = Spawn.GO(prefab, transform, off, "ColorButton_" + color); - buttons.Add(go); go.GetComponent().color = color; go.GetOrAddComponent().PortIndex = portIndex; - go.SetActive(true); + go.SetActive(true); + buttons.Add(go); i++; } } public void ResetThis() { - Parent.SetActive(false); - Debug.Log($"Destroying Old Color Buttons: {buttons.Count}"); foreach (var go in buttons) { @@ -51,5 +49,6 @@ public class ColorSelector : MonoBehaviour, IResettable Destroy(go); } buttons.Clear(); + Parent.SetActive(false); } }