Merge remote-tracking branch 'origin/model-ui-integration-work' into model-ui-integration-work

Assets/Scenes/Test.unity

@@ -826,10 +826,9 @@ GameObject:
   - component: {fileID: 502908131}
   - component: {fileID: 502908130}
   - component: {fileID: 502908129}
-  - component: {fileID: 502908128}
   m_Layer: 5
   m_Name: DoubleClickPanel
-  m_TagString: panel
+  m_TagString: ignored
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -853,36 +852,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &502908128
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 502908126}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Delegates:
-  - eventID: 4
-    callback:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 502908129}
-          m_MethodName: OnClick
-          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.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
-        Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
 --- !u!114 &502908129
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -895,6 +864,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 93204f29ac386764180b8a4c079542ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  clickWaitTime: 0.2
   uiManager: {fileID: 394305455}
 --- !u!114 &502908130
 MonoBehaviour:

ProjectSettings/TagManager.asset

@@ -7,8 +7,8 @@ TagManager:
   - path
   - pathui
   - VelocitySlider
-  - doubleclick
   - panel
+  - ignored
   layers:
   - Default
   - TransparentFX