diff options
author | chai <chaifix@163.com> | 2021-05-06 14:51:05 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2021-05-06 14:51:05 +0800 |
commit | f342c68d13bddf451ab6cd64fc5b13cf65b65c4f (patch) | |
tree | b3457f6c2c9b42017e84a01aef854a4e67586ddc /Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventData | |
parent | d0e1834bd1972b4262d3e9b46ed55698a7f92025 (diff) | |
parent | 70ee31ea614d248f67f3d98ada5acb981def7e58 (diff) |
Merge branch 'master' of warmcat.org:/home/git-repo/UGUI_LEARN
# Conflicts:
# Assets/Test/08_Button.meta
# Assets/Test/08_Button/08_Button.unity
# Assets/Test/08_Button/08_Button.unity.meta
Diffstat (limited to 'Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventData')
-rw-r--r-- | Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventData/BaseEventData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventData/BaseEventData.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventData/BaseEventData.cs index ecc94aa..f353314 100644 --- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventData/BaseEventData.cs +++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventData/BaseEventData.cs @@ -36,7 +36,7 @@ namespace UnityEngine.EventSystems public GameObject selectedObject { get { return m_EventSystem.currentSelectedGameObject; } - set { m_EventSystem.SetSelectedGameObject(value, this); } + set { m_EventSystem.SetSelectedGameObject(value, this); } // 会发送一个selecthandler事件 } } } |