From 59b4f868be071ccaaad2bb861396c1b1e453073c Mon Sep 17 00:00:00 2001 From: dooly Date: Sun, 5 Jan 2025 11:58:20 +1000 Subject: [PATCH] fixed addressables --- .../AssetGroups/Basis Foundation Assets.asset | 80 +++++++++++++++++++ .../Editor/BasisNetworkManagementEditor.cs | 5 +- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset b/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset index a9472a28..c8d7c8dd 100644 --- a/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset +++ b/Basis/Assets/AddressableAssetsData/AssetGroups/Basis Foundation Assets.asset @@ -40,6 +40,21 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 18406c2d98a4b874e9ccd06d2741d401 + m_Address: Packages/com.basis.visualtrackers/Prefabs/vr_tracker_vive_3_0.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 1c4eb22ae1b895b4999f192628cd9cdb + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_cv1_controller_right.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 213ae8df071a2ec42a9f405d5b3e0b62 + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_cv1_controller_left.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 26ade42e4ff7eb64eb194e1a6453ad85 m_Address: NetworkManagement m_ReadOnly: 0 @@ -70,6 +85,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 411cf3d73f4e3dc46a7ae9e13da44f03 + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_pro_controller_right.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 432cc037784849f449cebf9338d58f11 m_Address: SettingsPanel m_ReadOnly: 0 @@ -90,6 +110,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 4c139b2f91b0dc9448dca7fcc1b6f1e6 + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest2_controller_left.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 561d30f605c713f49992f1f48529936b m_Address: LocalPlayer m_ReadOnly: 0 @@ -105,6 +130,16 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 664b0a1856405914186fc25229d9d893 + m_Address: Packages/com.basis.visualtrackers/Prefabs/vr_tracker_vive_1_0.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 6cdbeef6535327d40a6f7839159facff + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_controller_left.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 71c6687014327544c95558a736c226c7 m_Address: Locomotion m_ReadOnly: 0 @@ -120,11 +155,21 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 86272a90b30fb814ea93537106bd9c2c + m_Address: Packages/com.basis.visualtrackers/Prefabs/valve_controller_knu_right.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 98a748106e6c47748a99038c99c23bb8 m_Address: LoadingAvatar m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 98f7128bebf3e374eb8cab55434e4f7e + m_Address: Packages/com.basis.visualtrackers/Prefabs/FallbackSphere.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 9b1578359dddd0245b76d3ccd9dcc2d3 m_Address: Assets/ScriptableObjects/BoneData.asset m_ReadOnly: 0 @@ -140,11 +185,31 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: c48a4804c2b9e8e4ba8c9ea8aab07a1e + m_Address: Packages/com.basis.visualtrackers/Prefabs/valve_controller_knu_left.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: c92fd7b20eb8eaf4eb4a6e236e4ac620 m_Address: Assets/Prefabs/Loadins/Virtual Keyboard.prefab m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: cdff6bc74faea65489485131ad236623 + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_plus_controller_left.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: d736adbd5f9ea3441922acf7da4225c3 + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_plus_controller_right.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: d7624434af8aa17488fd698eabbf2bb6 + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest2_controller_right.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: dd1db054b177db7459cc81633b86e525 m_Address: Assets/Scenes/initialization.unity m_ReadOnly: 0 @@ -155,6 +220,21 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: f95798865974f0740a6932a53740011f + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_controller_right.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: fc769e29146b5b34583aa23bb7d1a2b5 + m_Address: Packages/com.basis.visualtrackers/Prefabs/tundra_tracker.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: fd12decbd8eb25048853cfde62e68f90 + m_Address: Packages/com.basis.visualtrackers/Prefabs/oculus_quest_pro_controller_left.prefab + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 8959b13be1add604380750c0f2e2f9f5, type: 2} m_SchemaSet: diff --git a/Basis/Packages/com.basis.framework/Editor/BasisNetworkManagementEditor.cs b/Basis/Packages/com.basis.framework/Editor/BasisNetworkManagementEditor.cs index 49a0170e..af6daa73 100644 --- a/Basis/Packages/com.basis.framework/Editor/BasisNetworkManagementEditor.cs +++ b/Basis/Packages/com.basis.framework/Editor/BasisNetworkManagementEditor.cs @@ -29,7 +29,10 @@ public override void OnInspectorGUI() EditorGUILayout.LabelField("Receiver Count:", BasisNetworkManagement.ReceiverCount.ToString()); - + if(BasisNetworkManagement.Instance == null) + { + return; + } EditorGUILayout.Space(); EditorGUILayout.LabelField("Transmitter Details", EditorStyles.boldLabel); if (BasisNetworkManagement.Instance.Transmitter != null)