21 files changed, 29 insertions, 29 deletions

diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler.meta
new file mode 100644
index 0000000..732637d
--- /dev/null
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 146a9b1a2f14b51468a9381c1562257e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandle.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventHandle.cs
index 977514f..977514f 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandle.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventHandle.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandle.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventHandle.cs.meta
index 484a7cd..1e2c52f 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandle.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventHandle.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 5919f1bb652e12b46a1abbf58653b28c
-timeCreated: 1602119378
-licenseType: Free
+guid: 0c5751e0f52a2d9459e76555a888ad06
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventInterfaces.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventInterfaces.cs
index b808e6c..b808e6c 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventInterfaces.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventInterfaces.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventInterfaces.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventInterfaces.cs.meta
index 436f77b..2a369ae 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventInterfaces.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventInterfaces.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 40c86ee97518df241a850e926719dbc2
-timeCreated: 1602119378
-licenseType: Free
+guid: 7bb73ff56f2f85b4ca62f8cb5ea59840
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventSystem.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventSystem.cs
index 801daae..1440547 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventSystem.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventSystem.cs
@@ -175,8 +175,10 @@ namespace UnityEngine.EventSystems
                 return lhs.distance.CompareTo(rhs.distance);
 
             return lhs.index.CompareTo(rhs.index);
-        }
-
+        }

+

+        #region 射线检测
+

         private static readonly Comparison<RaycastResult> s_RaycastComparer = RaycastComparer;
 
         // 从PointerInputModule.GetTouchPointerEventData()来的触摸数据
@@ -195,9 +197,11 @@ namespace UnityEngine.EventSystems
             }
 
             raycastResults.Sort(s_RaycastComparer);
-        }
-
-        //c 是否点击到某个物体
+        }

+

+        #endregion 
+

+        //c 是否点击到某个物体

         public bool IsPointerOverGameObject()
         {
             return IsPointerOverGameObject(PointerInputModule.kMouseLeftId);
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventSystem.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventSystem.cs.meta
index ad6192d..8ff114e 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventSystem.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventSystem.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 47dabc676519a2840ab00d4e00228528
-timeCreated: 1602119378
-licenseType: Free
+guid: 153642a2f08376d4daebdf63af9e161a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventTrigger.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventTrigger.cs
index 11d1c1c..11d1c1c 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventTrigger.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventTrigger.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventTrigger.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventTrigger.cs.meta
index bbb941c..af5beba 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventTrigger.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventTrigger.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 17193886a08901d45ba6c4e9cebb18f6
-timeCreated: 1602119377
-licenseType: Free
+guid: bacfe5cf756f51b4f8c77a4addae254e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventTriggerType.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventTriggerType.cs
index 11c232c..11c232c 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventTriggerType.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventTriggerType.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventTriggerType.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventTriggerType.cs.meta
index a01a6b5..4647857 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventTriggerType.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/EventTriggerType.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: fe5c20ffd1028d540b638b6843759dcf
-timeCreated: 1602119380
-licenseType: Free
+guid: ec8af6a988832aa46844f9df796dfc4c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/ExecuteEvents.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/ExecuteEvents.cs
index a749ce8..a749ce8 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/ExecuteEvents.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/ExecuteEvents.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/ExecuteEvents.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/ExecuteEvents.cs.meta
index 55a5661..6317afb 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/ExecuteEvents.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/ExecuteEvents.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: f026ab7af2955364588010a84939930e
-timeCreated: 1602119380
-licenseType: Free
+guid: 06bc2e6f5036fa848bb09004f4ab4e54
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/MoveDirection.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/MoveDirection.cs
index 4f4147c..4f4147c 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/MoveDirection.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/MoveDirection.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/MoveDirection.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/MoveDirection.cs.meta
index ba67175..ba67175 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/MoveDirection.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/EventHandler/MoveDirection.cs.meta
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/InputModules/BaseInputModule.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/InputModules/BaseInputModule.cs
index 66736d1..f25f3fe 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/InputModules/BaseInputModule.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/InputModules/BaseInputModule.cs
@@ -56,6 +56,9 @@ namespace UnityEngine.EventSystems
         protected override void OnEnable()
         {
             base.OnEnable();
+            if(input != null)

+            {

+            }
             m_EventSystem = GetComponent<EventSystem>();
             m_EventSystem.UpdateModules(); // 把此input module加入EventSystem
         }
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/InputModules/PointerInputModule.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/InputModules/PointerInputModule.cs
index 3f93e7a..3aa8e09 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/InputModules/PointerInputModule.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/InputModules/PointerInputModule.cs
@@ -14,6 +14,7 @@ namespace UnityEngine.EventSystems
 
         public const int kFakeTouchesId = -4;
 
+        // 一个池子
         protected Dictionary<int, PointerEventData> m_PointerData = new Dictionary<int, PointerEventData>();
 
         protected bool GetPointerData(int id, out PointerEventData data, bool create)
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/RaycastResult.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/Raycasters/RaycastResult.cs
index 666ef8d..666ef8d 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/RaycastResult.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/Raycasters/RaycastResult.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/RaycastResult.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/Raycasters/RaycastResult.cs.meta
index 34d3799..c2d01ba 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/RaycastResult.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/Raycasters/RaycastResult.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 500a96364b902574fb3486a1c93591b3
-timeCreated: 1602119378
-licenseType: Free
+guid: 5f5a2c96e65809c43ad8a958f062ef1f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/RaycasterManager.cs b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/Raycasters/RaycasterManager.cs
index c3480b4..c3480b4 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/RaycasterManager.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/Raycasters/RaycasterManager.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/RaycasterManager.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/Raycasters/RaycasterManager.cs.meta
index 9351151..594b8d2 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/RaycasterManager.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/EventSystem/Raycasters/RaycasterManager.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: b028797ae6e79fd48b667fede5f64ca9
-timeCreated: 1602119379
-licenseType: Free
+guid: 5c12b7bf7a4800945ba532802a36b165
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2