summaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-04-07 19:10:30 +0800
committerchai <chaifix@163.com>2021-04-07 19:10:30 +0800
commite7dfbec8e8634e767d78959941daf71a96e021cf (patch)
tree58895a7c60df0bd3f316e6461051eabd1c0a51e1 /Assets
parentff5a3fbf31db349db11bbc5c60ba199d26780f19 (diff)
*移动目录
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Scenes/2D_3D_Buttons.unity160
-rw-r--r--Assets/Scenes/UI_1_Graphic.unity628
-rw-r--r--Assets/Scenes/UI_1_Graphic.unity.meta7
-rw-r--r--Assets/Scripts/CapsuleButton.cs6
-rw-r--r--Assets/Scripts/CustomInputModule.cs14
-rw-r--r--Assets/Scripts/CustomInputModule.cs.meta11
-rw-r--r--Assets/Scripts/PicoButton.cs6
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font.meta8
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontData.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontData.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs.meta)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontUpdateTracker.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontUpdateTracker.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontUpdateTracker.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontUpdateTracker.cs.meta)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics.meta8
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Graphic.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs)5
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Graphic.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRaycaster.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRaycaster.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRaycaster.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRaycaster.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRebuildTracker.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRebuildTracker.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRebuildTracker.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRebuildTracker.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRegistry.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRegistry.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRegistry.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRegistry.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/IGraphicEnabledDisabled.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IGraphicEnabledDisabled.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/IGraphicEnabledDisabled.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IGraphicEnabledDisabled.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Image.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Image.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/RawImage.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/RawImage.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/SpriteState.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SpriteState.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/SpriteState.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SpriteState.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/StencilMaterial.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/StencilMaterial.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/StencilMaterial.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/StencilMaterial.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Text.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Text.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.meta8
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMask.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMask.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMaskable.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMaskable.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMaskable.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMaskable.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/Mask.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/Mask.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskUtilities.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskUtilities.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskableGraphic.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskableGraphic.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/RectMask2D.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RectMask2D.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/RectMask2D.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RectMask2D.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls.meta8
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/AnimationTriggers.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/AnimationTriggers.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Button.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Button.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ColorBlock.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ColorBlock.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/DefaultControls.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/DefaultControls.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Dropdown.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Dropdown.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/InputField.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/InputField.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/InputField.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/InputField.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Navigation.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Navigation.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Navigation.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Navigation.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ScrollRect.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ScrollRect.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ScrollRect.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ScrollRect.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Scrollbar.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Scrollbar.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Selectable.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs)3
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Selectable.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Slider.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Slider.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Toggle.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Toggle.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ToggleGroup.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ToggleGroup.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ToggleGroup.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ToggleGroup.cs.meta)4
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Utility/SetPropertyUtility.cs (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SetPropertyUtility.cs)0
-rw-r--r--Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Utility/SetPropertyUtility.cs.meta (renamed from Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SetPropertyUtility.cs.meta)4
75 files changed, 868 insertions, 124 deletions
diff --git a/Assets/Scenes/2D_3D_Buttons.unity b/Assets/Scenes/2D_3D_Buttons.unity
index 7cbb577..7c12e9f 100644
--- a/Assets/Scenes/2D_3D_Buttons.unity
+++ b/Assets/Scenes/2D_3D_Buttons.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+ m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
@@ -113,6 +113,73 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1 &190687562
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 190687565}
+ - component: {fileID: 190687564}
+ - component: {fileID: 190687563}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &190687563
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 190687562}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 01eb80e630cacbf4ca051456e4a9f31f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Assembly-CSharp,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Texture: {fileID: 0}
+ m_UVRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1.62
+ height: 1
+--- !u!222 &190687564
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 190687562}
+--- !u!224 &190687565
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 190687562}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 5.370117}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 42.29, y: 50.91}
+ m_SizeDelta: {x: 56.77, y: 61.99}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &228417949
GameObject:
m_ObjectHideFlags: 0
@@ -124,7 +191,7 @@ GameObject:
- component: {fileID: 228417950}
- component: {fileID: 228417952}
- component: {fileID: 228417953}
- m_Layer: 8
+ m_Layer: 0
m_Name: PicoButton
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -248,7 +315,7 @@ MonoBehaviour:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 375808508}
- m_Enabled: 0
+ m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 67bf38e07c362674ebc60bfbd6dafa3a, type: 3}
m_Name:
@@ -366,7 +433,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
@@ -403,7 +470,6 @@ GameObject:
- component: {fileID: 925175243}
- component: {fileID: 925175242}
- component: {fileID: 925175241}
- - component: {fileID: 925175245}
- component: {fileID: 925175246}
m_Layer: 0
m_Name: Capsule
@@ -479,19 +545,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!136 &925175245
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 0}
- m_GameObject: {fileID: 925175240}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- m_Radius: 0.5
- m_Height: 2
- m_Direction: 1
- m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &925175246
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -515,13 +568,14 @@ GameObject:
- component: {fileID: 1360287299}
- component: {fileID: 1360287298}
- component: {fileID: 1360287302}
+ - component: {fileID: 1360287303}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!81 &1360287298
AudioListener:
m_ObjectHideFlags: 0
@@ -544,7 +598,7 @@ Camera:
m_GameObject: {fileID: 1360287297}
m_Enabled: 1
serializedVersion: 2
- m_ClearFlags: 1
+ m_ClearFlags: 2
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
@@ -599,6 +653,20 @@ MonoBehaviour:
m_EventMask:
serializedVersion: 2
m_Bits: 4294967295
+--- !u!114 &1360287303
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1360287297}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 055a0cdd9d5d3e0489f854f7bdf22ded, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EventMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &1400184286
GameObject:
m_ObjectHideFlags: 0
@@ -675,8 +743,9 @@ GameObject:
- component: {fileID: 1461691734}
- component: {fileID: 1461691733}
- component: {fileID: 1461691732}
+ - component: {fileID: 1461691736}
m_Layer: 8
- m_Name: Camera
+ m_Name: Camera2D
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -711,8 +780,8 @@ Camera:
m_GameObject: {fileID: 1461691731}
m_Enabled: 1
serializedVersion: 2
- m_ClearFlags: 4
- m_BackGroundColor: {r: 0.5735294, g: 0.73937905, b: 1, a: 0}
+ m_ClearFlags: 2
+ m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
@@ -727,7 +796,7 @@ Camera:
m_Depth: 0
m_CullingMask:
serializedVersion: 2
- m_Bits: 256
+ m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@@ -752,6 +821,20 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1461691736
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1461691731}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: b2bb18305a46ea44686ad8cdffbb3a58, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EventMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
--- !u!1 &1827934287
GameObject:
m_ObjectHideFlags: 0
@@ -760,8 +843,10 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 1827934290}
- - component: {fileID: 1827934289}
- component: {fileID: 1827934288}
+ - component: {fileID: 1827934289}
+ - component: {fileID: 1827934291}
+ - component: {fileID: 1827934292}
m_Layer: 0
m_Name: EventSystem
m_TagString: Untagged
@@ -795,7 +880,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1827934287}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 47dabc676519a2840ab00d4e00228528, type: 3}
+ m_Script: {fileID: 11500000, guid: 153642a2f08376d4daebdf63af9e161a, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FirstSelected: {fileID: 0}
@@ -814,3 +899,26 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1827934291
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1827934287}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 27cc0457fb3bcbe4eb6038275fbdde36, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ForceModuleActive: 0
+--- !u!114 &1827934292
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1827934287}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: abe4edfc993b886448942ebeb2e4ff0b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/Scenes/UI_1_Graphic.unity b/Assets/Scenes/UI_1_Graphic.unity
new file mode 100644
index 0000000..5b68d3e
--- /dev/null
+++ b/Assets/Scenes/UI_1_Graphic.unity
@@ -0,0 +1,628 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_OcclusionBakeSettings:
+ smallestOccluder: 5
+ smallestHole: 0.25
+ backfaceThreshold: 100
+ m_SceneGUID: 00000000000000000000000000000000
+ m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 8
+ m_Fog: 0
+ m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ m_FogMode: 3
+ m_FogDensity: 0.01
+ m_LinearFogStart: 0
+ m_LinearFogEnd: 300
+ m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+ m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+ m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+ m_AmbientIntensity: 1
+ m_AmbientMode: 0
+ m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+ m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+ m_HaloStrength: 0.5
+ m_FlareStrength: 1
+ m_FlareFadeSpeed: 3
+ m_HaloTexture: {fileID: 0}
+ m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+ m_DefaultReflectionMode: 0
+ m_DefaultReflectionResolution: 128
+ m_ReflectionBounces: 1
+ m_ReflectionIntensity: 1
+ m_CustomReflection: {fileID: 0}
+ m_Sun: {fileID: 0}
+ m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+--- !u!157 &3
+LightmapSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 11
+ m_GIWorkflowMode: 0
+ m_GISettings:
+ serializedVersion: 2
+ m_BounceScale: 1
+ m_IndirectOutputScale: 1
+ m_AlbedoBoost: 1
+ m_TemporalCoherenceThreshold: 1
+ m_EnvironmentLightingMode: 0
+ m_EnableBakedLightmaps: 1
+ m_EnableRealtimeLightmaps: 1
+ m_LightmapEditorSettings:
+ serializedVersion: 9
+ m_Resolution: 2
+ m_BakeResolution: 40
+ m_TextureWidth: 1024
+ m_TextureHeight: 1024
+ m_AO: 0
+ m_AOMaxDistance: 1
+ m_CompAOExponent: 1
+ m_CompAOExponentDirect: 0
+ m_Padding: 2
+ m_LightmapParameters: {fileID: 0}
+ m_LightmapsBakeMode: 1
+ m_TextureCompression: 1
+ m_FinalGather: 0
+ m_FinalGatherFiltering: 1
+ m_FinalGatherRayCount: 256
+ m_ReflectionCompression: 2
+ m_MixedBakeMode: 2
+ m_BakeBackend: 0
+ m_PVRSampling: 1
+ m_PVRDirectSampleCount: 32
+ m_PVRSampleCount: 500
+ m_PVRBounces: 2
+ m_PVRFilterTypeDirect: 0
+ m_PVRFilterTypeIndirect: 0
+ m_PVRFilterTypeAO: 0
+ m_PVRFilteringMode: 1
+ m_PVRCulling: 1
+ m_PVRFilteringGaussRadiusDirect: 1
+ m_PVRFilteringGaussRadiusIndirect: 5
+ m_PVRFilteringGaussRadiusAO: 2
+ m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+ m_PVRFilteringAtrousPositionSigmaIndirect: 2
+ m_PVRFilteringAtrousPositionSigmaAO: 1
+ m_ShowResolutionOverlay: 1
+ m_LightingDataAsset: {fileID: 0}
+ m_UseShadowmask: 1
+--- !u!196 &4
+NavMeshSettings:
+ serializedVersion: 2
+ m_ObjectHideFlags: 0
+ m_BuildSettings:
+ serializedVersion: 2
+ agentTypeID: 0
+ agentRadius: 0.5
+ agentHeight: 2
+ agentSlope: 45
+ agentClimb: 0.4
+ ledgeDropHeight: 0
+ maxJumpAcrossDistance: 0
+ minRegionArea: 2
+ manualCellSize: 0
+ cellSize: 0.16666667
+ manualTileSize: 0
+ tileSize: 256
+ accuratePlacement: 0
+ debug:
+ m_Flags: 0
+ m_NavMeshData: {fileID: 0}
+--- !u!1 &5479613
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 5479614}
+ - component: {fileID: 5479616}
+ - component: {fileID: 5479615}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5479614
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 5479613}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 17187342}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 178, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &5479615
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 5479613}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 09f4224b0cded254a977e1ac3c9e2470, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Assembly-CSharp,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u6D4B\u8BD5\u6D4B\u8BD5\u6D4B\u8BD5"
+--- !u!222 &5479616
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 5479613}
+--- !u!1 &17187338
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 17187342}
+ - component: {fileID: 17187341}
+ - component: {fileID: 17187340}
+ - component: {fileID: 17187339}
+ m_Layer: 5
+ m_Name: Canvas
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &17187339
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 17187338}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67bf38e07c362674ebc60bfbd6dafa3a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &17187340
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 17187338}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: debcf26b89013e446a6de5574715c5af, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+--- !u!223 &17187341
+Canvas:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 17187338}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!224 &17187342
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 17187338}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_Children:
+ - {fileID: 1142061126}
+ - {fileID: 973750423}
+ - {fileID: 5479614}
+ m_Father: {fileID: 0}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
+--- !u!1 &544732798
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 544732802}
+ - component: {fileID: 544732801}
+ - component: {fileID: 544732800}
+ - component: {fileID: 544732799}
+ m_Layer: 0
+ m_Name: Main Camera
+ m_TagString: MainCamera
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!81 &544732799
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 544732798}
+ m_Enabled: 1
+--- !u!124 &544732800
+Behaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 544732798}
+ m_Enabled: 1
+--- !u!20 &544732801
+Camera:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 544732798}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 2
+ m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.3
+ far clip plane: 1000
+ field of view: 60
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: -1
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 0}
+ m_TargetDisplay: 0
+ m_TargetEye: 3
+ m_HDR: 1
+ m_AllowMSAA: 1
+ m_AllowDynamicResolution: 0
+ m_ForceIntoRT: 0
+ m_OcclusionCulling: 1
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
+--- !u!4 &544732802
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 544732798}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 1, z: -10}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &973750422
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 973750423}
+ - component: {fileID: 973750425}
+ - component: {fileID: 973750424}
+ m_Layer: 5
+ m_Name: RawImage
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &973750423
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 973750422}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 17187342}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 48, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &973750424
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 973750422}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 01eb80e630cacbf4ca051456e4a9f31f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Assembly-CSharp,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Texture: {fileID: 0}
+ m_UVRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+--- !u!222 &973750425
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 973750422}
+--- !u!1 &1142061125
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1142061126}
+ - component: {fileID: 1142061128}
+ - component: {fileID: 1142061127}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1142061126
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1142061125}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 17187342}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -117, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1142061127
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1142061125}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: bd103b5bbc9cef740b4136f9f7a7b109, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Assembly-CSharp,
+ Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+--- !u!222 &1142061128
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1142061125}
+--- !u!1 &1155461032
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1155461035}
+ - component: {fileID: 1155461034}
+ - component: {fileID: 1155461033}
+ m_Layer: 0
+ m_Name: EventSystem
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1155461033
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1155461032}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e2665fa6a1fb2474d8a5c19f72f8d0c6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
+--- !u!114 &1155461034
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1155461032}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 153642a2f08376d4daebdf63af9e161a, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 5
+--- !u!4 &1155461035
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1155461032}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1759409930
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1759409932}
+ - component: {fileID: 1759409931}
+ m_Layer: 0
+ m_Name: Directional Light
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!108 &1759409931
+Light:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1759409930}
+ m_Enabled: 1
+ serializedVersion: 8
+ m_Type: 1
+ m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+ m_Intensity: 1
+ m_Range: 10
+ m_SpotAngle: 30
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 2
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 1
+ m_Bias: 0.05
+ m_NormalBias: 0.4
+ m_NearPlane: 0.2
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_Lightmapping: 4
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 1
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
+--- !u!4 &1759409932
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1759409930}
+ m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
+ m_LocalPosition: {x: 0, y: 3, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
diff --git a/Assets/Scenes/UI_1_Graphic.unity.meta b/Assets/Scenes/UI_1_Graphic.unity.meta
new file mode 100644
index 0000000..70f6e00
--- /dev/null
+++ b/Assets/Scenes/UI_1_Graphic.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 839818f74e71dd84d9e3a26639136fc4
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/CapsuleButton.cs b/Assets/Scripts/CapsuleButton.cs
index 8d19868..b72e5bd 100644
--- a/Assets/Scripts/CapsuleButton.cs
+++ b/Assets/Scripts/CapsuleButton.cs
@@ -8,17 +8,17 @@ public class CapsuleButton : MonoBehaviour, IPointerDownHandler, IPointerUpHandl
{
public virtual void OnPointerClick(PointerEventData eventData)
{
- // Debug.Log("CapsuleButton.OnPointerClick");
+ Debug.Log("CapsuleButton.OnPointerClick");
}
public virtual void OnPointerUp(PointerEventData eventData)
{
- // Debug.Log("CapsuleButton.OnPointerUp");
+ Debug.Log("CapsuleButton.OnPointerUp");
}
public virtual void OnPointerDown(PointerEventData eventData)
{
- // Debug.Log("CapsuleButton.OnPointerDown");
+ Debug.Log("CapsuleButton.OnPointerDown");
}
}
diff --git a/Assets/Scripts/CustomInputModule.cs b/Assets/Scripts/CustomInputModule.cs
new file mode 100644
index 0000000..c41eb63
--- /dev/null
+++ b/Assets/Scripts/CustomInputModule.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class CustomInputModule : BaseInputModule
+{
+ public override void Process()
+ {
+
+
+ // throw new System.NotImplementedException();
+ }
+}
diff --git a/Assets/Scripts/CustomInputModule.cs.meta b/Assets/Scripts/CustomInputModule.cs.meta
new file mode 100644
index 0000000..3fbdf31
--- /dev/null
+++ b/Assets/Scripts/CustomInputModule.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: abe4edfc993b886448942ebeb2e4ff0b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/PicoButton.cs b/Assets/Scripts/PicoButton.cs
index e86f2c0..385f90f 100644
--- a/Assets/Scripts/PicoButton.cs
+++ b/Assets/Scripts/PicoButton.cs
@@ -8,17 +8,17 @@ public class PicoButton : MonoBehaviour, IPointerDownHandler, IPointerUpHandler,
{
public virtual void OnPointerClick(PointerEventData eventData)
{
- // Debug.Log("PicoButton.OnPointerClick");
+ Debug.Log("PicoButton.OnPointerClick");
}
public virtual void OnPointerUp(PointerEventData eventData)
{
-// Debug.Log("PicoButton.OnPointerUp");
+ Debug.Log("PicoButton.OnPointerUp");
}
public virtual void OnPointerDown(PointerEventData eventData)
{
-// Debug.Log("PicoButton.OnPointerDown");
+ Debug.Log("PicoButton.OnPointerDown");
}
}
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