diff --git a/Editor/Sites/Possession_Editor.cs b/Editor/Sites/Possession_Editor.cs index c47be20..ca37ca9 100644 --- a/Editor/Sites/Possession_Editor.cs +++ b/Editor/Sites/Possession_Editor.cs @@ -23,7 +23,7 @@ namespace Passer { possession = (Possessable)target; DeterminePossessionType(); - //AddToAssetBundle(); + AddToAssetBundle(); } private void DeterminePossessionType() { @@ -42,13 +42,16 @@ namespace Passer { Scene activeScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene(); if (IsPrefab(possession.gameObject)) { - Debug.Log("is prefab"); + //Debug.Log("is prefab"); possession.assetPath = AssetDatabase.GetAssetPath(possession.gameObject); string scenePath = activeScene.path; AssetImporter assetImporter = AssetImporter.GetAtPath(possession.assetPath); if (assetImporter != null) - assetImporter.assetBundleName = "possessions"; //activeScene.name + "_possessions"; + // HACK: force avatars to avatarhops because we cannot change assetbundle in package prefabs + assetImporter.assetBundleName = "avatarshop"; // "possessions"; //activeScene.name + "_possessions"; + + //Debug.Log(possession.gameObject + ": Set AssetBundleName to " + assetImporter.assetBundleName); return; } @@ -58,7 +61,8 @@ namespace Passer { string scenePath = activeScene.path; AssetImporter assetImporter = AssetImporter.GetAtPath(possession.assetPath); - assetImporter.assetBundleName = "possessions"; //activeScene.name + "_possessions"; + // HACK: force avatars to avatarhops because we cannot change assetbundle in package prefabs + assetImporter.assetBundleName = "avatarshop"; //"possessions"; //activeScene.name + "_possessions"; //Debug.Log(possession.gameObject + ": Set AssetBundleName to " + assetImporter.assetBundleName); } } diff --git a/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/AutodeskCharity.prefab.meta b/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/AutodeskCharity.prefab.meta index 3ef3a6a..fad4c4d 100644 --- a/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/AutodeskCharity.prefab.meta +++ b/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/AutodeskCharity.prefab.meta @@ -3,5 +3,5 @@ guid: 6d76b63d1c2ee4f4995b2109dc16402f PrefabImporter: externalObjects: {} userData: - assetBundleName: possessions + assetBundleName: avatarshop assetBundleVariant: diff --git a/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/Mixamo.prefab.meta b/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/Mixamo.prefab.meta index 1c6f2c9..7044cd3 100644 --- a/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/Mixamo.prefab.meta +++ b/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/Mixamo.prefab.meta @@ -3,5 +3,5 @@ guid: 4a108532c0ba23c4796003a7390c1ae9 PrefabImporter: externalObjects: {} userData: - assetBundleName: possessions + assetBundleName: avatarshop assetBundleVariant: diff --git a/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/Robot Kyle.prefab.meta b/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/Robot Kyle.prefab.meta index c90a4a6..a137995 100644 --- a/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/Robot Kyle.prefab.meta +++ b/Samples~/VisitorsAndSites/Sites/AvatarShop/Resources/Robot Kyle.prefab.meta @@ -3,5 +3,5 @@ guid: f558cc7556c4ffc4594edb212b1cd0dc PrefabImporter: externalObjects: {} userData: - assetBundleName: possessions + assetBundleName: avatarshop assetBundleVariant: