Skip to content

Commit 5fad2eb

Browse files
committed
Migrate more UXComponents
1 parent 540da86 commit 5fad2eb

10 files changed

Lines changed: 784 additions & 2985 deletions

File tree

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ PrefabInstance:
2020
propertyPath: m_Pivot.y
2121
value: 0.5
2222
objectReference: {fileID: 0}
23-
- target: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3}
24-
propertyPath: m_RootOrder
25-
value: 3
26-
objectReference: {fileID: 0}
2723
- target: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3}
2824
propertyPath: m_AnchorMax.x
2925
value: 0.5

org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/CanvasButtonToggleSwitch.prefab

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,6 @@ PrefabInstance:
331331
propertyPath: m_Pivot.y
332332
value: 0.5
333333
objectReference: {fileID: 0}
334-
- target: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3}
335-
propertyPath: m_RootOrder
336-
value: 3
337-
objectReference: {fileID: 0}
338334
- target: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3}
339335
propertyPath: m_AnchorMax.x
340336
value: 0

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,10 +1175,6 @@ PrefabInstance:
11751175
propertyPath: m_Pivot.y
11761176
value: 0.5
11771177
objectReference: {fileID: 0}
1178-
- target: {fileID: 8174497233233282343, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3}
1179-
propertyPath: m_RootOrder
1180-
value: 3
1181-
objectReference: {fileID: 0}
11821178
- target: {fileID: 8174497233233282343, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3}
11831179
propertyPath: m_AnchorMax.x
11841180
value: 0.5

org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleEmptyButton.prefab

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,10 +1206,6 @@ PrefabInstance:
12061206
propertyPath: m_Pivot.y
12071207
value: 0.5
12081208
objectReference: {fileID: 0}
1209-
- target: {fileID: 8174497233233282343, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3}
1210-
propertyPath: m_RootOrder
1211-
value: 6
1212-
objectReference: {fileID: 0}
12131209
- target: {fileID: 8174497233233282343, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3}
12141210
propertyPath: m_AnchorMax.x
12151211
value: 0.5

org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/NonNativeKeyboard.prefab

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33582,9 +33582,9 @@ MonoBehaviour:
3358233582
m_Name:
3358333583
m_EditorClassIdentifier:
3358433584
fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2}
33585-
currentIconName: Icon 42
33585+
currentIconName: Arrow Right
3358633586
textMeshProComponent: {fileID: 1851442636371205706}
33587-
iconFontAsset: {fileID: 0}
33587+
migratedSuccessfully: 1
3358833588
--- !u!1 &457749926282753362
3358933589
GameObject:
3359033590
m_ObjectHideFlags: 0
@@ -33736,9 +33736,9 @@ MonoBehaviour:
3373633736
m_Name:
3373733737
m_EditorClassIdentifier:
3373833738
fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2}
33739-
currentIconName: Icon 44
33739+
currentIconName: Arrow Up
3374033740
textMeshProComponent: {fileID: 4700198312997907203}
33741-
iconFontAsset: {fileID: 0}
33741+
migratedSuccessfully: 1
3374233742
--- !u!1 &1195796392646670598
3374333743
GameObject:
3374433744
m_ObjectHideFlags: 0
@@ -34141,9 +34141,9 @@ MonoBehaviour:
3414134141
m_Name:
3414234142
m_EditorClassIdentifier:
3414334143
fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2}
34144-
currentIconName: Icon 39
34144+
currentIconName: Arrow Left
3414534145
textMeshProComponent: {fileID: 9102639994062334726}
34146-
iconFontAsset: {fileID: 0}
34146+
migratedSuccessfully: 1
3414734147
--- !u!1 &6916386755006368770
3414834148
GameObject:
3414934149
m_ObjectHideFlags: 0
@@ -34356,6 +34356,6 @@ MonoBehaviour:
3435634356
m_Name:
3435734357
m_EditorClassIdentifier:
3435834358
fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2}
34359-
currentIconName: Icon 44
34359+
currentIconName: Arrow Up
3436034360
textMeshProComponent: {fileID: 3229080939679983313}
34361-
iconFontAsset: {fileID: 0}
34361+
migratedSuccessfully: 1

org.mixedrealitytoolkit.uxcomponents/NearMenu/GrabBar.mat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ Material:
5454
m_Texture: {fileID: 0}
5555
m_Scale: {x: 1, y: 1}
5656
m_Offset: {x: 0, y: 0}
57+
- _EmissiveMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
5761
- _IridescentSpectrumMap:
5862
m_Texture: {fileID: 0}
5963
m_Scale: {x: 1, y: 1}
@@ -105,6 +109,7 @@ Material:
105109
- _DetailNormalMapScale: 1
106110
- _DirectionalLight: 0
107111
- _DstBlend: 1
112+
- _DstBlendAlpha: 1
108113
- _EdgeSmoothingMode: 1
109114
- _EdgeSmoothingValue: 0.25
110115
- _EnableChannelMap: 0
@@ -139,6 +144,7 @@ Material:
139144
- _Metallic: 0
140145
- _MipmapBias: -2
141146
- _Mode: 4
147+
- _NPR: 0
142148
- _NearLightFade: 0
143149
- _NearPlaneFade: 0
144150
- _NormalMapScale: 1
@@ -162,6 +168,7 @@ Material:
162168
- _SpecularHighlights: 1
163169
- _SphericalHarmonics: 0
164170
- _SrcBlend: 1
171+
- _SrcBlendAlpha: 1
165172
- _Stencil: 0
166173
- _StencilComp: 0
167174
- _StencilComparison: 0
@@ -175,6 +182,7 @@ Material:
175182
- _UseWorldScale: 0
176183
- _VertexColors: 1
177184
- _VertexExtrusion: 0
185+
- _VertexExtrusionConstantWidth: 0
178186
- _VertexExtrusionSmoothNormals: 0
179187
- _VertexExtrusionValue: 0
180188
- _ZOffsetFactor: 0
@@ -193,6 +201,8 @@ Material:
193201
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
194202
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
195203
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
204+
- _GradientAlpha: {r: 1, g: 1, b: 1, a: 1}
205+
- _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0}
196206
- _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0}
197207
- _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25}
198208
- _GradientColor2: {r: 0, g: 0.33, b: 0.88, a: 0.5}

0 commit comments

Comments
 (0)