From 0460090e2538921f5585b2e7b05ee0d36856c753 Mon Sep 17 00:00:00 2001 From: Oliver Wong Date: Thu, 16 Apr 2026 11:52:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8A=E7=9A=84=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/SampleScene.unity | 53 ++++++++++++++++++++++++---- Assets/Scripts/OCES/ButtonInvoker.cs | 14 +++----- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 17aec8f..345af06 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -192,7 +192,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: SetState(Ice) + m_Text: SetState(PlaceHolder) --- !u!222 &17265521 CanvasRenderer: m_ObjectHideFlags: 0 @@ -413,6 +413,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetGameState: 1 enableLowpass: 0 + buttonText: {fileID: 17265520} --- !u!114 &392790006 MonoBehaviour: m_ObjectHideFlags: 0 @@ -456,7 +457,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 392790007} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 392790005} + m_TargetAssemblyTypeName: OCES.ButtonInvoker, Assembly-CSharp + m_MethodName: OnButtonPressed + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &392790007 MonoBehaviour: m_ObjectHideFlags: 0 @@ -702,7 +715,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: SetState(Cloud) + m_Text: SetState(PlaceHolder) --- !u!222 &519563563 CanvasRenderer: m_ObjectHideFlags: 0 @@ -848,6 +861,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetGameState: 0 enableLowpass: 1 + buttonText: {fileID: 1985546676} --- !u!114 &876276284 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1148,7 +1162,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1161878328} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1161878330} + m_TargetAssemblyTypeName: OCES.ButtonInvoker, Assembly-CSharp + m_MethodName: OnButtonPressed + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1161878328 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1201,6 +1227,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetGameState: 0 enableLowpass: 0 + buttonText: {fileID: 1798358788} --- !u!1 &1193187742 GameObject: m_ObjectHideFlags: 0 @@ -1883,6 +1910,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetGameState: 2 enableLowpass: 0 + buttonText: {fileID: 519563562} --- !u!114 &1542973985 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1926,7 +1954,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1542973986} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1542973984} + m_TargetAssemblyTypeName: OCES.ButtonInvoker, Assembly-CSharp + m_MethodName: OnButtonPressed + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1542973986 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2319,7 +2359,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: SetState(Normal) + m_Text: SetState(PlaceHolder) --- !u!222 &1798358789 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2553,6 +2593,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetGameState: 0 enableLowpass: 0 + buttonText: {fileID: 351150077} --- !u!114 &1989157235 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/OCES/ButtonInvoker.cs b/Assets/Scripts/OCES/ButtonInvoker.cs index ca9623f..5a4acd0 100644 --- a/Assets/Scripts/OCES/ButtonInvoker.cs +++ b/Assets/Scripts/OCES/ButtonInvoker.cs @@ -7,25 +7,19 @@ namespace OCES { public class ButtonInvoker : MonoBehaviour { - public TileMaterial targetGameState; + public GameState targetGameState; public bool enableLowpass; + public Text buttonText; Button m_button; void Awake() { - this.m_button = GetComponent