diff --git a/Assets/Prefabs/AAA/Panel_SceneTab.prefab b/Assets/Prefabs/AAA/Panel_SceneTab.prefab index 854b6a51..af74158a 100644 --- a/Assets/Prefabs/AAA/Panel_SceneTab.prefab +++ b/Assets/Prefabs/AAA/Panel_SceneTab.prefab @@ -302,6 +302,81 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1 &1828746191059293427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6155689835216709668} + - component: {fileID: 7382687235111245149} + - component: {fileID: 7418746020399966401} + m_Layer: 5 + m_Name: Image_Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6155689835216709668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828746191059293427} + 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: [] + m_Father: {fileID: 2957796394030257269} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7382687235111245149 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828746191059293427} + m_CullTransparentMesh: 1 +--- !u!114 &7418746020399966401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828746191059293427} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2148437405753579215 GameObject: m_ObjectHideFlags: 0 @@ -646,7 +721,6 @@ GameObject: - component: {fileID: 414815044261889219} - component: {fileID: 599671405822714356} - component: {fileID: 7965948761973452031} - - component: {fileID: 1635961225968835824} m_Layer: 5 m_Name: Toggle_SceneStartSetting m_TagString: Untagged @@ -666,6 +740,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6155689835216709668} - {fileID: 5414053880477093086} m_Father: {fileID: 7869535843565774663} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -759,25 +834,7 @@ MonoBehaviour: onValueChanged: m_PersistentCalls: m_Calls: [] - m_IsOn: 1 ---- !u!114 &1635961225968835824 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6236778970705745713} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cbcda1b47b95ac34ab2023046cb7f99c, type: 3} - m_Name: - m_EditorClassIdentifier: - buttonImage: {fileID: 0} - buttonTexts: [] - buttonNormalColor: {r: 1, g: 1, b: 1, a: 1} - textNormalColor: {r: 0, g: 0, b: 0, a: 1} - buttonHoverColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1} - textHoverColor: {r: 1, g: 1, b: 1, a: 1} + m_IsOn: 0 --- !u!1 &6364516629602275813 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/PRF_SceneTabButton.prefab b/Assets/Resources/Prefabs/UI/PRF_SceneTabButton.prefab index 5c8220a3..eb15fefd 100644 --- a/Assets/Resources/Prefabs/UI/PRF_SceneTabButton.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_SceneTabButton.prefab @@ -151,7 +151,6 @@ GameObject: - component: {fileID: 1683257726940383873} - component: {fileID: 284554603807914663} - component: {fileID: 8757673063117549170} - - component: {fileID: 7089145306993282869} m_Layer: 0 m_Name: PRF_SceneTabButton m_TagString: Untagged @@ -171,6 +170,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7902857368135232837} - {fileID: 9070445086785307407} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -277,21 +277,78 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f0f743f6adb948949a56fcca9a6b1c87, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &7089145306993282869 +--- !u!1 &6422430102225104781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7902857368135232837} + - component: {fileID: 7729887892320933303} + - component: {fileID: 6841928886047939020} + m_Layer: 0 + m_Name: Image_Selected + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7902857368135232837 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6422430102225104781} + 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: [] + m_Father: {fileID: 7465889205661170490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7729887892320933303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6422430102225104781} + m_CullTransparentMesh: 1 +--- !u!114 &6841928886047939020 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4370817620361964804} + m_GameObject: {fileID: 6422430102225104781} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cbcda1b47b95ac34ab2023046cb7f99c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - buttonImage: {fileID: 0} - buttonTexts: [] - buttonNormalColor: {r: 1, g: 1, b: 1, a: 1} - textNormalColor: {r: 0, g: 0, b: 0, a: 1} - buttonHoverColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1} - textHoverColor: {r: 1, g: 1, b: 1, a: 1} + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Scripts/Studio/UI/Elements/UI_SceneTabButton.cs b/Assets/Scripts/Studio/UI/Elements/UI_SceneTabButton.cs index 3bcd3018..7d6d0c52 100644 --- a/Assets/Scripts/Studio/UI/Elements/UI_SceneTabButton.cs +++ b/Assets/Scripts/Studio/UI/Elements/UI_SceneTabButton.cs @@ -11,7 +11,7 @@ namespace Studio.UI private Toggle Toggle_SceneTab; private TextMeshProUGUI SceneName; - public Action onClickSceneTab; + public Action onClickSceneTab; public override void AfterAwake() { @@ -25,7 +25,7 @@ namespace Studio.UI } private void OnSceneTabValueChanged(bool isOn) { - onClickSceneTab?.Invoke(isOn); + onClickSceneTab?.Invoke(Toggle_SceneTab, isOn); } } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_SceneTab.cs b/Assets/Scripts/Studio/UI/Panel/Panel_SceneTab.cs index ad1cbd65..0a75b3f4 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_SceneTab.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_SceneTab.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using TMPro; using UnityEngine; using UnityEngine.UI; using XRLib.UI; @@ -42,6 +43,7 @@ namespace Studio.UI private void OnSceneStartSettingValueChanged(bool isOn) { Debug.Log($"Toggle_SceneStartSetting {isOn}"); + SetToggleChanged(Toggle_SceneStartSetting, isOn); onSceneSettingTab?.Invoke(isOn); } private void OnClickAddSceneTabButton() @@ -56,10 +58,27 @@ namespace Studio.UI Button_AddSceneTab.transform.SetAsLastSibling(); } - private void OnClickSceneTab(bool isOn) + private void OnClickSceneTab(Toggle toggle,bool isOn) { Debug.Log($"On Click Scene Tab: {isOn}"); + SetToggleChanged(toggle, isOn); onSceneTab?.Invoke(isOn); } + private void SetToggleChanged(Toggle toggle, bool isOn) + { + Debug.Log($"SetToggleChanged: {toggle.name} isOn: {isOn}"); + var image = toggle.transform.GetChild(0).GetComponent(); + image.gameObject.SetActive(isOn); + + TextMeshProUGUI text = toggle.GetComponentInChildren(); + if (isOn) + { + text.color = Color.white; + } + else + { + text.color = Color.black; + } + } } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs index f613a15e..af322578 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_StartSetting.cs @@ -72,7 +72,7 @@ namespace Studio.UI private void SetToggleChanged(Toggle toggle, bool isOn) { Debug.Log($"SetToggleChanged: {toggle.name} isOn: {isOn}"); - selectedToggle = TabToggles.GetFirstActiveToggle(); + selectedToggle = toggle; var image = toggle.transform.GetChild(0).GetComponent(); image.gameObject.SetActive(isOn);