Merge of fixes
commit
d9079e4732
|
@ -1,4 +1,8 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: c35f61edc180166489847c79f4b8ea46
|
guid: e9a81748fac51154f8688d2e3c46fd56
|
||||||
|
timeCreated: 1438724032
|
||||||
|
licenseType: Free
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
userData:
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
|
@ -1,4 +1,8 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: a7b682f292cfba6438971b2bc7e90705
|
guid: f6cbd6c26357c6a40947224e172bfdf6
|
||||||
|
timeCreated: 1438724032
|
||||||
|
licenseType: Free
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
userData:
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 9001b012db436b1438e03cdda2954484
|
guid: 9d40233b1c5add641bb2f4f7f12af05e
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
|
timeCreated: 1438724032
|
||||||
|
licenseType: Free
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
userData:
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
|
@ -39,6 +39,7 @@ namespace UnityEngine.UI.Extensions
|
||||||
this.onValueChanged.AddListener(OnValueChanged);
|
this.onValueChanged.AddListener(OnValueChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if UNITY_EDITOR
|
||||||
protected override void OnValidate()
|
protected override void OnValidate()
|
||||||
{
|
{
|
||||||
base.OnValidate();
|
base.OnValidate();
|
||||||
|
@ -67,6 +68,7 @@ namespace UnityEngine.UI.Extensions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
public void OnValueChanged(bool state)
|
public void OnValueChanged(bool state)
|
||||||
{
|
{
|
||||||
|
|
|
@ -70,7 +70,7 @@ namespace UnityEngine.UI.Extensions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Awake()
|
public void Start()
|
||||||
{
|
{
|
||||||
Initialize();
|
Initialize();
|
||||||
}
|
}
|
||||||
|
@ -277,6 +277,8 @@ namespace UnityEngine.UI.Extensions
|
||||||
/// <param name="directClick"> whether an item was directly clicked on</param>
|
/// <param name="directClick"> whether an item was directly clicked on</param>
|
||||||
public void ToggleDropdownPanel(bool directClick)
|
public void ToggleDropdownPanel(bool directClick)
|
||||||
{
|
{
|
||||||
|
_overlayRT.transform.localScale = new Vector3(1, 1, 1);
|
||||||
|
_scrollBarRT.transform.localScale = new Vector3(1, 1, 1);
|
||||||
_isPanelActive = !_isPanelActive;
|
_isPanelActive = !_isPanelActive;
|
||||||
_overlayRT.gameObject.SetActive(_isPanelActive);
|
_overlayRT.gameObject.SetActive(_isPanelActive);
|
||||||
if (_isPanelActive)
|
if (_isPanelActive)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
using UnityEditor;
|
using UnityEditor;
|
||||||
namespace UnityEngine.UI.Extensions
|
namespace UnityEngine.UI.Extensions
|
||||||
{
|
{
|
||||||
public class uGUITools : MonoBehaviour
|
public static class uGUITools
|
||||||
{
|
{
|
||||||
[MenuItem("uGUI/Anchors to Corners %[")]
|
[MenuItem("uGUI/Anchors to Corners %[")]
|
||||||
static void AnchorsToCorners()
|
static void AnchorsToCorners()
|
Binary file not shown.
Binary file not shown.
|
@ -168,10 +168,12 @@ namespace UnityEngine.UI.Extensions
|
||||||
this.ApplyShadow (verts, this.effectColor, start, verts.Count, 0, -distanceY);
|
this.ApplyShadow (verts, this.effectColor, start, verts.Count, 0, -distanceY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if UNITY_EDITOR
|
||||||
protected override void OnValidate ()
|
protected override void OnValidate ()
|
||||||
{
|
{
|
||||||
this.effectDistance = this.m_EffectDistance;
|
this.effectDistance = this.m_EffectDistance;
|
||||||
base.OnValidate ();
|
base.OnValidate ();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
|
@ -1,8 +1,12 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: a5f5420166e1c6d4f849661cbdbc52f8
|
guid: b35bd2ce6e015bb4f840cf9267dbe421
|
||||||
|
timeCreated: 1438721836
|
||||||
|
licenseType: Free
|
||||||
MonoImporter:
|
MonoImporter:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
defaultReferences: []
|
defaultReferences: []
|
||||||
executionOrder: 0
|
executionOrder: 0
|
||||||
icon: {instanceID: 0}
|
icon: {instanceID: 0}
|
||||||
userData:
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
Binary file not shown.
|
@ -1,4 +1,8 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: bdcf5079609572e459e7d8531bceb480
|
guid: 76d6c78532d65a240adbe094f108ce1a
|
||||||
|
timeCreated: 1438724423
|
||||||
|
licenseType: Free
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
userData:
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
Loading…
Reference in New Issue