summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Assets/Scenes/demo.unity25
-rw-r--r--Assets/Scripts/Test.cs7
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs10
3 files changed, 39 insertions, 3 deletions
diff --git a/Assets/Scenes/demo.unity b/Assets/Scenes/demo.unity
index 5b9ff0c..140edec 100644
--- a/Assets/Scenes/demo.unity
+++ b/Assets/Scenes/demo.unity
@@ -123,6 +123,7 @@ GameObject:
- component: {fileID: 533663748}
- component: {fileID: 533663747}
- component: {fileID: 533663746}
+ - component: {fileID: 533663749}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
@@ -187,7 +188,18 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 0}
m_OnClick:
m_PersistentCalls:
- m_Calls: []
+ m_Calls:
+ - m_Target: {fileID: 533663749}
+ m_MethodName: OnClickCallback
+ 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
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, Assembly-CSharp, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &533663747
@@ -223,6 +235,17 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 533663744}
+--- !u!114 &533663749
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 533663744}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 888d6900b9dcda148bf20be9c4b300c9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &640337470
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Test.cs b/Assets/Scripts/Test.cs
index 11b9f8c..69d4549 100644
--- a/Assets/Scripts/Test.cs
+++ b/Assets/Scripts/Test.cs
@@ -13,4 +13,11 @@ public class Test : MonoBehaviour {
void Update () {
}
+
+ public void OnClickCallback()
+ {
+ Debug.Log("OnClicked!!!");
+ }
+
+
}
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs
index b40a924..fdc4dd6 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs
@@ -61,6 +61,8 @@ namespace UnityEngine.UI
[SerializeField]
private bool m_Interactable = true;
+
+ //c m_TargetGraphic 只是用来做展示,这个变量不会用来进行射线检测,在Awake()里注释掉也还会触发点击事件
// Graphic that will be colored.
[FormerlySerializedAs("highlightGraphic")]
[FormerlySerializedAs("m_HighlightGraphic")]
@@ -112,8 +114,12 @@ namespace UnityEngine.UI
// Convenience function that converts the Graphic to a Image, if possible
public Image image
{
- get { return m_TargetGraphic as Image; }
- set { m_TargetGraphic = value; }
+ get {
+ return m_TargetGraphic as Image;
+ }
+ set {
+ m_TargetGraphic = value;
+ }
}
// Get the animator