Remove dependencies with AssetBundleBrowser and Addressables/Fix Issue that Addressable Builders can't set first Builder Script.

This commit is contained in:
Hiroki Omae 2020-06-25 12:13:34 +09:00
Родитель 8cbe5aa145
Коммит 2c56b22c2b
15 изменённых файлов: 110 добавлений и 24 удалений

Просмотреть файл

@ -1,13 +1,15 @@
using UnityEditor; using UnityEditor;
using UnityEditor.IMGUI.Controls; using UnityEditor.IMGUI.Controls;
using UnityEditor.AddressableAssets;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Model=UnityEngine.AssetGraph.DataModel.Version2; using Model=UnityEngine.AssetGraph.DataModel.Version2;
#if ADDRESSABLES_1_6_OR_NEWER
using UnityEditor.AddressableAssets;
#endif
namespace UnityEngine.AssetGraph { namespace UnityEngine.AssetGraph {
[Serializable] [Serializable]
@ -132,6 +134,7 @@ namespace UnityEngine.AssetGraph {
EditorGUILayout.HelpBox(selectedAsset, MessageType.None); EditorGUILayout.HelpBox(selectedAsset, MessageType.None);
} }
#if ADDRESSABLES_1_6_OR_NEWER
if (m_selectedAsset != null) { if (m_selectedAsset != null) {
var aaSettings = AddressableAssetSettingsDefaultObject.GetSettings(false); var aaSettings = AddressableAssetSettingsDefaultObject.GetSettings(false);
if (aaSettings != null) { if (aaSettings != null) {
@ -145,6 +148,7 @@ namespace UnityEngine.AssetGraph {
} }
} }
} }
#endif
} }
public void ReloadAndSelect() { public void ReloadAndSelect() {

Просмотреть файл

@ -3,10 +3,11 @@
* *
* This code will setup the output of the graph tool to be viewable in the browser. * This code will setup the output of the graph tool to be viewable in the browser.
* *
* AssetBundles-Browser Available at: * AssetBundles-Browser is available from Unity Package Manager.
* https://github.com/Unity-Technologies/AssetBundles-Browser
*/ */
#if ASSETBUNDLEBROWSER_1_7_OR_NEWER
using UnityEditor; using UnityEditor;
using Model = UnityEngine.AssetGraph.DataModel.Version2; using Model = UnityEngine.AssetGraph.DataModel.Version2;
using System; using System;
@ -140,3 +141,5 @@ namespace UnityEngine.AssetGraph {
} }
} }
} }
#endif

Просмотреть файл

@ -95,7 +95,7 @@ namespace UnityEngine.AssetGraph {
public Dictionary<string, List<AssetReference>> ToGroupDictionary() { public Dictionary<string, List<AssetReference>> ToGroupDictionary() {
Dictionary<string, List<AssetReference>> dic = new Dictionary<string, List<AssetReference>>(); Dictionary<string, List<AssetReference>> dic = new Dictionary<string, List<AssetReference>>();
foreach(var g in m_groups) { foreach(var g in m_groups) {
dic [g.name] = g.assets.Select(a => AssetReferenceDatabase.GetReference(a)).ToList(); dic [g.name] = g.assets.Select(AssetReferenceDatabase.GetReference).ToList();
} }
return dic; return dic;
} }

Просмотреть файл

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aba1c7432ab2e47459da27d4f1abeb74
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Просмотреть файл

@ -1,3 +1,12 @@
/**
* Addressable integration
*
* This code will add features for Addressables System.
*
* Addressables System is available from Unity Package Manager.
*/
#if ADDRESSABLES_1_6_OR_NEWER
using System; using System;
using System.Linq; using System.Linq;
@ -190,4 +199,6 @@ namespace UnityEngine.AssetGraph
} }
} }
} }
} }
#endif

Просмотреть файл

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 271e7cf2af1604c488f67c9086fd1c1d guid: ecbc77d52b04a4ea0959b200eced849b
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

Просмотреть файл

@ -1,3 +1,12 @@
/**
* Addressable integration
*
* This code will add features for Addressables System.
*
* Addressables System is available from Unity Package Manager.
*/
#if ADDRESSABLES_1_6_OR_NEWER
using System; using System;
using System.Linq; using System.Linq;
@ -169,4 +178,6 @@ namespace UnityEngine.AssetGraph
} }
} }
} }
} }
#endif

Просмотреть файл

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: f9361a213a36a41e0896201a46587eb1 guid: afb0cc9ce87ec4aef95c9b4c2261a3b2
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

Просмотреть файл

@ -1,3 +1,12 @@
/**
* Addressable integration
*
* This code will add features for Addressables System.
*
* Addressables System is available from Unity Package Manager.
*/
#if ADDRESSABLES_1_6_OR_NEWER
using System; using System;
using System.Linq; using System.Linq;
@ -173,4 +182,6 @@ namespace UnityEngine.AssetGraph
} }
} }
} }
} }
#endif

Просмотреть файл

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d4b98bc0f1d544bb18ab3b7cebb501a3 guid: 9bdee3e78787c4f539be1d0ff103d17f
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

Просмотреть файл

@ -1,3 +1,13 @@
/**
* Addressable integration
*
* This code will add features for Addressables System.
*
* Addressables System is available from Unity Package Manager.
*/
#if ADDRESSABLES_1_6_OR_NEWER
using UnityEditor; using UnityEditor;
using System; using System;
@ -110,8 +120,8 @@ namespace UnityEngine.AssetGraph {
} }
var dataBuilders = Settings.DataBuilders.Where(builder => (builder as IDataBuilder).CanBuildData<AddressablesPlayerBuildResult>()).ToList(); var dataBuilders = Settings.DataBuilders.Where(builder => (builder as IDataBuilder).CanBuildData<AddressablesPlayerBuildResult>()).ToList();
var builderIndex = m_currentDataBuilder == null ? 0 : dataBuilders.IndexOf(m_currentDataBuilder); var builderIndex = m_currentDataBuilder == null ? -1 : dataBuilders.IndexOf(m_currentDataBuilder);
var builderNames = dataBuilders var builderNames = dataBuilders
.Select(builder => ((IDataBuilder) builder).Name).ToArray(); .Select(builder => ((IDataBuilder) builder).Name).ToArray();
@ -279,3 +289,5 @@ namespace UnityEngine.AssetGraph {
} }
} }
} }
#endif

Просмотреть файл

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: fc338f3d3a0ff475b8bcede58168b62f guid: 71f0b2cf522d4463b8785e74ba1d86c4
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

Просмотреть файл

@ -17,5 +17,17 @@
"precompiledReferences": [], "precompiledReferences": [],
"autoReferenced": true, "autoReferenced": true,
"defineConstraints": [], "defineConstraints": [],
"versionDefines": [] "versionDefines": [
{
"name": "com.unity.assetbundlebrowser",
"expression": "1.7.0",
"define": "ASSETBUNDLEBROWSER_1_7_OR_NEWER"
},
{
"name": "com.unity.addressables",
"expression": "1.6.0",
"define": "ADDRESSABLES_1_6_OR_NEWER"
}
],
"noEngineReferences": false
} }

Просмотреть файл

@ -2,5 +2,23 @@
"name": "Unity.AssetGraph", "name": "Unity.AssetGraph",
"references": [], "references": [],
"includePlatforms": [], "includePlatforms": [],
"excludePlatforms": [] "excludePlatforms": [],
} "allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [
{
"name": "com.unity.assetbundlebrowser",
"expression": "1.7.0",
"define": "ASSETBUNDLEBROWSER_1_7_OR_NEWER"
},
{
"name": "com.unity.addressables",
"expression": "1.6.0",
"define": "ADDRESSABLES_1_6_OR_NEWER"
}
],
"noEngineReferences": false
}

Просмотреть файл

@ -1,13 +1,9 @@
{ {
"name": "com.unity.assetgraph", "name": "com.unity.assetgraph",
"displayName": "Asset Graph", "displayName": "Asset Graph",
"version": "1.7.0-preview", "version": "1.7.1-preview",
"unity": "2018.4", "unity": "2018.4",
"description": "AssetGraph is a visual toolset lets you configure asset workflow visually in Unity. It is intended to create rule-based configuration using graphs to create and manage efficient workflow around assets.", "description": "AssetGraph is a visual toolset lets you configure asset workflow visually in Unity. It is intended to create rule-based configuration using graphs to create and manage efficient workflow around assets.",
"keywords": ["asset", "bundle", "bundles", "assetbundles", "graph", "automation", "import", "resources"], "keywords": ["asset", "bundle", "bundles", "assetbundles", "graph", "automation", "import", "resources"],
"category": "Asset Bundles", "category": "Asset Bundles"
"dependencies": {
"com.unity.assetbundlebrowser" : "1.7.0",
"com.unity.addressables" : "1.7.5"
}
} }