From ccb9bedba7d449ac63c5d2186f4b8f3b99efd878 Mon Sep 17 00:00:00 2001 From: Griff Hazen Date: Thu, 22 Aug 2024 10:18:50 -0700 Subject: [PATCH] Updates to version .87 * New features * Use Application.productName for the various places where Leap Brush name was shown, to make it easier for developers to switch to their own application's name. * Bug fixes * Fix server url handling to ensure the correct preference path is used. Server urls were not persisting correctly. * Start preloading the Keyboard at app start to avoid long delays when initiating text entry. commit sha 6fb901b227d0a6582987874fbd02606ad1b160b5 --- .../String Table Shared Data.asset | 4 + .../Assets/Localization/String Table_en.asset | 14 +- .../Prefabs/Panels/Panel_AppTooOld.prefab | 13 + .../Prefabs/Panels/Panel_Base.prefab | 62 +- .../Prefabs/Panels/Panel_Main.prefab | 1061 +++++++++-------- .../Prefabs/Panels/Panel_NotConnected.prefab | 15 + .../Prefabs/Panels/Panel_NotLocalized.prefab | 283 ++--- .../Prefabs/Panels/Panel_ServerTooOld.prefab | 13 + .../Prefabs/Panels/Panel_Start.prefab | 15 +- .../MagicLeap/LeapBrush/Scripts/LeapBrush.cs | 32 +- .../LeapBrush/Scripts/LeapBrushKeyboard.cs | 35 +- .../Scripts/Panels/AppTooOldPanel.cs | 8 +- .../LeapBrush/Scripts/Panels/BasePanel.cs | 26 + .../Scripts/Panels/BasePanel.cs.meta | 3 + .../LeapBrush/Scripts/Panels/MainPanel.cs | 8 +- .../Scripts/Panels/NotConnectedPanel.cs | 4 +- .../Scripts/Panels/NotLocalizedPanel.cs | 6 +- .../Scripts/Panels/ServerTooOldPanel.cs | 8 +- .../LeapBrush/Scripts/Panels/StartPanel.cs | 4 +- .../Scripts/ServerConnectionManager.cs | 9 +- .../ProjectSettings/ProjectSettings.asset | 4 +- 21 files changed, 921 insertions(+), 706 deletions(-) create mode 100644 LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/BasePanel.cs create mode 100644 LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/BasePanel.cs.meta diff --git a/LeapBrush/Assets/Localization/String Table Shared Data.asset b/LeapBrush/Assets/Localization/String Table Shared Data.asset index ca6984d..a3dc18d 100644 --- a/LeapBrush/Assets/Localization/String Table Shared Data.asset +++ b/LeapBrush/Assets/Localization/String Table Shared Data.asset @@ -27,6 +27,10 @@ MonoBehaviour: m_Key: Panel_NotConnected_Description m_Metadata: m_Items: [] + - m_Id: 211181138363801600 + m_Key: Panel_Base_TitleAndTagline + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/LeapBrush/Assets/Localization/String Table_en.asset b/LeapBrush/Assets/Localization/String Table_en.asset index f650e75..51eaae1 100644 --- a/LeapBrush/Assets/Localization/String Table_en.asset +++ b/LeapBrush/Assets/Localization/String Table_en.asset @@ -44,10 +44,22 @@ MonoBehaviour: m_Metadata: m_Items: - rid: 4282061478414254105 + - m_Id: 211181138363801600 + m_Localized: '{AppName}: + + Collaborative drawing' + m_Metadata: + m_Items: + - rid: 4282061478414254105 references: version: 2 RefIds: - rid: 4282061478414254105 type: {class: SmartFormatTag, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} data: - m_Entries: 00e02f2e0b00000000e02ff71f00000000e0eff63b5e0200 + m_Entries: + m_SharedEntries: + - id: 48019529728 + - id: 137291096064 + - id: 666561592418304 + - id: 211181138363801600 diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_AppTooOld.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_AppTooOld.prefab index 0abc1ed..c881826 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_AppTooOld.prefab +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_AppTooOld.prefab @@ -222,3 +222,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3c8de2d1f8a94fd8b466fd2a86015f94, type: 3} m_Name: m_EditorClassIdentifier: + _titleText: {fileID: 4669476399653244337} +--- !u!114 &4669476399653244337 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8366121823105010990, guid: 823b5dfa790c346f8bc1013d686c5cae, + type: 3} + m_PrefabInstance: {fileID: 3807581774691139743} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Base.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Base.prefab index 7b55af4..52748af 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Base.prefab +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Base.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 2318457852725612083} - component: {fileID: 8366121823105010990} - component: {fileID: 1773201090991895300} + - component: {fileID: 3510747795104519816} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -32,7 +33,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1194267998740911632} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -67,7 +67,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Leap Brush: + m_text: '{AppName}: Collaborative drawing' m_isRightToLeft: 0 @@ -161,6 +161,54 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &3510747795104519816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 371917843334831926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56eb0353ae6e5124bb35b17aff880f16, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StringReference: + m_TableReference: + m_TableCollectionName: GUID:e8e41daa5f277456489732d059e978d5 + m_TableEntryReference: + m_KeyId: 211181138363801600 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: + - name: AppName + variable: + rid: 5889505804473860098 + m_FormatArguments: [] + m_UpdateString: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8366121823105010990} + m_TargetAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro + m_MethodName: set_text + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 1 + references: + version: 2 + RefIds: + - rid: 5889505804473860098 + type: {class: StringVariable, ns: UnityEngine.Localization.SmartFormat.PersistentVariables, + asm: Unity.Localization} + data: + m_Value: AppName --- !u!1 &683738241445646499 GameObject: m_ObjectHideFlags: 0 @@ -193,7 +241,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1194267998740911632} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -343,6 +390,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3054317939429941271} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -350,7 +398,6 @@ Transform: m_Children: - {fileID: 1692991003591617585} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6401641920235014139 GameObject: @@ -383,7 +430,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2519349517806460817} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -462,7 +508,6 @@ RectTransform: - {fileID: 1194267998740911632} - {fileID: 1288361396342501268} m_Father: {fileID: 2519349517806460817} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -527,7 +572,6 @@ RectTransform: - {fileID: 7908897168221126744} - {fileID: 4542690941404439521} m_Father: {fileID: 4718087437379088179} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -593,7 +637,6 @@ RectTransform: m_Children: - {fileID: 2519349517806460817} m_Father: {fileID: 7144193640668297163} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -695,7 +738,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4718087437379088179} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -795,7 +837,6 @@ RectTransform: - {fileID: 4718087437379088179} - {fileID: 7971003855663578077} m_Father: {fileID: 1692991003591617585} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -871,3 +912,4 @@ MonoBehaviour: attachedRectTransform: {fileID: 2519349517806460817} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Main.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Main.prefab index df7b6e1..21d4bea 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Main.prefab +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Main.prefab @@ -71,156 +71,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4602347017457763720} m_Modifications: - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Name - value: Button - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Size.x - value: 70.07001 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Size.y - value: 76.47 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1221714912161894049, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} propertyPath: m_ChildAlignment @@ -474,61 +324,6 @@ PrefabInstance: propertyPath: m_text value: "\uF606" objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - insertIndex: -1 - addedObject: {fileID: 6804883858343911371} - m_SourcePrefab: {fileID: 100100000, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} ---- !u!1 &2735949172398416787 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 103088149191778650} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6804883858343911371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2735949172398416787} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!114 &5511659882903158153 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5553896384577821907, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 103088149191778650} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &5511659882903158158 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5553896384577821908, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 103088149191778650} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1197439109901939053 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1047688125153880400} - m_Modifications: - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -564,6 +359,11 @@ PrefabInstance: propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.x @@ -674,48 +474,103 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_LocalScale.x - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_LocalScale.y - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_text - value: Settings - objectReference: {fileID: 0} - - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: -406019996522594200, guid: a7b1eb3942d2c8c488872d9cb07e253e, - type: 2} - - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_HorizontalAlignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_ActiveFontFeatures.Array.data[0] - value: 1801810542 - objectReference: {fileID: 0} - - target: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2800917670555804296, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + insertIndex: -1 + addedObject: {fileID: 6804883858343911371} + m_SourcePrefab: {fileID: 100100000, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} +--- !u!1 &2735949172398416787 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 103088149191778650} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6804883858343911371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2735949172398416787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &5511659882903158153 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5553896384577821907, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 103088149191778650} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &5511659882903158158 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5553896384577821908, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 103088149191778650} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1197439109901939053 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1047688125153880400} + m_Modifications: + - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + propertyPath: m_LocalScale.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + propertyPath: m_LocalScale.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + propertyPath: m_text + value: Settings + objectReference: {fileID: 0} + - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -406019996522594200, guid: a7b1eb3942d2c8c488872d9cb07e253e, + type: 2} + - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2558516649658020582, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + propertyPath: m_ActiveFontFeatures.Array.data[0] + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2800917670555804296, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} propertyPath: m_IsActive value: 0 @@ -897,37 +752,6 @@ PrefabInstance: propertyPath: m_ActiveFontFeatures.Array.data[0] value: 1801810542 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} ---- !u!224 &6741131975031729593 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5553896384577821908, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 1197439109901939053} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6741131975031729598 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5553896384577821907, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 1197439109901939053} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &3199940603412779456 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1047688125153880400} - m_Modifications: - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -1073,6 +897,37 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} +--- !u!224 &6741131975031729593 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5553896384577821908, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 1197439109901939053} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6741131975031729598 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5553896384577821907, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 1197439109901939053} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &3199940603412779456 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1047688125153880400} + m_Modifications: - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} propertyPath: m_LocalScale.x @@ -1296,37 +1151,6 @@ PrefabInstance: propertyPath: m_ActiveFontFeatures.Array.data[0] value: 1801810542 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} ---- !u!114 &7024241374284401939 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5553896384577821907, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 3199940603412779456} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &7024241374284401940 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5553896384577821908, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 3199940603412779456} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4526298771838838248 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 4602347017457763720} - m_Modifications: - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -1359,7 +1183,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, @@ -1472,6 +1296,37 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} +--- !u!114 &7024241374284401939 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5553896384577821907, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 3199940603412779456} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7024241374284401940 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5553896384577821908, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 3199940603412779456} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4526298771838838248 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4602347017457763720} + m_Modifications: - target: {fileID: 1221714912161894049, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} propertyPath: m_ChildAlignment @@ -1715,62 +1570,7 @@ PrefabInstance: propertyPath: m_ActiveFontFeatures.Array.data[0] value: 1801810542 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - insertIndex: -1 - addedObject: {fileID: 8548357222980194455} - m_SourcePrefab: {fileID: 100100000, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} ---- !u!1 &1893360838120154913 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 4526298771838838248} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8548357222980194455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1893360838120154913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!114 &8341725985588902203 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5553896384577821907, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 4526298771838838248} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &8341725985588902204 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5553896384577821908, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - m_PrefabInstance: {fileID: 4526298771838838248} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4697921153788804363 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1047688125153880400} - m_Modifications: - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, + - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name value: Button @@ -1802,7 +1602,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, @@ -1915,6 +1715,61 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8548357222980194455} + m_SourcePrefab: {fileID: 100100000, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} +--- !u!1 &1893360838120154913 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2636353348125852361, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 4526298771838838248} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8548357222980194455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1893360838120154913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &8341725985588902203 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5553896384577821907, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 4526298771838838248} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8341725985588902204 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5553896384577821908, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + type: 3} + m_PrefabInstance: {fileID: 4526298771838838248} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4697921153788804363 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1047688125153880400} + m_Modifications: - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} propertyPath: m_LocalScale.x @@ -2138,6 +1993,151 @@ PrefabInstance: propertyPath: m_text value: "\uF4F9" objectReference: {fileID: 0} + - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Name + value: Button + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Size.x + value: 70.07001 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Size.y + value: 76.47 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2877,6 +2877,18 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &2691477492030501755 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8366121823105010990, guid: 823b5dfa790c346f8bc1013d686c5cae, + type: 3} + m_PrefabInstance: {fileID: 5854789450315251285} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4602347017457763720 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7971003855663578077, guid: 823b5dfa790c346f8bc1013d686c5cae, @@ -2907,6 +2919,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e23b5707e8ac4e17b2e5a1708cd161af, type: 3} m_Name: m_EditorClassIdentifier: + _titleText: {fileID: 2691477492030501755} _colorPalettePopup: {fileID: 0} _importModelsPopup: {fileID: 0} _toolManager: {fileID: 0} @@ -2925,172 +2938,27 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4602347017457763720} m_Modifications: - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, + - target: {fileID: 1221714912161894049, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} - propertyPath: m_Name - value: Button + propertyPath: m_ChildAlignment + value: 3 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, + - target: {fileID: 1221714912161894049, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} - propertyPath: m_Size.x - value: 70.07001 + propertyPath: m_ChildControlWidth + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, + - target: {fileID: 1221714912161894049, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} - propertyPath: m_Size.y - value: 76.47 + propertyPath: m_ChildForceExpandWidth + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: m_LocalScale.x + value: 0.25 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1221714912161894049, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_ChildAlignment - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1221714912161894049, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_ChildControlWidth - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1221714912161894049, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_ChildForceExpandWidth - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, - type: 3} - propertyPath: m_LocalScale.x - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, + - target: {fileID: 1313930159352992362, guid: 5e5ab25e1896f49bdb4a02f2dcde39d3, type: 3} propertyPath: m_LocalScale.y value: 0.25 @@ -3338,6 +3206,151 @@ PrefabInstance: propertyPath: m_ActiveFontFeatures.Array.data[0] value: 1801810542 objectReference: {fileID: 0} + - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Name + value: Button + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Size.x + value: 70.07001 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Size.y + value: 76.47 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_NotConnected.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_NotConnected.prefab index 861f65d..c82190c 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_NotConnected.prefab +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_NotConnected.prefab @@ -881,6 +881,18 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 1926070599476774283} m_SourcePrefab: {fileID: 100100000, guid: 823b5dfa790c346f8bc1013d686c5cae, type: 3} +--- !u!114 &873293368453284650 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8366121823105010990, guid: 823b5dfa790c346f8bc1013d686c5cae, + type: 3} + m_PrefabInstance: {fileID: 8648284342219279876} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1628703343043229145 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7971003855663578077, guid: 823b5dfa790c346f8bc1013d686c5cae, @@ -905,7 +917,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0a5a384e35b64d638ec4edba6ff3e9c9, type: 3} m_Name: m_EditorClassIdentifier: + _titleText: {fileID: 873293368453284650} _drawSoloAreYouSurePopup: {fileID: 0} + _serverConnectionManager: {fileID: 0} + _keyboard: {fileID: 0} _chooseServerButton: {fileID: 3697566135199704586} _drawSoloButton: {fileID: 1417158729908695408} _notConnectedDescriptionText: {fileID: 6000567839426137994} diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_NotLocalized.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_NotLocalized.prefab index 0a95c63..440485e 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_NotLocalized.prefab +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_NotLocalized.prefab @@ -515,7 +515,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b5212c5018944d18424609252ece4b2, type: 3} m_Name: m_EditorClassIdentifier: + _titleText: {fileID: 4699004420609882338} _openSpacesAppButton: {fileID: 6829613215870200212} +--- !u!114 &4699004420609882338 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8366121823105010990, guid: 823b5dfa790c346f8bc1013d686c5cae, + type: 3} + m_PrefabInstance: {fileID: 3831535133180065228} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &6607599933224177169 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7971003855663578077, guid: 823b5dfa790c346f8bc1013d686c5cae, @@ -530,141 +543,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6607599933224177169} m_Modifications: - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Name - value: Button - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Size.y - value: 76.47 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1438130722105109126, guid: 83c8f3b69e9c24b5d92e5e1bfb3fe023, type: 3} propertyPath: m_text @@ -877,6 +755,141 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Name + value: Button + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Size.y + value: 76.47 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_ServerTooOld.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_ServerTooOld.prefab index 9c595ba..f314b65 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_ServerTooOld.prefab +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_ServerTooOld.prefab @@ -477,6 +477,18 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 8827311365010791269} m_SourcePrefab: {fileID: 100100000, guid: 823b5dfa790c346f8bc1013d686c5cae, type: 3} +--- !u!114 &4271290716192967533 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8366121823105010990, guid: 823b5dfa790c346f8bc1013d686c5cae, + type: 3} + m_PrefabInstance: {fileID: 5718660299432281667} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7295794861605217876 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3054317939429941271, guid: 823b5dfa790c346f8bc1013d686c5cae, @@ -495,3 +507,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 852a5a99e32b44efa3cd9e9f5cce78de, type: 3} m_Name: m_EditorClassIdentifier: + _titleText: {fileID: 4271290716192967533} diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Start.prefab b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Start.prefab index 05274f6..5a7094f 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Start.prefab +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Prefabs/Panels/Panel_Start.prefab @@ -1922,6 +1922,18 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 5279928367878300386} m_SourcePrefab: {fileID: 100100000, guid: 823b5dfa790c346f8bc1013d686c5cae, type: 3} +--- !u!114 &163510558874593251 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8366121823105010990, guid: 823b5dfa790c346f8bc1013d686c5cae, + type: 3} + m_PrefabInstance: {fileID: 8529404846404512461} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1783488408463020304 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7971003855663578077, guid: 823b5dfa790c346f8bc1013d686c5cae, @@ -1946,7 +1958,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 31445dd29a83459caf416e4692f8a0b5, type: 3} m_Name: m_EditorClassIdentifier: - _keyboardManager: {fileID: 0} + _titleText: {fileID: 163510558874593251} + _keyboard: {fileID: 0} _localizationManager: {fileID: 0} _startContinueButton: {fileID: 8639231737456761082} _startDescriptionText: {fileID: 6709278114838670147} diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/LeapBrush.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/LeapBrush.cs index 2dae50d..923266c 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/LeapBrush.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/LeapBrush.cs @@ -279,17 +279,38 @@ private void Start() /// private void Update() { + CheckStartupPerformanceDelay(); UpdateCameraFollow(); - UpdateUploadThread(); ProcessReceivedServerStates(); UpdatePanelVisibility(); - MaybeExpireOtherUsers(); ThreadDispatcher.DispatchAll(); } + /// + /// Monitor for a rendering performance goal at app startup. Once completed, + /// allow the main menu to be shown and start preloading the keyboard. + /// + private void CheckStartupPerformanceDelay() + { + if (_startupPerformanceDelayCompleted) + { + return; + } + + _startupPerformanceDelayCompleted = + Time.frameCount > 10 && Time.deltaTime < 1.5f / 60f; + + _mainMenu.SetActive(_startupPerformanceDelayCompleted); + + if (_startupPerformanceDelayCompleted) + { + _keyboard.Preload(); + } + } + /// /// Update the camera to follow a particular joined user if set. /// @@ -443,10 +464,6 @@ private void UpdatePanelVisibility() { if (!_startupPerformanceDelayCompleted) { - // Keep the main menu hidden until a startup frame delta goal has been achieved. - _startupPerformanceDelayCompleted = - Time.frameCount > 10 && Time.deltaTime < 1.5f / 60f; - _mainMenu.SetActive(_startupPerformanceDelayCompleted); return; } @@ -1415,7 +1432,8 @@ private void UpdateStatusText() _statusTextBuilder.Length = 0; _statusTextBuilder.AppendFormat( - "Leap Brush v{0}\n", Application.version); + "{0} v{1}\n", Application.productName, + Application.version); _statusTextBuilder.AppendFormat("UserName: {0}\n", _userDisplayName); { diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/LeapBrushKeyboard.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/LeapBrushKeyboard.cs index c50bc9a..4463600 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/LeapBrushKeyboard.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/LeapBrushKeyboard.cs @@ -24,21 +24,7 @@ public class LeapBrushKeyboard : MonoBehaviour, IPopup public void Show(string text) { - if (_sceneLoadOperation == null) - { - _sceneLoadOperation = SceneManager.LoadSceneAsync(KeyboardSceneName, - LoadSceneMode.Additive); - _sceneLoadOperation.completed += (_) => - { - Scene scene = SceneManager.GetSceneByName(KeyboardSceneName); - if (!scene.IsValid()) - { - Debug.LogError("Failed to find keyboard scene"); - } - - _keyboardManager = scene.GetRootGameObjects()[0].GetComponent(); - }; - } + Preload(); if (!_showRequested) { @@ -61,6 +47,25 @@ public void Show(string text) }; } + public void Preload() + { + if (_sceneLoadOperation == null) + { + _sceneLoadOperation = SceneManager.LoadSceneAsync(KeyboardSceneName, + LoadSceneMode.Additive); + _sceneLoadOperation.completed += (_) => + { + Scene scene = SceneManager.GetSceneByName(KeyboardSceneName); + if (!scene.IsValid()) + { + Debug.LogError("Failed to find keyboard scene"); + } + + _keyboardManager = scene.GetRootGameObjects()[0].GetComponent(); + }; + } + } + private void ShowInternal(string text) { _keyboardManager.gameObject.SetActive(true); diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/AppTooOldPanel.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/AppTooOldPanel.cs index 0a5a187..a614f6d 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/AppTooOldPanel.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/AppTooOldPanel.cs @@ -1,11 +1,13 @@ -using UnityEngine; - namespace MagicLeap.LeapBrush { /// /// Panel showing the user that their application is tool old to work with the current server. /// - public class AppTooOldPanel : MonoBehaviour + public class AppTooOldPanel : BasePanel { + private void Start() + { + base.Start(); + } } } \ No newline at end of file diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/BasePanel.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/BasePanel.cs new file mode 100644 index 0000000..7fd0b65 --- /dev/null +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/BasePanel.cs @@ -0,0 +1,26 @@ +using TMPro; +using UnityEngine; +using UnityEngine.Localization.Components; +using UnityEngine.Localization.SmartFormat.PersistentVariables; + +namespace MagicLeap.LeapBrush +{ + public class BasePanel : MonoBehaviour + { + [Header("Base Panel Internal Dependencies")] + + [SerializeField] + private TMP_Text _titleText; + + protected void Start() + { + LocalizeStringEvent textLocalized = + _titleText.GetComponent(); + + ((StringVariable) textLocalized.StringReference["AppName"]).Value + = Application.productName; + + textLocalized.StringReference.RefreshString(); + } + } +} \ No newline at end of file diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/BasePanel.cs.meta b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/BasePanel.cs.meta new file mode 100644 index 0000000..8b152c6 --- /dev/null +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/BasePanel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0f090f5268224768bc73719242444b9d +timeCreated: 1723747887 \ No newline at end of file diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/MainPanel.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/MainPanel.cs index 173c882..ace4170 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/MainPanel.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/MainPanel.cs @@ -1,5 +1,6 @@ using System; using MixedReality.Toolkit; +using Unity.VisualScripting; using UnityEngine; namespace MagicLeap.LeapBrush @@ -8,7 +9,7 @@ namespace MagicLeap.LeapBrush /// The main UI panel. Users can pick from the various brush options, settings, import model, /// and color palette. /// - public class MainPanel : MonoBehaviour + public class MainPanel : BasePanel { public event Action OnSettingsSelected; public event Action OnToolSelected; @@ -56,6 +57,11 @@ private void Awake() _popupTracker = gameObject.AddComponent(); } + private void Start() + { + base.Start(); + } + private void OnEnable() { _scribbleBrushButton.OnClicked.AddListener(OnScribbleBrushToolButtonClicked); diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/NotConnectedPanel.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/NotConnectedPanel.cs index e2b92a8..5f5a43d 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/NotConnectedPanel.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/NotConnectedPanel.cs @@ -10,7 +10,7 @@ namespace MagicLeap.LeapBrush /// /// Panel displayed when the currently selected server cannot be connected to. /// - public class NotConnectedPanel : MonoBehaviour + public class NotConnectedPanel : BasePanel { public event Action OnDrawSoloSelected; @@ -47,6 +47,8 @@ private void Awake() private void Start() { + base.Start(); + _chooseServerButton.OnClicked.AddListener(OnChooseServerButtonClicked); _drawSoloButton.OnClicked.AddListener(OnDrawSoloButtonClicked); _drawSoloAreYouSurePopup.OnConfirmSelected += OnDrawSoloConfirmButtonSelected; diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/NotLocalizedPanel.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/NotLocalizedPanel.cs index eeda5d8..7485622 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/NotLocalizedPanel.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/NotLocalizedPanel.cs @@ -10,8 +10,10 @@ namespace MagicLeap.LeapBrush /// The user is provided the opportunity to open the Spaces tool to create or localize /// to a space before continuing. /// - public class NotLocalizedPanel : MonoBehaviour + public class NotLocalizedPanel : BasePanel { + [Header("Internal Dependencies")] + [SerializeField] private StatefulInteractable _openSpacesAppButton; @@ -24,6 +26,8 @@ private void Awake() private void Start() { + base.Start(); + _openSpacesAppButton.OnClicked.AddListener(OnStartSpacesAppButtonClicked); } diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/ServerTooOldPanel.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/ServerTooOldPanel.cs index a4bdbfe..d14dd81 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/ServerTooOldPanel.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/ServerTooOldPanel.cs @@ -1,11 +1,13 @@ -using UnityEngine; - namespace MagicLeap.LeapBrush { /// /// Panel displayed when the server is too old to be used with the current app. /// - public class ServerTooOldPanel : MonoBehaviour + public class ServerTooOldPanel : BasePanel { + private void Start() + { + base.Start(); + } } } \ No newline at end of file diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/StartPanel.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/StartPanel.cs index e63ae86..ab31b1a 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/StartPanel.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/Panels/StartPanel.cs @@ -10,7 +10,7 @@ namespace MagicLeap.LeapBrush /// UI Panel allowing the user to select their name and confirm the space to use before /// continuing on to drawing. /// - public class StartPanel : MonoBehaviour + public class StartPanel : BasePanel { public event Action OnContinueSelected; public event Action OnSetUserDisplayName; @@ -94,6 +94,8 @@ private void Awake() private void Start() { + base.Start(); + _startContinueButton.OnClicked.AddListener(OnContinueButtonClicked); _changeSpaceButton.OnClicked.AddListener(OnChangeSpaceButtonClicked); _changeUserNameButton.OnClicked.AddListener(OnChangeUserNameButtonClicked); diff --git a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/ServerConnectionManager.cs b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/ServerConnectionManager.cs index 202d7fb..9638178 100644 --- a/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/ServerConnectionManager.cs +++ b/LeapBrush/Assets/MagicLeap/LeapBrush/Scripts/ServerConnectionManager.cs @@ -45,7 +45,7 @@ public string ServerUrl private void Awake() { - _persistentDataPath = Application.persistentDataPath; + EnsurePersistentDataPathInitialized(); } public LeapBrushApiBase.LeapBrushClient Connect(bool drawSolo) @@ -69,6 +69,8 @@ public void LoadServerUrl() return; } + EnsurePersistentDataPathInitialized(); + #if !UNITY_EDITOR string serverHostPortPrefPath = Path.Join(_persistentDataPath, "serverHostPort.txt"); @@ -143,5 +145,10 @@ public void SetServerUrl(string serverUrl) OnServerUrlChanged?.Invoke(serverUrl); } + + private void EnsurePersistentDataPathInitialized() + { + _persistentDataPath = Application.persistentDataPath; + } } } \ No newline at end of file diff --git a/LeapBrush/ProjectSettings/ProjectSettings.asset b/LeapBrush/ProjectSettings/ProjectSettings.asset index 8dbcddf..a89c51e 100644 --- a/LeapBrush/ProjectSettings/ProjectSettings.asset +++ b/LeapBrush/ProjectSettings/ProjectSettings.asset @@ -139,7 +139,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: .86 + bundleVersion: .87 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -170,7 +170,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 86 + AndroidBundleVersionCode: 87 AndroidMinSdkVersion: 29 AndroidTargetSdkVersion: 29 AndroidPreferredInstallLocation: 1