diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab index e1197c0d0..b66946e40 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab @@ -427,6 +427,7 @@ GameObject: - component: {fileID: 4095427112833100002} - component: {fileID: 4095427112833100000} - component: {fileID: 4095427112833100001} + - component: {fileID: 7538724603407037766} m_Layer: 5 m_Name: TopNavigationExample m_TagString: Untagged @@ -493,6 +494,47 @@ MonoBehaviour: thickness: 2 wedges: 8 calculateSmoothEdges: 1 +--- !u!114 &7538724603407037766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4095427112833100003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7636826640568287471 + - rid: 7617100123102511115 + - rid: 7617100121658621991 + - rid: 7617100121658621992 + references: + version: 2 + RefIds: + - rid: 7617100121658621991 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6126417514449433620} + k__BackingField: On Surface Color + - rid: 7617100121658621992 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6126417514449433620} + k__BackingField: Text Font + - rid: 7617100123102511115 + type: {class: ImageSpriteBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 7377956084833273159} + k__BackingField: MRTK Logo + - rid: 7636826640568287471 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4095427112833100001} + k__BackingField: Backplate Material --- !u!1 &4095427113250735759 GameObject: m_ObjectHideFlags: 0 @@ -810,7 +852,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 100 + value: Lightbulb objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -984,7 +1026,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 107 + value: Movie objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -1678,7 +1720,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab index be7600e38..86a3a12dd 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab @@ -674,6 +674,7 @@ GameObject: - component: {fileID: 3220012215463627515} - component: {fileID: 8084989196684289760} - component: {fileID: 5404797170367061738} + - component: {fileID: 863618738849702724} m_Layer: 5 m_Name: DescriptionPanel m_TagString: Untagged @@ -750,7 +751,84 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 +--- !u!114 &863618738849702724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540126486176102408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100123102511104 + - rid: 7617100123102511105 + - rid: 7617100123102511106 + - rid: 7617100123102511107 + - rid: 7617100123102511108 + - rid: 7617100123102511109 + - rid: 7617100123102511110 + - rid: 7617100123102511111 + - rid: 7617100123102511113 + - rid: 7617100459693309976 + references: + version: 2 + RefIds: + - rid: 7617100123102511104 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6809291684801504143} + k__BackingField: On Surface Color + - rid: 7617100123102511105 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6809291684801504143} + k__BackingField: Text Font + - rid: 7617100123102511106 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4568172237328552037} + k__BackingField: On Surface Color + - rid: 7617100123102511107 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4568172237328552037} + k__BackingField: Text Font + - rid: 7617100123102511108 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2446705927233332293} + k__BackingField: On Surface Color + - rid: 7617100123102511109 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2446705927233332293} + k__BackingField: Text Font + - rid: 7617100123102511110 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4376175471552893095} + k__BackingField: On Surface Color + - rid: 7617100123102511111 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 5822078602719066722} + k__BackingField: On Surface Color + - rid: 7617100123102511113 + type: {class: SpriteRendererSpriteBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1051251617942771901} + k__BackingField: MRTK Logo + - rid: 7617100459693309976 + type: {class: RendererMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6676203961570324161} + k__BackingField: Non-Canvas Backplate (8mm) Material --- !u!1 &7368034384095272423 GameObject: m_ObjectHideFlags: 0 @@ -795,7 +873,7 @@ GameObject: - component: {fileID: 3732017194820540582} - component: {fileID: 1051251617942771901} m_Layer: 0 - m_Name: MRTK_Logo_White + m_Name: MRTK_Logo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasUITearsheet.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasUITearsheet.unity index 71280400f..ec1b0441e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasUITearsheet.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasUITearsheet.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,14 +93,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +113,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -155,7 +151,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 65389176} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -240,20 +235,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -284,6 +282,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -366,7 +365,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 133 + value: Favorite objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -485,6 +484,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &14426175 stripped RectTransform: @@ -528,7 +530,6 @@ RectTransform: - {fileID: 2086818868} - {fileID: 1599070117} m_Father: {fileID: 831863309} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -595,6 +596,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -612,6 +620,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -694,7 +703,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 72 + value: Cut objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -821,6 +830,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &30053974 stripped RectTransform: @@ -832,6 +844,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1424732237} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -904,7 +917,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 115 + value: Group objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -1015,6 +1028,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &30664519 stripped RectTransform: @@ -1060,7 +1076,6 @@ RectTransform: - {fileID: 14426175} - {fileID: 1472954656} m_Father: {fileID: 1714867591} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1127,6 +1142,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -1144,6 +1166,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1212,7 +1235,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 51 + value: Horizontal List objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -1327,6 +1350,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &47838182 stripped RectTransform: @@ -1338,12 +1364,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1361,6 +1384,9 @@ PrefabInstance: value: EventSystem objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} --- !u!1 &65389172 GameObject: @@ -1374,6 +1400,7 @@ GameObject: - component: {fileID: 65389175} - component: {fileID: 65389174} - component: {fileID: 65389173} + - component: {fileID: 65389177} m_Layer: 5 m_Name: Buttons Canvas m_TagString: Untagged @@ -1438,7 +1465,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1460,18 +1489,77 @@ RectTransform: - {fileID: 3747106709254832807} - {fileID: 1944714597} m_Father: {fileID: 1369683957} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.5737, y: -0.04201} m_SizeDelta: {x: 352.4888, y: 281.9509} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &65389177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65389172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610090 + - rid: 1538473376477610091 + - rid: 1538473376477610092 + - rid: 1538473376477610087 + - rid: 1538473376477610088 + - rid: 1538473382797639792 + - rid: 1538473382797639793 + references: + version: 2 + RefIds: + - rid: 1538473376477610087 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6515328879105725118} + k__BackingField: Backplate Material + - rid: 1538473376477610088 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1944714600} + k__BackingField: Backplate Material + - rid: 1538473376477610090 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2100425384} + k__BackingField: Text Font + - rid: 1538473376477610091 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 86645938} + k__BackingField: Text Font + - rid: 1538473376477610092 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 11163958} + k__BackingField: Text Font + - rid: 1538473382797639792 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1622854746} + k__BackingField: Text Font + - rid: 1538473382797639793 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1622854746} + k__BackingField: On Surface Color --- !u!1001 &68209847 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1540,7 +1628,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 104 + value: Mail objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -1655,6 +1743,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &68209848 stripped RectTransform: @@ -1693,7 +1784,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1482164461} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1778,20 +1868,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1849,7 +1942,6 @@ RectTransform: m_Children: - {fileID: 906057049} m_Father: {fileID: 311062483} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1876,6 +1968,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -1920,7 +2019,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 65389176} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2005,20 +2103,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -2049,6 +2150,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 14468906} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2236,6 +2338,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1042814119} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &87540892 stripped RectTransform: @@ -2299,7 +2407,6 @@ RectTransform: - {fileID: 393337007} - {fileID: 628494713} m_Father: {fileID: 371654821} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2364,6 +2471,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -2381,6 +2495,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2449,7 +2564,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 141 + value: Undo objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -2564,6 +2679,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &101484292 stripped RectTransform: @@ -2575,6 +2693,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2087755156} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2758,6 +2877,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1349327197} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &109335092 stripped RectTransform: @@ -2785,6 +2910,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2853,7 +2979,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 26 + value: Sound objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -2968,6 +3094,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &117240531 stripped RectTransform: @@ -2979,6 +3108,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1073055405} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3047,7 +3177,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 91 + value: Headphones objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -3158,6 +3288,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &138829974 stripped RectTransform: @@ -3195,7 +3328,6 @@ RectTransform: - {fileID: 1488121688} - {fileID: 1854885402} m_Father: {fileID: 1092179575} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3372,6 +3504,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -3439,6 +3574,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1304147004} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3511,7 +3647,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -3618,6 +3754,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &151622003 stripped RectTransform: @@ -3658,7 +3797,6 @@ RectTransform: m_Children: - {fileID: 1936164015} m_Father: {fileID: 2118576653} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3725,6 +3863,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -3769,7 +3914,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3854,20 +3998,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3898,6 +4045,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3980,7 +4128,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 53 + value: Camera objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -4107,6 +4255,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &168021814 stripped RectTransform: @@ -4118,6 +4269,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4303,6 +4455,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &173788764 stripped RectTransform: @@ -4314,6 +4469,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1905834815} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -4409,12 +4565,21 @@ PrefabInstance: value: objectReference: {fileID: 1905834816} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &188341443 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 188341442} + m_PrefabAsset: {fileID: 0} --- !u!1001 &197159555 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 386957940} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -4510,12 +4675,21 @@ PrefabInstance: value: objectReference: {fileID: 386957941} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &197159556 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 197159555} + m_PrefabAsset: {fileID: 0} --- !u!1001 &198110455 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4584,7 +4758,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 31 + value: Notifications objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -4699,6 +4873,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &198110456 stripped RectTransform: @@ -4736,7 +4913,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4804,20 +4980,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -4880,7 +5059,6 @@ RectTransform: - {fileID: 880417321} - {fileID: 1403959011} m_Father: {fileID: 831863309} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4947,6 +5125,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -4996,7 +5181,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1093577527} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5082,20 +5266,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5126,6 +5313,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1874031336} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -5217,12 +5405,21 @@ PrefabInstance: value: objectReference: {fileID: 1874031337} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &276007649 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 276007648} + m_PrefabAsset: {fileID: 0} --- !u!1001 &280014427 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1637717373} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5414,6 +5611,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 531191238} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &280014428 stripped RectTransform: @@ -5441,6 +5644,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5618,6 +5822,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &284501559 stripped RectTransform: @@ -5629,6 +5836,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 479543587} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -5724,7 +5932,15 @@ PrefabInstance: value: objectReference: {fileID: 479543588} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &290101502 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 290101501} + m_PrefabAsset: {fileID: 0} --- !u!1 &308180791 GameObject: m_ObjectHideFlags: 0 @@ -5757,7 +5973,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1653004003} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5842,20 +6057,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5922,7 +6140,6 @@ RectTransform: - {fileID: 1122818193} - {fileID: 1122456285} m_Father: {fileID: 1623931610} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5986,7 +6203,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -6022,7 +6241,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1714867591} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6107,20 +6325,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -6188,7 +6409,6 @@ RectTransform: - {fileID: 1111325864} - {fileID: 68209848} m_Father: {fileID: 371654821} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6253,6 +6473,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -6270,6 +6497,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6338,7 +6566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 93 + value: History objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -6453,6 +6681,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &357876116 stripped RectTransform: @@ -6498,7 +6729,6 @@ RectTransform: - {fileID: 101034061} - {fileID: 335940727} m_Father: {fileID: 1158768845} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6515,6 +6745,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6601,7 +6832,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 84 + value: Globe objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -6716,6 +6947,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 197159556} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &386957939 stripped RectTransform: @@ -6743,6 +6980,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6811,7 +7049,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 35 + value: List objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -6926,6 +7164,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &389055256 stripped RectTransform: @@ -6937,6 +7178,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7005,7 +7247,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 26 + value: Sound objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -7120,6 +7362,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &393337007 stripped RectTransform: @@ -7131,6 +7376,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2087755156} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7326,6 +7572,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 2044694321} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &402425587 stripped RectTransform: @@ -7381,7 +7633,6 @@ RectTransform: m_Children: - {fileID: 1704462485} m_Father: {fileID: 311062483} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7440,6 +7691,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1854885402} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7516,7 +7768,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -7679,12 +7931,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!1001 &443057977 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 891825324} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -7900,6 +8156,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &443057978 stripped RectTransform: @@ -7939,7 +8198,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1424732237} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8018,6 +8276,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8100,7 +8359,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 19 + value: Write Mail objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -8207,6 +8466,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &471693313 stripped RectTransform: @@ -8218,6 +8480,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8286,7 +8549,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 94 + value: Home objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -8401,6 +8664,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &475336116 stripped RectTransform: @@ -8412,6 +8678,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 773317072} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8488,7 +8755,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 119 + value: Devices objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -8603,6 +8870,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 290101502} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &479543586 stripped RectTransform: @@ -8630,6 +8903,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 553395885} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8827,6 +9101,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &505641634 stripped RectTransform: @@ -8838,6 +9115,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8924,7 +9202,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 91 + value: Headphones objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -9051,6 +9329,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 826383660} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &514014398 stripped RectTransform: @@ -9078,6 +9362,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9251,6 +9536,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &519434938 stripped RectTransform: @@ -9262,12 +9550,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -9289,12 +9574,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} --- !u!1001 &531191237 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 280014429} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -9390,12 +9679,21 @@ PrefabInstance: value: objectReference: {fileID: 280014430} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &531191238 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 531191237} + m_PrefabAsset: {fileID: 0} --- !u!1001 &545482698 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1999519067} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9468,7 +9766,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 91 + value: Headphones objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -9575,6 +9873,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &545482699 stripped RectTransform: @@ -9618,7 +9919,6 @@ RectTransform: - {fileID: 733249950} - {fileID: 505641634} m_Father: {fileID: 1653004003} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9685,6 +9985,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -9702,12 +10009,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -9757,12 +10061,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &576536706 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1854885402} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9841,7 +10149,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -10004,6 +10312,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &576536707 stripped RectTransform: @@ -10015,6 +10326,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 591035305} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -10106,12 +10418,21 @@ PrefabInstance: value: objectReference: {fileID: 591035306} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &577083554 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 577083553} + m_PrefabAsset: {fileID: 0} --- !u!1001 &591035303 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10357,6 +10678,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 577083554} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &591035304 stripped RectTransform: @@ -10384,6 +10711,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10452,7 +10780,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 37 + value: Reset objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -10567,6 +10895,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &628494713 stripped RectTransform: @@ -10578,6 +10909,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796335078} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -10705,6 +11037,9 @@ PrefabInstance: value: CanvasSlider (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &630532475 stripped RectTransform: @@ -10750,7 +11085,6 @@ RectTransform: - {fileID: 168021814} - {fileID: 30053974} m_Father: {fileID: 1653004003} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10817,6 +11151,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -10861,7 +11202,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2118576653} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10949,20 +11289,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10993,6 +11336,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1424732237} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11093,7 +11437,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 85 + value: Edit objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -11204,6 +11548,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &695898586 stripped RectTransform: @@ -11215,6 +11562,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1122818193} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -11382,6 +11730,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &703335399 stripped RectTransform: @@ -11413,9 +11764,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -11465,8 +11815,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -11474,19 +11828,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &733249949 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 553395885} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11684,6 +12039,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &733249950 stripped RectTransform: @@ -11727,7 +12085,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 682545839} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11812,20 +12169,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -11856,12 +12216,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -11911,6 +12268,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + insertIndex: -1 + addedObject: {fileID: 1551252957} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} --- !u!1 &773317071 GameObject: @@ -11946,7 +12309,6 @@ RectTransform: - {fileID: 1874031335} - {fileID: 479543586} m_Father: {fileID: 1329564636} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11984,6 +12346,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1073055405} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12052,7 +12415,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 53 + value: Camera objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -12163,6 +12526,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &819541700 stripped RectTransform: @@ -12174,6 +12540,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12242,7 +12609,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 65 + value: Zoom objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -12357,6 +12724,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &820958105 stripped RectTransform: @@ -12368,6 +12738,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 514014399} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -12463,7 +12834,15 @@ PrefabInstance: value: objectReference: {fileID: 514014400} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &826383660 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 826383659} + m_PrefabAsset: {fileID: 0} --- !u!1 &831863308 GameObject: m_ObjectHideFlags: 0 @@ -12500,7 +12879,6 @@ RectTransform: - {fileID: 1424732237} - {fileID: 201720333} m_Father: {fileID: 2127076438} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -12512,6 +12890,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1599070118} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -12591,12 +12970,21 @@ PrefabInstance: value: objectReference: {fileID: 1599070119} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &834000930 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 834000929} + m_PrefabAsset: {fileID: 0} --- !u!1001 &850642144 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1424732237} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12669,7 +13057,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 100 + value: Lightbulb objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -12780,6 +13168,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &850642145 stripped RectTransform: @@ -12818,7 +13209,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 831863309} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -12903,20 +13293,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -12947,6 +13340,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 201720333} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13015,7 +13409,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 40 + value: Move objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -13126,6 +13520,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &880417321 stripped RectTransform: @@ -13168,7 +13565,6 @@ RectTransform: - {fileID: 443057978} - {fileID: 2137575391} m_Father: {fileID: 1290890163} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -13301,7 +13697,6 @@ RectTransform: m_Children: - {fileID: 1125450390} m_Father: {fileID: 85912328} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13360,6 +13755,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2087755156} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13555,6 +13951,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1508693225} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &924342751 stripped RectTransform: @@ -13582,6 +13984,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1073055405} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13650,7 +14053,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 113 + value: Settings Sliders objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -13761,6 +14164,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &943981974 stripped RectTransform: @@ -13772,6 +14178,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796335078} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -13899,6 +14306,9 @@ PrefabInstance: value: CanvasSlider (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &954672193 stripped RectTransform: @@ -13910,6 +14320,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1637717373} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13978,7 +14389,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 107 + value: Movie objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -14097,6 +14508,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &968557651 stripped RectTransform: @@ -14115,6 +14529,7 @@ GameObject: - component: {fileID: 1000460828} - component: {fileID: 1000460827} - component: {fileID: 1000460826} + - component: {fileID: 1000460830} m_Layer: 5 m_Name: Single Buttons Canvas m_TagString: Untagged @@ -14179,7 +14594,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -14197,13 +14614,59 @@ RectTransform: m_Children: - {fileID: 2118576653} m_Father: {fileID: 1369683957} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.5773, y: -0.2353} m_SizeDelta: {x: 345.3021, y: 156.8906} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1000460830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000460825} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610093 + - rid: 1538473376477610094 + - rid: 1538473382797639789 + - rid: 1538473382797639790 + - rid: 1538473382797639791 + references: + version: 2 + RefIds: + - rid: 1538473376477610093 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1023697618} + k__BackingField: Text Font + - rid: 1538473376477610094 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 692976829} + k__BackingField: Text Font + - rid: 1538473382797639789 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1031621825} + k__BackingField: Backplate Material + - rid: 1538473382797639790 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1304147007} + k__BackingField: Backplate Material + - rid: 1538473382797639791 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 154440646} + k__BackingField: Backplate Material --- !u!1 &1005008029 GameObject: m_ObjectHideFlags: 0 @@ -14239,7 +14702,6 @@ RectTransform: m_Children: - {fileID: 1371947327} m_Father: {fileID: 1277251431} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -14344,6 +14806,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} @@ -14398,10 +14861,6 @@ PrefabInstance: propertyPath: m_Name value: SampleSceneHandMenu objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -14455,6 +14914,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} --- !u!1 &1023697615 GameObject: @@ -14488,7 +14950,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2118576653} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14573,20 +15034,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -14646,7 +15110,6 @@ RectTransform: m_Children: - {fileID: 2115835485} m_Father: {fileID: 2118576653} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14713,6 +15176,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -14730,6 +15200,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 87540893} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -14809,7 +15280,15 @@ PrefabInstance: value: objectReference: {fileID: 87540894} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1042814119 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1042814118} + m_PrefabAsset: {fileID: 0} --- !u!1 &1045922679 GameObject: m_ObjectHideFlags: 0 @@ -14842,7 +15321,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1093577527} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14927,20 +15405,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -14971,6 +15452,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15057,7 +15539,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 74 + value: Bar Chart objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -15184,6 +15666,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1798621954} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1048775325 stripped RectTransform: @@ -15211,6 +15699,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 773317072} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15390,6 +15879,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1051477455 stripped RectTransform: @@ -15401,6 +15893,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15469,7 +15962,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 114 + value: Hierarchy objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -15584,6 +16077,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1064177822 stripped RectTransform: @@ -15627,7 +16123,6 @@ RectTransform: - {fileID: 1260305183} - {fileID: 819541700} m_Father: {fileID: 831863309} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -15694,6 +16189,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -15718,6 +16220,7 @@ GameObject: - component: {fileID: 1092179574} - component: {fileID: 1092179573} - component: {fileID: 1092179572} + - component: {fileID: 1092179576} m_Layer: 5 m_Name: Dialogs Canvas m_TagString: Untagged @@ -15782,7 +16285,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -15800,13 +16305,41 @@ RectTransform: m_Children: - {fileID: 149389691} m_Father: {fileID: 1369683957} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0.6818, y: -0.1034} m_SizeDelta: {x: 240.0909, y: 404.8173} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1092179576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092179571} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473382797639770 + - rid: 1538473382797639771 + references: + version: 2 + RefIds: + - rid: 1538473382797639770 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1488121690} + k__BackingField: Text Font + - rid: 1538473382797639771 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1854885406} + k__BackingField: Backplate Material --- !u!1 &1093577523 GameObject: m_ObjectHideFlags: 0 @@ -15819,6 +16352,7 @@ GameObject: - component: {fileID: 1093577526} - component: {fileID: 1093577525} - component: {fileID: 1093577524} + - component: {fileID: 1093577528} m_Layer: 5 m_Name: Top Navigation Canvas m_TagString: Untagged @@ -15883,7 +16417,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -15903,18 +16439,47 @@ RectTransform: - {fileID: 272965572} - {fileID: 1506166577} m_Father: {fileID: 1369683957} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.0175, y: -0.309} m_SizeDelta: {x: 227.4141, y: 146.1393} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1093577528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093577523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610114 + - rid: 1538473376477610115 + references: + version: 2 + RefIds: + - rid: 1538473376477610114 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1045922682} + k__BackingField: Text Font + - rid: 1538473376477610115 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 272965574} + k__BackingField: Text Font --- !u!1001 &1096736671 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15983,7 +16548,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 72 + value: Cut objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -16098,6 +16663,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1096736672 stripped RectTransform: @@ -16109,6 +16677,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -16177,7 +16746,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 98 + value: Pen Tip objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -16292,6 +16861,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1111325864 stripped RectTransform: @@ -16329,7 +16901,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -16396,20 +16967,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -16470,7 +17044,6 @@ RectTransform: - {fileID: 703335399} - {fileID: 1277251431} m_Father: {fileID: 311062483} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -16537,6 +17110,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -16554,6 +17134,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 906057049} m_Modifications: - target: {fileID: 4270209841583229004, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -16661,6 +17242,9 @@ PrefabInstance: value: CanvasSlider objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1125450390 stripped RectTransform: @@ -16672,6 +17256,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2056942515} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -16799,6 +17384,9 @@ PrefabInstance: value: CanvasSlider (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1125611905 stripped RectTransform: @@ -16810,6 +17398,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1517398120} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -16905,12 +17494,21 @@ PrefabInstance: value: objectReference: {fileID: 1517398121} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1129401599 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 1129401598} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1137517785 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2056942515} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -17038,6 +17636,9 @@ PrefabInstance: value: CanvasSlider objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1137517786 stripped RectTransform: @@ -17049,6 +17650,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1999519067} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -17216,6 +17818,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1138145396 stripped RectTransform: @@ -17254,7 +17859,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1714867591} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -17341,20 +17945,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -17392,6 +17999,7 @@ GameObject: - component: {fileID: 1158768844} - component: {fileID: 1158768843} - component: {fileID: 1158768842} + - component: {fileID: 1158768846} m_Layer: 5 m_Name: Button Grid Canvas m_TagString: Untagged @@ -17456,7 +18064,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -17474,18 +18084,65 @@ RectTransform: m_Children: - {fileID: 371654821} m_Father: {fileID: 1369683957} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.27, y: -0.304} m_SizeDelta: {x: 255.8181, y: 283.6979} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1158768846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158768841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610102 + - rid: 1538473376477610103 + - rid: 1538473376477610107 + - rid: 1538473376477610105 + - rid: 1538473376477610106 + references: + version: 2 + RefIds: + - rid: 1538473376477610102 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1503675472} + k__BackingField: Text Font + - rid: 1538473376477610103 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1935111451} + k__BackingField: Text Font + - rid: 1538473376477610105 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 101034064} + k__BackingField: Backplate Material + - rid: 1538473376477610106 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 335940730} + k__BackingField: Backplate Material + - rid: 1538473376477610107 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1983684640} + k__BackingField: Backplate Material --- !u!1001 &1170466718 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1369683957} m_Modifications: - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} @@ -17611,6 +18268,21 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 151308755} + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 151308756} + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 1170466720} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 1761219194} m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} --- !u!224 &1170466719 stripped RectTransform: @@ -17629,8 +18301,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 + handType: -1 + proximityType: -1 executionOrder: 0 minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} @@ -17640,6 +18312,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1472954657} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -17731,7 +18404,15 @@ PrefabInstance: value: objectReference: {fileID: 1472954658} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1181166648 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1181166647} + m_PrefabAsset: {fileID: 0} --- !u!1 &1187780960 GameObject: m_ObjectHideFlags: 0 @@ -17764,7 +18445,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1714867591} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -17849,20 +18529,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -17893,6 +18576,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -17961,7 +18645,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 74 + value: Bar Chart objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -18076,6 +18760,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1188352986 stripped RectTransform: @@ -18087,6 +18774,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -18169,7 +18857,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 45 + value: Attach objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -18284,6 +18972,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1238271666 stripped RectTransform: @@ -18295,6 +18986,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -18363,7 +19055,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 139 + value: Videocam objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -18478,6 +19170,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1250963981 stripped RectTransform: @@ -18489,6 +19184,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1073055405} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -18557,7 +19253,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 67 + value: Color Palette objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -18668,6 +19364,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1260305183 stripped RectTransform: @@ -18679,6 +19378,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -18747,7 +19447,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 91 + value: Headphones objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -18862,6 +19562,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1265028401 stripped RectTransform: @@ -18873,6 +19576,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 773317072} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -19056,6 +19760,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1469922710} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1270681976 stripped RectTransform: @@ -19111,7 +19821,6 @@ RectTransform: - {fileID: 1729846266} - {fileID: 1005008030} m_Father: {fileID: 1122818193} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19177,7 +19886,6 @@ RectTransform: - {fileID: 1665223376} - {fileID: 1915696964} m_Father: {fileID: 3747106709254832807} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19242,7 +19950,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 831863309} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19327,20 +20034,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -19400,7 +20110,6 @@ RectTransform: - {fileID: 1796335078} - {fileID: 891825324} m_Father: {fileID: 311062483} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19453,6 +20162,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -19470,6 +20186,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -19548,7 +20265,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 139 + value: Videocam objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -19655,6 +20372,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1298861446 stripped RectTransform: @@ -19695,7 +20415,6 @@ RectTransform: m_Children: - {fileID: 151622003} m_Father: {fileID: 2118576653} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19762,6 +20481,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -19779,6 +20505,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1614318675} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -19870,12 +20597,21 @@ PrefabInstance: value: objectReference: {fileID: 1614318676} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1311646145 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1311646144} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1313191255 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1424732237} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -19948,7 +20684,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 101 + value: Link objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -20059,6 +20795,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1313191256 stripped RectTransform: @@ -20100,7 +20839,6 @@ RectTransform: - {fileID: 1637717373} - {fileID: 773317072} m_Father: {fileID: 1714867591} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -20167,6 +20905,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -20184,6 +20929,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 109335093} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -20275,7 +21021,15 @@ PrefabInstance: value: objectReference: {fileID: 109335094} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1349327197 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1349327196} + m_PrefabAsset: {fileID: 0} --- !u!1 &1369683956 GameObject: m_ObjectHideFlags: 0 @@ -20299,6 +21053,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369683956} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -20315,13 +21070,13 @@ Transform: - {fileID: 1092179575} - {fileID: 1623931610} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1371947326 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1005008030} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -20537,6 +21292,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1371947327 stripped RectTransform: @@ -20548,6 +21306,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 14468906} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -20735,6 +21494,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1427191248} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1395554708 stripped RectTransform: @@ -20762,6 +21527,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 201720333} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -20830,7 +21596,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 14 + value: Add Location objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -20941,6 +21707,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1403959011 stripped RectTransform: @@ -20952,6 +21721,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -21020,7 +21790,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 77 + value: Icon 62298 objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -21135,6 +21905,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1419556815 stripped RectTransform: @@ -21179,7 +21952,6 @@ RectTransform: - {fileID: 850642145} - {fileID: 695898586} m_Father: {fileID: 831863309} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -21246,6 +22018,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -21263,6 +22042,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1395554709} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -21342,12 +22122,21 @@ PrefabInstance: value: objectReference: {fileID: 1395554710} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1427191248 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1427191247} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1469922709 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1270681977} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -21443,12 +22232,21 @@ PrefabInstance: value: objectReference: {fileID: 1270681978} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1469922710 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 1469922709} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1472954655 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -21527,7 +22325,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 129 + value: Save objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -21646,6 +22444,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1181166648} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1472954656 stripped RectTransform: @@ -21707,7 +22511,6 @@ RectTransform: - {fileID: 1048775325} - {fileID: 1517398119} m_Father: {fileID: 1653004003} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -21774,6 +22577,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -21818,7 +22628,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 149389691} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -21903,20 +22712,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -21974,7 +22786,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 371654821} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22059,20 +22870,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -22103,6 +22917,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1093577527} m_Modifications: - target: {fileID: 3272530386015204673, guid: beb27f14f40963b45a9fb5d2523f4711, type: 3} @@ -22542,6 +23357,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: beb27f14f40963b45a9fb5d2523f4711, type: 3} --- !u!224 &1506166577 stripped RectTransform: @@ -22553,6 +23371,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 924342752} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -22644,7 +23463,15 @@ PrefabInstance: value: objectReference: {fileID: 924342753} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1508693225 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1508693224} + m_PrefabAsset: {fileID: 0} --- !u!1 &1512031906 GameObject: m_ObjectHideFlags: 0 @@ -22676,7 +23503,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22743,20 +23569,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -22787,6 +23616,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -22873,7 +23703,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 31 + value: Notifications objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -23000,6 +23830,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1129401599} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1517398119 stripped RectTransform: @@ -23027,6 +23863,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2086818869} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -23106,12 +23943,21 @@ PrefabInstance: value: objectReference: {fileID: 2086818870} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1527218382 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1527218381} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1540026312 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -23180,7 +24026,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 25 + value: Save As objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -23295,6 +24141,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1540026313 stripped RectTransform: @@ -23327,13 +24176,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551252956} + serializedVersion: 2 m_LocalRotation: {x: 0.28939572, y: -0, z: -0, w: 0.9572095} m_LocalPosition: {x: -0.01144, y: -0.37624, z: 0.09883} m_LocalScale: {x: 0.23897779, y: 0.0437293, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 735511181} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 33.644, y: 0, z: 0} --- !u!64 &1551252958 MeshCollider: @@ -23343,9 +24192,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551252956} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -23366,6 +24223,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -23404,6 +24264,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1637717373} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -23476,7 +24337,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 110 + value: Newspaper objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -23599,6 +24460,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1577565684 stripped RectTransform: @@ -23610,6 +24474,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 14468906} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -23797,6 +24662,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 834000930} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1599070117 stripped RectTransform: @@ -23850,7 +24721,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -23917,20 +24787,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -23961,6 +24834,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1826937101} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -24056,12 +24930,21 @@ PrefabInstance: value: objectReference: {fileID: 1826937102} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1606706622 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 1606706621} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1614318673 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2087755156} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -24257,6 +25140,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1311646145} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1614318674 stripped RectTransform: @@ -24311,7 +25200,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1944714597} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -24396,20 +25284,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -24447,6 +25338,7 @@ GameObject: - component: {fileID: 1623931609} - component: {fileID: 1623931608} - component: {fileID: 1623931607} + - component: {fileID: 1623931611} m_Layer: 5 m_Name: Sliders Canvas m_TagString: Untagged @@ -24511,7 +25403,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -24529,18 +25423,83 @@ RectTransform: m_Children: - {fileID: 311062483} m_Father: {fileID: 1369683957} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0.94920003, y: -0.0954} m_SizeDelta: {x: 302.2189, y: 388.8804} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1623931611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1623931606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473382797639772 + - rid: 1538473382797639773 + - rid: 1538473382797639774 + - rid: 1538473382797639775 + - rid: 1538473382797639776 + - rid: 1538473382797639777 + - rid: 1538473382797639778 + - rid: 1538473382797639779 + references: + version: 2 + RefIds: + - rid: 1538473382797639772 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 163304840} + k__BackingField: Text Font + - rid: 1538473382797639773 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1600123139} + k__BackingField: Text Font + - rid: 1538473382797639774 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1512031908} + k__BackingField: Text Font + - rid: 1538473382797639775 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 200481605} + k__BackingField: Text Font + - rid: 1538473382797639776 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1122456286} + k__BackingField: Text Font + - rid: 1538473382797639777 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 85912329} + k__BackingField: Backplate Material + - rid: 1538473382797639778 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1290890165} + k__BackingField: Backplate Material + - rid: 1538473382797639779 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1122818196} + k__BackingField: Backplate Material --- !u!1001 &1630388036 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1729846266} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -24680,6 +25639,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &1630388037 stripped RectTransform: @@ -24698,6 +25660,7 @@ GameObject: - component: {fileID: 1635487815} - component: {fileID: 1635487814} - component: {fileID: 1635487813} + - component: {fileID: 1635487817} m_Layer: 5 m_Name: ListMenus Canvas m_TagString: Untagged @@ -24762,7 +25725,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -24780,13 +25745,113 @@ RectTransform: m_Children: - {fileID: 1653004003} m_Father: {fileID: 1369683957} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0.388, y: -0.151} m_SizeDelta: {x: 414.4783, y: 500} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1635487817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635487812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473382797639769 + - rid: 1538473382797639768 + - rid: 1538473382797639767 + - rid: 1538473382797639766 + - rid: 1538473382797639765 + - rid: 1538473382797639764 + - rid: 1538473382797639780 + - rid: 1538473382797639781 + - rid: 1538473382797639782 + - rid: 1538473382797639783 + - rid: 1538473382797639784 + - rid: 1538473382797639785 + - rid: 1538473382797639788 + - rid: 1538473382797639787 + references: + version: 2 + RefIds: + - rid: 1538473382797639764 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2087755159} + k__BackingField: Backplate Material + - rid: 1538473382797639765 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 553395888} + k__BackingField: Backplate Material + - rid: 1538473382797639766 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1482164464} + k__BackingField: Backplate Material + - rid: 1538473382797639767 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 682545842} + k__BackingField: Backplate Material + - rid: 1538473382797639768 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1635540425} + k__BackingField: Text Font + - rid: 1538473382797639769 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 308180794} + k__BackingField: Text Font + - rid: 1538473382797639780 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 759505762} + k__BackingField: Text Font + - rid: 1538473382797639781 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 759505762} + k__BackingField: On Surface Color + - rid: 1538473382797639782 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 83153274} + k__BackingField: Text Font + - rid: 1538473382797639783 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 83153274} + k__BackingField: On Surface Color + - rid: 1538473382797639784 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1894806655} + k__BackingField: Text Font + - rid: 1538473382797639785 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1894806655} + k__BackingField: On Surface Color + - rid: 1538473382797639787 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1674269242} + k__BackingField: On Surface Color + - rid: 1538473382797639788 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1674269242} + k__BackingField: Text Font --- !u!1 &1635540422 GameObject: m_ObjectHideFlags: 0 @@ -24819,7 +25884,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1653004003} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -24904,20 +25968,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -24976,7 +26043,6 @@ RectTransform: - {fileID: 280014428} - {fileID: 1577565684} m_Father: {fileID: 1329564636} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -25044,7 +26110,6 @@ RectTransform: - {fileID: 308180792} - {fileID: 1635540423} m_Father: {fileID: 1635487816} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -25056,6 +26121,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 201720333} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -25124,7 +26190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 53 + value: Camera objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -25235,6 +26301,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1662388757 stripped RectTransform: @@ -25246,6 +26315,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1288869893} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -25314,7 +26384,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 107 + value: Movie objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -25425,6 +26495,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1665223376 stripped RectTransform: @@ -25463,7 +26536,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2087755156} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -25548,20 +26620,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -25592,6 +26667,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 404960832} m_Modifications: - target: {fileID: 4270209841583229004, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -25699,6 +26775,9 @@ PrefabInstance: value: CanvasSlider objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1704462485 stripped RectTransform: @@ -25710,6 +26789,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796335078} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -25837,6 +26917,9 @@ PrefabInstance: value: CanvasSlider objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1706338808 stripped RectTransform: @@ -25848,6 +26931,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -25930,7 +27014,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 62 + value: Paste objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -26057,6 +27141,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1708049806 stripped RectTransform: @@ -26075,6 +27162,7 @@ GameObject: - component: {fileID: 1714867594} - component: {fileID: 1714867593} - component: {fileID: 1714867592} + - component: {fileID: 1714867595} m_Layer: 5 m_Name: Toggle Button Canvas m_TagString: Untagged @@ -26100,7 +27188,6 @@ RectTransform: - {fileID: 1329564636} - {fileID: 47797540} m_Father: {fileID: 1369683957} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -26164,10 +27251,59 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &1714867595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714867590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610112 + - rid: 1538473376477610111 + - rid: 1538473376477610113 + - rid: 1538473376477610109 + - rid: 1538473376477610110 + references: + version: 2 + RefIds: + - rid: 1538473376477610109 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1329564639} + k__BackingField: Backplate Material + - rid: 1538473376477610110 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 47797543} + k__BackingField: Backplate Material + - rid: 1538473376477610111 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 332225188} + k__BackingField: Text Font + - rid: 1538473376477610112 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1148378778} + k__BackingField: Text Font + - rid: 1538473376477610113 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1187780963} + k__BackingField: Text Font --- !u!1 &1729846265 GameObject: m_ObjectHideFlags: 0 @@ -26203,7 +27339,6 @@ RectTransform: - {fileID: 1630388037} - {fileID: 1995220997} m_Father: {fileID: 1277251431} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -26288,6 +27423,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1854885402} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -26364,7 +27500,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -26527,6 +27663,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!1 &1761219193 stripped GameObject: @@ -26541,9 +27680,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1761219193} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.99999994, y: 0.99999994, z: 0.1} m_Center: {x: 0, y: -0.000000014901161, z: 0.05} --- !u!1001 &1767162169 @@ -26551,6 +27698,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -26619,7 +27767,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 40 + value: Move objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -26734,6 +27882,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1767162170 stripped RectTransform: @@ -26745,6 +27896,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 553395885} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -26930,6 +28082,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1773838171 stripped RectTransform: @@ -26941,6 +28096,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -27009,7 +28165,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -27124,6 +28280,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1794244716 stripped RectTransform: @@ -27167,7 +28326,6 @@ RectTransform: - {fileID: 630532475} - {fileID: 954672193} m_Father: {fileID: 1290890163} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -27272,6 +28430,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1048775326} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -27367,12 +28526,21 @@ PrefabInstance: value: objectReference: {fileID: 1048775327} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1798621954 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 1798621953} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1817612629 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1288869893} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -27441,7 +28609,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 82 + value: Doc objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -27548,6 +28716,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1817612630 stripped RectTransform: @@ -27559,6 +28730,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -27641,7 +28813,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 132 + value: Settings objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -27760,6 +28932,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1606706622} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1826937101 stripped RectTransform: @@ -27782,6 +28960,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1854885402} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -27858,7 +29037,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -28021,6 +29200,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!1 &1854885401 GameObject: @@ -28062,7 +29244,6 @@ RectTransform: - {fileID: 368534647} - {fileID: 576536707} m_Father: {fileID: 149389691} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28129,6 +29310,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -28204,6 +29392,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1999519067} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -28280,7 +29469,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -28387,6 +29576,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1856862789 stripped RectTransform: @@ -28398,6 +29590,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 773317072} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -28470,7 +29663,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 111 + value: Sticky Note objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -28585,6 +29778,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 276007649} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1874031335 stripped RectTransform: @@ -28639,7 +29838,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 831863309} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28724,20 +29922,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -28795,7 +29996,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 553395885} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -28880,20 +30080,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -28924,6 +30127,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -28992,7 +30196,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 85 + value: Edit objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -29107,6 +30311,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1900920948 stripped RectTransform: @@ -29118,6 +30325,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29204,7 +30412,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -29331,6 +30539,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 188341443} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1905834814 stripped RectTransform: @@ -29358,6 +30572,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 201720333} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29426,7 +30641,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 63 + value: Time objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -29537,6 +30752,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1914810143 stripped RectTransform: @@ -29548,6 +30766,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1288869893} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29620,7 +30839,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 95 + value: Photo objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -29731,6 +30950,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1915696964 stripped RectTransform: @@ -29742,6 +30964,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29810,7 +31033,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 34 + value: Mobile objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -29925,6 +31148,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1925369313 stripped RectTransform: @@ -29963,7 +31189,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 371654821} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -30051,20 +31276,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -30095,6 +31323,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 154440643} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -30173,7 +31402,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -30280,6 +31509,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1936164015 stripped RectTransform: @@ -30325,7 +31557,6 @@ RectTransform: - {fileID: 1990262478} - {fileID: 284501559} m_Father: {fileID: 65389176} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -30392,6 +31623,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -30409,6 +31647,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -30477,7 +31716,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 76 + value: Delete objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -30592,6 +31831,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1945241971 stripped RectTransform: @@ -30603,6 +31845,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -30671,7 +31914,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 5 + value: Calendar objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -30786,6 +32029,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1951361111 stripped RectTransform: @@ -30797,6 +32043,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -30875,7 +32122,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 115 + value: Group objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -30994,6 +32241,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1955009909 stripped RectTransform: @@ -31041,7 +32291,6 @@ RectTransform: - {fileID: 389055256} - {fileID: 1925369313} m_Father: {fileID: 371654821} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -31106,6 +32355,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -31123,6 +32379,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -31201,7 +32458,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 20 + value: Mic objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -31308,6 +32565,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1990262478 stripped RectTransform: @@ -31319,6 +32579,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -31401,7 +32662,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 54 + value: Shopping Cart objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -31528,6 +32789,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1994347811 stripped RectTransform: @@ -31539,6 +32803,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1729846266} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -31678,6 +32943,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &1995220997 stripped RectTransform: @@ -31717,7 +32985,6 @@ RectTransform: - {fileID: 545482699} - {fileID: 1856862789} m_Father: {fileID: 3747106709254832807} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -31755,6 +33022,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 402425588} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -31850,7 +33118,15 @@ PrefabInstance: value: objectReference: {fileID: 402425589} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &2044694321 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 2044694320} + m_PrefabAsset: {fileID: 0} --- !u!1 &2056942514 GameObject: m_ObjectHideFlags: 0 @@ -31887,7 +33163,6 @@ RectTransform: - {fileID: 1137517786} - {fileID: 1125611905} m_Father: {fileID: 1277251431} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -31992,6 +33267,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 14468906} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -32179,6 +33455,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1527218382} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2086818868 stripped RectTransform: @@ -32239,7 +33521,6 @@ RectTransform: - {fileID: 1614318674} - {fileID: 924342751} m_Father: {fileID: 1653004003} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32306,6 +33587,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -32350,7 +33638,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 65389176} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32437,20 +33724,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -32481,6 +33771,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1031621822} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -32549,7 +33840,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 22 + value: Music objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -32660,6 +33951,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2115835485 stripped RectTransform: @@ -32700,7 +33994,6 @@ RectTransform: - {fileID: 1304147004} - {fileID: 154440643} m_Father: {fileID: 1000460829} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32719,6 +34012,7 @@ GameObject: - component: {fileID: 2127076437} - component: {fileID: 2127076436} - component: {fileID: 2127076435} + - component: {fileID: 2127076439} m_Layer: 5 m_Name: Button Bar Canvas m_TagString: Untagged @@ -32783,7 +34077,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -32801,18 +34097,77 @@ RectTransform: m_Children: - {fileID: 831863309} m_Father: {fileID: 1369683957} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.28, y: -0.058} m_SizeDelta: {x: 261.305, y: 253.3427} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2127076439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127076434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610101 + - rid: 1538473376477610100 + - rid: 1538473376477610099 + - rid: 1538473376477610098 + - rid: 1538473376477610097 + - rid: 1538473376477610096 + - rid: 1538473376477610095 + references: + version: 2 + RefIds: + - rid: 1538473376477610095 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 201720336} + k__BackingField: Backplate Material + - rid: 1538473376477610096 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1424732240} + k__BackingField: Backplate Material + - rid: 1538473376477610097 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 14468909} + k__BackingField: Backplate Material + - rid: 1538473376477610098 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1073055408} + k__BackingField: Backplate Material + - rid: 1538473376477610099 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1876059102} + k__BackingField: Text Font + - rid: 1538473376477610100 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 861724341} + k__BackingField: Text Font + - rid: 1538473376477610101 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1290511388} + k__BackingField: Text Font --- !u!1001 &2137575390 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 891825324} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -33028,6 +34383,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &2137575391 stripped RectTransform: @@ -33057,7 +34415,6 @@ RectTransform: - {fileID: 1288869893} - {fileID: 1999519067} m_Father: {fileID: 65389176} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -33144,7 +34501,25 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 calculateSmoothEdges: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 705507995} + - {fileID: 553824788} + - {fileID: 530525190} + - {fileID: 1008854671} + - {fileID: 49756652} + - {fileID: 1369683957} + - {fileID: 771189643} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity index 1042b49f7..9afb8a7df 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,14 +93,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +113,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -151,6 +147,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5174431} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.38268343, z: -0, w: 0.92387956} m_LocalPosition: {x: -1.129, y: -0.1747, z: -0.545} m_LocalScale: {x: 1, y: 1, z: 1} @@ -159,7 +156,6 @@ Transform: - {fileID: 1710053220} - {fileID: 1998461902} m_Father: {fileID: 1203713056} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} --- !u!1 &6284416 GameObject: @@ -185,13 +181,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6284416} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0917, y: -0.0671, z: 0.0163} m_LocalScale: {x: 0.00096758676, y: 0.004151988, z: 0.0017068039} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1376890154} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!212 &6284418 SpriteRenderer: @@ -210,6 +206,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -270,13 +269,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37486930} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.38268343, z: -0, w: 0.92387956} m_LocalPosition: {x: 0.004, y: 1.749, z: -0.004} m_LocalScale: {x: 1.8175921, y: 0.05679976, z: 1.8175921} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1146931003} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &37486933 MeshRenderer: @@ -295,6 +294,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -346,9 +348,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 76807523} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.10026801, y: 0.082757965, z: 0.093791895} m_Center: {x: -0.00011960028, y: -0.000000057742, z: -0.008266095} --- !u!1 &76865735 @@ -382,7 +392,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -449,20 +458,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -500,6 +512,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -530,6 +545,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1727403011} m_Modifications: - target: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} @@ -597,14 +613,44 @@ PrefabInstance: value: -1.22 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: cfecafee97b1bac42be6698465e5bd45, type: 2} - target: {fileID: 2300002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: edc81f8444b03444eae776bfc3a3dd00, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 37486931} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416687} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416690} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416686} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416688} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416689} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416691} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416692} + - targetCorrespondingSourceObject: {fileID: 100004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 1146931006} m_SourcePrefab: {fileID: 100100000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} --- !u!4 &79416684 stripped Transform: @@ -637,10 +683,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 79416685} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -947,6 +1004,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -1006,6 +1066,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -1183,7 +1244,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1251,20 +1311,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -1302,6 +1365,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1350,6 +1416,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 150862478} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.0001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1362,7 +1429,6 @@ Transform: - {fileID: 1180287156} - {fileID: 4654093213557177395} m_Father: {fileID: 1203713056} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &186579027 stripped RectTransform: @@ -1374,16 +1440,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1913468802} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_Name value: FlatPanel (1) objectReference: {fileID: 0} - - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -1453,6 +1516,33 @@ PrefabInstance: value: 0.00014997 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 305342091} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624898} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624895} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624896} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624897} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624903} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624904} + - targetCorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624894} m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &235624891 stripped Transform: @@ -1477,9 +1567,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 235624892} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 0.99999994, z: 0.1} m_Center: {x: 0, y: 0.000000074505806, z: 0.05} --- !u!114 &235624895 @@ -1796,6 +1894,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -1919,6 +2020,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2101,7 +2203,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1848983997} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2174,20 +2275,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -2225,6 +2329,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2279,13 +2386,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 305342090} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.005910009, y: 0.0011000037, z: -0.0055999756} m_LocalScale: {x: 0.0058, y: 0.0058, z: 0.0058} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 235624891} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &305342092 SpriteRenderer: @@ -2304,6 +2411,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2355,6 +2465,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2456,6 +2567,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2546,6 +2658,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 782737666} m_Modifications: - target: {fileID: 7017536481509416457, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} @@ -2673,6 +2786,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} --- !u!224 &392741045 stripped RectTransform: @@ -2703,8 +2819,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 422166483} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.032281224 m_Height: 0.15444483 m_Direction: 1 @@ -2740,7 +2865,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2818,20 +2942,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -2869,6 +2996,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2899,6 +3029,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1852224431} m_Modifications: - target: {fileID: 593722386012418505, guid: 7d421b6091df2b5439be946871d23d28, type: 3} @@ -2962,12 +3093,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d421b6091df2b5439be946871d23d28, type: 3} --- !u!1001 &460835580 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1848983997} m_Modifications: - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -3111,7 +3246,7 @@ PrefabInstance: value: Icon 85 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 7867802180497734224, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -3131,6 +3266,15 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2244185730444192509, guid: cd0f0697f0939504389ec612388f609a, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4659777866328155393, guid: cd0f0697f0939504389ec612388f609a, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!4 &460835581 stripped Transform: @@ -3158,6 +3302,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 3695091241684208261, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} @@ -3249,6 +3394,12 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6001337464062027464, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} --- !u!4 &502884643 stripped Transform: @@ -3260,12 +3411,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -3283,6 +3431,9 @@ PrefabInstance: value: MRTKInputSimulator objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} --- !u!1 &563549573 GameObject: @@ -3317,13 +3468,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563549573} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.2566485, z: -0, w: 0.9665049} m_LocalPosition: {x: 0.6704, y: -0.41940457, z: 0.4235} m_LocalScale: {x: 0.0687472, y: 0.068747185, z: 0.06874721} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: -29.743002, z: 0} --- !u!82 &563549575 AudioSource: @@ -3336,6 +3487,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -3729,6 +3881,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -3798,10 +3953,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563549573} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 1 m_AngularDrag: 1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -3815,9 +3981,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563549573} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &563549580 @@ -3837,6 +4011,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3965,6 +4142,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -4055,6 +4233,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} @@ -4234,7 +4413,7 @@ PrefabInstance: value: UnityEngine.AudioClip, UnityEngine objectReference: {fileID: 0} - target: {fileID: 3409721415966526836, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: aed69361010390840abc588081f8e964, type: 2} - target: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} @@ -4286,6 +4465,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + insertIndex: -1 + addedObject: {fileID: 343732524} m_SourcePrefab: {fileID: 100100000, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} --- !u!4 &607222683 stripped Transform: @@ -4305,9 +4490,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 624982108} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 0.99999994, z: 0.1} m_Center: {x: 0, y: 0.000000074505806, z: 0.05} --- !u!1001 &663760220 @@ -4315,6 +4508,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1913468802} m_Modifications: - target: {fileID: 251265376, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} @@ -4333,10 +4527,6 @@ PrefabInstance: propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value value: 1 objectReference: {fileID: 0} - - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} propertyPath: m_LocalPosition.x value: -0.406 @@ -4382,6 +4572,9 @@ PrefabInstance: value: CoffeeBoundsControl (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} --- !u!1 &665858362 GameObject: @@ -4414,7 +4607,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782737666} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4482,20 +4674,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -4533,6 +4728,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4588,9 +4786,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -4640,8 +4837,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -4649,13 +4850,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &730431820 GameObject: @@ -4688,7 +4889,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4756,20 +4956,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -4807,6 +5010,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4847,12 +5053,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -4902,6 +5105,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + insertIndex: -1 + addedObject: {fileID: 1551252957} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} --- !u!1 &782737665 GameObject: @@ -4926,6 +5135,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 782737665} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: -0.769, y: -0.403, z: -0.264} m_LocalScale: {x: 1, y: 1, z: 1} @@ -4936,7 +5146,6 @@ Transform: - {fileID: 2128020770} - {fileID: 392741045} m_Father: {fileID: 1203713056} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} --- !u!1 &828245819 GameObject: @@ -4969,7 +5178,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5037,20 +5245,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -5088,6 +5299,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5118,6 +5332,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 150862479} m_Modifications: - target: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} @@ -5185,10 +5400,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 5486639398703893882, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: b499c1bdbc12cd648937c46a2a6f8b01, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1256458038} + - targetCorrespondingSourceObject: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1256458039} + - targetCorrespondingSourceObject: {fileID: 7047533903058496966, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1617622750} m_SourcePrefab: {fileID: 100100000, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} --- !u!4 &831445128 stripped Transform: @@ -5200,16 +5427,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1913468802} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_Name value: FlatPanel objectReference: {fileID: 0} - - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -5279,6 +5503,33 @@ PrefabInstance: value: 0.00014997 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 2026715037} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468523} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468519} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468520} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468521} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468522} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468524} + - targetCorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 624982110} m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &840468517 stripped Transform: @@ -5686,6 +5937,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -5745,6 +5999,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -5927,13 +6182,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888851581} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.43443066, z: -0, w: 0.90070534} m_LocalPosition: {x: 0.6121, y: -0.49410006, z: 0.4318} m_LocalScale: {x: 0.06874721, y: 0.068747185, z: 0.06874721} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -51.498, z: 0} --- !u!114 &888851583 MonoBehaviour: @@ -6243,6 +6498,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -6316,6 +6574,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -6408,10 +6667,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888851581} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 1 m_AngularDrag: 1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -6425,9 +6695,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888851581} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &888851588 @@ -6447,6 +6725,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6585,7 +6866,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2131597836} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6661,20 +6941,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -6712,6 +6995,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6906,6 +7192,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -6976,9 +7265,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 958324214} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.99999994, y: 1.0000001, z: 0.099999994} m_Center: {x: 0, y: 0, z: 0.049999997} --- !u!114 &958324218 @@ -7004,6 +7301,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} @@ -7095,6 +7393,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 372063526549692233, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} --- !u!4 &1001175448 stripped Transform: @@ -7106,6 +7410,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} @@ -7345,10 +7650,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 1963561309274324397, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 0c3570eeff29ef44e9fed596a4cc3ffd, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + insertIndex: -1 + addedObject: {fileID: 573431357} m_SourcePrefab: {fileID: 100100000, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} --- !u!4 &1002036032 stripped Transform: @@ -7383,6 +7694,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1089489030} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.0528, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -7395,7 +7707,6 @@ Transform: - {fileID: 1001175448} - {fileID: 1669647714} m_Father: {fileID: 1852224431} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1099479633 GameObject: @@ -7428,7 +7739,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782737666} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7493,20 +7803,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -7544,6 +7857,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7587,9 +7903,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146931002} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: -1 m_Mesh: {fileID: -1636560234873357706, guid: 3ceb984318b1e34419d826d447ca4eec, type: 3} @@ -7606,9 +7930,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1149607822} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1.0000004, z: 0.100000024} m_Center: {x: 0.00000017881393, y: -4.440892e-17, z: 0.050000012} --- !u!1001 &1170466718 @@ -7616,6 +7948,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1203713056} m_Modifications: - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} @@ -7648,10 +7981,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7755,6 +8084,21 @@ PrefabInstance: BasicPressableButtonVisuals.cs' objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 958324217} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 958324215} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 958324216} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 958324218} m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} --- !u!224 &1170466719 stripped RectTransform: @@ -7792,7 +8136,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7866,20 +8209,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -7917,6 +8263,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7965,6 +8314,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1203713055} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.061, y: 1.769, z: 1.104} m_LocalScale: {x: 1, y: 1, z: 1} @@ -7981,7 +8331,6 @@ Transform: - {fileID: 469873930} - {fileID: 5174432} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1232423736 GameObject: @@ -8014,6 +8363,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232423736} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.583, y: -0.043, z: 0.726} m_LocalScale: {x: 1.4077, y: 1.4077, z: 1.4077} @@ -8021,7 +8371,6 @@ Transform: m_Children: - {fileID: 1823018503} m_Father: {fileID: 2131597836} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1232423738 BoxCollider: @@ -8031,9 +8380,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232423736} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.16749653, y: 0.16336748, z: 0.15683585} m_Center: {x: 0.0008220735, y: 0.0052850842, z: -0.024257582} --- !u!82 &1232423739 @@ -8047,6 +8404,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -8392,6 +8750,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -8568,7 +8929,7 @@ MonoBehaviour: transitionDuration: 0 --- !u!95 &1232423744 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8582,6 +8943,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -8610,12 +8972,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -8665,6 +9024,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1256458037 stripped GameObject: @@ -8682,6 +9044,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -8942,6 +9305,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -8966,6 +9332,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} @@ -9205,10 +9572,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 1963561309274324397, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 0c3570eeff29ef44e9fed596a4cc3ffd, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1270236527} m_SourcePrefab: {fileID: 100100000, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} --- !u!4 &1270236525 stripped Transform: @@ -9231,6 +9604,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -9321,6 +9695,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1727403011} m_Modifications: - target: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} @@ -9432,6 +9807,45 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530694} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530698} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530696} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530697} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530699} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530700} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530701} + - targetCorrespondingSourceObject: {fileID: 100020, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1959878137} + - targetCorrespondingSourceObject: {fileID: 100022, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 422166484} + - targetCorrespondingSourceObject: {fileID: 100024, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 2126969655} + - targetCorrespondingSourceObject: {fileID: 100012, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1393598444} + - targetCorrespondingSourceObject: {fileID: 100016, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 76807524} m_SourcePrefab: {fileID: 100100000, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} --- !u!4 &1294530692 stripped Transform: @@ -9450,10 +9864,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1294530693} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -9647,6 +10072,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -9720,6 +10148,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -9879,11 +10308,6 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 ---- !u!1 &1346790086 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - m_PrefabInstance: {fileID: 771189643} - m_PrefabAsset: {fileID: 0} --- !u!82 &1351537950 stripped AudioSource: m_CorrespondingSourceObject: {fileID: 155148266066309764, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} @@ -9922,13 +10346,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357057977} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.2566485, z: -0, w: 0.9665049} m_LocalPosition: {x: 0.679, y: -0.4941, z: 0.48800004} m_LocalScale: {x: 0.0687472, y: 0.068747185, z: 0.06874721} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -29.743002, z: 0} --- !u!114 &1357057979 MonoBehaviour: @@ -10238,6 +10662,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -10311,6 +10738,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -10403,10 +10831,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357057977} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 1 m_AngularDrag: 1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -10420,9 +10859,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357057977} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1357057984 @@ -10442,6 +10889,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10580,7 +11030,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10646,20 +11095,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -10697,6 +11149,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10755,13 +11210,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357838088} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.03280899, z: -0, w: 0.9994617} m_LocalPosition: {x: 0.725, y: -0.49410006, z: 0.413} m_LocalScale: {x: 0.06874719, y: 0.068747185, z: 0.0687472} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1727403011} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 3.76, z: 0} --- !u!114 &1357838090 MonoBehaviour: @@ -11071,6 +11526,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -11144,6 +11602,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -11236,10 +11695,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357838088} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 1 m_AngularDrag: 1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -11253,9 +11723,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357838088} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1357838095 @@ -11275,6 +11753,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11387,6 +11868,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -11474,6 +11956,15 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5092507606405556712, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1811028555225687572, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &1364289930 stripped Transform: @@ -11485,10 +11976,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1708103290} m_Modifications: - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: fa21a874e3f75f84f8a7d806d8809ca0, type: 2} - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -11572,6 +12064,15 @@ PrefabInstance: value: -0.0072 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 6284417} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1149607826} m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &1376890154 stripped Transform: @@ -11591,9 +12092,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1393598443} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.08828581 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1404428860 @@ -11619,6 +12128,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1404428860} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.0349, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -11630,7 +12140,6 @@ Transform: - {fileID: 4326491061339189} - {fileID: 1270236525} m_Father: {fileID: 1852224431} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1455400526 stripped AudioSource: @@ -11650,9 +12159,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1470489459} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.14754184, y: 0.24699001, z: 0.14326136} m_Center: {x: 0.00059055915, y: 0.12349499, z: -0.011793165} --- !u!114 &1470489464 @@ -11700,13 +12217,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551252956} + serializedVersion: 2 m_LocalRotation: {x: 0.28939572, y: -0, z: -0, w: 0.9572095} m_LocalPosition: {x: -0.01144, y: -0.37624, z: 0.09883} m_LocalScale: {x: 0.23897779, y: 0.0437293, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 735511181} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 33.644, y: 0, z: 0} --- !u!64 &1551252958 MeshCollider: @@ -11716,9 +12233,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551252956} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -11739,6 +12264,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11790,9 +12318,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1617622746} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.7013047, y: 1.7013043, z: 1.7013047} m_Center: {x: 0.00000047683716, y: -0.00000011920929, z: 0} --- !u!1001 &1669647713 @@ -11800,6 +12336,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 1220126735185249923, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} @@ -11883,7 +12420,7 @@ PrefabInstance: value: objectReference: {fileID: 9100000, guid: e3404cf816858784985fd5888cefbbb1, type: 2} - target: {fileID: 7119852961148484655, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 8133592760163744572, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} @@ -11899,6 +12436,15 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1220126735637944177, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 5719829374270691469, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} --- !u!4 &1669647714 stripped Transform: @@ -11910,6 +12456,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 150862479} m_Modifications: - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} @@ -12045,6 +12592,9 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} --- !u!4 &1685298795 stripped Transform: @@ -12074,6 +12624,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1708103289} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: 0.077, y: 0, z: -0.072} m_LocalScale: {x: 1, y: 1, z: 1} @@ -12083,7 +12634,6 @@ Transform: - {fileID: 2131597836} - {fileID: 1727403011} m_Father: {fileID: 1203713056} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} --- !u!1 &1710053216 GameObject: @@ -12346,6 +12896,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -12415,6 +12968,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1710053216} + 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} @@ -12422,7 +12976,6 @@ Transform: m_Children: - {fileID: 186579027} m_Father: {fileID: 5174432} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1710053221 AudioSource: @@ -12435,6 +12988,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -12803,6 +13357,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -12876,6 +13433,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -13075,7 +13633,7 @@ MonoBehaviour: transitionDuration: 0 --- !u!95 &1724991371 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -13089,6 +13647,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -13117,6 +13676,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727403010} + 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} @@ -13129,7 +13689,6 @@ Transform: - {fileID: 79416684} - {fileID: 1294530692} m_Father: {fileID: 1708103290} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1729004921 stripped AudioSource: @@ -13141,6 +13700,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 2285124468144155093, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -13152,7 +13712,7 @@ PrefabInstance: value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 3060986453813667140, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 3119290704008432693, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -13248,6 +13808,15 @@ PrefabInstance: value: PressableButton_128x32mm_IconAndText_L objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6366612889032461850, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 564332035890725350, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} --- !u!4 &1758148431 stripped Transform: @@ -13285,7 +13854,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13350,20 +13918,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -13401,6 +13972,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13452,13 +14026,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823018502} + serializedVersion: 2 m_LocalRotation: {x: -0.0009970319, y: 0.84594023, z: 0.00047610726, w: 0.5332766} m_LocalPosition: {x: 0, y: -0.0749, z: -0.028} m_LocalScale: {x: 0.7956348, y: 0.79563415, z: 0.7956348} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1232423737} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -0.107, y: 115.546, z: -0.068} --- !u!23 &1823018504 MeshRenderer: @@ -13477,6 +14051,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13534,6 +14111,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1203713056} m_Modifications: - target: {fileID: 443995632, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} @@ -13584,18 +14162,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalScale.x - value: 0.04 - objectReference: {fileID: 0} - - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalScale.y - value: 0.137 - objectReference: {fileID: 0} - - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.048499994 - objectReference: {fileID: 0} - target: {fileID: 284030044009447867, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: Spatialize value: 1 @@ -13608,18 +14174,6 @@ PrefabInstance: propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value value: 1 objectReference: {fileID: 0} - - target: {fileID: 402277338338922732, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_UseGravity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 534244713576997589, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_text - value: "\uF34D" - objectReference: {fileID: 0} - - target: {fileID: 534244713576997589, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 724323403903675551, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13640,18 +14194,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 942987468863586275, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.03299999 - objectReference: {fileID: 0} - - target: {fileID: 942987469246865708, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.06499999 - objectReference: {fileID: 0} - - target: {fileID: 942987469383587423, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.09699999 - objectReference: {fileID: 0} - target: {fileID: 986953982429952368, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_Name value: WhiteboardExample @@ -13685,7 +14227,7 @@ PrefabInstance: value: Icon 79 objectReference: {fileID: 0} - target: {fileID: 1287902911309006504, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 1510911413115419833, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} @@ -13736,10 +14278,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2236187689672624870, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2599463952435006009, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_text value: "\uF36A" @@ -13776,18 +14314,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3484184696762796712, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3649796767034289732, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - - target: {fileID: 3717038121812215605, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: currentIconName - value: Icon 76 - objectReference: {fileID: 0} - target: {fileID: 4024654762168814417, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_Size.y value: 32 @@ -13824,14 +14350,6 @@ PrefabInstance: propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value value: 1 objectReference: {fileID: 0} - - target: {fileID: 4649580226607449371, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4649580226607449371, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0.007 - objectReference: {fileID: 0} - target: {fileID: 5037185138549003642, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13940,14 +14458,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6439058074634937319, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6439058074634937319, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.0245 - objectReference: {fileID: 0} - target: {fileID: 6709910909478096088, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14028,22 +14538,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 7613463721665348061, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.016499994 - objectReference: {fileID: 0} - - target: {fileID: 7613463722260290446, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8403003260084890620, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_LocalPosition.x value: -0.842 @@ -14097,6 +14591,18 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8372833645970865070, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + insertIndex: -1 + addedObject: {fileID: 1824793669} + - targetCorrespondingSourceObject: {fileID: 8549021144382954156, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4355450153607930378, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} --- !u!1 &1824793668 stripped GameObject: @@ -14149,6 +14655,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848983996} + 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} @@ -14157,7 +14664,6 @@ Transform: - {fileID: 460835581} - {fileID: 243610129} m_Father: {fileID: 1203713056} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1852224430 GameObject: @@ -14182,6 +14688,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1852224430} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.19388044, y: 0.43222737, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -14194,19 +14701,15 @@ Transform: - {fileID: 1089489031} - {fileID: 1404428861} m_Father: {fileID: 1203713056} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1866417129 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1203713056} m_Modifications: - - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} propertyPath: m_LocalPosition.x value: -0.689 @@ -14252,6 +14755,12 @@ PrefabInstance: value: Pen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3084243108605482235, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1866417131} m_SourcePrefab: {fileID: 100100000, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} --- !u!1 &1866417130 stripped GameObject: @@ -14304,6 +14813,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1913468801} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.056, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -14319,13 +14829,13 @@ Transform: - {fileID: 2059242324} - {fileID: 828245820} m_Father: {fileID: 1203713056} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1923515644 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131597836} m_Modifications: - target: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} @@ -14401,6 +14911,36 @@ PrefabInstance: value: 0.00005 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991368} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991371} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991366} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991367} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991369} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991370} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1923515646} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1470489463} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1470489464} m_SourcePrefab: {fileID: 100100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} --- !u!4 &1923515645 stripped Transform: @@ -14433,8 +14973,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4654093213557177396} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 10.918639 m_Height: 26.952131 m_Direction: 1 @@ -14640,6 +15189,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -14684,6 +15236,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -14787,8 +15340,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1959878136} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.03228122 m_Height: 0.15444481 m_Direction: 1 @@ -14798,6 +15360,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} @@ -15029,6 +15592,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + insertIndex: -1 + addedObject: {fileID: 380279361} m_SourcePrefab: {fileID: 100100000, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} --- !u!4 &1996988710 stripped Transform: @@ -15066,7 +15635,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5174432} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -15134,20 +15702,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -15185,6 +15756,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15234,13 +15808,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026715036} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.005910009, y: 0.0011000037, z: -0.0055999756} m_LocalScale: {x: 0.0058, y: 0.0058, z: 0.0058} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 840468517} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2026715038 SpriteRenderer: @@ -15259,6 +15833,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15325,7 +15902,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -15397,20 +15973,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -15448,6 +16027,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15504,7 +16086,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -15572,20 +16153,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -15623,6 +16207,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15658,6 +16245,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} @@ -15961,6 +16549,33 @@ PrefabInstance: value: "\uF342" objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4042998139673148539, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7464071161666581383, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4042998139036849028, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7464071162302864504, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4042998140648635396, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7464071160695288824, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4042998139867488095, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7464071161472225443, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} --- !u!4 &2096650620 stripped Transform: @@ -15996,13 +16611,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123527392} + serializedVersion: 2 m_LocalRotation: {x: 0.21668836, y: -0.8997533, z: -0.21801639, w: 0.30977273} m_LocalPosition: {x: 0.4087, y: -0.3559, z: -0.0792} m_LocalScale: {x: 1.1901672, y: 1.1901666, z: 1.190167} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 24.512, y: -96.121, z: -22.092} --- !u!23 &2123527394 MeshRenderer: @@ -16021,6 +16636,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -16065,6 +16683,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -16351,6 +16970,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -16378,9 +17000,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123527392} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.112064324, y: 0.13389134, z: 0.11896934} m_Center: {x: -0.004010728, y: 0.012695584, z: -0.00058461254} --- !u!114 &2123527399 @@ -16410,8 +17040,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2126969654} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.032281216 m_Height: 0.15444481 m_Direction: 1 @@ -16421,6 +17060,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 782737666} m_Modifications: - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -16524,6 +17164,18 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5092507606858315802, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 2128020772} + - targetCorrespondingSourceObject: {fileID: 5092507606405556712, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1811028555225687572, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &2128020770 stripped Transform: @@ -16572,6 +17224,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131597835} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: -0.042, z: 0.202} m_LocalScale: {x: 1, y: 1, z: 1} @@ -16581,7 +17234,6 @@ Transform: - {fileID: 1923515645} - {fileID: 956891493} m_Father: {fileID: 1708103290} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4326491061339189 stripped Transform: @@ -16593,6 +17245,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 38784627857828811, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} @@ -17652,6 +18305,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} --- !u!82 &364946991195464073 stripped AudioSource: @@ -17663,6 +18319,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1913468802} m_Modifications: - target: {fileID: 251265377, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} @@ -17685,10 +18342,6 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} propertyPath: m_LocalPosition.x value: -0.191 @@ -17734,12 +18387,16 @@ PrefabInstance: value: CoffeeBoundsControl objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} --- !u!1001 &2578649064215403923 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1710053220} m_Modifications: - target: {fileID: 238993406236766840, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} @@ -19292,7 +19949,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.y - value: 47.01599 + value: 47.04004 objectReference: {fileID: 0} - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Enabled @@ -19300,7 +19957,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Center.y - value: 4.2420044 + value: 4.2299805 objectReference: {fileID: 0} - target: {fileID: 6776978392769446706, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: Spatialize @@ -19344,7 +20001,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.y - value: 47.01599 + value: 47.04004 objectReference: {fileID: 0} - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Enabled @@ -19352,7 +20009,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Center.y - value: 4.2420044 + value: 4.2299805 objectReference: {fileID: 0} - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.x @@ -19360,7 +20017,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.y - value: 128 + value: 127.97656 objectReference: {fileID: 0} - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Enabled @@ -19372,7 +20029,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Center.y - value: 0 + value: -0.01171875 objectReference: {fileID: 0} - target: {fileID: 6776978392855206654, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: Spatialize @@ -19448,7 +20105,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.y - value: 47.01599 + value: 47.04004 objectReference: {fileID: 0} - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Enabled @@ -19460,7 +20117,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Center.y - value: 4.2420044 + value: 4.2299805 objectReference: {fileID: 0} - target: {fileID: 6790485856255541986, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.x @@ -19843,12 +20500,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} --- !u!1001 &4654093213557177394 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 150862479} m_Modifications: - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} @@ -19912,6 +20573,21 @@ PrefabInstance: value: MRTK_Logo objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929573049} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929573052} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929573050} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929573051} m_SourcePrefab: {fileID: -4161369568681901532, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} --- !u!4 &4654093213557177395 stripped Transform: @@ -19928,12 +20604,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -19951,54 +20624,18 @@ PrefabInstance: value: EventSystem objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} --- !u!1001 &7372669236719069155 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1346790086} - - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1346790086} - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: Spatialize value: 1 @@ -20051,10 +20688,6 @@ PrefabInstance: propertyPath: m_Name value: HandMenu objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -20108,4 +20741,18 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 705507995} + - {fileID: 7372669236719069155} + - {fileID: 530525190} + - {fileID: 1241509141} + - {fileID: 5905304273903168958} + - {fileID: 1203713056} + - {fileID: 771189643} diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json index 23830891f..16cea28ea 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/manifest.json +++ b/UnityProjects/MRTKDevTemplate/Packages/manifest.json @@ -33,6 +33,7 @@ "org.mixedrealitytoolkit.input": "file:../../../org.mixedrealitytoolkit.input", "org.mixedrealitytoolkit.spatialmanipulation": "file:../../../org.mixedrealitytoolkit.spatialmanipulation", "org.mixedrealitytoolkit.standardassets": "file:../../../org.mixedrealitytoolkit.standardassets", + "org.mixedrealitytoolkit.theming": "file:../../../org.mixedrealitytoolkit.theming", "org.mixedrealitytoolkit.tools": "file:../../../org.mixedrealitytoolkit.tools", "org.mixedrealitytoolkit.uxcomponents": "file:../../../org.mixedrealitytoolkit.uxcomponents", "org.mixedrealitytoolkit.uxcomponents.noncanvas": "file:../../../org.mixedrealitytoolkit.uxcomponents.noncanvas", diff --git a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json index d652f6d50..ecd6f6950 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json +++ b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json @@ -434,6 +434,17 @@ "com.microsoft.mrtk.graphicstools.unity": "0.8.0" } }, + "org.mixedrealitytoolkit.theming": { + "version": "file:../../../org.mixedrealitytoolkit.theming", + "depth": 0, + "source": "local", + "dependencies": { + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", + "org.mixedrealitytoolkit.core": "4.0.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", + "com.unity.textmeshpro": "3.0.6" + } + }, "org.mixedrealitytoolkit.tools": { "version": "file:../../../org.mixedrealitytoolkit.tools", "depth": 0, diff --git a/org.mixedrealitytoolkit.core/CHANGELOG.md b/org.mixedrealitytoolkit.core/CHANGELOG.md index 67dbd17d1..f58f6423b 100644 --- a/org.mixedrealitytoolkit.core/CHANGELOG.md +++ b/org.mixedrealitytoolkit.core/CHANGELOG.md @@ -2,7 +2,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## Unreleased +## [4.0.0-pre.3] - 2026-05-20 + +### Added + +* Added `AllowGenericTypeDefinition` to `SystemType` to allow for generics. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) ### Changed @@ -13,7 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Fixed "The type MixedReality.Toolkit.Core MixedReality.Toolkit.Experimental.BubbleChildHoverEvents/TrickleChildHoverEvents/BubbleChildSelectEvents/TrickleChildSelectEvents is being serialized by `[SerializeReference]`, but is missing the `[Serializable]` attribute." on Unity 6.3. [PR #1107](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1107) -## Deprecated +### Deprecated * Deprecated `AdjustTrackingOrigin` on `CameraSettings`. This functionality has been deprecated by the XR Origin component. This property has never had an effect in MRTK3 and will be removed in a future release. [PR #1110](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1110) diff --git a/org.mixedrealitytoolkit.core/Editor/PropertyDrawers/DrawIfPropertyDrawer.cs b/org.mixedrealitytoolkit.core/Editor/PropertyDrawers/DrawIfPropertyDrawer.cs index 2649c0b09..b6032a84e 100644 --- a/org.mixedrealitytoolkit.core/Editor/PropertyDrawers/DrawIfPropertyDrawer.cs +++ b/org.mixedrealitytoolkit.core/Editor/PropertyDrawers/DrawIfPropertyDrawer.cs @@ -30,12 +30,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten /// public override float GetPropertyHeight(SerializedProperty property, GUIContent label) { - if (!ShouldShow(property)) - { - return 0f; - } - - return base.GetPropertyHeight(property, label); + return ShouldShow(property) ? base.GetPropertyHeight(property, label) : 0f; } private bool ShouldShow(SerializedProperty property) @@ -43,9 +38,7 @@ private bool ShouldShow(SerializedProperty property) DrawIfAttribute drawIf = attribute as DrawIfAttribute; if (drawIf == null) { return true; } - string path = drawIf.ComparedPropertyName; - - SerializedProperty propertyToCheck = property.serializedObject.FindProperty(path); + SerializedProperty propertyToCheck = property.serializedObject.FindProperty(drawIf.ComparedPropertyName); if (propertyToCheck == null) { Debug.LogError($"DrawIfAttribute couldn't find the SerializedProperty to compare against! (property name: {drawIf.ComparedPropertyName})"); diff --git a/org.mixedrealitytoolkit.core/Utilities/Attributes/ExtendsAttribute.cs b/org.mixedrealitytoolkit.core/Utilities/Attributes/ExtendsAttribute.cs index 619c65376..2a9149b06 100644 --- a/org.mixedrealitytoolkit.core/Utilities/Attributes/ExtendsAttribute.cs +++ b/org.mixedrealitytoolkit.core/Utilities/Attributes/ExtendsAttribute.cs @@ -30,8 +30,9 @@ public ExtendsAttribute(Type baseType, TypeGrouping grouping) : base(baseType, g public override bool IsConstraintSatisfied(Type type) { return base.IsConstraintSatisfied(type) && - BaseType.IsAssignableFrom(type) && + (BaseType.IsAssignableFrom(type) || + (AllowGenericTypeDefinition && type.BaseType != null && type.BaseType.IsGenericType && BaseType.Equals(type.BaseType.GetGenericTypeDefinition()))) && type != BaseType; } } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/Utilities/Attributes/SystemTypeAttribute.cs b/org.mixedrealitytoolkit.core/Utilities/Attributes/SystemTypeAttribute.cs index 01290b2f0..1249b253d 100644 --- a/org.mixedrealitytoolkit.core/Utilities/Attributes/SystemTypeAttribute.cs +++ b/org.mixedrealitytoolkit.core/Utilities/Attributes/SystemTypeAttribute.cs @@ -23,6 +23,12 @@ public abstract class SystemTypeAttribute : PropertyAttribute /// public bool AllowAbstract { get; set; } = false; + /// + /// Gets or sets whether generic classes can be selected from drop-down. + /// Defaults to a value of unless explicitly specified. + /// + public bool AllowGenericTypeDefinition { get; set; } = false; + /// /// Initializes a new instance of the class. /// @@ -45,7 +51,7 @@ protected SystemTypeAttribute(Type type, TypeGrouping grouping = TypeGrouping.By /// public virtual bool IsConstraintSatisfied(Type type) { - return AllowAbstract || !type.IsAbstract; + return (AllowAbstract || !type.IsAbstract) && (AllowGenericTypeDefinition || !type.IsGenericTypeDefinition); } } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.standardassets/CHANGELOG.md b/org.mixedrealitytoolkit.standardassets/CHANGELOG.md index 880333c41..c1607aa34 100644 --- a/org.mixedrealitytoolkit.standardassets/CHANGELOG.md +++ b/org.mixedrealitytoolkit.standardassets/CHANGELOG.md @@ -2,11 +2,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## Unreleased +## [3.3.0-pre.1] - 2026-05-20 ### Changed -* Updated icon names in MRTK_FluentIconSet.asset and Selawik-Semibold-MRTKIcons.asset to be more descriptive. [PR #1077](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1077) +* Updated icon names in MRTK_FluentIconSet.asset and Selawik-Semibold-MRTKIcons.asset to be more descriptive. [PR #1077](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1077) & [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) ## [3.2.1] - 2025-11-12 diff --git a/org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset b/org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset index 273a4c1eb..2d1d96dd7 100644 --- a/org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset +++ b/org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset @@ -142,7 +142,7 @@ MonoBehaviour: value: 62174 - key: Alarm value: 62178 - - key: Zoom + - key: Cloud value: 62181 - key: Open In New value: 62194 @@ -166,7 +166,7 @@ MonoBehaviour: value: 62277 - key: Delete value: 62285 - - key: Icon 62298 + - key: Computer value: 62298 - key: Dialpad value: 62303 @@ -174,7 +174,7 @@ MonoBehaviour: value: 62314 - key: Cancel value: 62318 - - key: Layout 2 + - key: Layout value: 62326 - key: Doc value: 62329 @@ -216,7 +216,7 @@ MonoBehaviour: value: 62679 - key: Link value: 62693 - - key: Icon 62700 + - key: Link 2 value: 62700 - key: Location On value: 62713 diff --git a/org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet.asset b/org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet.asset index c08e6a2b8..54e471c82 100644 --- a/org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet.asset +++ b/org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet.asset @@ -142,7 +142,7 @@ MonoBehaviour: value: 62174 - key: Alarm value: 62178 - - key: Zoom + - key: Cloud value: 62181 - key: Open In New value: 62194 @@ -166,7 +166,7 @@ MonoBehaviour: value: 62277 - key: Delete value: 62285 - - key: Icon 77 + - key: Computer value: 62298 - key: Dialpad value: 62303 @@ -174,7 +174,7 @@ MonoBehaviour: value: 62314 - key: Cancel value: 62318 - - key: Layout 2 + - key: Layout value: 62326 - key: Doc value: 62329 @@ -216,7 +216,7 @@ MonoBehaviour: value: 62679 - key: Link value: 62693 - - key: Icon 102 + - key: Link 2 value: 62700 - key: Location On value: 62713 diff --git a/org.mixedrealitytoolkit.standardassets/package.json b/org.mixedrealitytoolkit.standardassets/package.json index b770573e2..0a7bb68b7 100644 --- a/org.mixedrealitytoolkit.standardassets/package.json +++ b/org.mixedrealitytoolkit.standardassets/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.standardassets", - "version": "3.3.0-development", + "version": "3.3.0-development.pre.1", "description": "Common assets used by the MRTK packages, including common fonts, materials, and models. Relies on the Graphics Tools collection of shaders.", "displayName": "MRTK Standard Assets", "msftFeatureCategory": "MRTK3", diff --git a/org.mixedrealitytoolkit.theming/AssemblyInfo.cs b/org.mixedrealitytoolkit.theming/AssemblyInfo.cs new file mode 100644 index 000000000..218ffdc9c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/AssemblyInfo.cs @@ -0,0 +1,15 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyProduct("Mixed Reality Toolkit UX Theming")] +[assembly: AssemblyCopyright("Copyright (c) Mixed Reality Toolkit Contributors")] + +[assembly: InternalsVisibleTo("MixedReality.Toolkit.Theming.Editor")] + +// The AssemblyVersion attribute is checked-in and is recommended not to be changed often. +// https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version +// AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. +[assembly: AssemblyVersion("1.0.0.0")] diff --git a/org.mixedrealitytoolkit.theming/AssemblyInfo.cs.meta b/org.mixedrealitytoolkit.theming/AssemblyInfo.cs.meta new file mode 100644 index 000000000..892060a27 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd8f4169cd8a4df48ac8feff44ed8702 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders.meta b/org.mixedrealitytoolkit.theming/Binders.meta new file mode 100644 index 000000000..775fee110 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce334cc034bd7c7499ad53ab02d99c26 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs b/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs new file mode 100644 index 000000000..f36683211 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs @@ -0,0 +1,52 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UIElements; + +namespace MixedReality.Toolkit.Theming +{ + public abstract class BaseThemeBinder : IBinder + { + [field: SerializeField] + protected K Target { get; private set; } + + [field: SerializeField, HideInInspector] + public string ThemeDefinitionItemName { get; private set; } + + protected abstract void Apply(BaseThemeItemData themeItemData); + + protected void OnThemeChanged(ChangeEvent changeEvent) + { + if (changeEvent.newValue == null) + { + Debug.LogWarning($"{GetType().Name}: Received a theme change event with a null theme. Skipping Apply."); + return; + } + + if (!changeEvent.newValue.TryGetItemData(ThemeDefinitionItemName, out BaseThemeItemData value)) + { + Debug.LogWarning($"{GetType().Name}: No item named '{ThemeDefinitionItemName}' of type '{typeof(T).Name}' found in theme '{changeEvent.newValue.name}'."); + return; + } + + Apply(value); + } + + void IBinder.Subscribe(ThemeDataSource themeDataSource) + { + if (themeDataSource != null) + { + themeDataSource.AddListener(OnThemeChanged); + } + } + + void IBinder.Unsubscribe(ThemeDataSource themeDataSource) + { + if (themeDataSource != null) + { + themeDataSource.RemoveListener(OnThemeChanged); + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs.meta new file mode 100644 index 000000000..7f3c41224 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9459ae0bfe34be24e96f3f79e384d90b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs b/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs new file mode 100644 index 000000000..db211806f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs @@ -0,0 +1,51 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.UX; +using System; +using TMPro; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [Serializable] + public class FontIconSetBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null && + Target.TextMeshProComponent != null && + Target.IconSelector != null && + Target.IconSelector.CurrentIconName != null && + themeItemData?.Value?.FontIconSet != null && + themeItemData.Value.FontIconSet.GlyphIconsByName != null && + themeItemData.Value.FontIconSet.GlyphIconsByName.ContainsKey(Target.IconSelector.CurrentIconName)) + { + // Clear the text to prevent missing character warnings when changing the font + Target.TextMeshProComponent.text = string.Empty; + Target.TextMeshProComponent.font = themeItemData.Value.Font; + Target.IconSelector.SetFontIconSet(themeItemData.Value.FontIconSet, true); + } + } + + [Serializable] + public class FontIconSetBinding + { + [field: SerializeField] + public FontIconSelector IconSelector { get; private set; } + + [field: SerializeField] + public TMP_Text TextMeshProComponent { get; private set; } + } + + [Serializable] + public class FontIconSetData + { + [field: SerializeField] + public TMP_FontAsset Font { get; private set; } + + [field: SerializeField] + public FontIconSet FontIconSet { get; private set; } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs.meta new file mode 100644 index 000000000..3d285ca7b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 79ad0c9f980cdb14c8e62716499c5da7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs b/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs new file mode 100644 index 000000000..50a290082 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs @@ -0,0 +1,20 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UI; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class GraphicColorBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.color = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs.meta new file mode 100644 index 000000000..578241ef3 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9e6dbd7ced329ef4f9b540ea7d4d5bee +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs b/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs new file mode 100644 index 000000000..66b77fc41 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs @@ -0,0 +1,20 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UI; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class GraphicMaterialBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.material = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs.meta new file mode 100644 index 000000000..d3394e15c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 232b8661c9be4d446a7ce038f48b0760 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/IBinder.cs b/org.mixedrealitytoolkit.theming/Binders/IBinder.cs new file mode 100644 index 000000000..dd64ad902 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/IBinder.cs @@ -0,0 +1,13 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +namespace MixedReality.Toolkit.Theming +{ + public interface IBinder + { + void Subscribe(ThemeDataSource themeDataSource); + void Unsubscribe(ThemeDataSource themeDataSource); + + string ThemeDefinitionItemName { get; } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/IBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/IBinder.cs.meta new file mode 100644 index 000000000..1f52cf3b6 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/IBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f3ea076276620fc4888c26f7bc68d7f2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs b/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs new file mode 100644 index 000000000..a02e8cd81 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs @@ -0,0 +1,20 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UI; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class ImageSpriteBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.sprite = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs.meta new file mode 100644 index 000000000..9ff947f22 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6ab68b63843d0f24eb3bc1a4349ed89e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs b/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs new file mode 100644 index 000000000..c2c5ce61a --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs @@ -0,0 +1,20 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UI; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class LayoutGroupPaddingBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.padding = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs.meta new file mode 100644 index 000000000..4709da232 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9df85a72df4780545bb4ae373fbe6a0b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs b/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs new file mode 100644 index 000000000..0850970bc --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs @@ -0,0 +1,19 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class RendererMaterialBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.material = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs.meta new file mode 100644 index 000000000..2ee87530f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ad27e47d68f7044c948fe7bd2c2106a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs b/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs new file mode 100644 index 000000000..21388e483 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs @@ -0,0 +1,20 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using Microsoft.MixedReality.GraphicsTools; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class RoundedRectMask2DRadiusBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.Radii = Vector3.one * themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs.meta new file mode 100644 index 000000000..0d78a3975 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7d52126062c5a4442bd6800e89d1f6cf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs new file mode 100644 index 000000000..24b1ccc51 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs @@ -0,0 +1,19 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class SpriteRendererColorBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.color = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs.meta new file mode 100644 index 000000000..650c562f1 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0818ebc31f7842047a74482722d60201 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs new file mode 100644 index 000000000..bfbe24a0c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs @@ -0,0 +1,19 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class SpriteRendererSpriteBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.sprite = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs.meta new file mode 100644 index 000000000..30b1f1142 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8d37b91b434ef87458ad6c3515863101 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs b/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs new file mode 100644 index 000000000..f62fc6d3b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs @@ -0,0 +1,82 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.UX; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a theme item to a single tint effect on a + /// component. + /// + /// + /// Add one of these binders per state (or per state+effect combination) to a + /// component. Each binder reads a Color from the + /// active theme and routes it to the matching tint effect via + /// . + /// + /// Set to one of the built-in state names (Disabled, + /// PassiveHover, ActiveHover, Select, Toggle) or any + /// custom state you have added. + /// + /// Leave unassigned to repaint every ITintEffect in that + /// state. Assign it to the specific Graphic or SpriteRenderer that appears + /// in the tintables list of the effect you want to target — this is rename-proof and + /// breaks visibly (missing reference) rather than silently if the object is deleted. + /// This is the preferred approach when one state contains multiple tint effects that need + /// different colors (e.g. a background tint and an icon tint). + /// + [System.Serializable] + public class StateVisualizerEffectColorBinder : BaseThemeBinder + { + [SerializeField] + [Tooltip("The name of the StateVisualizer state to target (e.g. 'PassiveHover', 'Toggle').")] + private string stateName = "PassiveHover"; + + /// The name of the state whose tint effect(s) will be updated. + public string StateName + { + get => stateName; + set => stateName = value; + } + + [SerializeField] + [Tooltip("The specific Graphic or SpriteRenderer that appears in the tintables list of " + + "the effect to target. Leave unassigned to update every tint effect in the state.")] + private UnityEngine.Object tintTarget; + + /// + /// The specific tintable component used to identify which ITintEffect to update, + /// or to update all tint effects in the state. + /// + /// + /// Assign the same Graphic or SpriteRenderer that is listed in the + /// effect's Tintables array in the Inspector. This is rename-proof and breaks + /// visibly (missing reference) rather than silently if the object is deleted. + /// + public UnityEngine.Object TintTarget + { + get => tintTarget; + set => tintTarget = value; + } + + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target == null) + { + Debug.LogWarning($"{nameof(StateVisualizerEffectColorBinder)}: Target {nameof(StateVisualizer)} is null. Skipping Apply."); + return; + } + + if (string.IsNullOrEmpty(stateName)) + { + Debug.LogWarning($"{nameof(StateVisualizerEffectColorBinder)}: {nameof(StateName)} is not set. Skipping Apply."); + return; + } + + Target.TrySetStateTintColor(stateName, tintTarget, themeItemData.Value); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs.meta new file mode 100644 index 000000000..9ad8ea4c0 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e0a31f0a06206334cb52572615736c37 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs b/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs new file mode 100644 index 000000000..dd86cb292 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs @@ -0,0 +1,19 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using TMPro; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class TMP_TextFontAssetBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.font = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs.meta new file mode 100644 index 000000000..a7a17d7b4 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90624ee5453f0504db2aede9ac58879d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs b/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs new file mode 100644 index 000000000..0baf4905a --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs @@ -0,0 +1,19 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class TransformLocalScaleBinder : BaseThemeBinder + { + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.localScale = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs.meta new file mode 100644 index 000000000..be7c49e40 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c6ba7974c6d770a4baa18e9a72c9429d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/CHANGELOG.md b/org.mixedrealitytoolkit.theming/CHANGELOG.md new file mode 100644 index 000000000..ff4a26279 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/CHANGELOG.md @@ -0,0 +1,14 @@ +# Changelog + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). + +## [1.0.0-pre.1] - 2026-05-20 + +### Added + +* Added the new MRTK UX Theming package (`org.mixedrealitytoolkit.theming`) for runtime theme switching across MRTK canvas UI. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) + * Added `ThemeDataSource`, `Theme`, `ThemeDefinition`, and `ThemeBinding` as the core theming data model and binding workflow. + * Added serializable theme item data types for colors, floats, font icon sets, materials, rect offsets, sprites, TextMeshPro font assets, and Vector3 values. + * Added built-in binders for common Unity and MRTK UI properties, including graphic color/material, renderer material, image and sprite renderer sprite/color, layout group padding, rounded rectangle mask radius, transform local scale, TMP font assets, font icon sets, and StateVisualizer tint colors. + * Added editor tooling for creating and configuring themes, theme data sources, theme bindings, and font icon set maps in the Unity Inspector. + * Added package documentation, screenshots, license, assembly definitions, sample theme assets, and a default MRTK font icon set map. diff --git a/org.mixedrealitytoolkit.theming/CHANGELOG.md.meta b/org.mixedrealitytoolkit.theming/CHANGELOG.md.meta new file mode 100644 index 000000000..e02f6f3e8 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/CHANGELOG.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8e60cbf77fc6f5e4ab9e709f98ff0ef9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/ColorThemeItemData.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/ColorThemeItemData.png new file mode 100644 index 000000000..b23476cc2 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/ColorThemeItemData.png differ diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/TextColorMapping.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/TextColorMapping.png new file mode 100644 index 000000000..ae75d59d9 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/TextColorMapping.png differ diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBinding.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBinding.png new file mode 100644 index 000000000..2573a2352 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBinding.png differ diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBindingThemeSource.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBindingThemeSource.png new file mode 100644 index 000000000..6e1024e76 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBindingThemeSource.png differ diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeDataSource.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeDataSource.png new file mode 100644 index 000000000..503d76308 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeDataSource.png differ diff --git a/org.mixedrealitytoolkit.theming/Editor.meta b/org.mixedrealitytoolkit.theming/Editor.meta new file mode 100644 index 000000000..44abac83d --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c140b5483033a0340ac014b9c87a8066 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs new file mode 100644 index 000000000..b607b960c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs @@ -0,0 +1,12 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System.Reflection; + +[assembly: AssemblyProduct("Mixed Reality Toolkit UX Theming - Editor")] +[assembly: AssemblyCopyright("Copyright (c) Mixed Reality Toolkit Contributors")] + +// The AssemblyVersion attribute is checked-in and is recommended not to be changed often. +// https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version +// AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. +[assembly: AssemblyVersion("1.0.0.0")] diff --git a/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs.meta b/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs.meta new file mode 100644 index 000000000..c17950303 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d76b07a922b0df143a27a11a349459a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs b/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs new file mode 100644 index 000000000..aad4bb5b5 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs @@ -0,0 +1,161 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.Editor; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomPropertyDrawer(typeof(BaseThemeBinder<,>), true)] + public class BaseThemeBinderDrawer : PropertyDrawer + { + private static string themeDefinitionItemNameField; + private static string ThemeDefinitionItemNameField => themeDefinitionItemNameField ??= InspectorUIUtility.GetBackingField("ThemeDefinitionItemName"); + + private static readonly Dictionary cachedLabels = new Dictionary(); + private static readonly Dictionary cachedValueTypes = new Dictionary(); + private static readonly List reusableMatchingItemNames = new List(); + + public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) + { + if (label.text.StartsWith("Element")) + { + if (!cachedLabels.TryGetValue(label.text, out string cachedLabel)) + { + cachedLabel = label.text.Replace("Element", "Binder"); + cachedLabels[label.text] = cachedLabel; + } + label = new GUIContent(label) { text = cachedLabel }; + } + + SerializedProperty themeDataSourceProperty = property.serializedObject.FindProperty("themeDataSource"); + + string[] names = null; + SerializedProperty themeDefinitionItemName = null; + bool hasDataSource = themeDataSourceProperty != null && themeDataSourceProperty.objectReferenceValue != null; + + // Only pay the cost of parsing available items when the property is actively expanded + if (property.isExpanded && property.managedReferenceValue != null && hasDataSource) + { + themeDefinitionItemName = property.FindPropertyRelative(ThemeDefinitionItemNameField); + + ThemeDataSource dataSource = themeDataSourceProperty.objectReferenceValue as ThemeDataSource; + if (dataSource != null) + { + names = ParseThemeItems(dataSource.Definition, property.managedReferenceValue); + } + } + + label = EditorGUI.BeginProperty(position, label, property); + + // Draw the foldout and all child properties within the allocated rect. + Rect propertyRect = position; + if (hasDataSource) + { + // Reserve the last line for the Bound Theme Item popup when expanded. + propertyRect.height -= property.isExpanded ? EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing : 0; + } + EditorGUI.PropertyField(propertyRect, property, label, true); + + // Draw the Bound Theme Item popup using the Rect API, within the allocated position. + if (hasDataSource && property.isExpanded) + { + // Child fields are indented 15px from position.x. Unity's label/control + // split is at position.x + labelWidth, so the label width is (labelWidth - 15f) + // and the control starts at that same absolute split point. + const float indentWidth = 15f; + float rowY = position.y + propertyRect.height + EditorGUIUtility.standardVerticalSpacing; + float splitX = position.x + EditorGUIUtility.labelWidth; + float rightEdge = position.x + position.width; + Rect labelRect = new Rect(position.x + indentWidth, rowY, EditorGUIUtility.labelWidth - indentWidth, EditorGUIUtility.singleLineHeight); + Rect controlRect = new Rect(splitX, rowY, rightEdge - splitX, EditorGUIUtility.singleLineHeight); + + if (names != null) + { + int selected = System.Array.IndexOf(names, themeDefinitionItemName.stringValue); + using (var check = new EditorGUI.ChangeCheckScope()) + { + EditorGUI.LabelField(labelRect, "Bound Theme Item"); + selected = EditorGUI.Popup(controlRect, selected, names); + if (check.changed) + { + themeDefinitionItemName.stringValue = names[selected]; + } + } + } + else + { + using (new EditorGUI.DisabledScope(true)) + { + EditorGUI.LabelField(labelRect, "Bound Theme Item"); + EditorGUI.Popup(controlRect, 0, new string[] { "(No matching items)" }); + } + } + } + + EditorGUI.EndProperty(); + } + + public override float GetPropertyHeight(SerializedProperty property, GUIContent label) + { + float height = EditorGUI.GetPropertyHeight(property); + + // Add a line for the Bound Theme Item popup when the foldout is expanded and a data source is available. + if (property.isExpanded && property.managedReferenceValue != null) + { + SerializedProperty themeDataSourceProperty = property.serializedObject.FindProperty("themeDataSource"); + if (themeDataSourceProperty != null && themeDataSourceProperty.objectReferenceValue != null) + { + height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + } + } + + return height; + } + + private string[] ParseThemeItems(ThemeDefinition themeDefinition, object binder) + { + if (themeDefinition == null || themeDefinition.ThemeDefinitionItems == null || binder == null) + { + return null; + } + + System.Type binderType = binder.GetType(); + if (!cachedValueTypes.TryGetValue(binderType, out System.Type valueType)) + { + System.Type baseBinderType = binderType; + while (baseBinderType != null && (!baseBinderType.IsGenericType || baseBinderType.GetGenericTypeDefinition() != typeof(BaseThemeBinder<,>))) + { + baseBinderType = baseBinderType.BaseType; + } + + valueType = baseBinderType?.GenericTypeArguments[0]; + cachedValueTypes[binderType] = valueType; + } + + if (valueType == null) + { + return null; + } + + reusableMatchingItemNames.Clear(); + + foreach (ThemeDefinition.ThemeDefinitionItem item in themeDefinition.ThemeDefinitionItems) + { + if (item != null + && !string.IsNullOrWhiteSpace(item.Name) + && item.DataType?.Type != null + && item.DataType.Type.BaseType != null + && item.DataType.Type.BaseType.GenericTypeArguments.Length > 0 + && item.DataType.Type.BaseType.GenericTypeArguments[0].IsAssignableFrom(valueType)) + { + reusableMatchingItemNames.Add(item.Name); + } + } + + return reusableMatchingItemNames.Count > 0 ? reusableMatchingItemNames.ToArray() : null; + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs.meta b/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs.meta new file mode 100644 index 000000000..514c5dfba --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f0f8b840810ac3044aa74e3940c04c18 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs b/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs new file mode 100644 index 000000000..a9c9fcbf1 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs @@ -0,0 +1,188 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.Editor; +using MixedReality.Toolkit.UX; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomEditor(typeof(FontIconSetMap))] + public class FontIconSetMapEditor : UnityEditor.Editor + { + private SerializedProperty setDefinitionProperty; + private SerializedProperty fontIconSetsProperty; + + private int numColumns = 4; + private bool editToggled = false; + private List foldoutStates = new(); + + // Deferred State Variables + private FontIconSet pendingIconSet = null; + private string pendingIconToRenameOld = null; + private string pendingIconToRenameNew = null; + + public void OnEnable() + { + setDefinitionProperty = serializedObject.FindProperty("setDefinition"); + fontIconSetsProperty = serializedObject.FindProperty("fontIconSets"); + // Ensure we have enough values to track all assigned icon sets + for (int i = foldoutStates.Count; i < fontIconSetsProperty.arraySize; i++) + { + foldoutStates.Add(false); + } + } + + public override void OnInspectorGUI() + { + serializedObject.Update(); + + if (Event.current.type == EventType.Layout) + { + if (pendingIconSet != null && pendingIconToRenameOld != null && pendingIconToRenameNew != null) + { + Undo.RecordObject(pendingIconSet, "Rename Icon"); + pendingIconSet.UpdateIconName(pendingIconToRenameOld, pendingIconToRenameNew); + EditorUtility.SetDirty(pendingIconSet); + pendingIconSet = null; + pendingIconToRenameOld = null; + pendingIconToRenameNew = null; + } + } + + EditorGUILayout.PropertyField(setDefinitionProperty); + EditorGUILayout.PropertyField(fontIconSetsProperty); + editToggled = EditorGUILayout.Toggle("Edit Names", editToggled); + EditorGUILayout.LabelField(string.Empty, GUI.skin.horizontalSlider); + + FontIconSetDefinition setDefinition = setDefinitionProperty.objectReferenceValue as FontIconSetDefinition; + const int TileSize = 90; + + Dictionary> iconMatches = new Dictionary>(); + + for (int i = 0; i < fontIconSetsProperty.arraySize; i++) + { + FontIconSet iconSet = fontIconSetsProperty.GetArrayElementAtIndex(i).objectReferenceValue as FontIconSet; + if (iconSet == null) + { + continue; + } + + List> glyphs = new List>(iconSet.GlyphIconsByName); + + int column = 0; + + if (editToggled) + { + glyphs.Sort((pair1, pair2) => pair1.Value.CompareTo(pair2.Value)); + + if (foldoutStates.Count <= i) + { + foldoutStates.Add(false); + } + + if (foldoutStates[i] = EditorGUILayout.Foldout(foldoutStates[i], iconSet.name, true)) + { + string[] availableNamesArray = null; + if (setDefinition != null && setDefinition.IconNames != null) + { + availableNamesArray = FontIconSetInspector.GetAvailableIconNames(iconSet, setDefinition); + FontIconSetInspector.DrawInvalidIconNameHelpBox(iconSet, setDefinition); + } + + EditorGUILayout.BeginHorizontal(); + foreach (KeyValuePair kv in glyphs) + { + if (column >= numColumns) + { + column = 0; + EditorGUILayout.EndHorizontal(); + EditorGUILayout.BeginHorizontal(); + } + + EditorGUILayout.BeginVertical(GUILayout.Width(TileSize)); + + Rect textureRect = GUILayoutUtility.GetRect(TileSize, TileSize, GUI.skin.box); + EditorGUI.DrawRect(textureRect, new Color(0f, 0f, 0f, 0.1f)); + FontIconSetInspector.EditorDrawTMPGlyph(textureRect, kv.Value, iconSet.IconFontAsset); + + if (availableNamesArray != null && FontIconSetInspector.DrawIconNamePopup(kv.Key, availableNamesArray, setDefinition.IconNames, TileSize, out string newName)) + { + pendingIconSet = iconSet; + pendingIconToRenameOld = kv.Key; + pendingIconToRenameNew = newName; + } + + EditorGUILayout.EndVertical(); + + column++; + } + + EditorGUILayout.EndHorizontal(); + } + } + else + { + foreach (KeyValuePair kv in glyphs) + { + if (iconMatches.TryGetValue(kv.Key, out List icons)) + { + icons.Add(iconSet); + } + else + { + iconMatches.Add(kv.Key, new List { iconSet }); + } + } + } + } + + if (!editToggled) + { + // Sort the matched keys so the icons display in a predictable alphabetical order. + List sortedKeys = new List(iconMatches.Keys); + sortedKeys.Sort(); + + foreach (string key in sortedKeys) + { + List icons = iconMatches[key]; + + if (setDefinition != null && setDefinition.IconNames != null) + { + EditorGUILayout.BeginVertical(); + + EditorGUILayout.LabelField(key, EditorStyles.boldLabel); + + EditorGUILayout.BeginHorizontal(); + + for (int i = 0; i < fontIconSetsProperty.arraySize; i++) + { + FontIconSet iconSet = fontIconSetsProperty.GetArrayElementAtIndex(i).objectReferenceValue as FontIconSet; + Rect iconRect = GUILayoutUtility.GetRect(TileSize, TileSize, GUI.skin.box); + EditorGUI.DrawRect(iconRect, new Color(0f, 0f, 0f, 0.1f)); + + if (icons.Contains(iconSet)) + { + FontIconSetInspector.EditorDrawTMPGlyph(iconRect, iconSet.GlyphIconsByName[key], iconSet.IconFontAsset); + } + } + + EditorGUILayout.EndHorizontal(); + + EditorGUILayout.EndVertical(); + } + } + } + + if (Event.current.type == EventType.Repaint) + { + float editorWindowWidth = GUILayoutUtility.GetLastRect().width; + numColumns = (int)Mathf.Floor(editorWindowWidth / (TileSize + GUI.skin.button.margin.right)); + } + + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs.meta b/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs.meta new file mode 100644 index 000000000..d9d7cb69e --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df22f8ff1a7c965478e57897bf2b0e1a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef b/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef new file mode 100644 index 000000000..2a228dfae --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef @@ -0,0 +1,23 @@ +{ + "name": "MixedReality.Toolkit.Theming.Editor", + "rootNamespace": "MixedReality.Toolkit.Theming.Editor", + "references": [ + "GUID:56255bd5d851a6243b63cb370cfc40b1", + "GUID:1712c250045dc734ba8993abefec8428", + "GUID:2238d58cada9b6746a548c6bff32c381", + "GUID:9a9367d437335a947a847011f5575869", + "GUID:e76caf03ea6b3df499bbc873e017d102", + "GUID:6055be8ebefd69e48b49212b09b47b2f" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef.meta b/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef.meta new file mode 100644 index 000000000..587dcc9ef --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 16570cd2fc0ec514cb2f350e689eeb09 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs b/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs new file mode 100644 index 000000000..3e331165b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs @@ -0,0 +1,66 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEditor; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomEditor(typeof(ThemeDataSource), true)] + public class ThemeDataSourceEditor : UnityEditor.Editor + { + private UnityEditor.Editor themeDefinitionEditor = null; + private static bool themeDefinitionFoldout = false; + + protected void OnDisable() + { + if (themeDefinitionEditor != null) + { + DestroyImmediate(themeDefinitionEditor); + themeDefinitionEditor = null; + } + } + + /// + /// Called by the Unity editor to render custom inspector UI for this component. + /// + public override void OnInspectorGUI() + { + serializedObject.Update(); + + SerializedProperty iterator = serializedObject.GetIterator(); + bool enterChildren = true; + + while (iterator.NextVisible(enterChildren)) + { + enterChildren = false; + + EditorGUILayout.PropertyField(iterator, true); + + if (iterator.name == "themeDefinition" && iterator.objectReferenceValue != null) + { + UnityEditor.Editor.CreateCachedEditor(iterator.objectReferenceValue, null, ref themeDefinitionEditor); + + themeDefinitionFoldout = EditorGUILayout.Foldout(themeDefinitionFoldout, "Definition Details", true); + if (themeDefinitionFoldout && themeDefinitionEditor != null) + { + using (new EditorGUI.IndentLevelScope()) + { + themeDefinitionEditor.OnInspectorGUI(); + } + } + } + + if (iterator.name == "activeTheme" && iterator.objectReferenceValue is Theme theme) + { + UnityEngine.Object activeDefinition = serializedObject.FindProperty("themeDefinition")?.objectReferenceValue; + if (theme.Definition != null && theme.Definition != activeDefinition) + { + EditorGUILayout.HelpBox($"Assigned theme's definition ({theme.Definition.name}) does not match this data source's definition ({(activeDefinition != null ? activeDefinition.name : "null")}).\nThis will lead to undefined behavior at runtime.", MessageType.Error); + } + } + } + + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs.meta b/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs.meta new file mode 100644 index 000000000..b1d0a939e --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c0542958f16458042ab14a7595250755 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs b/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs new file mode 100644 index 000000000..17a68df4b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs @@ -0,0 +1,41 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEditor; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomEditor(typeof(ThemeDefinition))] + public class ThemeDefinitionEditor : UnityEditor.Editor + { + public override void OnInspectorGUI() + { + serializedObject.Update(); + + DrawDefaultInspector(); + + ThemeDefinition def = target as ThemeDefinition; + if (def != null && def.ThemeDefinitionItems != null) + { + foreach (var item in def.ThemeDefinitionItems) + { + if (item == null) { continue; } + + string displayLabel = string.IsNullOrWhiteSpace(item.Name) ? "(null)" : item.Name; + System.Type type = item.DataType?.Type; + + if (type == null) + { + EditorGUILayout.HelpBox($"Item '{displayLabel}' has no DataType selected, or the type could not be resolved.", MessageType.Warning); + } + else if (type.IsAbstract || type.IsInterface || type.IsGenericTypeDefinition) + { + EditorGUILayout.HelpBox($"Item '{displayLabel}' uses an invalid DataType ({type.Name}). It must be a concrete, non-generic class to be instantiated.", MessageType.Warning); + } + } + } + + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs.meta b/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs.meta new file mode 100644 index 000000000..252cb02a7 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bd66f2c84c6572b48a8ed4194a8bc818 \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs b/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs new file mode 100644 index 000000000..451512b7a --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs @@ -0,0 +1,187 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.Editor; +using System; +using UnityEditor; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomEditor(typeof(Theme), true)] + public class ThemeEditor : UnityEditor.Editor + { + private SerializedProperty themeDefinitionProp = null; + private SerializedProperty themeItemsProp = null; + + private static bool itemsFoldout = false; + + private static readonly System.Collections.Generic.HashSet failedTypes = new System.Collections.Generic.HashSet(); + + private string nameField; + private string dataField; + private string valueField; + + static ThemeEditor() + { + AssemblyReloadEvents.afterAssemblyReload += failedTypes.Clear; + } + + protected void OnEnable() + { + themeDefinitionProp = serializedObject.FindProperty("definition"); + themeItemsProp = serializedObject.FindProperty("themeItems"); + + nameField = InspectorUIUtility.GetBackingField(nameof(ThemeDefinition.ThemeDefinitionItem.Name)); + dataField = InspectorUIUtility.GetBackingField(nameof(Theme.ThemeItem.Data)); + valueField = InspectorUIUtility.GetBackingField(nameof(BaseThemeItemData.Value)); + + // Clear the cache when the asset is (re)selected + failedTypes.Clear(); + } + + /// + /// Called by the Unity editor to render custom inspector UI for this component. + /// + public override void OnInspectorGUI() + { + serializedObject.Update(); + + EditorGUILayout.PropertyField(themeDefinitionProp); + + ThemeDefinition themeDefinition = themeDefinitionProp.objectReferenceValue as ThemeDefinition; + + if (themeDefinition != null && themeDefinition.ThemeDefinitionItems != null && themeItemsProp != null) + { + itemsFoldout = EditorGUILayout.Foldout(itemsFoldout, "Theme Values", true); + if (itemsFoldout) + { + if (Event.current.type == EventType.Layout) + { + ReconcileThemeItems(themeDefinition, themeItemsProp); + + // Force the SerializedObject to immediately sync any newly instantiated + // [SerializeReference] payloads so their child properties (like 'Value') + // are fully discoverable during this exact same Layout pass. + serializedObject.ApplyModifiedProperties(); + serializedObject.Update(); + } + + using (new EditorGUI.IndentLevelScope()) + { + for (int i = 0; i < themeItemsProp.arraySize; i++) + { + SerializedProperty themeItemProp = themeItemsProp.GetArrayElementAtIndex(i); + SerializedProperty dataProp = themeItemProp.FindPropertyRelative(dataField); + SerializedProperty valueProp = dataProp?.FindPropertyRelative(valueField); + + string themeItemName = themeItemProp.FindPropertyRelative(nameField).stringValue; + string displayLabel = string.IsNullOrWhiteSpace(themeItemName) ? "(null)" : themeItemName; + + if (valueProp != null) + { + // Draw just the Value field, labeled with the item name, + // skipping the intermediate "Data" foldout entirely. + EditorGUILayout.PropertyField(valueProp, new GUIContent(displayLabel), true); + } + else + { + if (dataProp?.managedReferenceValue == null) + { + if (i < themeDefinition.ThemeDefinitionItems.Length) + { + var definitionItem = themeDefinition.ThemeDefinitionItems[i]; + if (definitionItem.DataType?.Type == null) + { + EditorGUILayout.HelpBox($"'{displayLabel}' has no valid DataType selected in the ThemeDefinition.", MessageType.Warning); + } + else + { + EditorGUILayout.HelpBox($"Failed to initialize data for '{displayLabel}'. Ensure its DataType ({definitionItem.DataType.Type.Name}) is a concrete class with a default constructor.", MessageType.Warning); + } + } + + using (new EditorGUI.DisabledScope(true)) + { + EditorGUILayout.LabelField(displayLabel, "null"); + } + } + else + { + // Fallback for any item whose Data doesn't follow the + // BaseThemeItemData shape. + EditorGUILayout.PropertyField(dataProp, new GUIContent(displayLabel), true); + } + } + } + } + } + } + + serializedObject.ApplyModifiedProperties(); + } + + private void ReconcileThemeItems(ThemeDefinition themeDefinition, SerializedProperty themeItemsProp) + { + var definitionItems = themeDefinition.ThemeDefinitionItems; + for (int i = 0; i < definitionItems.Length; i++) + { + var definitionItem = definitionItems[i]; + if (definitionItem == null) { continue; } + string themeDefinitionItemName = definitionItem.Name; + + SerializedProperty themeItem = themeItemsProp.arraySize > i ? themeItemsProp.GetArrayElementAtIndex(i) : null; + if (themeItem == null + || themeItem.FindPropertyRelative(nameField).stringValue != themeDefinitionItemName) + { + // Search for an existing item with the matching name further in the list, + // so we can move it into position rather than discarding its saved values. + int existingIndex = -1; + for (int j = i + 1; j < themeItemsProp.arraySize; j++) + { + string existingName = themeItemsProp.GetArrayElementAtIndex(j) + .FindPropertyRelative(nameField) + .stringValue; + if (existingName == themeDefinitionItemName) + { + existingIndex = j; + break; + } + } + + if (existingIndex >= 0) + { + // Move the found item up to position i, preserving its saved values. + themeItemsProp.MoveArrayElement(existingIndex, i); + themeItem = themeItemsProp.GetArrayElementAtIndex(i); + } + else + { + // No existing item found — insert a fresh one with default values. + themeItemsProp.InsertArrayElementAtIndex(i); + themeItem = themeItemsProp.GetArrayElementAtIndex(i); + themeItem.managedReferenceValue = new Theme.ThemeItem(themeDefinitionItemName, null); + } + } + + // Unified instantiation and auto-healing for missing or mismatched data types + Type expectedType = definitionItem.DataType?.Type; + SerializedProperty dataProp = themeItem.FindPropertyRelative(dataField); + Type actualType = dataProp?.managedReferenceValue?.GetType(); + + if (dataProp != null && expectedType != null && expectedType != actualType && !failedTypes.Contains(expectedType)) + { + try + { + dataProp.managedReferenceValue = Activator.CreateInstance(expectedType); + } + catch + { + failedTypes.Add(expectedType); + } + } + } + themeItemsProp.arraySize = definitionItems.Length; + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs.meta b/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs.meta new file mode 100644 index 000000000..a3731936c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 11a69312bcdb62f4288e591dee20a625 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData.meta b/org.mixedrealitytoolkit.theming/ItemData.meta new file mode 100644 index 000000000..1907237cd --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2cce0cb63cfc327408973b9b78463a4d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs new file mode 100644 index 000000000..f44b34f5d --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs @@ -0,0 +1,13 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + public abstract class BaseThemeItemData + { + [field: SerializeField] + public T Value { get; set; } + } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs.meta new file mode 100644 index 000000000..bbc78b4a8 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61742c507788fd34982b820b87e7da03 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs new file mode 100644 index 000000000..4fc289559 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class ColorThemeItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs.meta new file mode 100644 index 000000000..29848c306 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5759cf6e2c697a644998df43d99988db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs new file mode 100644 index 000000000..1f419646f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs @@ -0,0 +1,8 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class FloatItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs.meta new file mode 100644 index 000000000..fc8e41e07 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 80ecb1dc22674da4692bfa9e55c8a6a0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs new file mode 100644 index 000000000..f83ea8527 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs @@ -0,0 +1,8 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class FontIconSetItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs.meta new file mode 100644 index 000000000..62ee5ec1e --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cfb1186fc72d3f24d85b73210d22ed5b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs new file mode 100644 index 000000000..09961cacb --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class MaterialThemeItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs.meta new file mode 100644 index 000000000..ce428ff29 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88c207c8a0256d047bd24a1867ea5825 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs new file mode 100644 index 000000000..5d91ee98d --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class RectOffsetItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs.meta new file mode 100644 index 000000000..613e51664 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcca02906a2c1ae449af22395741eb86 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs new file mode 100644 index 000000000..9cc88ebb3 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class SpriteThemeItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs.meta new file mode 100644 index 000000000..0e55b1d6c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 27d6dc828636c2c4eb5a6b7e6dbfd8c7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs new file mode 100644 index 000000000..461eb24ee --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using TMPro; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class TMP_FontAssetThemeItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs.meta new file mode 100644 index 000000000..40a28d6dd --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 170a5653632decb4f85bd4e064ea893b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs new file mode 100644 index 000000000..dfdaf84ce --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class Vector3ItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs.meta new file mode 100644 index 000000000..71e6ebdee --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3418308499e06d045a124a4e446540c8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/LICENSE.md b/org.mixedrealitytoolkit.theming/LICENSE.md new file mode 100644 index 000000000..426390d68 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/LICENSE.md @@ -0,0 +1,28 @@ +BSD 3-Clause License + +Copyright (c) 2026, Mixed Reality Toolkit Contributors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/org.mixedrealitytoolkit.theming/LICENSE.md.meta b/org.mixedrealitytoolkit.theming/LICENSE.md.meta new file mode 100644 index 000000000..cac902fe9 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/LICENSE.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d1d898d173981e4ca6ff00eedb11863 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef b/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef new file mode 100644 index 000000000..0433b9dfa --- /dev/null +++ b/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef @@ -0,0 +1,19 @@ +{ + "name": "MixedReality.Toolkit.Theming", + "rootNamespace": "MixedReality.Toolkit.Theming", + "references": [ + "GUID:22213891bfe50254781c448a2277a9a5", + "GUID:56255bd5d851a6243b63cb370cfc40b1", + "GUID:9a9367d437335a947a847011f5575869", + "GUID:6055be8ebefd69e48b49212b09b47b2f" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef.meta b/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef.meta new file mode 100644 index 000000000..7f0d40bd4 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2238d58cada9b6746a548c6bff32c381 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/README.md b/org.mixedrealitytoolkit.theming/README.md new file mode 100644 index 000000000..58b69ce18 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/README.md @@ -0,0 +1,143 @@ +# MRTK UX Theming + +## Overview + +MRTK Theming 3.0 is a lightweight data-binding system that routes named values from a theme asset to components in the scene. Switching the active theme on a `ThemeDataSource` instantly updates every bound component across all scenes and prefabs that reference it. + +The system has three layers: + +| Layer | Asset / Component | Purpose | +|---|---|---| +| **Schema** | `ThemeDefinition` (ScriptableObject) | Declares what named items exist and what type each one is | +| **State** | `ThemeDataSource` (ScriptableObject) | The single source of truth for the currently active theme | +| **Values** | `Theme` (ScriptableObject) | Provides a concrete value for every item in the definition | +| **Binding** | `ThemeBinding` (MonoBehaviour) + binders | Connects a theme item to a specific component on a GameObject | + +> [!NOTE] +> `ThemeBinding` exists in the UX Core package for cross-package compatibility. + +--- + +## Theme data source + +A `ThemeDataSource` ScriptableObject is the single source of truth for which theme is currently active. Create one per logical theme domain (e.g. one for the whole app, or one per scene). + +![ThemeDataSource](./Documentation~/Images/ThemeDataSource.png) + +The `ThemeDataSource` holds: + +- **`activeTheme`** — the currently applied `Theme` asset. +- **`themeDefinition`** — the `ThemeDefinition` asset (schema) that all compatible themes must conform to. + +To switch themes at runtime, assign a new `Theme` to `themeDataSource.value`. Every `ThemeBinding` component subscribed to that source will immediately receive and apply the new values. + +### Theme definition + +A `ThemeDefinition` ScriptableObject is a list of named items, each with a declared data type. It acts as the contract between the `ThemeDataSource` and all `Theme` assets that reference it — every `Theme` must provide a value for every item in the definition. + +Each item has: + +- **Name** — a string key used to match binders to values at runtime (e.g. `"Primary Color"`, `"Backplate Material"`). +- **Data type** — a concrete subclass of `BaseThemeItemData` (e.g. `ColorThemeItemData`, `MaterialThemeItemData`). + +![ColorThemeItemData](./Documentation~/Images/ColorThemeItemData.png) + +--- + +## Theme + +A `Theme` ScriptableObject is assigned to a `ThemeDataSource` and provides a concrete value for every item declared in its referenced `ThemeDefinition` schema. + +![TextColorMapping](./Documentation~/Images/TextColorMapping.png) + +The `Theme` inspector automatically displays one field per definition item, typed correctly. Themes are **complete** — every item in the definition must have a value. This ensures that switching themes always fully overwrites every bound property, with no leftover values from a previous theme. + +--- + +## Theme binding + +The `ThemeBinding` MonoBehaviour connects a `ThemeDataSource` to one or more components on the same GameObject (or its children). Add it to any GameObject that should respond to theme changes. + +![ThemeBindingThemeSource](./Documentation~/Images/ThemeBindingThemeSource.png) + +`ThemeBinding` holds: + +- **`themeDataSource`** — the source to subscribe to. +- **`binders`** — a list of `IBinder` implementations, each connecting one theme item to one component. + +On `OnEnable`, each binder subscribes to the data source and immediately receives the current theme. On `OnDisable`, binders unsubscribe. + +![ThemeBinding](./Documentation~/Images/ThemeBinding.png) + +### Theme binders + +A theme binder connects a named theme item to a specific component property. Each binder has: + +- **Target** — the component to update (e.g. a `Graphic`, `Transform`, `Renderer`). +- **Bound Theme Item** — the name of the item in the `ThemeDefinition` to read from. + +When the active theme changes, the binder looks up its named item in the new theme and calls `Apply` with the value. + +#### Built-in binders + +| Binder | Data type | Target | Sets | +|---|---|---|---| +| `GraphicColorBinder` | `Color` | `Graphic` | `Graphic.color` | +| `GraphicMaterialBinder` | `Material` | `Graphic` | `Graphic.material` | +| `RendererMaterialBinder` | `Material` | `Renderer` | `Renderer.material` | +| `TMP_TextFontAssetBinder` | `TMP_FontAsset` | `TMP_Text` | Font asset | +| `ImageSpriteBinder` | `Sprite` | `Image` | `Image.sprite` | +| `SpriteRendererSpriteBinder` | `Sprite` | `SpriteRenderer` | `SpriteRenderer.sprite` | +| `SpriteRendererColorBinder` | `Color` | `SpriteRenderer` | `SpriteRenderer.color` | +| `TransformLocalScaleBinder` | `Vector3` | `Transform` | `Transform.localScale` | +| `LayoutGroupPaddingBinder` | `RectOffset` | `HorizontalOrVerticalLayoutGroup` | Padding | +| `RoundedRectMask2DRadiusBinder` | `float` | `RoundedRectMask2D` | Corner radius | +| `FontIconSetBinder` | `FontIconSetData` | — | Font + icon set | +| `StateVisualizerEffectColorBinder` | `Color` | `StateVisualizer` | Tint effect color per state | + +--- + +## Extending the system + +### Creating a new theme item data type + +Subclass `BaseThemeItemData` with the desired value type and mark it `[Serializable]`: + +```csharp +[Serializable] +public class FloatItemData : BaseThemeItemData { } +``` + +The new type will automatically appear in the `ThemeDefinition` item type dropdown in the Inspector. + +### Creating a new binder + +Subclass `BaseThemeBinder` where `T` is the value type and `K` is the target component type. Mark it `[Serializable]` and implement `Apply`: + +```csharp +[Serializable] +public class MyCustomBinder : BaseThemeBinder +{ + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.MyColorProperty = themeItemData.Value; + } + } +} +``` + +The new binder will automatically appear in the `ThemeBinding` binder type dropdown in the Inspector, and the **Bound Theme Item** dropdown will show only the definition items whose data type is compatible with `T`. + +--- + +## How theme switching works at runtime + +1. `themeDataSource.value = newTheme` is called. +2. `ThemeDataSource` fires a `ChangeEvent` to all listeners. +3. Each `ThemeBinding` component's binders receive the event via `OnThemeChanged`. +4. Each binder calls `Theme.TryGetItemData(ThemeDefinitionItemName, ...)` to look up its value. +5. If found, `Apply` is called with the new value. If not found, a warning is logged. + +Because themes are complete (every definition item has a value in every theme), every bound property is always overwritten on a theme switch — there are no partial updates or leftover values from a previous theme. diff --git a/org.mixedrealitytoolkit.theming/README.md.meta b/org.mixedrealitytoolkit.theming/README.md.meta new file mode 100644 index 000000000..ebb7518d9 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 700ac8701616d044d882395e52a8cbee +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming.meta b/org.mixedrealitytoolkit.theming/Theming.meta new file mode 100644 index 000000000..7a0608b8b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95d454a1ae204534abca1c45248ba018 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs b/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs new file mode 100644 index 000000000..4a54a8385 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs @@ -0,0 +1,18 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.UX; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [CreateAssetMenu(fileName = "MRTK_Theming_FontIconSetMap_New", menuName = "MRTK/Theming/Font Icon Set Map")] + public class FontIconSetMap : ScriptableObject + { + [SerializeField] + private FontIconSetDefinition setDefinition; + + [SerializeField] + private FontIconSet[] fontIconSets; + } +} diff --git a/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs.meta b/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs.meta new file mode 100644 index 000000000..1d1c72e57 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2a49c8c479a4ab64fa9d1ac42bf347e4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset new file mode 100644 index 000000000..cc107dec7 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset @@ -0,0 +1,19 @@ +%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: 3f1a7927806b6cc45a1ef33fc3f04465, type: 3} + m_Name: MRTK_Theming_DataSource + m_EditorClassIdentifier: + activeTheme: {fileID: 0} + onThemeChanged: + m_PersistentCalls: + m_Calls: [] + themeDefinition: {fileID: 11400000, guid: da6ba53b6d024604bbff6fa870ff4e4e, type: 2} diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset.meta b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset.meta new file mode 100644 index 000000000..d8e4b4f75 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57993c46ea42acf4ca3067542443bc45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset new file mode 100644 index 000000000..115e45c6d --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset @@ -0,0 +1,96 @@ +%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: 3b6e110c23f5e404dbbfdc87cb47ff23, type: 3} + m_Name: MRTK_Theming_DefaultDefinition + m_EditorClassIdentifier: + k__BackingField: + - k__BackingField: Backplate Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Non-Canvas Backplate (8mm) Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Non-Canvas Backplate (10mm) Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Non-Canvas Backplate (13mm) Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Text Font + k__BackingField: + reference: MixedReality.Toolkit.Theming.TMP_FontAssetThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Icon Set + k__BackingField: + reference: MixedReality.Toolkit.Theming.FontIconSetItemData, MixedReality.Toolkit.Theming + - k__BackingField: MRTK Logo + k__BackingField: + reference: MixedReality.Toolkit.Theming.SpriteThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Canvas Backplate Quad Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Panel Group Padding + k__BackingField: + reference: MixedReality.Toolkit.Theming.RectOffsetItemData, MixedReality.Toolkit.Theming + - k__BackingField: Button Corner Radius + k__BackingField: + reference: MixedReality.Toolkit.Theming.FloatItemData, MixedReality.Toolkit.Theming + - k__BackingField: Tab Indicator Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Horizontal Tab Indicator Scale + k__BackingField: + reference: MixedReality.Toolkit.Theming.Vector3ItemData, MixedReality.Toolkit.Theming + - k__BackingField: Primary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Primary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Primary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Primary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Secondary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Secondary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Secondary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Secondary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Tertiary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Tertiary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Tertiary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Tertiary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Surface Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Surface Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Surface Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset.meta b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset.meta new file mode 100644 index 000000000..fc09641d3 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da6ba53b6d024604bbff6fa870ff4e4e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset new file mode 100644 index 000000000..21c5f4828 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset @@ -0,0 +1,18 @@ +%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: 2a49c8c479a4ab64fa9d1ac42bf347e4, type: 3} + m_Name: MRTK_Theming_FontIconSetMap + m_EditorClassIdentifier: + setDefinition: {fileID: 11400000, guid: e63daff880b56ed439a2e852b6e6993a, type: 2} + fontIconSets: + - {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2} + - {fileID: 11400000, guid: 98fec9bd136c93c44ba1f6f1bd5f38b5, type: 2} diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset.meta b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset.meta new file mode 100644 index 000000000..477da27e2 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 596e56f5586db9b4098cd33d94c7fb72 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/Theme.cs b/org.mixedrealitytoolkit.theming/Theming/Theme.cs new file mode 100644 index 000000000..f369fcd3f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/Theme.cs @@ -0,0 +1,79 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// A ScriptableObject that provides concrete values for every item declared in a 's definition. + /// + [CreateAssetMenu(fileName = "Theme", menuName = "MRTK/Theming/Theme", order = 0)] + public class Theme : ScriptableObject + { + [SerializeField] + [Tooltip("The schema that this theme conforms to. Every theme item must map to an item defined here.")] + private ThemeDefinition definition; + + /// + /// The schema that this theme conforms to. Every theme item must map to an item defined here. + /// + public ThemeDefinition Definition => definition; + + [SerializeReference] + [Tooltip("The items defining this theme's data mapped to the definition's items.")] + private List themeItems = new List(); + + /// + /// Attempts to retrieve the data for a specific theme item by its name and expected type. + /// + /// The expected type of the theme item data (e.g., ). + /// The name of the theme item as defined in the theme definition. + /// When this method returns, contains the item data if found, or the default value otherwise. + /// if an item with the specified name and type is found; otherwise, . + public bool TryGetItemData(string itemName, out T itemValue) + { + if (themeItems != null) + { + foreach (var themeItem in themeItems) + { + if (themeItem != null && themeItem.Name == itemName && themeItem.Data is T themeItemData) + { + itemValue = themeItemData; + return true; + } + } + } + + itemValue = default; + return false; + } + + /// + /// Represents a single named entry in a theme containing a data payload. + /// + [Serializable] + internal class ThemeItem + { + /// + /// The name of the theme item. + /// + [field: SerializeField, HideInInspector] + public string Name { get; private set; } + + /// + /// The underlying data value for this theme item. + /// + [field: SerializeReference] + public object Data { get; private set; } + + public ThemeItem(string name, object data) + { + Name = name; + Data = data; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Theming/Theme.cs.meta b/org.mixedrealitytoolkit.theming/Theming/Theme.cs.meta new file mode 100644 index 000000000..c91085e14 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/Theme.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9530d537087fef24eb7a177accd13c7d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs b/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs new file mode 100644 index 000000000..e99ec94f4 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs @@ -0,0 +1,71 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.UIElements; + +namespace MixedReality.Toolkit.Theming +{ + [CreateAssetMenu(fileName = "Theme Data Source", menuName = "MRTK/Theming/Theme Data Source", order = 0)] + public class ThemeDataSource : ScriptableObject, INotifyValueChanged + { + [SerializeField] + private Theme activeTheme; + + [SerializeField] + private UnityEvent> onThemeChanged = new(); + + [SerializeField] + private ThemeDefinition themeDefinition; + + public ThemeDefinition Definition => themeDefinition; + + #region INotifyValueChanged + + /// + public Theme value + { + get => activeTheme; + set + { + if (value != null && value.Definition != null && value.Definition != themeDefinition) + { + Debug.LogError($"New theme's definition ({value.Definition.name}) does not match this data source's definition ({(themeDefinition != null ? themeDefinition.name : "null")})"); + } + + using (ChangeEvent changeEvent = ChangeEvent.GetPooled(activeTheme, value)) + { + // target is intentionally unset, as ThemeDataSource is not a UIElements visual + // element, but ChangeEvent is used for its newValue/previousValue semantics + // and object pooling + SetValueWithoutNotify(value); + onThemeChanged.Invoke(changeEvent); + } + } + } + + /// + public void SetValueWithoutNotify(Theme newValue) + { + activeTheme = newValue; + } + + #endregion INotifyValueChanged + + public void AddListener(UnityAction> action) + { + if (action == null) { return; } + onThemeChanged.AddListener(action); + if (activeTheme == null) { return; } + using ChangeEvent changeEvent = ChangeEvent.GetPooled(null, activeTheme); + action.Invoke(changeEvent); + } + + public void RemoveListener(UnityAction> action) + { + if (action == null) { return; } + onThemeChanged.RemoveListener(action); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs.meta b/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs.meta new file mode 100644 index 000000000..381858223 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f1a7927806b6cc45a1ef33fc3f04465 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs b/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs new file mode 100644 index 000000000..037ec997f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs @@ -0,0 +1,26 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [CreateAssetMenu(fileName = "Theme Definition", menuName = "MRTK/Theming/Theme Definition", order = 1)] + public class ThemeDefinition : ScriptableObject + { + [field: SerializeField] + [Tooltip("The items defining the theme that can be bound to this source.")] + public ThemeDefinitionItem[] ThemeDefinitionItems { get; private set; } + + [Serializable] + public class ThemeDefinitionItem + { + [field: SerializeField] + public string Name { get; set; } + + [field: SerializeField, Extends(typeof(BaseThemeItemData<>), TypeGrouping.ByNamespaceFlat, AllowGenericTypeDefinition = true)] + public SystemType DataType { get; set; } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs.meta b/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs.meta new file mode 100644 index 000000000..b9634812c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3b6e110c23f5e404dbbfdc87cb47ff23 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/package.json b/org.mixedrealitytoolkit.theming/package.json new file mode 100644 index 000000000..e804a9e08 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/package.json @@ -0,0 +1,24 @@ +{ + "name": "org.mixedrealitytoolkit.theming", + "version": "1.0.0-development.pre.1", + "description": "Core theming scripts for building MR UI components. Intended to be consumed when building UX libraries. For pre-existing library of components, see the UX Components package.", + "displayName": "MRTK UX Theming", + "author": "Mixed Reality Toolkit Contributors", + "license": "BSD 3-Clause", + "repository": { + "type": "git", + "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity.git" + }, + "bugs": { + "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" + }, + "unity": "6000.0", + "unityRelease": "66f2", + "documentationUrl": "https://www.mixedrealitytoolkit.org", + "dependencies": { + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", + "org.mixedrealitytoolkit.core": "4.0.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", + "com.unity.textmeshpro": "3.0.6" + } +} \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/package.json.meta b/org.mixedrealitytoolkit.theming/package.json.meta new file mode 100644 index 000000000..4e1a918b6 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0eea43c3b742dc4291ba8492ff3435a +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab index 0c2e860de..71579c827 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab @@ -905,10 +905,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7746750332524202746, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: 'managedReferences[1393819269385945089]' value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.GraphicTintEffect @@ -1138,6 +1134,9 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 5319578128471115350} m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 7344942429739044722} - targetCorrespondingSourceObject: {fileID: 2828958436599032273, guid: b85e005d231192249b7077b40a4d4e45, type: 3} insertIndex: -1 addedObject: {fileID: 3015392985318836008} @@ -1153,11 +1152,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4185972052008607584 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 9026472854072389792, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + m_PrefabInstance: {fileID: 5139722473249402816} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4185972052008607586 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9026472854072389794, guid: b85e005d231192249b7077b40a4d4e45, type: 3} m_PrefabInstance: {fileID: 5139722473249402816} m_PrefabAsset: {fileID: 0} +--- !u!114 &4585478379361187306 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + m_PrefabInstance: {fileID: 5139722473249402816} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8376646494505211202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02df0dfd31465cf42bd60027ac90b874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6922469056340231697 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2828958436599032273, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -1194,6 +1215,88 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2828958436599032274, guid: b85e005d231192249b7077b40a4d4e45, type: 3} m_PrefabInstance: {fileID: 5139722473249402816} m_PrefabAsset: {fileID: 0} +--- !u!1 &8376646494505211202 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + m_PrefabInstance: {fileID: 5139722473249402816} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7344942429739044722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8376646494505211202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 6006879866990887121 + - rid: 6006879866990887122 + - rid: 6006879866990887123 + - rid: 6006879866990887124 + - rid: 6006879866990887125 + - rid: 6006879866990887126 + - rid: 6006879866990887127 + - rid: 6006879866990887129 + - rid: 6006879866990887128 + references: + version: 2 + RefIds: + - rid: 6006879866990887121 + type: {class: FontIconSetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: + k__BackingField: {fileID: 7245587814888172855} + k__BackingField: {fileID: 5095746839500215027} + k__BackingField: Icon Set + - rid: 6006879866990887122 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1922220768106560367} + k__BackingField: Text Font + - rid: 6006879866990887123 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1922220768106560367} + k__BackingField: On Surface Color + - rid: 6006879866990887124 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8493469810320727241} + k__BackingField: On Surface Color + - rid: 6006879866990887125 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 5095746839500215027} + k__BackingField: On Surface Color + - rid: 6006879866990887126 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2228947736508096533} + k__BackingField: On Surface Color + - rid: 6006879866990887127 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8467006667157818416} + k__BackingField: Tab Indicator Material + - rid: 6006879866990887128 + type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4585478379361187306} + k__BackingField: Primary Color + stateName: Toggle + tintTarget: {fileID: 8467006667157818416} + - rid: 6006879866990887129 + type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4585478379361187306} + k__BackingField: Primary Color + stateName: Toggle + tintTarget: {fileID: 4185972052008607584} --- !u!224 &8376646494505211229 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab index e96e42393..b990a9ddd 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab @@ -345,6 +345,7 @@ GameObject: - component: {fileID: 7976009683108370513} - component: {fileID: 2632565233158286779} - component: {fileID: 1995394188294645620} + - component: {fileID: 3722787625447876489} m_Layer: 5 m_Name: Empty Button m_TagString: Untagged @@ -1002,6 +1003,35 @@ MonoBehaviour: seeItSayItLabel: {fileID: 3358038249354970442} pattern: Say '{0}' positionControl: {fileID: 0} +--- !u!114 &3722787625447876489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3705378105823492738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473242837123161 + - rid: 1538473242837123160 + references: + version: 2 + RefIds: + - rid: 1538473242837123160 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 9026472854072389792} + k__BackingField: Surface Color + - rid: 1538473242837123161 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 9026472854072389792} + k__BackingField: Canvas Backplate Quad Material --- !u!1 &9026472854072389795 GameObject: m_ObjectHideFlags: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab index 648462b03..6b5d7d688 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1619375032725711555} - component: {fileID: 961341594221179252} - component: {fileID: 8652067621810633434} + - component: {fileID: 785579326716734801} m_Layer: 5 m_Name: UIMenuBackplate_R13 m_TagString: Untagged @@ -76,3 +77,26 @@ MonoBehaviour: thickness: 2 wedges: 8 calculateSmoothEdges: 1 +--- !u!114 &785579326716734801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8510261678218358358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100121658621954 + references: + version: 2 + RefIds: + - rid: 7617100121658621954 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8652067621810633434} + k__BackingField: Backplate Material diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab index c9cfd63b8..36c737c0e 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1619375032725711555} - component: {fileID: 961341594221179252} - component: {fileID: 8652067621810633434} + - component: {fileID: 3367734699037627833} m_Layer: 5 m_Name: UIPanelBackplate_R16 m_TagString: Untagged @@ -76,3 +77,26 @@ MonoBehaviour: thickness: 2 wedges: 8 calculateSmoothEdges: 1 +--- !u!114 &3367734699037627833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8510261678218358358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100121658621953 + references: + version: 2 + RefIds: + - rid: 7617100121658621953 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8652067621810633434} + k__BackingField: Backplate Material diff --git a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab index 6ae9e2554..285b2d2b3 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 6264478733034656625} - component: {fileID: 233999318278807519} - component: {fileID: 1925175511647506998} + - component: {fileID: 6793636336473426600} m_Layer: 5 m_Name: CanvasButtonBar m_TagString: Untagged @@ -120,6 +121,29 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!114 &6793636336473426600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6264478733034656630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473309753835627 + references: + version: 2 + RefIds: + - rid: 1538473309753835627 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6264478733034656625} + k__BackingField: Backplate Material --- !u!1001 &1097437160816526514 PrefabInstance: m_ObjectHideFlags: 0 @@ -128,10 +152,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -302,10 +322,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -476,10 +492,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -650,14 +662,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_SharedBackplate.prefab b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_SharedBackplate.prefab index fde831b78..914b65e60 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_SharedBackplate.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_SharedBackplate.prefab @@ -119,6 +119,7 @@ GameObject: - component: {fileID: 6264478733034656625} - component: {fileID: 233999318278807519} - component: {fileID: 1925175511647506998} + - component: {fileID: 3508941522267798669} m_Layer: 5 m_Name: CanvasButtonBar_SharedBackplate m_TagString: Untagged @@ -227,6 +228,41 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!114 &3508941522267798669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6264478733034656630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473309753835628 + - rid: 1538473309753835629 + - rid: 1538473309753835630 + references: + version: 2 + RefIds: + - rid: 1538473309753835628 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6264478733034656625} + k__BackingField: Backplate Material + - rid: 1538473309753835629 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2047881656393054248} + k__BackingField: Canvas Backplate Quad Material + - rid: 1538473309753835630 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2047881656393054248} + k__BackingField: Primary Container Color --- !u!1001 &1097437160816526514 PrefabInstance: m_ObjectHideFlags: 0 @@ -235,10 +271,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -413,10 +445,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -591,10 +619,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -769,10 +793,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md b/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md index 8898a2a61..b1d8ccc78 100644 --- a/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md @@ -2,13 +2,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## Unreleased +## [4.0.0-pre.3] - 2026-05-20 ### Changed * Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) * Reserialized prefabs and animations to remove stale serialized fields. [PR #1115](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1115) * Updated the Action Button prefab to have a more descriptive icon name. [PR #1117](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1117) +* Updated various prefabs to be themeable. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) ## [4.0.0-pre.2] - 2025-12-05 diff --git a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialog.prefab b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialog.prefab index b3e3d4555..db6c6fc5a 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialog.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialog.prefab @@ -213,6 +213,7 @@ GameObject: - component: {fileID: 3464395001938839902} - component: {fileID: 4665157281537287932} - component: {fileID: 941895475344048534} + - component: {fileID: 3304842204257264291} m_Layer: 5 m_Name: CanvasDialog m_TagString: Untagged @@ -281,6 +282,53 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &3304842204257264291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6930810733556124559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100121658622016 + - rid: 7617100121658622018 + - rid: 7617100121658622019 + - rid: 7617100121658622020 + - rid: 7617100121658622021 + references: + version: 2 + RefIds: + - rid: 7617100121658622016 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6930810734963254062} + k__BackingField: On Surface Color + - rid: 7617100121658622018 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6930810734963254062} + k__BackingField: Text Font + - rid: 7617100121658622019 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6930810734943986774} + k__BackingField: On Surface Color + - rid: 7617100121658622020 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6930810734943986774} + k__BackingField: Text Font + - rid: 7617100121658622021 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8902223861511733022} + k__BackingField: Backplate Material --- !u!1 &6930810734943986772 GameObject: m_ObjectHideFlags: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/SeeItSayItLabel-Canvas.prefab b/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/SeeItSayItLabel-Canvas.prefab index bfeafaf59..a3ea5643c 100644 --- a/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/SeeItSayItLabel-Canvas.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/SeeItSayItLabel-Canvas.prefab @@ -129,8 +129,6 @@ GameObject: m_Component: - component: {fileID: 2648010737493403592} - component: {fileID: 613211636435409487} - - component: {fileID: 6468409002762060768} - - component: {fileID: 1984157648487324098} m_Layer: 5 m_Name: CanvasRoot m_TagString: Untagged @@ -181,46 +179,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &6468409002762060768 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400135068623992445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &1984157648487324098 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400135068623992445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1 &2542652557800958703 GameObject: m_ObjectHideFlags: 0 @@ -232,6 +190,7 @@ GameObject: - component: {fileID: 8174497233233282343} - component: {fileID: 7378201789336955507} - component: {fileID: 4142207705701966788} + - component: {fileID: -6408582823915813169} m_Layer: 0 m_Name: SeeItSayItLabel-Canvas m_TagString: Untagged @@ -330,6 +289,41 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 +--- !u!114 &-6408582823915813169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2542652557800958703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100032241303552 + - rid: 7617100032241303553 + - rid: 7617100032241303554 + references: + version: 2 + RefIds: + - rid: 7617100032241303552 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1094569825582854354} + k__BackingField: Backplate Material + - rid: 7617100032241303553 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2762179398116406116} + k__BackingField: On Surface Color + - rid: 7617100032241303554 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2762179398116406116} + k__BackingField: Text Font --- !u!1 &8925799636652996939 GameObject: m_ObjectHideFlags: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/Checkbox.prefab b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/Checkbox.prefab index cf0359e92..03d7421ec 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/Checkbox.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/Checkbox.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 4920426125932797076} - component: {fileID: 1755546517986312659} - component: {fileID: 1333775942222694079} + - component: {fileID: 5024593287958842062} m_Layer: 5 m_Name: Checkbox m_TagString: Untagged @@ -160,6 +161,31 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345098608517470577} m_CullTransparentMesh: 1 +--- !u!114 &5024593287958842062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345098608517470577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 6006879866990887130 + references: + version: 2 + RefIds: + - rid: 6006879866990887130 + type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6434074875067239604} + k__BackingField: Primary Color + stateName: Toggle + tintTarget: {fileID: 269199439855791924} --- !u!1 &7189414470030404245 GameObject: m_ObjectHideFlags: 0 @@ -172,6 +198,7 @@ GameObject: - component: {fileID: 1989956866083351710} - component: {fileID: 269199439855791924} - component: {fileID: 6136921357999623811} + - component: {fileID: 5834772403435721670} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -248,3 +275,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0fda4953718e0264291c42cb2a637fb5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5834772403435721670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7189414470030404245} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7636826640568287483 + references: + version: 2 + RefIds: + - rid: 7636826640568287483 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 269199439855791924} + k__BackingField: On Surface Color diff --git a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/ToggleSwitch.prefab b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/ToggleSwitch.prefab index a423ca38f..ce378c389 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/ToggleSwitch.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/ToggleSwitch.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 6434074875067239604} - component: {fileID: 4920426125932797076} - component: {fileID: 1755546517986312659} + - component: {fileID: 1109057887825850324} m_Layer: 5 m_Name: ToggleSwitch m_TagString: Untagged @@ -152,6 +153,43 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &1109057887825850324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345098608517470577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610083 + - rid: 7636826640568287486 + - rid: 1538473382797639794 + references: + version: 2 + RefIds: + - rid: 1538473376477610083 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 269199439855791924} + k__BackingField: Surface Container Color + - rid: 1538473382797639794 + type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6434074875067239604} + k__BackingField: Primary Color + stateName: Toggle + tintTarget: {fileID: 269199439855791924} + - rid: 7636826640568287486 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8388226346315569560} + k__BackingField: Primary Color --- !u!1 &7189414470030404245 GameObject: m_ObjectHideFlags: 0 diff --git a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md index 4917eb2c5..56540f95b 100644 --- a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md @@ -2,15 +2,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## Unreleased +## [4.0.0-pre.3] - 2026-05-20 ### Added * Added the ability to map different icon sets together to have matching names (prerequisite for theming work). [PR #1077](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1077) +* Add "Sort and Deduplicate" option to `FontIconSetDefinition`. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) ### Changed * Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) +* Updated `FontIconSelector`, `StateVisualizer`, and `TintEffect` to be themeable. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) ### Fixed diff --git a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSelectorInspector.cs b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSelectorInspector.cs index 9b0fc0433..48f9c8206 100644 --- a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSelectorInspector.cs +++ b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSelectorInspector.cs @@ -2,6 +2,7 @@ // Licensed under the BSD 3-Clause using MixedReality.Toolkit.UX; +using System.Collections.Generic; using TMPro; using UnityEditor; using UnityEngine; @@ -106,6 +107,8 @@ public override void OnInspectorGUI() private int numColumns = 4; private Vector2 scrollAmount; + private float cachedTileSize = 0f; + private GUILayoutOption[] cachedButtonOptions; public void DrawIconGrid(FontIconSelector fontIconSelector, float tileSize) { @@ -116,9 +119,19 @@ public void DrawIconGrid(FontIconSelector fontIconSelector, float tileSize) scrollAmount = EditorGUILayout.BeginScrollView(scrollAmount, GUILayout.MaxHeight(128), GUILayout.MinHeight(64)); EditorGUILayout.BeginHorizontal(); - foreach (string iconName in fontIconSet.GlyphIconsByName.Keys) + List> sortedIcons = new List>(fontIconSet.GlyphIconsByName); + sortedIcons.Sort((a, b) => a.Key.CompareTo(b.Key)); + + if (cachedTileSize != tileSize || cachedButtonOptions == null) + { + cachedTileSize = tileSize; + cachedButtonOptions = new GUILayoutOption[] { GUILayout.Height(tileSize), GUILayout.Width(tileSize) }; + } + + foreach (KeyValuePair kvp in sortedIcons) { - uint unicodeValue = fontIconSet.GlyphIconsByName[iconName]; + string iconName = kvp.Key; + uint unicodeValue = kvp.Value; if (column >= numColumns) { @@ -127,10 +140,11 @@ public void DrawIconGrid(FontIconSelector fontIconSelector, float tileSize) EditorGUILayout.BeginHorizontal(); } - if (GUILayout.Button(" ", - GUILayout.Height(tileSize), - GUILayout.Width(tileSize))) + if (GUILayout.Button(" ", cachedButtonOptions)) { + // Flush any pending changes from other Inspector fields (e.g. lost focus) manually editing the icon name + serializedObject.ApplyModifiedProperties(); + if (fontIconSelector.TextMeshProComponent != null) { Undo.RecordObjects(new Object[] { fontIconSelector, fontIconSelector.TextMeshProComponent }, "Changed icon"); @@ -147,6 +161,9 @@ public void DrawIconGrid(FontIconSelector fontIconSelector, float tileSize) { PrefabUtility.RecordPrefabInstancePropertyModifications(fontIconSelector.TextMeshProComponent); } + + // Resync the serialized object after manually editing the icon name + serializedObject.Update(); } Rect textureRect = GUILayoutUtility.GetLastRect(); diff --git a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs index b4e077840..38aa1af8d 100644 --- a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs +++ b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs @@ -38,7 +38,6 @@ public class FontIconSetInspector : UnityEditor.Editor private List> iconEntries = new List>(); private List validNames = new List(); - private List availableNames = new List(); private HashSet selectedUnicodeValues = new HashSet(); private string[] availableNamesArray = Array.Empty(); private bool requiresUpdate = false; @@ -104,7 +103,6 @@ private void UpdateIconEntries() iconEntries.Sort((a, b) => a.Key.CompareTo(b.Key)); validNames.Clear(); - availableNames.Clear(); if (fontIconSetDefinitionProp != null) { @@ -114,16 +112,18 @@ private void UpdateIconEntries() foreach (string name in setDefinition.IconNames) { validNames.Add(name); - if (!fontIconSet.GlyphIconsByName.ContainsKey(name)) - { - availableNames.Add(name); - } } + availableNamesArray = GetAvailableIconNames(fontIconSet, setDefinition); + } + else + { + availableNamesArray = new string[] { string.Empty }; } } - availableNames.Sort(); - availableNames.Insert(0, string.Empty); - availableNamesArray = availableNames.ToArray(); + else + { + availableNamesArray = new string[] { string.Empty }; + } Repaint(); } @@ -137,17 +137,26 @@ public override void OnInspectorGUI() { if (pendingIconToAdd.HasValue) { - AddIcon((FontIconSet)target, pendingIconToAdd.Value); + foreach (var t in targets) + { + requiresUpdate |= AddIcon((FontIconSet)t, pendingIconToAdd.Value); + } pendingIconToAdd = null; } if (pendingIconToRemove != null) { - RemoveIcon((FontIconSet)target, pendingIconToRemove); + foreach (var t in targets) + { + requiresUpdate |= RemoveIcon((FontIconSet)t, pendingIconToRemove); + } pendingIconToRemove = null; } if (pendingIconToRenameOld != null && pendingIconToRenameNew != null) { - UpdateIconName((FontIconSet)target, pendingIconToRenameOld, pendingIconToRenameNew); + foreach (var t in targets) + { + requiresUpdate |= UpdateIconName((FontIconSet)t, pendingIconToRenameOld, pendingIconToRenameNew); + } pendingIconToRenameOld = null; pendingIconToRenameNew = null; } @@ -194,6 +203,8 @@ public override void OnInspectorGUI() { FontIconSet fontIconSet = target as FontIconSet; TMP_FontAsset fontAsset = iconFontAssetProp.objectReferenceValue as TMP_FontAsset; + if (fontAsset == null) { return; } + FontIconSetDefinition setDefinition = fontIconSetDefinitionProp.objectReferenceValue as FontIconSetDefinition; showAvailableIcons = EditorGUILayout.Foldout(showAvailableIcons, "Available Icons", true); @@ -234,20 +245,7 @@ public override void OnInspectorGUI() } else { - bool hasInvalidName = false; - foreach (KeyValuePair entry in iconEntries) - { - if (!validNames.Contains(entry.Value)) - { - hasInvalidName = true; - break; - } - } - - if (hasInvalidName) - { - EditorGUILayout.HelpBox("Icon names highlighted yellow are not present in the selected Font Icon Set Definition and should be updated.", MessageType.Warning); - } + DrawInvalidIconNameHelpBox(fontIconSet, setDefinition); // Catch edge cases where the external asset size changes while this inspector is still focused if (setDefinition.IconNames != null && validNames.Count != setDefinition.IconNames.Count) @@ -283,24 +281,10 @@ public override void OnInspectorGUI() if (fontIconSetDefinitionProp.objectReferenceValue != null) { - // Place the current icon's name in the array - availableNamesArray[0] = iconEntry.Value; - - using (var check = new EditorGUI.ChangeCheckScope()) + if (DrawIconNamePopup(iconEntry.Value, availableNamesArray, validNames, ButtonDimension, out string newName)) { - // If the currently selected name isn't in our icon set map names, highlight the popup - Color oldColor = GUI.backgroundColor; - if (!validNames.Contains(iconEntry.Value)) - { - GUI.backgroundColor = Color.yellow; - } - int selected = EditorGUILayout.Popup(string.Empty, 0, availableNamesArray, GUILayout.MaxWidth(ButtonDimension)); - if (check.changed) - { - pendingIconToRenameNew = availableNamesArray[selected]; - pendingIconToRenameOld = iconEntry.Value; - } - GUI.backgroundColor = oldColor; + pendingIconToRenameNew = newName; + pendingIconToRenameOld = iconEntry.Value; } } else @@ -390,7 +374,6 @@ private bool AddIcon(FontIconSet fontIconSet, uint unicodeValue) Undo.RecordObject(fontIconSet, "Add Icon"); if (fontIconSet.AddIcon(name, unicodeValue)) { - UpdateIconEntries(); EditorUtility.SetDirty(fontIconSet); return true; } @@ -404,7 +387,6 @@ private bool RemoveIcon(FontIconSet fontIconSet, string iconName) Undo.RecordObject(fontIconSet, "Remove Icon"); if (fontIconSet.RemoveIcon(iconName)) { - UpdateIconEntries(); EditorUtility.SetDirty(fontIconSet); return true; } @@ -412,14 +394,15 @@ private bool RemoveIcon(FontIconSet fontIconSet, string iconName) return false; } - private void UpdateIconName(FontIconSet fontIconSet, string oldName, string newName) + private bool UpdateIconName(FontIconSet fontIconSet, string oldName, string newName) { Undo.RecordObject(fontIconSet, "Rename Icon"); if (fontIconSet.UpdateIconName(oldName, newName)) { - UpdateIconEntries(); EditorUtility.SetDirty(fontIconSet); + return true; } + return false; } private bool CheckIfHoloLensIconFontExists() @@ -434,12 +417,112 @@ private bool CheckIfHoloLensIconFontExists() return false; } + /// + /// Generates an array of available icon names (those present in the definition but not yet assigned in the icon set), + /// with an empty string at index 0 to act as a placeholder for the currently selected icon name. + /// + public static string[] GetAvailableIconNames(FontIconSet iconSet, FontIconSetDefinition setDefinition) + { + if (iconSet == null || setDefinition == null || setDefinition.IconNames == null) + { + return null; + } + + List availableNames = new List(); + foreach (string name in setDefinition.IconNames) + { + if (!iconSet.GlyphIconsByName.ContainsKey(name)) + { + availableNames.Add(name); + } + } + availableNames.Sort(); + availableNames.Insert(0, string.Empty); + return availableNames.ToArray(); + } + + /// + /// Draws a warning HelpBox if the provided contains assigned icon names that are not present in the . + /// + public static void DrawInvalidIconNameHelpBox(FontIconSet iconSet, FontIconSetDefinition setDefinition) + { + if (iconSet == null || setDefinition == null || setDefinition.IconNames == null) + { + return; + } + + foreach (string assignedName in iconSet.GlyphIconsByName.Keys) + { + bool isNameValid = false; + foreach (string validName in setDefinition.IconNames) + { + if (validName == assignedName) + { + isNameValid = true; + break; + } + } + + if (!isNameValid) + { + EditorGUILayout.HelpBox("Icon names highlighted yellow are not present in the selected Font Icon Set Definition and should be updated.", MessageType.Warning); + return; + } + } + } + + /// + /// Draws a popup for renaming an icon, highlighting it yellow if the name is invalid/missing from the definition. + /// + public static bool DrawIconNamePopup(string currentName, string[] availableNamesArray, IEnumerable validNames, float maxWidth, out string newName) + { + newName = currentName; + if (availableNamesArray == null || availableNamesArray.Length == 0) + { + return false; + } + + availableNamesArray[0] = currentName; + + bool changed = false; + using (var check = new EditorGUI.ChangeCheckScope()) + { + Color oldColor = GUI.backgroundColor; + + bool isNameValid = false; + foreach (string validName in validNames) + { + if (validName == currentName) + { + isNameValid = true; + break; + } + } + + if (!isNameValid) + { + GUI.backgroundColor = Color.yellow; + } + + int selected = EditorGUILayout.Popup(string.Empty, 0, availableNamesArray, GUILayout.MaxWidth(maxWidth)); + if (check.changed) + { + newName = availableNamesArray[selected]; + changed = true; + } + + GUI.backgroundColor = oldColor; + } + + return changed; + } + /// /// Draws a Text Mesh Pro glyph in the supplied . /// public static void EditorDrawTMPGlyph(Rect position, uint unicode, TMP_FontAsset fontAsset, bool selected = false, Material fontRenderMaterial = null) { - if (fontAsset.characterLookupTable.TryGetValue(unicode, out TMP_Character character)) + if (fontAsset != null && fontAsset.characterLookupTable.TryGetValue(unicode, out TMP_Character character)) { EditorDrawTMPGlyph(position, fontAsset, character, selected, fontRenderMaterial); } @@ -448,7 +531,7 @@ public static void EditorDrawTMPGlyph(Rect position, uint unicode, TMP_FontAsset /// /// Draws a Text Mesh Pro glyph in the supplied . /// - public static void EditorDrawTMPGlyph(Rect glyphRect, TMP_FontAsset fontAsset, TMP_Character character, bool selected = false, Material fontRenderMaterial = null) + private static void EditorDrawTMPGlyph(Rect glyphRect, TMP_FontAsset fontAsset, TMP_Character character, bool selected = false, Material fontRenderMaterial = null) { if (Event.current.type == EventType.Repaint) { @@ -503,9 +586,9 @@ public static void EditorDrawTMPGlyph(Rect glyphRect, TMP_FontAsset fontAsset, T } } } - catch (Exception) + catch (Exception e) { - EditorGUILayout.LabelField("Couldn't draw character icon. UnicodeValue may not be available in the font asset."); + GUI.Label(glyphRect, new GUIContent($"Couldn't draw icon: {e.Message}")); } } } diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs index 1b1c11d82..232fec77e 100644 --- a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs @@ -88,6 +88,24 @@ private void OnValidate() SetIcon(currentIconName); } + /// + /// Updates the current and optionally refreshes the icon. + /// + /// + /// If you plan on manually setting after calling this method, it's recommended not to refresh the icon here. + /// + /// The new font icon set to use for this selector. + /// Whether to update the icon using the currently-set name using the new font icon set. + public void SetFontIconSet(FontIconSet fontIconSet, bool refreshIcon = false) + { + fontIcons = fontIconSet; + + if (refreshIcon) + { + SetIcon(currentIconName); + } + } + /// /// Looks up the Unicode value for the specified icon name and applies it to the text component. /// diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs index 8688d2f8a..da535c498 100644 --- a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs @@ -16,5 +16,28 @@ public class FontIconSetDefinition : ScriptableObject /// The list of icon names defined by this asset. /// public IReadOnlyList IconNames => iconNames; + +#if UNITY_EDITOR + /// + /// Sorts the icon names and removes duplicates for cleaner serialization. + /// + [ContextMenu("Sort and Deduplicate")] + public void SortAndDeduplicate() + { + if (iconNames == null || iconNames.Length == 0) + { + return; + } + + UnityEditor.Undo.RecordObject(this, "Sort and Deduplicate Icon Names"); + + var uniqueSorted = new List(new HashSet(iconNames)); + uniqueSorted.Sort(); + + iconNames = uniqueSorted.ToArray(); + + UnityEditor.EditorUtility.SetDirty(this); + } +#endif } } diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset b/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset index 4ef93033e..787f96148 100644 --- a/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset @@ -13,163 +13,163 @@ MonoBehaviour: m_Name: MRTKFontIconSetDefinition m_EditorClassIdentifier: iconNames: - - Wifi - - Bluetooth - - Brightness - - Airplane - - Settings - - Group - - Pin - - Bookmark - - Stop Circle - - Add Favorite - - Favorite - - Send - - Search - - Save - - Record Circle - - Question Mark - - Block - - Print - - Power Button - - Play Circle - - Play - - Unpin - - Devices - - Phone - - Person - - Home - - Zoom - - Calendar - - Camera - - Paste - - Phone + - Account Tree - Add - - Mail - - Mute - - Mic Off - - Copy - - Visibility On - - Visibility Off - - Link - - Attach - - Lightbulb - - Movie - - Thumb Up - - Thumb Down - - Thumb Down - - Videocam - - Location On - - Location Off - - Mic - - Undo + - Add Circle + - Add Favorite + - Add Group + - Add Location + - Add Note + - Add Tab + - Airplane + - Alarm + - Alarm Off - Apps - - Tag + - Arrow Down - Arrow Left - Arrow Right - Arrow Up - - Arrow Down - - Refresh - - Menu - - More Vertical - - More Horizontal - - Delete + - Attach + - Bar Chart + - Block + - Bluetooth + - Book + - Bookmark + - Brightness + - Cached + - Calendar + - Call + - Call End + - Camera + - Cancel + - Cast + - Check + - Chevron Down - Chevron Left - Chevron Right - Chevron Up - - Chevron Down - - Lock - - Unlock - - Repeat - - Cast + - Circle - Clipboard - - Erase - - History - - Notifications - - Notifications Off - - List - - Call - - Call End - - Check - - Edit - - Folder - - Alarm Off - - Warning - - Info - - Error - - Keyboard - - Cancel - - Dialpad - - Photo - - Save As - Close + - Cloud + - Color Palette + - Computer + - Copy - Cut - - Move - - Sticky Note - - Add Note - - Pan - - Add Group - - Book - - Settings Sliders - - Hierarchy - - Add Location - - Grid View - - Show Chart - - Cached - - Add Circle - - Music Info - - Remove Location - - Language + - Delete + - Devices + - Dialpad + - Display + - Doc + - Draft + - Edit + - Edit Doc + - Erase + - Error + - Exclamation Point + - Exit + - Favorite + - Flag Outline + - Folder - Globe + - Graph + - Grid View + - Group + - Hand Left + - Hand Right - Headphones - Heart Outline - - Exclamation Point - - Pushpin - - Pen Tip - - Flag Outline + - Hierarchy + - History + - Home + - Horizontal List + - Info - Keep - - Remove - - Sunny - - Report - - Graph 1 - - Tune + - Keyboard + - Label + - Language + - Layout + - Layout Grid + - Lightbulb + - Line Chart + - Link + - Link 2 + - List + - Location Off + - Location On + - Lock + - Mail + - Menu + - Message + - Messenger + - Mic + - Mic Off - Mobile + - More Horizontal + - More Vertical + - Move + - Movie + - Music + - Music Info + - Music Mute + - Mute + - My Location - Newspaper - No Sound - - Label + - Notifications + - Notifications Off - Open In New - - Account Tree - - Doc - - My Location - - Write Mail - - Hand Left - - Hand Right - - Add Tab - - Sound - - Circle - - Tab + - Pan + - Paste + - Pen Tip + - Person + - Phone + - Photo + - Pie Chart + - Pin + - Play + - Play Circle + - Power Button + - Print + - Pushpin + - Question Mark + - Record Circle + - Refresh + - Remove + - Remove Location + - Repeat + - Report - Reset - - Music - - Music Mute - - Edit Doc - - Swap Vert - - Horizontal List - - Vertical List - - Layout Grid - - Uniform Grid + - Save + - Save As + - Search + - Send + - Settings + - Settings Sliders - Shopping Cart - - Messenger - - Message - - Alarm - - Color Palette - - Edit - - Draft - - User - - Bar Chart - - Pie Chart - - Line Chart + - Show Chart - Smiley - - Display - - Layout 2 + - Sound + - Sticky Note + - Stop Circle + - Sunny + - Swap Vert + - Tab + - Tag + - Thumb Down + - Thumb Up - Time - - Exit + - Tune + - Undo + - Uniform Grid + - Unlock + - Unpin + - User + - Vertical List + - Videocam + - Visibility Off + - Visibility On + - Warning + - Wifi + - Write Mail + - Zoom diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs index 916fa7c01..e13f08194 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs @@ -8,6 +8,29 @@ namespace MixedReality.Toolkit.UX { + /// + /// Exposes tint color mutation on a without requiring knowledge of its generic type. + /// Used by external systems (e.g. theming) to set colors at runtime. + /// + internal interface ITintEffect + { + /// + /// The tint color applied by this effect. + /// + Color TintColor { get; set; } + + /// + /// Returns if is one of the tintable + /// objects owned by this effect. + /// + /// + /// The check is performed inside against the original + /// typed List<T>, so Unity's overloaded == operator fires correctly + /// without any upcast that would reduce the comparison to managed-wrapper reference equality. + /// + bool HasTintable(UnityEngine.Object obj); + } + /// /// An that wraps a Unity PlayableBehaviour /// component, and can tint arbitrary types of components. @@ -19,7 +42,7 @@ namespace MixedReality.Toolkit.UX /// Subclass this class to create tinting behaviour for arbitrary Unity components. /// [Serializable] - internal abstract class TintEffect : PlayableEffect, ISerializationCallbackReceiver + internal abstract class TintEffect : PlayableEffect, ITintEffect, ISerializationCallbackReceiver { /// /// A PlayableBehavior that controls the tint effect, based on the @@ -194,6 +217,9 @@ internal enum BlendType Multiply } + // Used internally to hint to the editor that this is a variable/float-based state. + // Kept in sync with the concrete subclass name via OnBeforeSerialize/OnAfterDeserialize + // so the reorderable-list header in the Inspector stays readable. [SerializeField] [HideInInspector] #pragma warning disable CS0414 // Inspector uses this as a helpful label in lists. @@ -211,10 +237,38 @@ internal enum BlendType [Tooltip("The objects to tint. All of them must share the same tint color; use separate TintEffects for different colors.")] private List tintables; + /// + bool ITintEffect.HasTintable(UnityEngine.Object obj) + { + if (tintables == null || obj == null) + { + return false; + } + + // Iterate against the original List so that Unity's overloaded == operator + // is used for the comparison, rather than managed-wrapper reference equality. + foreach (T item in tintables) + { + if (item is UnityEngine.Object unityObj && unityObj == obj) + { + return true; + } + } + + return false; + } + [SerializeField] [Tooltip("Tint color.")] private Color color = Color.white; + /// + Color ITintEffect.TintColor + { + get => color; + set => color = value; + } + [SerializeField] [Tooltip("Should the playable be played back as a one-shot triggered effect, or should the playback time be directly driven by the state's value?")] private PlayableEffect.PlaybackType playbackMode; diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/StateVisualizer.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/StateVisualizer.cs index 09f58c0b3..6bd0a721e 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/StateVisualizer.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/StateVisualizer.cs @@ -351,6 +351,85 @@ private void OnDestroy() } } + /// + /// Sets the tint color on all effects within the named state. + /// + /// The name of the state whose tint effects should be updated. + /// The color to apply. + /// + /// if the state was found and at least one tint effect was updated, + /// otherwise. + /// + public bool TrySetStateTintColor(string stateName, Color color) + { + if (!stateContainers.TryGetValue(stateName, out State state)) + { + return false; + } + + bool anyUpdated = false; + foreach (IEffect effect in state.Effects) + { + if (effect is ITintEffect tintEffect) + { + tintEffect.TintColor = color; + anyUpdated = true; + } + } + + return anyUpdated; + } + + /// + /// Sets the tint color on the within the named state whose + /// returns for + /// . + /// + /// + /// This is the preferred overload when a single state contains multiple tint effects that + /// need different colors (e.g. a background tint and an icon tint). Assign the + /// UnityEngine.Object reference directly in the Inspector — it is rename-proof and + /// breaks visibly (missing reference) rather than silently if the object is deleted. + /// + /// If is this method behaves + /// identically to and updates every + /// tint effect in the state. + /// + /// The name of the state whose tint effects should be updated. + /// A that appears in the + /// tintables list of the effect to update, or to update all tint + /// effects in the state. + /// The color to apply. + /// + /// if the state was found and at least one matching tint effect was + /// updated, otherwise. + /// + public bool TrySetStateTintColor(string stateName, UnityEngine.Object tintTarget, Color color) + { + if (tintTarget == null) + { + return TrySetStateTintColor(stateName, color); + } + + if (!stateContainers.TryGetValue(stateName, out State state)) + { + return false; + } + + bool anyUpdated = false; + foreach (IEffect effect in state.Effects) + { + if (effect is ITintEffect tintEffect && + tintEffect.HasTintable(tintTarget)) + { + tintEffect.TintColor = color; + anyUpdated = true; + } + } + + return anyUpdated; + } + /// /// Adds the provided effect to the state with name . /// Creates the state if it doesn't exist. diff --git a/org.mixedrealitytoolkit.uxcore/Theming.meta b/org.mixedrealitytoolkit.uxcore/Theming.meta new file mode 100644 index 000000000..4de1b65ff --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b4588601bed84d47965abae903e7c03 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs new file mode 100644 index 000000000..588a0bff2 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs @@ -0,0 +1,12 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System.Reflection; + +[assembly: AssemblyProduct("Mixed Reality Toolkit UX Core Theming")] +[assembly: AssemblyCopyright("Copyright (c) Mixed Reality Toolkit Contributors")] + +// The AssemblyVersion attribute is checked-in and is recommended not to be changed often. +// https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version +// AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs.meta b/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs.meta new file mode 100644 index 000000000..732d48a25 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dca329abb86cbed439db681cb5c19650 \ No newline at end of file diff --git a/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef b/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef new file mode 100644 index 000000000..0e1ed8af8 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef @@ -0,0 +1,23 @@ +{ + "name": "MixedReality.Toolkit.UXCore.Theming", + "rootNamespace": "MixedReality.Toolkit.UX", + "references": [ + "GUID:56255bd5d851a6243b63cb370cfc40b1", + "GUID:2238d58cada9b6746a548c6bff32c381" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [ + { + "name": "org.mixedrealitytoolkit.theming", + "expression": "", + "define": "MRTK_THEMING_PRESENT" + } + ], + "noEngineReferences": false +} \ No newline at end of file diff --git a/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef.meta b/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef.meta new file mode 100644 index 000000000..cc29fc63a --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9ec3d438d2c0eb94ca75bc73e75e1937 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs b/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs new file mode 100644 index 000000000..b07482816 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs @@ -0,0 +1,71 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +#if MRTK_THEMING_PRESENT +using MixedReality.Toolkit.Theming; +#endif + +using UnityEngine; + +namespace MixedReality.Toolkit.UX +{ + public class ThemeBinding : MonoBehaviour + { +#if MRTK_THEMING_PRESENT + [SerializeField] + [Tooltip("The theme data source manager.")] + private ThemeDataSource themeDataSource; + + [SerializeReference, InterfaceSelector] + [Tooltip("The list of bound theme entries.")] + private IBinder[] binders = System.Array.Empty(); + + private readonly System.Collections.Generic.List subscribedBinders = new System.Collections.Generic.List(); + private ThemeDataSource subscribedDataSource; + + protected void OnEnable() + { + if (themeDataSource == null) + { + Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has no {nameof(ThemeDataSource)} assigned.", this); + return; + } + + subscribedDataSource = themeDataSource; + + if (binders != null) + { + foreach (IBinder binder in binders) + { + if (binder == null) + { + Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has a null binder entry.", this); + continue; + } + + if (string.IsNullOrWhiteSpace(binder.ThemeDefinitionItemName)) + { + Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has a {binder.GetType().Name} with no theme item assigned.", this); + } + + binder.Subscribe(subscribedDataSource); + subscribedBinders.Add(binder); + } + } + } + + protected void OnDisable() + { + if (subscribedDataSource != null) + { + foreach (IBinder binder in subscribedBinders) + { + binder?.Unsubscribe(subscribedDataSource); + } + subscribedBinders.Clear(); + subscribedDataSource = null; + } + } +#endif + } +} diff --git a/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs.meta b/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs.meta new file mode 100644 index 000000000..621e0b4b3 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 699100ca886480c4a94ced56b1ae0e94 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: