From 81d458f7de8a4e000e5de98b0848927f9cc9ddbe Mon Sep 17 00:00:00 2001 From: PopSlime Date: Tue, 19 Dec 2023 14:55:45 +0800 Subject: [PATCH] Fix the foreground icon not tinted with the button. --- .../Unity/UI/CanvasRendererColorLinker.cs | 18 +++++ .../UI/CanvasRendererColorLinker.cs.meta | 11 +++ .../Interface2/Prefabs/PathedBrowser.prefab | 70 +++++++++++++++++++ 3 files changed, 99 insertions(+) create mode 100644 Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs create mode 100644 Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs.meta diff --git a/Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs b/Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs new file mode 100644 index 0000000..cb605b4 --- /dev/null +++ b/Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs @@ -0,0 +1,18 @@ +using UnityEngine; + +namespace Cryville.Common.Unity.UI { + [ExecuteAlways] + [RequireComponent(typeof(CanvasRenderer))] + public class CanvasRendererColorLinker : MonoBehaviour { + [SerializeField] CanvasRenderer m_source; + CanvasRenderer _target; + + void Awake() { + _target = GetComponent(); + } + void Update() { + if (m_source == null) return; + _target.SetColor(m_source.GetColor()); + } + } +} diff --git a/Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs.meta b/Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs.meta new file mode 100644 index 0000000..3d6f889 --- /dev/null +++ b/Assets/Cryville/Common/Unity/UI/CanvasRendererColorLinker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5f490a9cc1b652746b3062810e200ec5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Interface2/Prefabs/PathedBrowser.prefab b/Assets/Interface2/Prefabs/PathedBrowser.prefab index 4cbeec9..68886ef 100644 --- a/Assets/Interface2/Prefabs/PathedBrowser.prefab +++ b/Assets/Interface2/Prefabs/PathedBrowser.prefab @@ -1038,6 +1038,7 @@ GameObject: m_Component: - component: {fileID: 2319095376096015890} - component: {fileID: 2319095376096015889} + - component: {fileID: 2663291941447286118} - component: {fileID: 2319095376096015888} - component: {fileID: 2319095376096015891} m_Layer: 5 @@ -1075,6 +1076,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2319095376096015893} m_CullTransparentMesh: 1 +--- !u!114 &2663291941447286118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2319095376096015893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f490a9cc1b652746b3062810e200ec5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_source: {fileID: 2319095376564565048} --- !u!114 &2319095376096015888 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1909,6 +1923,7 @@ GameObject: m_Component: - component: {fileID: 2319095376472542955} - component: {fileID: 2319095376472542950} + - component: {fileID: 7320597239586877796} - component: {fileID: 2319095376472542953} - component: {fileID: 2319095376472542952} m_Layer: 5 @@ -1946,6 +1961,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2319095376472542954} m_CullTransparentMesh: 1 +--- !u!114 &7320597239586877796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2319095376472542954} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f490a9cc1b652746b3062810e200ec5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_source: {fileID: 2319095376097978900} --- !u!114 &2319095376472542953 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3715,6 +3743,7 @@ GameObject: m_Component: - component: {fileID: 2319095377441944856} - component: {fileID: 2319095377441944855} + - component: {fileID: 3026249316812826803} - component: {fileID: 2319095377441944854} - component: {fileID: 2319095377441944857} m_Layer: 5 @@ -3752,6 +3781,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2319095377441944859} m_CullTransparentMesh: 1 +--- !u!114 &3026249316812826803 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2319095377441944859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f490a9cc1b652746b3062810e200ec5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_source: {fileID: 2319095376741523101} --- !u!114 &2319095377441944854 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4376,6 +4418,7 @@ GameObject: m_Component: - component: {fileID: 8080582060239898157} - component: {fileID: 7012381214920549299} + - component: {fileID: 8279706572689531805} - component: {fileID: 4597753358795499179} - component: {fileID: 375898685499585906} m_Layer: 5 @@ -4413,6 +4456,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2930991941796330309} m_CullTransparentMesh: 1 +--- !u!114 &8279706572689531805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2930991941796330309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f490a9cc1b652746b3062810e200ec5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_source: {fileID: 4044751882484877840} --- !u!114 &4597753358795499179 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4467,6 +4523,7 @@ GameObject: m_Component: - component: {fileID: 5686375501743813363} - component: {fileID: 4638495221703792782} + - component: {fileID: 4406843008405151299} - component: {fileID: 1222445939077120797} - component: {fileID: 7665036607268282307} m_Layer: 5 @@ -4504,6 +4561,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3515643494497263550} m_CullTransparentMesh: 1 +--- !u!114 &4406843008405151299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3515643494497263550} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f490a9cc1b652746b3062810e200ec5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_source: {fileID: 374346557467880074} --- !u!114 &1222445939077120797 MonoBehaviour: m_ObjectHideFlags: 0