Skip to content

Commit 2aeb3e0

Browse files
keveleighkeveleigh
committed
org.mixedrealitytoolkit.uxcomponents updates
1 parent 9577064 commit 2aeb3e0

11 files changed

Lines changed: 418 additions & 82 deletions

File tree

‎org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab‎

Lines changed: 107 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -905,10 +905,6 @@ PrefabInstance:
905905
propertyPath: m_LocalEulerAnglesHint.z
906906
value: 0
907907
objectReference: {fileID: 0}
908-
- target: {fileID: 7746750332524202746, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
909-
propertyPath: m_Enabled
910-
value: 0
911-
objectReference: {fileID: 0}
912908
- target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
913909
propertyPath: 'managedReferences[1393819269385945089]'
914910
value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.GraphicTintEffect
@@ -1138,6 +1134,9 @@ PrefabInstance:
11381134
insertIndex: -1
11391135
addedObject: {fileID: 5319578128471115350}
11401136
m_AddedComponents:
1137+
- targetCorrespondingSourceObject: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
1138+
insertIndex: -1
1139+
addedObject: {fileID: 7344942429739044722}
11411140
- targetCorrespondingSourceObject: {fileID: 2828958436599032273, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
11421141
insertIndex: -1
11431142
addedObject: {fileID: 3015392985318836008}
@@ -1153,11 +1152,33 @@ MonoBehaviour:
11531152
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
11541153
m_Name:
11551154
m_EditorClassIdentifier:
1155+
--- !u!114 &4185972052008607584 stripped
1156+
MonoBehaviour:
1157+
m_CorrespondingSourceObject: {fileID: 9026472854072389792, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
1158+
m_PrefabInstance: {fileID: 5139722473249402816}
1159+
m_PrefabAsset: {fileID: 0}
1160+
m_GameObject: {fileID: 0}
1161+
m_Enabled: 1
1162+
m_EditorHideFlags: 0
1163+
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
1164+
m_Name:
1165+
m_EditorClassIdentifier:
11561166
--- !u!224 &4185972052008607586 stripped
11571167
RectTransform:
11581168
m_CorrespondingSourceObject: {fileID: 9026472854072389794, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
11591169
m_PrefabInstance: {fileID: 5139722473249402816}
11601170
m_PrefabAsset: {fileID: 0}
1171+
--- !u!114 &4585478379361187306 stripped
1172+
MonoBehaviour:
1173+
m_CorrespondingSourceObject: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
1174+
m_PrefabInstance: {fileID: 5139722473249402816}
1175+
m_PrefabAsset: {fileID: 0}
1176+
m_GameObject: {fileID: 8376646494505211202}
1177+
m_Enabled: 1
1178+
m_EditorHideFlags: 0
1179+
m_Script: {fileID: 11500000, guid: 02df0dfd31465cf42bd60027ac90b874, type: 3}
1180+
m_Name:
1181+
m_EditorClassIdentifier:
11611182
--- !u!1 &6922469056340231697 stripped
11621183
GameObject:
11631184
m_CorrespondingSourceObject: {fileID: 2828958436599032273, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
@@ -1194,6 +1215,88 @@ RectTransform:
11941215
m_CorrespondingSourceObject: {fileID: 2828958436599032274, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
11951216
m_PrefabInstance: {fileID: 5139722473249402816}
11961217
m_PrefabAsset: {fileID: 0}
1218+
--- !u!1 &8376646494505211202 stripped
1219+
GameObject:
1220+
m_CorrespondingSourceObject: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3}
1221+
m_PrefabInstance: {fileID: 5139722473249402816}
1222+
m_PrefabAsset: {fileID: 0}
1223+
--- !u!114 &7344942429739044722
1224+
MonoBehaviour:
1225+
m_ObjectHideFlags: 0
1226+
m_CorrespondingSourceObject: {fileID: 0}
1227+
m_PrefabInstance: {fileID: 0}
1228+
m_PrefabAsset: {fileID: 0}
1229+
m_GameObject: {fileID: 8376646494505211202}
1230+
m_Enabled: 1
1231+
m_EditorHideFlags: 0
1232+
m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3}
1233+
m_Name:
1234+
m_EditorClassIdentifier:
1235+
themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2}
1236+
binders:
1237+
- rid: 6006879866990887121
1238+
- rid: 6006879866990887122
1239+
- rid: 6006879866990887123
1240+
- rid: 6006879866990887124
1241+
- rid: 6006879866990887125
1242+
- rid: 6006879866990887126
1243+
- rid: 6006879866990887127
1244+
- rid: 6006879866990887129
1245+
- rid: 6006879866990887128
1246+
references:
1247+
version: 2
1248+
RefIds:
1249+
- rid: 6006879866990887121
1250+
type: {class: FontIconSetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1251+
data:
1252+
<Target>k__BackingField:
1253+
<IconSelector>k__BackingField: {fileID: 7245587814888172855}
1254+
<TextMeshProComponent>k__BackingField: {fileID: 5095746839500215027}
1255+
<ThemeDefinitionItemName>k__BackingField: Icon Set
1256+
- rid: 6006879866990887122
1257+
type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1258+
data:
1259+
<Target>k__BackingField: {fileID: 1922220768106560367}
1260+
<ThemeDefinitionItemName>k__BackingField: Text Font
1261+
- rid: 6006879866990887123
1262+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1263+
data:
1264+
<Target>k__BackingField: {fileID: 1922220768106560367}
1265+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
1266+
- rid: 6006879866990887124
1267+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1268+
data:
1269+
<Target>k__BackingField: {fileID: 8493469810320727241}
1270+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
1271+
- rid: 6006879866990887125
1272+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1273+
data:
1274+
<Target>k__BackingField: {fileID: 5095746839500215027}
1275+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
1276+
- rid: 6006879866990887126
1277+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1278+
data:
1279+
<Target>k__BackingField: {fileID: 2228947736508096533}
1280+
<ThemeDefinitionItemName>k__BackingField: On Surface Color
1281+
- rid: 6006879866990887127
1282+
type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1283+
data:
1284+
<Target>k__BackingField: {fileID: 8467006667157818416}
1285+
<ThemeDefinitionItemName>k__BackingField: Tab Indicator Material
1286+
- rid: 6006879866990887128
1287+
type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1288+
data:
1289+
<Target>k__BackingField: {fileID: 4585478379361187306}
1290+
<ThemeDefinitionItemName>k__BackingField: Primary Color
1291+
stateName: Toggle
1292+
tintTarget: {fileID: 8467006667157818416}
1293+
- rid: 6006879866990887129
1294+
type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1295+
data:
1296+
<Target>k__BackingField: {fileID: 4585478379361187306}
1297+
<ThemeDefinitionItemName>k__BackingField: Primary Color
1298+
stateName: Toggle
1299+
tintTarget: {fileID: 4185972052008607584}
11971300
--- !u!224 &8376646494505211229 stripped
11981301
RectTransform:
11991302
m_CorrespondingSourceObject: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3}

‎org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ GameObject:
345345
- component: {fileID: 7976009683108370513}
346346
- component: {fileID: 2632565233158286779}
347347
- component: {fileID: 1995394188294645620}
348+
- component: {fileID: 3722787625447876489}
348349
m_Layer: 5
349350
m_Name: Empty Button
350351
m_TagString: Untagged
@@ -1002,6 +1003,35 @@ MonoBehaviour:
10021003
seeItSayItLabel: {fileID: 3358038249354970442}
10031004
pattern: Say '{0}'
10041005
positionControl: {fileID: 0}
1006+
--- !u!114 &3722787625447876489
1007+
MonoBehaviour:
1008+
m_ObjectHideFlags: 0
1009+
m_CorrespondingSourceObject: {fileID: 0}
1010+
m_PrefabInstance: {fileID: 0}
1011+
m_PrefabAsset: {fileID: 0}
1012+
m_GameObject: {fileID: 3705378105823492738}
1013+
m_Enabled: 1
1014+
m_EditorHideFlags: 0
1015+
m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3}
1016+
m_Name:
1017+
m_EditorClassIdentifier:
1018+
themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2}
1019+
binders:
1020+
- rid: 1538473242837123161
1021+
- rid: 1538473242837123160
1022+
references:
1023+
version: 2
1024+
RefIds:
1025+
- rid: 1538473242837123160
1026+
type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1027+
data:
1028+
<Target>k__BackingField: {fileID: 9026472854072389792}
1029+
<ThemeDefinitionItemName>k__BackingField: Surface Color
1030+
- rid: 1538473242837123161
1031+
type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
1032+
data:
1033+
<Target>k__BackingField: {fileID: 9026472854072389792}
1034+
<ThemeDefinitionItemName>k__BackingField: Canvas Backplate Quad Material
10051035
--- !u!1 &9026472854072389795
10061036
GameObject:
10071037
m_ObjectHideFlags: 0

‎org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ GameObject:
1111
- component: {fileID: 1619375032725711555}
1212
- component: {fileID: 961341594221179252}
1313
- component: {fileID: 8652067621810633434}
14+
- component: {fileID: 785579326716734801}
1415
m_Layer: 5
1516
m_Name: UIMenuBackplate_R13
1617
m_TagString: Untagged
@@ -76,3 +77,26 @@ MonoBehaviour:
7677
thickness: 2
7778
wedges: 8
7879
calculateSmoothEdges: 1
80+
--- !u!114 &785579326716734801
81+
MonoBehaviour:
82+
m_ObjectHideFlags: 0
83+
m_CorrespondingSourceObject: {fileID: 0}
84+
m_PrefabInstance: {fileID: 0}
85+
m_PrefabAsset: {fileID: 0}
86+
m_GameObject: {fileID: 8510261678218358358}
87+
m_Enabled: 1
88+
m_EditorHideFlags: 0
89+
m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3}
90+
m_Name:
91+
m_EditorClassIdentifier:
92+
themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2}
93+
binders:
94+
- rid: 7617100121658621954
95+
references:
96+
version: 2
97+
RefIds:
98+
- rid: 7617100121658621954
99+
type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
100+
data:
101+
<Target>k__BackingField: {fileID: 8652067621810633434}
102+
<ThemeDefinitionItemName>k__BackingField: Backplate Material

‎org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ GameObject:
1111
- component: {fileID: 1619375032725711555}
1212
- component: {fileID: 961341594221179252}
1313
- component: {fileID: 8652067621810633434}
14+
- component: {fileID: 3367734699037627833}
1415
m_Layer: 5
1516
m_Name: UIPanelBackplate_R16
1617
m_TagString: Untagged
@@ -76,3 +77,26 @@ MonoBehaviour:
7677
thickness: 2
7778
wedges: 8
7879
calculateSmoothEdges: 1
80+
--- !u!114 &3367734699037627833
81+
MonoBehaviour:
82+
m_ObjectHideFlags: 0
83+
m_CorrespondingSourceObject: {fileID: 0}
84+
m_PrefabInstance: {fileID: 0}
85+
m_PrefabAsset: {fileID: 0}
86+
m_GameObject: {fileID: 8510261678218358358}
87+
m_Enabled: 1
88+
m_EditorHideFlags: 0
89+
m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3}
90+
m_Name:
91+
m_EditorClassIdentifier:
92+
themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2}
93+
binders:
94+
- rid: 7617100121658621953
95+
references:
96+
version: 2
97+
RefIds:
98+
- rid: 7617100121658621953
99+
type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
100+
data:
101+
<Target>k__BackingField: {fileID: 8652067621810633434}
102+
<ThemeDefinitionItemName>k__BackingField: Backplate Material

‎org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab‎

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ GameObject:
1313
- component: {fileID: 6264478733034656625}
1414
- component: {fileID: 233999318278807519}
1515
- component: {fileID: 1925175511647506998}
16+
- component: {fileID: 6793636336473426600}
1617
m_Layer: 5
1718
m_Name: CanvasButtonBar
1819
m_TagString: Untagged
@@ -120,6 +121,29 @@ MonoBehaviour:
120121
m_Spacing: {x: 0, y: 0}
121122
m_Constraint: 2
122123
m_ConstraintCount: 1
124+
--- !u!114 &6793636336473426600
125+
MonoBehaviour:
126+
m_ObjectHideFlags: 0
127+
m_CorrespondingSourceObject: {fileID: 0}
128+
m_PrefabInstance: {fileID: 0}
129+
m_PrefabAsset: {fileID: 0}
130+
m_GameObject: {fileID: 6264478733034656630}
131+
m_Enabled: 1
132+
m_EditorHideFlags: 0
133+
m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3}
134+
m_Name:
135+
m_EditorClassIdentifier:
136+
themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2}
137+
binders:
138+
- rid: 1538473309753835627
139+
references:
140+
version: 2
141+
RefIds:
142+
- rid: 1538473309753835627
143+
type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming}
144+
data:
145+
<Target>k__BackingField: {fileID: 6264478733034656625}
146+
<ThemeDefinitionItemName>k__BackingField: Backplate Material
123147
--- !u!1001 &1097437160816526514
124148
PrefabInstance:
125149
m_ObjectHideFlags: 0
@@ -128,10 +152,6 @@ PrefabInstance:
128152
serializedVersion: 3
129153
m_TransformParent: {fileID: 6264478733034656631}
130154
m_Modifications:
131-
- target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
132-
propertyPath: m_IsActive
133-
value: 1
134-
objectReference: {fileID: 0}
135155
- target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
136156
propertyPath: m_IsActive
137157
value: 0
@@ -302,10 +322,6 @@ PrefabInstance:
302322
serializedVersion: 3
303323
m_TransformParent: {fileID: 6264478733034656631}
304324
m_Modifications:
305-
- target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
306-
propertyPath: m_IsActive
307-
value: 1
308-
objectReference: {fileID: 0}
309325
- target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
310326
propertyPath: m_IsActive
311327
value: 0
@@ -476,10 +492,6 @@ PrefabInstance:
476492
serializedVersion: 3
477493
m_TransformParent: {fileID: 6264478733034656631}
478494
m_Modifications:
479-
- target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
480-
propertyPath: m_IsActive
481-
value: 1
482-
objectReference: {fileID: 0}
483495
- target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
484496
propertyPath: m_IsActive
485497
value: 0
@@ -650,14 +662,6 @@ PrefabInstance:
650662
serializedVersion: 3
651663
m_TransformParent: {fileID: 6264478733034656631}
652664
m_Modifications:
653-
- target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
654-
propertyPath: m_IsActive
655-
value: 1
656-
objectReference: {fileID: 0}
657-
- target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
658-
propertyPath: m_IsActive
659-
value: 0
660-
objectReference: {fileID: 0}
661665
- target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3}
662666
propertyPath: m_AnchorMax.y
663667
value: 1

0 commit comments

Comments
 (0)