From fe3a3ce272f9def71f61fdabf3b56c4d8a6d127f Mon Sep 17 00:00:00 2001 From: Bill Ramsour Date: Fri, 8 Dec 2017 11:04:05 -0600 Subject: [PATCH 1/4] null check on asset icon --- Editor/AssetListTree.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Editor/AssetListTree.cs b/Editor/AssetListTree.cs index ac66f2a..edbef9f 100644 --- a/Editor/AssetListTree.cs +++ b/Editor/AssetListTree.cs @@ -150,7 +150,8 @@ private void CellGUI(Rect cellRect, AssetBundleModel.AssetTreeItem item, int col case 0: { var iconRect = new Rect(cellRect.x + 1, cellRect.y + 1, cellRect.height - 2, cellRect.height - 2); - GUI.DrawTexture(iconRect, item.icon, ScaleMode.ScaleToFit); + if(item.icon != null) + GUI.DrawTexture(iconRect, item.icon, ScaleMode.ScaleToFit); DefaultGUI.Label( new Rect(cellRect.x + iconRect.xMax + 1, cellRect.y, cellRect.width - iconRect.width, cellRect.height), item.displayName, From 93d654361b30ceafc9114cf8991001e2ba829116 Mon Sep 17 00:00:00 2001 From: Bill Date: Fri, 8 Dec 2017 13:15:23 -0600 Subject: [PATCH 2/4] fixing paths to work offline. --- Documentation/com.unity.assetbundlebrowser.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/com.unity.assetbundlebrowser.md b/Documentation/com.unity.assetbundlebrowser.md index f84c517..5e826d1 100644 --- a/Documentation/com.unity.assetbundlebrowser.md +++ b/Documentation/com.unity.assetbundlebrowser.md @@ -4,7 +4,7 @@ This tool enables the user to view and edit the configuration of asset bundles f Use this tool as an alternative to selecting assets and setting their asset bundle manually in the inspector. It can be dropped into any Unity project with a version of 5.6 or greater. It will create a new menu item in __Window__ > __AssetBundle Browser__. The bundle configuration, build functionality, and build-bundle inspection are split into three tabs within the new window. -![BrowserHeader](/Documentation/images/browser_header.png) +![BrowserHeader](../Documentation/images/browser_header.png) ### Requires Unity 5.6+ @@ -13,7 +13,7 @@ Use this tool as an alternative to selecting assets and setting their asset bund This window provides an explorer like interface to managing and modifying asset bundles in your project. When first opened, the tool will parse all bundle data in the background, slowly marking warnings or errors it detects. It does what it can to stay in sync with the project, but cannot always be aware of activity outside the tool. To force a quick pass at error detection, or to update the tool with changes made externally, hit the Refresh button in the upper left. The window is broken into four sections: Bundle List, Bundle Details, Asset List, and Asset Details. -![BroserConfigure](/Documentation/images/browser_configure2.png) +![BroserConfigure](../Documentation/images/browser_configure2.png) ### Bundle List From e29b816b3bd1904f2eeb8ac269e6b23964fa0a4f Mon Sep 17 00:00:00 2001 From: Bill Ramsour Date: Fri, 8 Dec 2017 13:21:28 -0600 Subject: [PATCH 3/4] adding asmdef --- .npmignore | 6 ++++++ CHANGELOG.md | 5 ++++- Editor/com.unity.assetbundlebrowser.Editor.asmdef | 10 ++++++++++ Editor/com.unity.assetbundlebrowser.Editor.asmdef.meta | 8 ++++++++ package.json | 2 +- 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 .npmignore create mode 100644 Editor/com.unity.assetbundlebrowser.Editor.asmdef create mode 100644 Editor/com.unity.assetbundlebrowser.Editor.asmdef.meta diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..6ea176f --- /dev/null +++ b/.npmignore @@ -0,0 +1,6 @@ +Documentation/ApiDocs/** +.npmrc +.npmignore +.gitignore +QAReport.md +QAReport.md.meta \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index db2fd7b..e760f4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [1.1.4] - 2017-11-09 +## [1.2.0] - 2017-12-08 +- Added asmdef to keep browser in its own assembly +- minor null check fixes +## [1.1.4] - 2017-11-09 - Initial submission for package distribution diff --git a/Editor/com.unity.assetbundlebrowser.Editor.asmdef b/Editor/com.unity.assetbundlebrowser.Editor.asmdef new file mode 100644 index 0000000..ef58257 --- /dev/null +++ b/Editor/com.unity.assetbundlebrowser.Editor.asmdef @@ -0,0 +1,10 @@ +{ + "name": "com.unity.resourcemanager.Editor", + "references": [ + "com.unity.resourcemanager.Runtime" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [] +} diff --git a/Editor/com.unity.assetbundlebrowser.Editor.asmdef.meta b/Editor/com.unity.assetbundlebrowser.Editor.asmdef.meta new file mode 100644 index 0000000..095abac --- /dev/null +++ b/Editor/com.unity.assetbundlebrowser.Editor.asmdef.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ac9b6d07046c0442a95ef301bd5cd22 +timeCreated: 1512760713 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/package.json b/package.json index 2f8e1c7..4eb8378 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.unity.assetbundlebrowser", - "version": "1.1.4", + "version": "1.2.0", "unity": "2018.1", "description": "Editor tool used to manually manage Asset Bundle configuration.", "keywords": ["asset", "bundle", "bundles", "assetbundles"], From b4fba50db76cf686e757d28b7de4d28525f8dadd Mon Sep 17 00:00:00 2001 From: Bill Ramsour Date: Fri, 8 Dec 2017 13:24:43 -0600 Subject: [PATCH 4/4] putting in the _correct_ asmdef file --- Editor/com.unity.assetbundlebrowser.Editor.asmdef | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Editor/com.unity.assetbundlebrowser.Editor.asmdef b/Editor/com.unity.assetbundlebrowser.Editor.asmdef index ef58257..f2cbcf0 100644 --- a/Editor/com.unity.assetbundlebrowser.Editor.asmdef +++ b/Editor/com.unity.assetbundlebrowser.Editor.asmdef @@ -1,7 +1,6 @@ { - "name": "com.unity.resourcemanager.Editor", + "name": "com.unity.assetbundlebrowser.Editor", "references": [ - "com.unity.resourcemanager.Runtime" ], "includePlatforms": [ "Editor"