From e7dfbec8e8634e767d78959941daf71a96e021cf Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 7 Apr 2021 19:10:30 +0800 Subject: =?UTF-8?q?*=E7=A7=BB=E5=8A=A8=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/2D_3D_Buttons.unity | 160 +- Assets/Scenes/UI_1_Graphic.unity | 628 +++++ Assets/Scenes/UI_1_Graphic.unity.meta | 7 + Assets/Scripts/CapsuleButton.cs | 6 +- Assets/Scripts/CustomInputModule.cs | 14 + Assets/Scripts/CustomInputModule.cs.meta | 11 + Assets/Scripts/PicoButton.cs | 6 +- .../UnityEngine.UI/UI/Core/AnimationTriggers.cs | 36 - .../UI/Core/AnimationTriggers.cs.meta | 13 - .../uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs | 75 - .../UnityEngine.UI/UI/Core/Button.cs.meta | 13 - .../UnityEngine.UI/UI/Core/ColorBlock.cs | 91 - .../UnityEngine.UI/UI/Core/ColorBlock.cs.meta | 13 - .../UnityEngine.UI/UI/Core/DefaultControls.cs | 581 ----- .../UnityEngine.UI/UI/Core/DefaultControls.cs.meta | 13 - .../uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs | 649 ----- .../UnityEngine.UI/UI/Core/Dropdown.cs.meta | 13 - .../uGUI-2017.1/UnityEngine.UI/UI/Core/Font.meta | 8 + .../UnityEngine.UI/UI/Core/Font/FontData.cs | 158 ++ .../UnityEngine.UI/UI/Core/Font/FontData.cs.meta | 13 + .../UI/Core/Font/FontUpdateTracker.cs | 67 + .../UI/Core/Font/FontUpdateTracker.cs.meta | 13 + .../uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs | 158 -- .../UnityEngine.UI/UI/Core/FontData.cs.meta | 13 - .../UnityEngine.UI/UI/Core/FontUpdateTracker.cs | 67 - .../UI/Core/FontUpdateTracker.cs.meta | 13 - .../uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs | 654 ------ .../UnityEngine.UI/UI/Core/Graphic.cs.meta | 13 - .../UnityEngine.UI/UI/Core/GraphicRaycaster.cs | 288 --- .../UI/Core/GraphicRaycaster.cs.meta | 13 - .../UI/Core/GraphicRebuildTracker.cs | 38 - .../UI/Core/GraphicRebuildTracker.cs.meta | 13 - .../UnityEngine.UI/UI/Core/GraphicRegistry.cs | 76 - .../UnityEngine.UI/UI/Core/GraphicRegistry.cs.meta | 13 - .../UnityEngine.UI/UI/Core/Graphics.meta | 8 + .../UnityEngine.UI/UI/Core/Graphics/Graphic.cs | 659 ++++++ .../UI/Core/Graphics/Graphic.cs.meta | 11 + .../UI/Core/Graphics/GraphicRaycaster.cs | 288 +++ .../UI/Core/Graphics/GraphicRaycaster.cs.meta | 11 + .../UI/Core/Graphics/GraphicRebuildTracker.cs | 38 + .../UI/Core/Graphics/GraphicRebuildTracker.cs.meta | 11 + .../UI/Core/Graphics/GraphicRegistry.cs | 76 + .../UI/Core/Graphics/GraphicRegistry.cs.meta | 11 + .../UI/Core/Graphics/IGraphicEnabledDisabled.cs | 10 + .../Core/Graphics/IGraphicEnabledDisabled.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Graphics/Image.cs | 1165 +++++++++ .../UnityEngine.UI/UI/Core/Graphics/Image.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Graphics/RawImage.cs | 121 + .../UI/Core/Graphics/RawImage.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Graphics/SpriteState.cs | 33 + .../UI/Core/Graphics/SpriteState.cs.meta | 11 + .../UI/Core/Graphics/StencilMaterial.cs | 169 ++ .../UI/Core/Graphics/StencilMaterial.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Graphics/Text.cs | 571 +++++ .../UnityEngine.UI/UI/Core/Graphics/Text.cs.meta | 11 + .../UI/Core/IGraphicEnabledDisabled.cs | 10 - .../UI/Core/IGraphicEnabledDisabled.cs.meta | 13 - Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs | 11 - .../UnityEngine.UI/UI/Core/IMask.cs.meta | 13 - .../UnityEngine.UI/UI/Core/IMaskable.cs | 9 - .../UnityEngine.UI/UI/Core/IMaskable.cs.meta | 13 - Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs | 1165 --------- .../UnityEngine.UI/UI/Core/Image.cs.meta | 13 - .../UnityEngine.UI/UI/Core/InputField.cs | 2484 -------------------- .../UnityEngine.UI/UI/Core/InputField.cs.meta | 13 - Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs | 166 -- .../UnityEngine.UI/UI/Core/Mask.cs.meta | 13 - .../uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.meta | 8 + .../UnityEngine.UI/UI/Core/Mask/IMask.cs | 11 + .../UnityEngine.UI/UI/Core/Mask/IMask.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Mask/IMaskable.cs | 9 + .../UnityEngine.UI/UI/Core/Mask/IMaskable.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Mask/Mask.cs | 166 ++ .../UnityEngine.UI/UI/Core/Mask/Mask.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs | 182 ++ .../UI/Core/Mask/MaskUtilities.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs | 229 ++ .../UI/Core/Mask/MaskableGraphic.cs.meta | 11 + .../UnityEngine.UI/UI/Core/Mask/RectMask2D.cs | 173 ++ .../UnityEngine.UI/UI/Core/Mask/RectMask2D.cs.meta | 11 + .../UnityEngine.UI/UI/Core/MaskUtilities.cs | 182 -- .../UnityEngine.UI/UI/Core/MaskUtilities.cs.meta | 13 - .../UnityEngine.UI/UI/Core/MaskableGraphic.cs | 229 -- .../UnityEngine.UI/UI/Core/MaskableGraphic.cs.meta | 13 - .../UnityEngine.UI/UI/Core/Navigation.cs | 74 - .../UnityEngine.UI/UI/Core/Navigation.cs.meta | 13 - .../uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs | 121 - .../UnityEngine.UI/UI/Core/RawImage.cs.meta | 13 - .../UnityEngine.UI/UI/Core/RectMask2D.cs | 173 -- .../UnityEngine.UI/UI/Core/RectMask2D.cs.meta | 13 - .../UnityEngine.UI/UI/Core/ScrollRect.cs | 864 ------- .../UnityEngine.UI/UI/Core/ScrollRect.cs.meta | 13 - .../UnityEngine.UI/UI/Core/Scrollbar.cs | 417 ---- .../UnityEngine.UI/UI/Core/Scrollbar.cs.meta | 13 - .../UnityEngine.UI/UI/Core/Selectable.cs | 654 ------ .../UnityEngine.UI/UI/Core/Selectable.cs.meta | 13 - .../UnityEngine.UI/UI/Core/SetPropertyUtility.cs | 36 - .../UI/Core/SetPropertyUtility.cs.meta | 13 - .../uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs | 442 ---- .../UnityEngine.UI/UI/Core/Slider.cs.meta | 13 - .../UnityEngine.UI/UI/Core/SpriteState.cs | 33 - .../UnityEngine.UI/UI/Core/SpriteState.cs.meta | 13 - .../UnityEngine.UI/UI/Core/StencilMaterial.cs | 169 -- .../UnityEngine.UI/UI/Core/StencilMaterial.cs.meta | 13 - Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs | 571 ----- .../UnityEngine.UI/UI/Core/Text.cs.meta | 13 - .../uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs | 242 -- .../UnityEngine.UI/UI/Core/Toggle.cs.meta | 13 - .../UnityEngine.UI/UI/Core/ToggleGroup.cs | 73 - .../UnityEngine.UI/UI/Core/ToggleGroup.cs.meta | 13 - .../UnityEngine.UI/UI/Core/UIControls.meta | 8 + .../UI/Core/UIControls/AnimationTriggers.cs | 36 + .../UI/Core/UIControls/AnimationTriggers.cs.meta | 11 + .../UnityEngine.UI/UI/Core/UIControls/Button.cs | 75 + .../UI/Core/UIControls/Button.cs.meta | 11 + .../UI/Core/UIControls/ColorBlock.cs | 91 + .../UI/Core/UIControls/ColorBlock.cs.meta | 11 + .../UI/Core/UIControls/DefaultControls.cs | 581 +++++ .../UI/Core/UIControls/DefaultControls.cs.meta | 11 + .../UnityEngine.UI/UI/Core/UIControls/Dropdown.cs | 649 +++++ .../UI/Core/UIControls/Dropdown.cs.meta | 11 + .../UI/Core/UIControls/InputField.cs | 2484 ++++++++++++++++++++ .../UI/Core/UIControls/InputField.cs.meta | 11 + .../UI/Core/UIControls/Navigation.cs | 74 + .../UI/Core/UIControls/Navigation.cs.meta | 11 + .../UI/Core/UIControls/ScrollRect.cs | 864 +++++++ .../UI/Core/UIControls/ScrollRect.cs.meta | 11 + .../UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs | 417 ++++ .../UI/Core/UIControls/Scrollbar.cs.meta | 11 + .../UI/Core/UIControls/Selectable.cs | 653 +++++ .../UI/Core/UIControls/Selectable.cs.meta | 11 + .../UnityEngine.UI/UI/Core/UIControls/Slider.cs | 442 ++++ .../UI/Core/UIControls/Slider.cs.meta | 11 + .../UnityEngine.UI/UI/Core/UIControls/Toggle.cs | 242 ++ .../UI/Core/UIControls/Toggle.cs.meta | 11 + .../UI/Core/UIControls/ToggleGroup.cs | 73 + .../UI/Core/UIControls/ToggleGroup.cs.meta | 11 + .../UI/Core/Utility/SetPropertyUtility.cs | 36 + .../UI/Core/Utility/SetPropertyUtility.cs.meta | 11 + 139 files changed, 12030 insertions(+), 11286 deletions(-) create mode 100644 Assets/Scenes/UI_1_Graphic.unity create mode 100644 Assets/Scenes/UI_1_Graphic.unity.meta create mode 100644 Assets/Scripts/CustomInputModule.cs create mode 100644 Assets/Scripts/CustomInputModule.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Dropdown.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontData.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontData.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontUpdateTracker.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Font/FontUpdateTracker.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontData.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontUpdateTracker.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/FontUpdateTracker.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphic.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRaycaster.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRaycaster.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRebuildTracker.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRebuildTracker.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRegistry.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/GraphicRegistry.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Graphic.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Graphic.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRaycaster.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRaycaster.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRebuildTracker.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRebuildTracker.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRegistry.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/GraphicRegistry.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/IGraphicEnabledDisabled.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/IGraphicEnabledDisabled.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Image.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Image.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/RawImage.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/RawImage.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/SpriteState.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/SpriteState.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/StencilMaterial.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/StencilMaterial.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Text.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Graphics/Text.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IGraphicEnabledDisabled.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IGraphicEnabledDisabled.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMask.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMaskable.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/IMaskable.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Image.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/InputField.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/InputField.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMask.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMask.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMaskable.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/IMaskable.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/Mask.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/Mask.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskUtilities.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/MaskableGraphic.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/RectMask2D.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Mask/RectMask2D.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskUtilities.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskUtilities.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskableGraphic.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/MaskableGraphic.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Navigation.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Navigation.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RawImage.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RectMask2D.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/RectMask2D.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ScrollRect.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ScrollRect.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Scrollbar.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Scrollbar.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Selectable.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SetPropertyUtility.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SetPropertyUtility.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Slider.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SpriteState.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/SpriteState.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/StencilMaterial.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/StencilMaterial.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Text.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Toggle.cs.meta delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ToggleGroup.cs delete mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ToggleGroup.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/AnimationTriggers.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/AnimationTriggers.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Button.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Button.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ColorBlock.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ColorBlock.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/DefaultControls.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/DefaultControls.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Dropdown.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Dropdown.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/InputField.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/InputField.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Navigation.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Navigation.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ScrollRect.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ScrollRect.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Scrollbar.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Selectable.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Selectable.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Slider.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Slider.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Toggle.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/Toggle.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ToggleGroup.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/UIControls/ToggleGroup.cs.meta create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Utility/SetPropertyUtility.cs create mode 100644 Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Utility/SetPropertyUtility.cs.meta (limited to 'Assets') 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 @@ +锘縰sing 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/AnimationTriggers.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs deleted file mode 100644 index e42871b..0000000 --- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using UnityEngine.Serialization; - -namespace UnityEngine.UI -{ - [Serializable] - public class AnimationTriggers - { - private const string kDefaultNormalAnimName = "Normal"; - private const string kDefaultSelectedAnimName = "Highlighted"; - private const string kDefaultPressedAnimName = "Pressed"; - private const string kDefaultDisabledAnimName = "Disabled"; - - [FormerlySerializedAs("normalTrigger")] - [SerializeField] - private string m_NormalTrigger = kDefaultNormalAnimName; - - [FormerlySerializedAs("highlightedTrigger")] - [FormerlySerializedAs("m_SelectedTrigger")] - [SerializeField] - private string m_HighlightedTrigger = kDefaultSelectedAnimName; - - [FormerlySerializedAs("pressedTrigger")] - [SerializeField] - private string m_PressedTrigger = kDefaultPressedAnimName; - - [FormerlySerializedAs("disabledTrigger")] - [SerializeField] - private string m_DisabledTrigger = kDefaultDisabledAnimName; - - public string normalTrigger { get { return m_NormalTrigger; } set { m_NormalTrigger = value; } } - public string highlightedTrigger { get { return m_HighlightedTrigger; } set { m_HighlightedTrigger = value; } } - public string pressedTrigger { get { return m_PressedTrigger; } set { m_PressedTrigger = value; } } - public string disabledTrigger { get { return m_DisabledTrigger; } set { m_DisabledTrigger = value; } } - } -} diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs.meta deleted file mode 100644 index 3ce27e0..0000000 --- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/AnimationTriggers.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: c5ef5ca89cbc4644cae2997e4a851944 -timeCreated: 1602119380 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs deleted file mode 100644 index 8be5532..0000000 --- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System; -using System.Collections; -using UnityEngine.Events; -using UnityEngine.EventSystems; -using UnityEngine.Serialization; - -namespace UnityEngine.UI -{ - // Button that's meant to work with mouse or touch-based devices. - [AddComponentMenu("UI/Button", 30)] - public class Button : Selectable, IPointerClickHandler, ISubmitHandler - { - [Serializable] - public class ButtonClickedEvent : UnityEvent {} - - // Event delegates triggered on click. - [FormerlySerializedAs("onClick")] - [SerializeField] - private ButtonClickedEvent m_OnClick = new ButtonClickedEvent(); - - protected Button() - {} - - public ButtonClickedEvent onClick - { - get { return m_OnClick; } - set { m_OnClick = value; } - } - - private void Press() - { - if (!IsActive() || !IsInteractable()) - return; - - UISystemProfilerApi.AddMarker("Button.onClick", this); - m_OnClick.Invoke(); - } - - // Trigger all registered callbacks. - public virtual void OnPointerClick(PointerEventData eventData) - { - if (eventData.button != PointerEventData.InputButton.Left) - return; - - Press(); - } - - public virtual void OnSubmit(BaseEventData eventData) - { - Press(); - - // if we get set disabled during the press - // don't run the coroutine. - if (!IsActive() || !IsInteractable()) - return; - - DoStateTransition(SelectionState.Pressed, false); - StartCoroutine(OnFinishSubmit()); - } - - private IEnumerator OnFinishSubmit() - { - var fadeTime = colors.fadeDuration; - var elapsedTime = 0f; - - while (elapsedTime < fadeTime) - { - elapsedTime += Time.unscaledDeltaTime; - yield return null; - } - - DoStateTransition(currentSelectionState, false); - } - } -} diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs.meta deleted file mode 100644 index d34a2d3..0000000 --- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/Button.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: b55754d97ca63cd4dbfeea25c980c065 -timeCreated: 1602119379 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs deleted file mode 100644 index c78d617..0000000 --- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System; -using UnityEngine.Serialization; - -namespace UnityEngine.UI -{ - [Serializable] - public struct ColorBlock : IEquatable - { - [FormerlySerializedAs("normalColor")] - [SerializeField] - private Color m_NormalColor; - - [FormerlySerializedAs("highlightedColor")] - [FormerlySerializedAs("m_SelectedColor")] - [SerializeField] - private Color m_HighlightedColor; - - [FormerlySerializedAs("pressedColor")] - [SerializeField] - private Color m_PressedColor; - - [FormerlySerializedAs("disabledColor")] - [SerializeField] - private Color m_DisabledColor; - - [Range(1, 5)] - [SerializeField] - private float m_ColorMultiplier; - - [FormerlySerializedAs("fadeDuration")] - [SerializeField] - private float m_FadeDuration; - - public Color normalColor { get { return m_NormalColor; } set { m_NormalColor = value; } } - public Color highlightedColor { get { return m_HighlightedColor; } set { m_HighlightedColor = value; } } - public Color pressedColor { get { return m_PressedColor; } set { m_PressedColor = value; } } - public Color disabledColor { get { return m_DisabledColor; } set { m_DisabledColor = value; } } - public float colorMultiplier { get { return m_ColorMultiplier; } set { m_ColorMultiplier = value; } } - public float fadeDuration { get { return m_FadeDuration; } set { m_FadeDuration = value; } } - - public static ColorBlock defaultColorBlock - { - get - { - var c = new ColorBlock - { - m_NormalColor = new Color32(255, 255, 255, 255), - m_HighlightedColor = new Color32(245, 245, 245, 255), - m_PressedColor = new Color32(200, 200, 200, 255), - m_DisabledColor = new Color32(200, 200, 200, 128), - colorMultiplier = 1.0f, - fadeDuration = 0.1f - }; - return c; - } - } - - public override bool Equals(object obj) - { - if (!(obj is ColorBlock)) - return false; - - return Equals((ColorBlock)obj); - } - - public bool Equals(ColorBlock other) - { - return normalColor == other.normalColor && - highlightedColor == other.highlightedColor && - pressedColor == other.pressedColor && - disabledColor == other.disabledColor && - colorMultiplier == other.colorMultiplier && - fadeDuration == other.fadeDuration; - } - - public static bool operator==(ColorBlock point1, ColorBlock point2) - { - return point1.Equals(point2); - } - - public static bool operator!=(ColorBlock point1, ColorBlock point2) - { - return !point1.Equals(point2); - } - - public override int GetHashCode() - { - return base.GetHashCode(); - } - } -} diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs.meta b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs.meta deleted file mode 100644 index 6c616c3..0000000 --- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/ColorBlock.cs.meta +++ /dev/null @@ -1,13 +0,0 @@ -fileFormatVersion: 2 -guid: 5c8834cada9a547419a323569ac63c64 -timeCreated: 1602119378 -licenseType: Free -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs b/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs deleted file mode 100644 index a22ff9a..0000000 --- a/Assets/uGUI-2017.1/UnityEngine.UI/UI/Core/DefaultControls.cs +++ /dev/null @@ -1,581 +0,0 @@ -using UnityEngine; -using System.Collections.Generic; - -namespace UnityEngine.UI -{ - public static class DefaultControls - { - public struct Resources - { - public Sprite standard; - public Sprite background; - public Sprite inputField; - public Sprite knob; - public Sprite checkmark; - public Sprite dropdown; - public Sprite mask; - } - - private const float kWidth = 160f; - private const float kThickHeight = 30f; - private const float kThinHeight = 20f; - private static Vector2 s_ThickElementSize = new Vector2(kWidth, kThickHeight); - private static Vector2 s_ThinElementSize = new Vector2(kWidth, kThinHeight); - private static Vector2 s_ImageElementSize = new Vector2(100f, 100f); - private static Color s_DefaultSelectableColor = new Color(1f, 1f, 1f, 1f); - private static Color s_PanelColor = new Color(1f, 1f, 1f, 0.392f); - private static Color s_TextColor = new Color(50f / 255f, 50f / 255f, 50f / 255f, 1f); - - // Helper methods at top - - private static GameObject CreateUIElementRoot(string name, Vector2 size) - { - GameObject child = new GameObject(name); - RectTransform rectTransform = child.AddComponent(); - rectTransform.sizeDelta = size; - return child; - } - - static GameObject CreateUIObject(string name, GameObject parent) - { - GameObject go = new GameObject(name); - go.AddComponent(); - SetParentAndAlign(go, parent); - return go; - } - - private static void SetDefaultTextValues(Text lbl) - { - // Set text values we want across UI elements in default controls. - // Don't set values which are the same as the default values for the Text component, - // since there's no point in that, and it's good to keep them as consistent as possible. - lbl.color = s_TextColor; - - // Reset() is not called when playing. We still want the default font to be assigned - lbl.AssignDefaultFont(); - } - - private static void SetDefaultColorTransitionValues(Selectable slider) - { - ColorBlock colors = slider.colors; - colors.highlightedColor = new Color(0.882f, 0.882f, 0.882f); - colors.pressedColor = new Color(0.698f, 0.698f, 0.698f); - colors.disabledColor = new Color(0.521f, 0.521f, 0.521f); - } - - private static void SetParentAndAlign(GameObject child, GameObject parent) - { - if (parent == null) - return; - - child.transform.SetParent(parent.transform, false); - SetLayerRecursively(child, parent.layer); - } - - private static void SetLayerRecursively(GameObject go, int layer) - { - go.layer = layer; - Transform t = go.transform; - for (int i = 0; i < t.childCount; i++) - SetLayerRecursively(t.GetChild(i).gameObject, layer); - } - - // Actual controls - - public static GameObject CreatePanel(Resources resources) - { - GameObject panelRoot = CreateUIElementRoot("Panel", s_ThickElementSize); - - // Set RectTransform to stretch - RectTransform rectTransform = panelRoot.GetComponent(); - rectTransform.anchorMin = Vector2.zero; - rectTransform.anchorMax = Vector2.one; - rectTransform.anchoredPosition = Vector2.zero; - rectTransform.sizeDelta = Vector2.zero; - - Image image = panelRoot.AddComponent(); - image.sprite = resources.background; - image.type = Image.Type.Sliced; - image.color = s_PanelColor; - - return panelRoot; - } - - public static GameObject CreateButton(Resources resources) - { - GameObject buttonRoot = CreateUIElementRoot("Button", s_ThickElementSize); - - GameObject childText = new GameObject("Text"); - childText.AddComponent(); - SetParentAndAlign(childText, buttonRoot); - - Image image = buttonRoot.AddComponent(); - image.sprite = resources.standard; - image.type = Image.Type.Sliced; - image.color = s_DefaultSelectableColor; - - Button bt = buttonRoot.AddComponent