From 5357f5592b8650032fe2428a1a18ee94e546f082 Mon Sep 17 00:00:00 2001 From: bnco <33021110+bnco-dev@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:50:37 +0000 Subject: [PATCH] MMVR off by default --- ...ue.asset => Avatar Catalogue (Full).asset} | 2 +- ...eta => Avatar Catalogue (Full).asset.meta} | 0 .../Prefabs/Avatar Catalogue (Minimal).asset | 16 +++++++ .../Avatar Catalogue (Minimal).asset.meta | 8 ++++ .../Ubiq/Runtime/Prefabs/Network Scene.prefab | 2 +- .../Assets/Ubiq/Samples/Demo (XRI)/Demo.unity | 46 +++++++------------ 6 files changed, 43 insertions(+), 31 deletions(-) rename Unity/Assets/Ubiq/Runtime/Prefabs/{Avatar Catalogue.asset => Avatar Catalogue (Full).asset} (94%) rename Unity/Assets/Ubiq/Runtime/Prefabs/{Avatar Catalogue.asset.meta => Avatar Catalogue (Full).asset.meta} (100%) create mode 100644 Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Minimal).asset create mode 100644 Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Minimal).asset.meta diff --git a/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue.asset b/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Full).asset similarity index 94% rename from Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue.asset rename to Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Full).asset index fa0d48a8e..078d32585 100644 --- a/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue.asset +++ b/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Full).asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4467f6c3b47040840ab7f7665d8bddbe, type: 3} - m_Name: Avatar Catalogue + m_Name: Avatar Catalogue (Full) m_EditorClassIdentifier: prefabs: - {fileID: 3172939939781028348, guid: 59bce046eba3bb14a80855d4c1810e99, type: 3} diff --git a/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue.asset.meta b/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Full).asset.meta similarity index 100% rename from Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue.asset.meta rename to Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Full).asset.meta diff --git a/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Minimal).asset b/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Minimal).asset new file mode 100644 index 000000000..7209caef1 --- /dev/null +++ b/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Minimal).asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4467f6c3b47040840ab7f7665d8bddbe, type: 3} + m_Name: Avatar Catalogue (Minimal) + m_EditorClassIdentifier: + prefabs: + - {fileID: 3172939939781028348, guid: 59bce046eba3bb14a80855d4c1810e99, type: 3} diff --git a/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Minimal).asset.meta b/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Minimal).asset.meta new file mode 100644 index 000000000..4324da70e --- /dev/null +++ b/Unity/Assets/Ubiq/Runtime/Prefabs/Avatar Catalogue (Minimal).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 154fbe2147d60d44384df3453ca8feba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Ubiq/Runtime/Prefabs/Network Scene.prefab b/Unity/Assets/Ubiq/Runtime/Prefabs/Network Scene.prefab index 44bcb10e0..85809f279 100644 --- a/Unity/Assets/Ubiq/Runtime/Prefabs/Network Scene.prefab +++ b/Unity/Assets/Ubiq/Runtime/Prefabs/Network Scene.prefab @@ -237,7 +237,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 78043eb8bdd2f6b44a1cfd44c3b8fa5a, type: 3} m_Name: m_EditorClassIdentifier: - avatarCatalogue: {fileID: 11400000, guid: 4b37ef17d00e6504aa8d20da64793d0d, type: 2} + avatarCatalogue: {fileID: 11400000, guid: 154fbe2147d60d44384df3453ca8feba, type: 2} avatarPrefab: {fileID: 3172939939781028348, guid: 59bce046eba3bb14a80855d4c1810e99, type: 3} --- !u!1 &9015508115495883622 diff --git a/Unity/Assets/Ubiq/Samples/Demo (XRI)/Demo.unity b/Unity/Assets/Ubiq/Samples/Demo (XRI)/Demo.unity index 2e528cef7..8bf9c81da 100644 --- a/Unity/Assets/Ubiq/Samples/Demo (XRI)/Demo.unity +++ b/Unity/Assets/Ubiq/Samples/Demo (XRI)/Demo.unity @@ -135,6 +135,11 @@ PrefabInstance: propertyPath: m_Name value: Ubiq MMVR Avatar Input objectReference: {fileID: 0} + - target: {fileID: 2592011007710657933, guid: 2e62b01f42067844d8004b554a90dedf, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4132170291569262069, guid: 2e62b01f42067844d8004b554a90dedf, type: 3} propertyPath: m_LocalPosition.x @@ -550,18 +555,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 526704043} m_PrefabAsset: {fileID: 0} ---- !u!114 &1368223729 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1082635309853141966, guid: 73369a530bd8253469d623a3ea6dcff9, - type: 3} - m_PrefabInstance: {fileID: 8839457145026391851} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 78043eb8bdd2f6b44a1cfd44c3b8fa5a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1925563522 PrefabInstance: m_ObjectHideFlags: 0 @@ -625,11 +618,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 9186234166527958117, guid: 61b71c727ebe74446be4304f95c8d477, - type: 3} - propertyPath: avatarManager - value: - objectReference: {fileID: 1368223729} - target: {fileID: 9186234166527958117, guid: 61b71c727ebe74446be4304f95c8d477, type: 3} propertyPath: posOffsetLeft.x @@ -1296,32 +1284,32 @@ PrefabInstance: - target: {fileID: 743039901501322695, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 743039901501322695, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 743039901501322695, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_SizeDelta.x - value: 30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 743039901501322695, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 743039901501322695, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_AnchoredPosition.x - value: 53 + value: 0 objectReference: {fileID: 0} - target: {fileID: 743039901501322695, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1253916436262327332, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} @@ -1571,32 +1559,32 @@ PrefabInstance: - target: {fileID: 6806867407171974117, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6806867407171974117, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6806867407171974117, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_SizeDelta.x - value: 30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6806867407171974117, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6806867407171974117, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_AnchoredPosition.x - value: 21 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6806867407171974117, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3} propertyPath: m_AnchoredPosition.y - value: -22.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6866552682078070656, guid: 73369a530bd8253469d623a3ea6dcff9, type: 3}