diff --git a/LICENSE.meta b/LICENSE.meta index c691be0..31a0259 100644 --- a/LICENSE.meta +++ b/LICENSE.meta @@ -1,4 +1,8 @@ fileFormatVersion: 2 -guid: c35f61edc180166489847c79f4b8ea46 +guid: e9a81748fac51154f8688d2e3c46fd56 +timeCreated: 1438724032 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/README.md.meta b/README.md.meta index 462d66a..bd96daa 100644 --- a/README.md.meta +++ b/README.md.meta @@ -1,4 +1,8 @@ fileFormatVersion: 2 -guid: a7b682f292cfba6438971b2bc7e90705 +guid: f6cbd6c26357c6a40947224e172bfdf6 +timeCreated: 1438724032 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/Scripts.meta b/Scripts.meta index 4b89cef..ffbad0d 100644 --- a/Scripts.meta +++ b/Scripts.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 -guid: 9001b012db436b1438e03cdda2954484 +guid: 9d40233b1c5add641bb2f4f7f12af05e folderAsset: yes +timeCreated: 1438724032 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/Scripts/Accordion/AccordionElement.cs b/Scripts/Accordion/AccordionElement.cs index 3005e55..a2f7055 100644 --- a/Scripts/Accordion/AccordionElement.cs +++ b/Scripts/Accordion/AccordionElement.cs @@ -38,7 +38,8 @@ namespace UnityEngine.UI.Extensions this.m_LayoutElement = this.gameObject.GetComponent(); this.onValueChanged.AddListener(OnValueChanged); } - + +#if UNITY_EDITOR protected override void OnValidate() { base.OnValidate(); @@ -67,7 +68,8 @@ namespace UnityEngine.UI.Extensions } } } - +#endif + public void OnValueChanged(bool state) { if (this.m_LayoutElement == null) diff --git a/Scripts/CanvasGroupActivator.cs b/Scripts/Editor/CanvasGroupActivator.cs similarity index 100% rename from Scripts/CanvasGroupActivator.cs rename to Scripts/Editor/CanvasGroupActivator.cs diff --git a/Scripts/CanvasGroupActivator.cs.meta b/Scripts/Editor/CanvasGroupActivator.cs.meta similarity index 100% rename from Scripts/CanvasGroupActivator.cs.meta rename to Scripts/Editor/CanvasGroupActivator.cs.meta diff --git a/Scripts/uGUITools.cs b/Scripts/Editor/uGUITools.cs similarity index 96% rename from Scripts/uGUITools.cs rename to Scripts/Editor/uGUITools.cs index c4a4eea..a3fb414 100644 --- a/Scripts/uGUITools.cs +++ b/Scripts/Editor/uGUITools.cs @@ -1,10 +1,10 @@ -/// Credit Senshi -/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/ (uGUITools link) - +/// Credit Senshi +/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/ (uGUITools link) + using UnityEditor; namespace UnityEngine.UI.Extensions { - public class uGUITools : MonoBehaviour + public static class uGUITools { [MenuItem("uGUI/Anchors to Corners %[")] static void AnchorsToCorners() @@ -112,4 +112,4 @@ namespace UnityEngine.UI.Extensions } } } -} +} diff --git a/Scripts/uGUITools.cs.meta b/Scripts/Editor/uGUITools.cs.meta similarity index 100% rename from Scripts/uGUITools.cs.meta rename to Scripts/Editor/uGUITools.cs.meta diff --git a/Scripts/HSVPicker/Picker.prefab b/Scripts/HSVPicker/Picker.prefab index 1b1e04a..41594df 100644 Binary files a/Scripts/HSVPicker/Picker.prefab and b/Scripts/HSVPicker/Picker.prefab differ diff --git a/Scripts/HSVPicker/PickerTest.unity b/Scripts/HSVPicker/PickerTest.unity index 4c50344..bc47f80 100644 Binary files a/Scripts/HSVPicker/PickerTest.unity and b/Scripts/HSVPicker/PickerTest.unity differ diff --git a/Scripts/NicerOutline.cs b/Scripts/NicerOutline.cs index 199d2bc..d951602 100644 --- a/Scripts/NicerOutline.cs +++ b/Scripts/NicerOutline.cs @@ -167,11 +167,13 @@ namespace UnityEngine.UI.Extensions count = verts.Count; this.ApplyShadow (verts, this.effectColor, start, verts.Count, 0, -distanceY); } - + +#if UNITY_EDITOR protected override void OnValidate () { this.effectDistance = this.m_EffectDistance; base.OnValidate (); } +#endif } } diff --git a/Scripts/SelectionBox/ExampleSelectable.cs b/Scripts/SelectionBox/ExampleSelectable.cs index 96d9ec5..580d3b2 100644 --- a/Scripts/SelectionBox/ExampleSelectable.cs +++ b/Scripts/SelectionBox/ExampleSelectable.cs @@ -84,9 +84,9 @@ namespace UnityEngine.UI.Extensions { image.color = color; } - else if (renderer) + else if (GetComponent()) { - renderer.material.color = color; + GetComponent().material.color = color; } diff --git a/Scripts/SelectionBox/Selection Box Test.unity b/Scripts/SelectionBox/Selection Box Test.unity index e222310..976c367 100644 Binary files a/Scripts/SelectionBox/Selection Box Test.unity and b/Scripts/SelectionBox/Selection Box Test.unity differ diff --git a/Scripts/SelectionBox/SelectionBox.cs b/Scripts/SelectionBox/SelectionBox.cs index bb1f847..1169beb 100644 --- a/Scripts/SelectionBox/SelectionBox.cs +++ b/Scripts/SelectionBox/SelectionBox.cs @@ -235,7 +235,7 @@ namespace UnityEngine.UI.Extensions } else { //If it doesn't have a rectTransform, we need to get the radius so we can use it as an area around the center to detect a click. //This works because a 2D or 3D renderer will both return a radius - var radius = selectable.transform.renderer.bounds.extents.magnitude; + var radius = selectable.transform.GetComponent().bounds.extents.magnitude; var selectableScreenPoint = GetScreenPointOfSelectable(selectable); diff --git a/Scripts/UIScrollToSelection.cs.meta b/Scripts/UIScrollToSelection.cs.meta new file mode 100644 index 0000000..a0882bc --- /dev/null +++ b/Scripts/UIScrollToSelection.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b35bd2ce6e015bb4f840cf9267dbe421 +timeCreated: 1438721836 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityUIExtensions.unitypackage b/UnityUIExtensions.unitypackage index 067fa30..5fa1a12 100644 Binary files a/UnityUIExtensions.unitypackage and b/UnityUIExtensions.unitypackage differ diff --git a/UnityUIExtensions.unitypackage.meta b/UnityUIExtensions.unitypackage.meta index 6d3e7de..c4561a3 100644 --- a/UnityUIExtensions.unitypackage.meta +++ b/UnityUIExtensions.unitypackage.meta @@ -1,4 +1,8 @@ fileFormatVersion: 2 -guid: bdcf5079609572e459e7d8531bceb480 +guid: 76d6c78532d65a240adbe094f108ce1a +timeCreated: 1438724423 +licenseType: Free DefaultImporter: userData: + assetBundleName: + assetBundleVariant: