Merged in update/2019_2 (pull request #55)

Updating project for 2019 and adding assembly definitions for dev

Approved-by: Jesse Talavera-Greenberg <jessetalavera@aol.com>
pull/413/head
Simon Jackson 2019-09-09 10:48:58 +00:00
commit 2548e28cc0
9 changed files with 75 additions and 8 deletions

View File

@ -0,0 +1,18 @@
{
"name": "UnityUIExtensions.editor",
"references": [
"GUID:343deaaf83e0cee4ca978e7df0b80d21",
"GUID:2bafac87e7f4b9b418d9448d219b01ab",
"GUID:cf414061cae3a954baf92763590f3127"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": []
}

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9f71b9db6a45e5443a83cb8095085d47
DefaultImporter:
guid: c053729641303074282de705dbd4b1b8
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:

View File

@ -0,0 +1,14 @@
{
"name": "UnityUIExtensions.examples",
"references": [
"GUID:cf414061cae3a954baf92763590f3127"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": []
}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 57c81f7dab5e78246ba6f1744e8ec715
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -98,7 +98,13 @@ namespace UnityEngine.UI.Extensions {
// Used for custom selection as a variable for other scripts
private bool selected = false;
// Positions of images for icon placement
public bool Selected
{
get { return selected; }
set { selected = value; }
}
// Positions of images for icon placement
private List<Vector2> positions = new List<Vector2>();
// Little hack to support multiple hrefs with same name

14
UnityUIExtensions.asmdef Normal file
View File

@ -0,0 +1,14 @@
{
"name": "UnityUIExtensions",
"references": [
"GUID:2bafac87e7f4b9b418d9448d219b01ab"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": []
}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cf414061cae3a954baf92763590f3127
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,18 +1,19 @@
{
"name": "unity-ui-extensions",
"version": "2.0.1",
"name": "com.unity.uiextensions",
"version": "2.1.0",
"description": "An extension project for the Unity3D UI system, all crafted and contributed by the awesome Unity community",
"author": "Simon darkside Jackson <@SimonDarksideJ>",
"contributors": [{
"name": "SimonDarksideJ",
"twitter": "@SimonDarksideJ"
}],
"unity": "2019.1",
"repository": {
"type": "hg",
"url": "https://ddreaper@bitbucket.org/ddreaper/unity-ui-extensions"
"url": "https://ddreaper@bitbucket.org/UnityUIExtensions/unity-ui-extensions"
},
"bugs": {
"url": "https://bitbucket.org/ddreaper/unity-ui-extensions/issues"
"url": "https://bitbucket.org/UnityUIExtensions/unity-ui-extensions/issues"
},
"keywords": [
"Unity3D",
@ -20,5 +21,5 @@
"Unity UI",
"UI Extensions"
],
"license": "BSD"
"license": "BSD3"
}