Skip to content

Commit 45e020f

Browse files
committed
Reserialize MRTKDevTemplate\Assets
1 parent 2c42f77 commit 45e020f

54 files changed

Lines changed: 2624 additions & 5404 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Quad.prefab

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Transform:
2525
m_PrefabInstance: {fileID: 0}
2626
m_PrefabAsset: {fileID: 0}
2727
m_GameObject: {fileID: 484208870302911250}
28+
serializedVersion: 2
2829
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2930
m_LocalPosition: {x: 0, y: 0, z: 0}
3031
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -36,7 +37,6 @@ Transform:
3637
- {fileID: 330837963086729989}
3738
- {fileID: 133969779087695481}
3839
m_Father: {fileID: 0}
39-
m_RootOrder: 0
4040
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4141
--- !u!114 &3782549843674289555
4242
MonoBehaviour:
@@ -97,13 +97,13 @@ Transform:
9797
m_PrefabInstance: {fileID: 0}
9898
m_PrefabAsset: {fileID: 0}
9999
m_GameObject: {fileID: 4999043571444206104}
100+
serializedVersion: 2
100101
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
101102
m_LocalPosition: {x: 0.253, y: 0, z: 0.01}
102103
m_LocalScale: {x: 3.8187168, y: 1.2575, z: 0.001}
103104
m_ConstrainProportionsScale: 0
104105
m_Children: []
105106
m_Father: {fileID: 484208870302911251}
106-
m_RootOrder: 0
107107
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
108108
--- !u!33 &4467701978597395349
109109
MeshFilter:
@@ -130,6 +130,9 @@ MeshRenderer:
130130
m_ReflectionProbeUsage: 1
131131
m_RayTracingMode: 2
132132
m_RayTraceProcedural: 0
133+
m_RayTracingAccelStructBuildFlagsOverride: 0
134+
m_RayTracingAccelStructBuildFlags: 1
135+
m_SmallMeshCulling: 1
133136
m_RenderingLayerMask: 1
134137
m_RendererPriority: 0
135138
m_Materials:
@@ -163,9 +166,17 @@ MeshCollider:
163166
m_PrefabAsset: {fileID: 0}
164167
m_GameObject: {fileID: 4999043571444206104}
165168
m_Material: {fileID: 0}
169+
m_IncludeLayers:
170+
serializedVersion: 2
171+
m_Bits: 0
172+
m_ExcludeLayers:
173+
serializedVersion: 2
174+
m_Bits: 0
175+
m_LayerOverridePriority: 0
166176
m_IsTrigger: 0
177+
m_ProvidesContacts: 0
167178
m_Enabled: 1
168-
serializedVersion: 4
179+
serializedVersion: 5
169180
m_Convex: 0
170181
m_CookingOptions: 30
171182
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
@@ -200,7 +211,6 @@ RectTransform:
200211
m_ConstrainProportionsScale: 0
201212
m_Children: []
202213
m_Father: {fileID: 484208870302911251}
203-
m_RootOrder: 2
204214
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
205215
m_AnchorMin: {x: 0.5, y: 0.5}
206216
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -224,6 +234,9 @@ MeshRenderer:
224234
m_ReflectionProbeUsage: 1
225235
m_RayTracingMode: 2
226236
m_RayTraceProcedural: 0
237+
m_RayTracingAccelStructBuildFlagsOverride: 0
238+
m_RayTracingAccelStructBuildFlags: 1
239+
m_SmallMeshCulling: 1
227240
m_RenderingLayerMask: 4294967295
228241
m_RendererPriority: 0
229242
m_Materials:
@@ -307,20 +320,23 @@ MonoBehaviour:
307320
m_VerticalAlignment: 256
308321
m_textAlignment: 65535
309322
m_characterSpacing: 0
323+
m_characterHorizontalScale: 1
310324
m_wordSpacing: 0
311325
m_lineSpacing: 0
312326
m_lineSpacingMax: 0
313327
m_paragraphSpacing: 0
314328
m_charWidthMaxAdj: 0
315-
m_enableWordWrapping: 1
329+
m_TextWrappingMode: 1
316330
m_wordWrappingRatios: 0.4
317331
m_overflowMode: 0
318332
m_linkedTextComponent: {fileID: 0}
319333
parentLinkedComponent: {fileID: 0}
320334
m_enableKerning: 1
335+
m_ActiveFontFeatures: 00000000
321336
m_enableExtraPadding: 0
322337
checkPaddingRequired: 0
323338
m_isRichText: 1
339+
m_EmojiFallbackSupport: 1
324340
m_parseCtrlCharacters: 1
325341
m_isOrthographic: 0
326342
m_isCullingEnabled: 0
@@ -368,13 +384,13 @@ Transform:
368384
m_PrefabInstance: {fileID: 0}
369385
m_PrefabAsset: {fileID: 0}
370386
m_GameObject: {fileID: 7143347138592074966}
387+
serializedVersion: 2
371388
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
372389
m_LocalPosition: {x: -0.999, y: 0, z: 0.0001}
373390
m_LocalScale: {x: 1, y: 1, z: 1}
374391
m_ConstrainProportionsScale: 0
375392
m_Children: []
376393
m_Father: {fileID: 484208870302911251}
377-
m_RootOrder: 3
378394
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
379395
--- !u!33 &1301481325207250709
380396
MeshFilter:
@@ -401,6 +417,9 @@ MeshRenderer:
401417
m_ReflectionProbeUsage: 1
402418
m_RayTracingMode: 2
403419
m_RayTraceProcedural: 0
420+
m_RayTracingAccelStructBuildFlagsOverride: 0
421+
m_RayTracingAccelStructBuildFlags: 1
422+
m_SmallMeshCulling: 1
404423
m_RenderingLayerMask: 1
405424
m_RendererPriority: 0
406425
m_Materials:
@@ -434,9 +453,17 @@ MeshCollider:
434453
m_PrefabAsset: {fileID: 0}
435454
m_GameObject: {fileID: 7143347138592074966}
436455
m_Material: {fileID: 0}
456+
m_IncludeLayers:
457+
serializedVersion: 2
458+
m_Bits: 0
459+
m_ExcludeLayers:
460+
serializedVersion: 2
461+
m_Bits: 0
462+
m_LayerOverridePriority: 0
437463
m_IsTrigger: 0
464+
m_ProvidesContacts: 0
438465
m_Enabled: 1
439-
serializedVersion: 4
466+
serializedVersion: 5
440467
m_Convex: 0
441468
m_CookingOptions: 30
442469
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
@@ -493,7 +520,6 @@ RectTransform:
493520
m_ConstrainProportionsScale: 0
494521
m_Children: []
495522
m_Father: {fileID: 484208870302911251}
496-
m_RootOrder: 1
497523
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
498524
m_AnchorMin: {x: 0.5, y: 0.5}
499525
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -517,6 +543,9 @@ MeshRenderer:
517543
m_ReflectionProbeUsage: 1
518544
m_RayTracingMode: 2
519545
m_RayTraceProcedural: 0
546+
m_RayTracingAccelStructBuildFlagsOverride: 0
547+
m_RayTracingAccelStructBuildFlags: 1
548+
m_SmallMeshCulling: 1
520549
m_RenderingLayerMask: 4294967295
521550
m_RendererPriority: 0
522551
m_Materials:
@@ -600,20 +629,23 @@ MonoBehaviour:
600629
m_VerticalAlignment: 256
601630
m_textAlignment: 65535
602631
m_characterSpacing: 0
632+
m_characterHorizontalScale: 1
603633
m_wordSpacing: 0
604634
m_lineSpacing: 0
605635
m_lineSpacingMax: 0
606636
m_paragraphSpacing: 0
607637
m_charWidthMaxAdj: 0
608-
m_enableWordWrapping: 1
638+
m_TextWrappingMode: 1
609639
m_wordWrappingRatios: 0.4
610640
m_overflowMode: 1
611641
m_linkedTextComponent: {fileID: 0}
612642
parentLinkedComponent: {fileID: 0}
613643
m_enableKerning: 1
644+
m_ActiveFontFeatures: 00000000
614645
m_enableExtraPadding: 0
615646
checkPaddingRequired: 0
616647
m_isRichText: 1
648+
m_EmojiFallbackSupport: 1
617649
m_parseCtrlCharacters: 1
618650
m_isOrthographic: 0
619651
m_isCullingEnabled: 0
@@ -658,13 +690,13 @@ Transform:
658690
m_PrefabInstance: {fileID: 0}
659691
m_PrefabAsset: {fileID: 0}
660692
m_GameObject: {fileID: 8921049681858529749}
693+
serializedVersion: 2
661694
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
662695
m_LocalPosition: {x: 1.922, y: -0.382, z: -0.1}
663696
m_LocalScale: {x: 10, y: 10, z: 0.1}
664697
m_ConstrainProportionsScale: 0
665698
m_Children: []
666699
m_Father: {fileID: 484208870302911251}
667-
m_RootOrder: 4
668700
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
669701
--- !u!114 &8181566081582823493
670702
MonoBehaviour:

UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Sprite.prefab

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ RectTransform:
3131
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 484208869767866870}
34-
m_RootOrder: 0
3534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3635
m_AnchorMin: {x: 0.5, y: 0.5}
3736
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -104,20 +103,23 @@ MonoBehaviour:
104103
m_VerticalAlignment: 512
105104
m_textAlignment: 65535
106105
m_characterSpacing: 0
106+
m_characterHorizontalScale: 1
107107
m_wordSpacing: 0
108108
m_lineSpacing: 0
109109
m_lineSpacingMax: 0
110110
m_paragraphSpacing: 0
111111
m_charWidthMaxAdj: 0
112-
m_enableWordWrapping: 1
112+
m_TextWrappingMode: 1
113113
m_wordWrappingRatios: 0.4
114114
m_overflowMode: 1
115115
m_linkedTextComponent: {fileID: 0}
116116
parentLinkedComponent: {fileID: 0}
117117
m_enableKerning: 1
118+
m_ActiveFontFeatures: 00000000
118119
m_enableExtraPadding: 0
119120
checkPaddingRequired: 0
120121
m_isRichText: 1
122+
m_EmojiFallbackSupport: 1
121123
m_parseCtrlCharacters: 1
122124
m_isOrthographic: 1
123125
m_isCullingEnabled: 0
@@ -170,7 +172,6 @@ RectTransform:
170172
- {fileID: 1664250162257263080}
171173
- {fileID: 484208869994139854}
172174
m_Father: {fileID: 484208870302911251}
173-
m_RootOrder: 1
174175
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
175176
m_AnchorMin: {x: 0, y: 0}
176177
m_AnchorMax: {x: 0, y: 0}
@@ -194,7 +195,9 @@ Canvas:
194195
m_OverrideSorting: 0
195196
m_OverridePixelPerfect: 0
196197
m_SortingBucketNormalizedSize: 0
198+
m_VertexColorAlwaysGammaSpace: 0
197199
m_AdditionalShaderChannelsFlag: 25
200+
m_UpdateRectTransformForStandalone: 0
198201
m_SortingLayerID: 0
199202
m_SortingOrder: 0
200203
m_TargetDisplay: 0
@@ -269,7 +272,6 @@ RectTransform:
269272
m_ConstrainProportionsScale: 0
270273
m_Children: []
271274
m_Father: {fileID: 484208869767866870}
272-
m_RootOrder: 2
273275
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
274276
m_AnchorMin: {x: 0.5, y: 0.5}
275277
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -293,6 +295,9 @@ SpriteRenderer:
293295
m_ReflectionProbeUsage: 1
294296
m_RayTracingMode: 0
295297
m_RayTraceProcedural: 0
298+
m_RayTracingAccelStructBuildFlagsOverride: 0
299+
m_RayTracingAccelStructBuildFlags: 1
300+
m_SmallMeshCulling: 1
296301
m_RenderingLayerMask: 1
297302
m_RendererPriority: 0
298303
m_Materials:
@@ -374,6 +379,7 @@ Transform:
374379
m_PrefabInstance: {fileID: 0}
375380
m_PrefabAsset: {fileID: 0}
376381
m_GameObject: {fileID: 484208870302911250}
382+
serializedVersion: 2
377383
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
378384
m_LocalPosition: {x: 0, y: 0, z: 0}
379385
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -382,7 +388,6 @@ Transform:
382388
- {fileID: 5308369766463393447}
383389
- {fileID: 484208869767866870}
384390
m_Father: {fileID: 0}
385-
m_RootOrder: 0
386391
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
387392
--- !u!114 &2185989686393736106
388393
MonoBehaviour:
@@ -428,7 +433,6 @@ RectTransform:
428433
m_ConstrainProportionsScale: 0
429434
m_Children: []
430435
m_Father: {fileID: 484208869767866870}
431-
m_RootOrder: 1
432436
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
433437
m_AnchorMin: {x: 0.5, y: 0.5}
434438
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -501,20 +505,23 @@ MonoBehaviour:
501505
m_VerticalAlignment: 512
502506
m_textAlignment: 65535
503507
m_characterSpacing: 0
508+
m_characterHorizontalScale: 1
504509
m_wordSpacing: 0
505510
m_lineSpacing: 0
506511
m_lineSpacingMax: 0
507512
m_paragraphSpacing: 0
508513
m_charWidthMaxAdj: 0
509-
m_enableWordWrapping: 1
514+
m_TextWrappingMode: 1
510515
m_wordWrappingRatios: 0.4
511516
m_overflowMode: 1
512517
m_linkedTextComponent: {fileID: 0}
513518
parentLinkedComponent: {fileID: 0}
514519
m_enableKerning: 1
520+
m_ActiveFontFeatures: 00000000
515521
m_enableExtraPadding: 0
516522
checkPaddingRequired: 0
517523
m_isRichText: 1
524+
m_EmojiFallbackSupport: 1
518525
m_parseCtrlCharacters: 1
519526
m_isOrthographic: 1
520527
m_isCullingEnabled: 0
@@ -558,13 +565,13 @@ Transform:
558565
m_PrefabInstance: {fileID: 0}
559566
m_PrefabAsset: {fileID: 0}
560567
m_GameObject: {fileID: 4999043571444206104}
568+
serializedVersion: 2
561569
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
562570
m_LocalPosition: {x: 0, y: 0, z: 0.01}
563571
m_LocalScale: {x: 3.498168, y: 1.0075, z: 0.13091514}
564572
m_ConstrainProportionsScale: 0
565573
m_Children: []
566574
m_Father: {fileID: 484208870302911251}
567-
m_RootOrder: 0
568575
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
569576
--- !u!33 &4467701978597395349
570577
MeshFilter:
@@ -591,6 +598,9 @@ MeshRenderer:
591598
m_ReflectionProbeUsage: 1
592599
m_RayTracingMode: 2
593600
m_RayTraceProcedural: 0
601+
m_RayTracingAccelStructBuildFlagsOverride: 0
602+
m_RayTracingAccelStructBuildFlags: 1
603+
m_SmallMeshCulling: 1
594604
m_RenderingLayerMask: 1
595605
m_RendererPriority: 0
596606
m_Materials:
@@ -624,9 +634,17 @@ MeshCollider:
624634
m_PrefabAsset: {fileID: 0}
625635
m_GameObject: {fileID: 4999043571444206104}
626636
m_Material: {fileID: 0}
637+
m_IncludeLayers:
638+
serializedVersion: 2
639+
m_Bits: 0
640+
m_ExcludeLayers:
641+
serializedVersion: 2
642+
m_Bits: 0
643+
m_LayerOverridePriority: 0
627644
m_IsTrigger: 0
645+
m_ProvidesContacts: 0
628646
m_Enabled: 1
629-
serializedVersion: 4
647+
serializedVersion: 5
630648
m_Convex: 0
631649
m_CookingOptions: 30
632650
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}

0 commit comments

Comments
 (0)