68 files changed, 68 insertions, 92 deletions

diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font.meta
new file mode 100644
index 0000000..28b5ef6
--- /dev/null
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 680fe3dddba51f54ca833b46dc6b5a82
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontData.cs
index 760c9ee..760c9ee 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontData.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontData.cs.meta
index f4bb2a1..f4bb2a1 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontData.cs.meta
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontUpdateTracker.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontUpdateTracker.cs
index 2228457..2228457 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontUpdateTracker.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontUpdateTracker.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontUpdateTracker.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontUpdateTracker.cs.meta
index 8e6ddeb..8e6ddeb 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontUpdateTracker.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontUpdateTracker.cs.meta
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics.meta
new file mode 100644
index 0000000..f28155d
--- /dev/null
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 68d41682b219698458518d531a2805cc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Graphic.cs
index f11ea6d..4bbabc7 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Graphic.cs
@@ -322,6 +322,7 @@ namespace UnityEngine.UI
             }
         }
 
+        // canvas重建
         public virtual void Rebuild(CanvasUpdate update)
         {
             if (canvasRenderer.cull)
@@ -363,6 +364,7 @@ namespace UnityEngine.UI
             canvasRenderer.SetTexture(mainTexture);
         }
 
+        //c 顶点重建
         /// <summary>
         /// Update the renderer's vertices.
         /// </summary>
@@ -374,6 +376,7 @@ namespace UnityEngine.UI
                 DoMeshGeneration();
         }
 
+        // 顶点重建，生成mesh
         private void DoMeshGeneration()
         {
             if (rectTransform != null && rectTransform.rect.width >= 0 && rectTransform.rect.height >= 0)
@@ -381,6 +384,7 @@ namespace UnityEngine.UI
             else
                 s_VertexHelper.Clear(); // clear the vertex helper so invalid graphics dont draw.
 
+            // 可以通过实现IMeshModifer修改mesh
             var components = ListPool<Component>.Get();
             GetComponents(typeof(IMeshModifier), components);
 
@@ -390,6 +394,7 @@ namespace UnityEngine.UI
             ListPool<Component>.Release(components);
 
             s_VertexHelper.FillMesh(workerMesh);
+            // 传入canvasRenderer作为mesh
             canvasRenderer.SetMesh(workerMesh);
         }
 
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Graphic.cs.meta
index 9e52f63..e02d697 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Graphic.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: b23c580d5799b7d4ba478bea9f72f0c3
-timeCreated: 1602119379
-licenseType: Free
+guid: 3acb46ac7ba14ff4e938138943716b11
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRaycaster.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRaycaster.cs
index 2582204..2582204 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRaycaster.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRaycaster.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRaycaster.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRaycaster.cs.meta
index 518d3a5..d51fee9 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRaycaster.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRaycaster.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 67bf38e07c362674ebc60bfbd6dafa3a
-timeCreated: 1602119378
-licenseType: Free
+guid: 0dc7198a94080b64e9e51e6f934b3e35
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRebuildTracker.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRebuildTracker.cs
index c081269..c081269 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRebuildTracker.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRebuildTracker.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRebuildTracker.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRebuildTracker.cs.meta
index bb02d89..d0fff87 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRebuildTracker.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRebuildTracker.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 491a25b4af3d73646b66c206c3f5a498
-timeCreated: 1602119378
-licenseType: Free
+guid: 40f1f16390b7d7842b9e0c5df6baa9d8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRegistry.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRegistry.cs
index ca7eddf..ca7eddf 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRegistry.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRegistry.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRegistry.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRegistry.cs.meta
index 19171ed..bc0ed05 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRegistry.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRegistry.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 671a16f238f35ea44bdafa69a40e0c2d
-timeCreated: 1602119378
-licenseType: Free
+guid: b0a078c41319d0f4ab759c3ad44fd733
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IGraphicEnabledDisabled.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/IGraphicEnabledDisabled.cs
index f2becbb..f2becbb 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IGraphicEnabledDisabled.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/IGraphicEnabledDisabled.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IGraphicEnabledDisabled.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/IGraphicEnabledDisabled.cs.meta
index 4b43931..24c8266 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IGraphicEnabledDisabled.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/IGraphicEnabledDisabled.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 78349d02f81a717489da82c94c83915b
-timeCreated: 1602119379
-licenseType: Free
+guid: b6892dbec884b7b4482fe7cdb11bc565
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Image.cs
index cae7667..cae7667 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Image.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Image.cs.meta
index 0dc59eb..91ab591 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Image.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: bd103b5bbc9cef740b4136f9f7a7b109
-timeCreated: 1602119379
-licenseType: Free
+guid: 0cba8e295482e184f9f6a5a8f2b559c3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/RawImage.cs
index 35f0508..35f0508 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/RawImage.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/RawImage.cs.meta
index 53e5ab7..2a70e35 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/RawImage.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 01eb80e630cacbf4ca051456e4a9f31f
-timeCreated: 1602119377
-licenseType: Free
+guid: 570773b73e8b0334fb410b7457eb8b6a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SpriteState.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/SpriteState.cs
index c95e146..c95e146 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SpriteState.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/SpriteState.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SpriteState.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/SpriteState.cs.meta
index bcbcd90..b389ded 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SpriteState.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/SpriteState.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 8cd3375e91ce0c541ac077f123103deb
-timeCreated: 1602119379
-licenseType: Free
+guid: cc6d0c85730bc354697c6b7d971eda44
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/StencilMaterial.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/StencilMaterial.cs
index c12f209..c12f209 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/StencilMaterial.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/StencilMaterial.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/StencilMaterial.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/StencilMaterial.cs.meta
index 592d224..3fd6a69 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/StencilMaterial.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/StencilMaterial.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 8f8d1b2a17cde9641b9fc2dcad8497ea
-timeCreated: 1602119379
-licenseType: Free
+guid: 2d445d28188ffd745990df17f1ce8914
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Text.cs
index c087983..c087983 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Text.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Text.cs.meta
index 12a1d58..ea6d1d8 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Text.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 09f4224b0cded254a977e1ac3c9e2470
-timeCreated: 1602119377
-licenseType: Free
+guid: 48696ad002dcb2146ab8d6ad72d455d7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.meta
new file mode 100644
index 0000000..ad6af48
--- /dev/null
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3bc3203fe03d7b049ae99a951f541714
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMask.cs
index ffe7aed..ffe7aed 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMask.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMask.cs.meta
index b63cd65..2eab58a 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMask.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 44470cd6135f89e4482e8889e20d5fd1
-timeCreated: 1602119378
-licenseType: Free
+guid: d54c702726ac4fa4daf18719b41de69f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMaskable.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMaskable.cs
index 8f8a28c..8f8a28c 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMaskable.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMaskable.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMaskable.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMaskable.cs.meta
index e77bf4e..298aac8 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMaskable.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMaskable.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 50c87a2601e232441a24482cdad19aa4
-timeCreated: 1602119378
-licenseType: Free
+guid: 5775a30dcbc6e484c8795bb7e18ada44
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/Mask.cs
index 39dc291..39dc291 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/Mask.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/Mask.cs.meta
index ad0143e..50caa3d 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/Mask.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 08b88a487efed1a478829b039fbff93c
-timeCreated: 1602119377
-licenseType: Free
+guid: bfc675de41855c44aaedb7af695ba899
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskUtilities.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs
index c975dc6..c975dc6 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskUtilities.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskUtilities.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs.meta
index 8fa42b8..5e7829c 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskUtilities.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 26ce0b90ebd1c95479f66552e75d244a
-timeCreated: 1602119378
-licenseType: Free
+guid: 469f0aa53de5d4c4fb69e83419090a01
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskableGraphic.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs
index 4995dc1..4995dc1 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskableGraphic.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskableGraphic.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs.meta
index beba820..07f0d51 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskableGraphic.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 992fd8507d19125429f6329159229e35
-timeCreated: 1602119379
-licenseType: Free
+guid: 1316d79994e789c448714be540d28f4f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RectMask2D.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/RectMask2D.cs
index 87d2dbf..87d2dbf 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RectMask2D.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/RectMask2D.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RectMask2D.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/RectMask2D.cs.meta
index 82f17d6..3f31967 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RectMask2D.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/RectMask2D.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 0a826fa934b68e048944f44494370d9b
-timeCreated: 1602119377
-licenseType: Free
+guid: c06d6b758f7cbc148afa25153c439510
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls.meta
new file mode 100644
index 0000000..4dfd750
--- /dev/null
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5a1494dd81f8d794282718b40b1ea46e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/AnimationTriggers.cs
index e42871b..e42871b 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/AnimationTriggers.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/AnimationTriggers.cs.meta
index 3ce27e0..52f2ca0 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/AnimationTriggers.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: c5ef5ca89cbc4644cae2997e4a851944
-timeCreated: 1602119380
-licenseType: Free
+guid: fd02e9c578e561646b10984381250bf5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Button.cs
index 8be5532..8be5532 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Button.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Button.cs.meta
index d34a2d3..cbdb3a1 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Button.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: b55754d97ca63cd4dbfeea25c980c065
-timeCreated: 1602119379
-licenseType: Free
+guid: a754c749030e1d848bed7a3cb2e5520f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ColorBlock.cs
index c78d617..c78d617 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ColorBlock.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ColorBlock.cs.meta
index 6c616c3..8680539 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ColorBlock.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 5c8834cada9a547419a323569ac63c64
-timeCreated: 1602119378
-licenseType: Free
+guid: f7d25b8a109dd134fa40749f78bbd907
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/DefaultControls.cs
index a22ff9a..a22ff9a 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/DefaultControls.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/DefaultControls.cs.meta
index 522ab37..4365d7a 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/DefaultControls.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 73819a9cb2cf34c4292e9383c95fa28e
-timeCreated: 1602119379
-licenseType: Free
+guid: ca969270ec2be6848bd9453f8c69a4b3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Dropdown.cs
index 86bed37..86bed37 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Dropdown.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Dropdown.cs.meta
index e12c326..a80360c 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Dropdown.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: a257dea267b93c341aebca14f0ae9075
-timeCreated: 1602119379
-licenseType: Free
+guid: bfed003f40ad7ff4ba0ba7ccf49021aa
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/InputField.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/InputField.cs
index 1f3267a..1f3267a 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/InputField.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/InputField.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/InputField.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/InputField.cs.meta
index 20062b5..a11780b 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/InputField.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/InputField.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 51f52ab0b0b8ab44f95879d5d5c2cfd1
-timeCreated: 1602119378
-licenseType: Free
+guid: fd5762ccacc914a428b1e5e5ae0f0edb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Navigation.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Navigation.cs
index 8dce1d5..8dce1d5 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Navigation.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Navigation.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Navigation.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Navigation.cs.meta
index 6c0eed5..a5f02d3 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Navigation.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Navigation.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: d417ae318d490fb4aa85f1c859feb69b
-timeCreated: 1602119380
-licenseType: Free
+guid: 7565fbbe496d6e749a2a17d8acb60c80
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ScrollRect.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ScrollRect.cs
index f41fea8..f41fea8 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ScrollRect.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ScrollRect.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ScrollRect.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ScrollRect.cs.meta
index 44d9a4f..98d9f63 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ScrollRect.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ScrollRect.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 5b32cbdce3063e349a6833a674cb7034
-timeCreated: 1602119378
-licenseType: Free
+guid: 209674c43848ab24e8778e3f7bcd0f11
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Scrollbar.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs
index cbb1605..cbb1605 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Scrollbar.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Scrollbar.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs.meta
index e772141..04b16c4 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Scrollbar.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 091570f7ac9efc442bef67775529ec98
-timeCreated: 1602119377
-licenseType: Free
+guid: 340d739069b7eae4daa7634ca999bcf8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Selectable.cs
index fdc4dd6..c0cda18 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Selectable.cs
@@ -61,8 +61,7 @@ namespace UnityEngine.UI
         [SerializeField]
         private bool m_Interactable = true;
 
-
-				//c m_TargetGraphic 只是用来做展示，这个变量不会用来进行射线检测，在Awake()里注释掉也还会触发点击事件
+		//c m_TargetGraphic 只是用来做展示，这个变量不会用来进行射线检测，在Awake()里注释掉也还会触发点击事件
         // Graphic that will be colored.
         [FormerlySerializedAs("highlightGraphic")]
         [FormerlySerializedAs("m_HighlightGraphic")]
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Selectable.cs.meta
index d962e7f..394fcbd 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Selectable.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 045baeb18dc2dd147a19bbe02f2aa086
-timeCreated: 1602119377
-licenseType: Free
+guid: af75b3d5d7b48814da1f058ff4ae7653
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Slider.cs
index ce8f4bb..ce8f4bb 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Slider.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Slider.cs.meta
index 869f5a2..dce4469 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Slider.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 4d5e3ff175382bb4aaf8f182c71b45e2
-timeCreated: 1602119378
-licenseType: Free
+guid: 4735d34897dc608419d8f2b983b58420
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Toggle.cs
index 5dc9275..5dc9275 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Toggle.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Toggle.cs.meta
index 2d04bdd..b4a15b7 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Toggle.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 3ecc6ddfad0ebc742884ce269ad2ecfb
-timeCreated: 1602119378
-licenseType: Free
+guid: 34e74f28b4633794eb61b9c3f6d97b37
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ToggleGroup.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ToggleGroup.cs
index da5e021..da5e021 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ToggleGroup.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ToggleGroup.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ToggleGroup.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ToggleGroup.cs.meta
index 8feec2f..0649cf7 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ToggleGroup.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ToggleGroup.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 6735854222a18c640ba133d50d02799f
-timeCreated: 1602119378
-licenseType: Free
+guid: 10b2fd7b649a75145b1e4a36a3c91dfd
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SetPropertyUtility.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Utility/SetPropertyUtility.cs
index 15d8519..15d8519 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SetPropertyUtility.cs
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Utility/SetPropertyUtility.cs
diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SetPropertyUtility.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Utility/SetPropertyUtility.cs.meta
index 366a94c..ee3936e 100644
--- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SetPropertyUtility.cs.meta
+++ b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Utility/SetPropertyUtility.cs.meta
@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: 68039ef89de31384bab429f2c49b2f2a
-timeCreated: 1602119378
-licenseType: Free
+guid: c7eb311d761ee3d409de0593312d6fa2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2