HumanoidControl/HumanoidControl_Free
HumanoidControl/HumanoidControl_Free
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Determine possesable siteLocation at scene load

Browse Source
This commit is contained in:
Pascal Serrarens 2022-02-22 13:02:26 +01:00
parent 9f7a96187f
commit 8d7142f3b0
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/Sites/Possessable_Editor.cs
View File

@ -51,7 +51,7 @@ namespace Passer {
// HACK: force avatars to avatarhops because we cannot change assetbundle in package prefabs // HACK: force avatars to avatarhops because we cannot change assetbundle in package prefabs
assetImporter.assetBundleName = activeScene.name + "_possessions"; assetImporter.assetBundleName = activeScene.name + "_possessions";
Debug.Log(possession.gameObject + ": Set AssetBundleName to " + assetImporter.assetBundleName); Debug.Log(possession.gameObject + ": Set AssetBundleName to " + assetImporter.assetBundleName + " - " + possession.siteLocation);
return; return;
} }
@ -63,7 +63,7 @@ namespace Passer {
AssetImporter assetImporter = AssetImporter.GetAtPath(possession.assetPath); AssetImporter assetImporter = AssetImporter.GetAtPath(possession.assetPath);
// HACK: force avatars to avatarhops because we cannot change assetbundle in package prefabs // HACK: force avatars to avatarhops because we cannot change assetbundle in package prefabs
assetImporter.assetBundleName = activeScene.name + "_possessions"; assetImporter.assetBundleName = activeScene.name + "_possessions";
Debug.Log(possession.gameObject + ": Set AssetBundleName to " + assetImporter.assetBundleName); Debug.Log(possession.gameObject + ": Set AssetBundleName to " + assetImporter.assetBundleName + " - " + possession.siteLocation);
} }
} }

19
Runtime/Sites/Scripts/Possessable.cs
View File

@ -1,6 +1,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement;
namespace Passer { namespace Passer {
@ -42,19 +43,31 @@ namespace Passer {
/// </summary> /// </summary>
public bool isUnique = false; public bool isUnique = false;
[SerializeField]
private string _siteLocation; private string _siteLocation;
public string siteLocation { public string siteLocation {
get { get {
if (_siteLocation == null) { if (_siteLocation == null)
DetermineSiteLocation();
return _siteLocation;
}
}
private void DetermineSiteLocation() {
if (SiteNavigator.currentSite == null) if (SiteNavigator.currentSite == null)
_siteLocation = ""; _siteLocation = "";
else {
string siteLocation = SiteNavigator.currentSite.siteLocation; string siteLocation = SiteNavigator.currentSite.siteLocation;
_siteLocation = (siteLocation + "_possessions"); _siteLocation = (siteLocation + "_possessions");
} }
return _siteLocation;
} }
protected virtual void Awake() {
UnityEngine.SceneManagement.SceneManager.sceneLoaded += OnSceneLoaded;
}
private void OnSceneLoaded(Scene scene, LoadSceneMode mode) {
DetermineSiteLocation();
} }
public string assetPath; public string assetPath;

5
Samples~/VisitorsAndSites/Sites/AvatarShop.unity
View File

@ -605,7 +605,8 @@ MonoBehaviour:
possessionType: 1 possessionType: 1
crossSite: 1 crossSite: 1
isUnique: 1 isUnique: 1
assetPath: Assets/Passer/HumanoidControlFree/Samples/VisitorsAndSites/Sites/AvatarShop/Resources/AutodeskCharity.prefab _siteLocation:
assetPath: Packages/com.passervr.humanoidcontrol_free/Samples/VisitorsAndSites/Sites/AvatarShop/Resources/AutodeskCharity.prefab
--- !u!114 &2192530470517696406 --- !u!114 &2192530470517696406
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1041,6 +1042,7 @@ MonoBehaviour:
possessionType: 1 possessionType: 1
crossSite: 1 crossSite: 1
isUnique: 1 isUnique: 1
_siteLocation:
assetPath: Packages/com.passervr.humanoidcontrol_free/Samples/VisitorsAndSites/Sites/AvatarShop/Resources/Robot assetPath: Packages/com.passervr.humanoidcontrol_free/Samples/VisitorsAndSites/Sites/AvatarShop/Resources/Robot
Kyle.prefab Kyle.prefab
--- !u!114 &3076393132243293709 --- !u!114 &3076393132243293709
@ -1478,6 +1480,7 @@ MonoBehaviour:
possessionType: 1 possessionType: 1
crossSite: 1 crossSite: 1
isUnique: 1 isUnique: 1
_siteLocation:
assetPath: Packages/com.passervr.humanoidcontrol_free/Samples/VisitorsAndSites/Sites/AvatarShop/Resources/Mixamo.prefab assetPath: Packages/com.passervr.humanoidcontrol_free/Samples/VisitorsAndSites/Sites/AvatarShop/Resources/Mixamo.prefab
--- !u!114 &3740099460417575030 --- !u!114 &3740099460417575030
MonoBehaviour: MonoBehaviour: