Skip to content

Commit 1253841

Browse files
amirebrahimiamirebrahimi
authored
Merge pull request #177 from Unity-Technologies/staging
0.0.6 staging -> master
2 parents da638d5 + 73dcd46 commit 1253841

Some content is hidden

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

50 files changed

+578
-1106
lines changed

‎Menus/MainMenu/MainMenu.cs

+3
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,9 @@ void CreateFaceButtons(List<Type> types)
187187
provider.settingsMenuInstance = m_MainMenuUI.AddSubmenu(buttonData.sectionName, provider.settingsMenuPrefab);
188188
});
189189
}
190+
191+
if (customMenuAttribute != null && customMenuAttribute.tooltip != null)
192+
b.tooltipText = customMenuAttribute.tooltip.tooltipText;
190193
});
191194
}
192195
}

‎Menus/MainMenu/Prefabs/MenuFace.prefab

+54-57
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ GameObject:
1616
m_ObjectHideFlags: 1
1717
m_PrefabParentObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 4
19+
serializedVersion: 5
2020
m_Component:
21-
- 224: {fileID: 224000012046007752}
22-
- 114: {fileID: 114000014048498192}
23-
- 114: {fileID: 114000012901787054}
21+
- component: {fileID: 224000012046007752}
22+
- component: {fileID: 114000014048498192}
23+
- component: {fileID: 114000012901787054}
2424
m_Layer: 5
2525
m_Name: ButtonGrid
2626
m_TagString: Untagged
@@ -33,11 +33,11 @@ GameObject:
3333
m_ObjectHideFlags: 0
3434
m_PrefabParentObject: {fileID: 0}
3535
m_PrefabInternal: {fileID: 100100000}
36-
serializedVersion: 4
36+
serializedVersion: 5
3737
m_Component:
38-
- 4: {fileID: 4000014077601618}
39-
- 33: {fileID: 33000011761534160}
40-
- 137: {fileID: 137000010769614414}
38+
- component: {fileID: 4000014077601618}
39+
- component: {fileID: 33000011761534160}
40+
- component: {fileID: 137000010769614414}
4141
m_Layer: 0
4242
m_Name: TitleIcon
4343
m_TagString: Untagged
@@ -50,14 +50,14 @@ GameObject:
5050
m_ObjectHideFlags: 0
5151
m_PrefabParentObject: {fileID: 0}
5252
m_PrefabInternal: {fileID: 100100000}
53-
serializedVersion: 4
53+
serializedVersion: 5
5454
m_Component:
55-
- 224: {fileID: 224000011294836516}
56-
- 223: {fileID: 223000012805865200}
57-
- 114: {fileID: 114000012004038330}
58-
- 114: {fileID: 114000013614773404}
59-
- 114: {fileID: 114000012540919192}
60-
- 225: {fileID: 225000011820790320}
55+
- component: {fileID: 224000011294836516}
56+
- component: {fileID: 223000012805865200}
57+
- component: {fileID: 114000012004038330}
58+
- component: {fileID: 114000013614773404}
59+
- component: {fileID: 114000012540919192}
60+
- component: {fileID: 225000011820790320}
6161
m_Layer: 5
6262
m_Name: MenuFace
6363
m_TagString: Untagged
@@ -70,11 +70,11 @@ GameObject:
7070
m_ObjectHideFlags: 0
7171
m_PrefabParentObject: {fileID: 0}
7272
m_PrefabInternal: {fileID: 100100000}
73-
serializedVersion: 4
73+
serializedVersion: 5
7474
m_Component:
75-
- 4: {fileID: 4000010544386176}
76-
- 33: {fileID: 33000014220048304}
77-
- 23: {fileID: 23000012074004932}
75+
- component: {fileID: 4000010544386176}
76+
- component: {fileID: 33000014220048304}
77+
- component: {fileID: 23000012074004932}
7878
m_Layer: 0
7979
m_Name: BorderOutline
8080
m_TagString: Untagged
@@ -87,12 +87,12 @@ GameObject:
8787
m_ObjectHideFlags: 0
8888
m_PrefabParentObject: {fileID: 0}
8989
m_PrefabInternal: {fileID: 100100000}
90-
serializedVersion: 4
90+
serializedVersion: 5
9191
m_Component:
92-
- 224: {fileID: 224000010431111768}
93-
- 222: {fileID: 222000011972603126}
94-
- 114: {fileID: 114000012702133128}
95-
- 114: {fileID: 114000010693038044}
92+
- component: {fileID: 224000010431111768}
93+
- component: {fileID: 222000011972603126}
94+
- component: {fileID: 114000012702133128}
95+
- component: {fileID: 114000010693038044}
9696
m_Layer: 5
9797
m_Name: ButtonsMask
9898
m_TagString: Untagged
@@ -105,12 +105,12 @@ GameObject:
105105
m_ObjectHideFlags: 1
106106
m_PrefabParentObject: {fileID: 0}
107107
m_PrefabInternal: {fileID: 100100000}
108-
serializedVersion: 4
108+
serializedVersion: 5
109109
m_Component:
110-
- 224: {fileID: 224000010897006452}
111-
- 114: {fileID: 114000013559505558}
112-
- 222: {fileID: 222000010488777626}
113-
- 114: {fileID: 114000013499017046}
110+
- component: {fileID: 224000010897006452}
111+
- component: {fileID: 114000013559505558}
112+
- component: {fileID: 222000010488777626}
113+
- component: {fileID: 114000013499017046}
114114
m_Layer: 5
115115
m_Name: ButtonsScrollRect
116116
m_TagString: Untagged
@@ -123,11 +123,11 @@ GameObject:
123123
m_ObjectHideFlags: 0
124124
m_PrefabParentObject: {fileID: 0}
125125
m_PrefabInternal: {fileID: 100100000}
126-
serializedVersion: 4
126+
serializedVersion: 5
127127
m_Component:
128-
- 224: {fileID: 224000013513340820}
129-
- 222: {fileID: 222000010078248208}
130-
- 114: {fileID: 114000013940025958}
128+
- component: {fileID: 224000013513340820}
129+
- component: {fileID: 222000010078248208}
130+
- component: {fileID: 114000013940025958}
131131
m_Layer: 5
132132
m_Name: TitleText
133133
m_TagString: Untagged
@@ -144,10 +144,10 @@ Transform:
144144
m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
145145
m_LocalPosition: {x: 0, y: 252.50934, z: 0.9865579}
146146
m_LocalScale: {x: 2000.0002, y: 2000.0002, z: 12.331977}
147-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
148147
m_Children: []
149148
m_Father: {fileID: 224000011294836516}
150149
m_RootOrder: 1
150+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
151151
--- !u!4 &4000014077601618
152152
Transform:
153153
m_ObjectHideFlags: 1
@@ -157,10 +157,10 @@ Transform:
157157
m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
158158
m_LocalPosition: {x: -112.00004, y: 461.50934, z: 0.909}
159159
m_LocalScale: {x: 2000.0004, y: 2000, z: 12.33198}
160-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
161160
m_Children: []
162161
m_Father: {fileID: 224000011294836516}
163162
m_RootOrder: 0
163+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
164164
--- !u!23 &23000012074004932
165165
MeshRenderer:
166166
m_ObjectHideFlags: 1
@@ -175,20 +175,23 @@ MeshRenderer:
175175
m_ReflectionProbeUsage: 0
176176
m_Materials:
177177
- {fileID: 2100000, guid: 552c79e14b5f355429da3b0617fd3a77, type: 2}
178-
m_SubsetIndices:
178+
m_StaticBatchInfo:
179+
firstSubMesh: 0
180+
subMeshCount: 0
179181
m_StaticBatchRoot: {fileID: 0}
180182
m_ProbeAnchor: {fileID: 0}
181183
m_LightProbeVolumeOverride: {fileID: 0}
182184
m_ScaleInLightmap: 1
183185
m_PreserveUVs: 0
184186
m_IgnoreNormalsForChartDetection: 0
185187
m_ImportantGI: 0
186-
m_SelectedWireframeHidden: 0
188+
m_SelectedEditorRenderState: 3
187189
m_MinimumChartSize: 4
188190
m_AutoUVMaxDistance: 0.5
189191
m_AutoUVMaxAngle: 89
190192
m_LightmapParameters: {fileID: 0}
191193
m_SortingLayerID: 0
194+
m_SortingLayer: 0
192195
m_SortingOrder: 0
193196
--- !u!33 &33000011761534160
194197
MeshFilter:
@@ -215,7 +218,6 @@ MonoBehaviour:
215218
m_Script: {fileID: -1200242548, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
216219
m_Name:
217220
m_EditorClassIdentifier:
218-
m_RunInEditMode: 0
219221
m_ShowMaskGraphic: 0
220222
--- !u!114 &114000012004038330
221223
MonoBehaviour:
@@ -228,7 +230,6 @@ MonoBehaviour:
228230
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
229231
m_Name:
230232
m_EditorClassIdentifier:
231-
m_RunInEditMode: 0
232233
m_UiScaleMode: 0
233234
m_ReferencePixelsPerUnit: 100
234235
m_ScaleFactor: 1
@@ -250,7 +251,6 @@ MonoBehaviour:
250251
m_Script: {fileID: 11500000, guid: b175c00e798af2f4b8e419ea7236f0eb, type: 3}
251252
m_Name:
252253
m_EditorClassIdentifier:
253-
m_RunInEditMode: 0
254254
m_BorderOutline: {fileID: 23000012074004932}
255255
m_CanvasGroup: {fileID: 225000011820790320}
256256
m_FaceTitle: {fileID: 114000013940025958}
@@ -268,7 +268,6 @@ MonoBehaviour:
268268
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
269269
m_Name:
270270
m_EditorClassIdentifier:
271-
m_RunInEditMode: 0
272271
m_Material: {fileID: 2100000, guid: 2bf39d4275e117e4189340f2739de824, type: 2}
273272
m_Color: {r: 1, g: 1, b: 1, a: 1}
274273
m_RaycastTarget: 1
@@ -296,7 +295,6 @@ MonoBehaviour:
296295
m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
297296
m_Name:
298297
m_EditorClassIdentifier:
299-
m_RunInEditMode: 0
300298
m_HorizontalFit: 0
301299
m_VerticalFit: 2
302300
--- !u!114 &114000013499017046
@@ -310,7 +308,6 @@ MonoBehaviour:
310308
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
311309
m_Name:
312310
m_EditorClassIdentifier:
313-
m_RunInEditMode: 0
314311
m_Material: {fileID: 0}
315312
m_Color: {r: 1, g: 1, b: 1, a: 0}
316313
m_RaycastTarget: 1
@@ -338,11 +335,10 @@ MonoBehaviour:
338335
m_Script: {fileID: 1367256648, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
339336
m_Name:
340337
m_EditorClassIdentifier:
341-
m_RunInEditMode: 0
342338
m_Content: {fileID: 224000012046007752}
343339
m_Horizontal: 0
344340
m_Vertical: 1
345-
m_MovementType: 2
341+
m_MovementType: 1
346342
m_Elasticity: 0.1
347343
m_Inertia: 1
348344
m_DecelerationRate: 0.135
@@ -370,7 +366,6 @@ MonoBehaviour:
370366
m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
371367
m_Name:
372368
m_EditorClassIdentifier:
373-
m_RunInEditMode: 0
374369
m_IgnoreReversedGraphics: 1
375370
m_BlockingObjects: 0
376371
m_BlockingMask:
@@ -387,7 +382,6 @@ MonoBehaviour:
387382
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
388383
m_Name:
389384
m_EditorClassIdentifier:
390-
m_RunInEditMode: 0
391385
m_Material: {fileID: 2100000, guid: dec2d25be9058334c91a0402762efa61, type: 2}
392386
m_Color: {r: 1, g: 1, b: 1, a: 1}
393387
m_RaycastTarget: 0
@@ -421,7 +415,6 @@ MonoBehaviour:
421415
m_Script: {fileID: -2095666955, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
422416
m_Name:
423417
m_EditorClassIdentifier:
424-
m_RunInEditMode: 0
425418
m_Padding:
426419
m_Left: 0
427420
m_Right: 0
@@ -448,20 +441,23 @@ SkinnedMeshRenderer:
448441
m_ReflectionProbeUsage: 0
449442
m_Materials:
450443
- {fileID: 2100000, guid: 8bd9ff8b835cffa489137898df169aa6, type: 2}
451-
m_SubsetIndices:
444+
m_StaticBatchInfo:
445+
firstSubMesh: 0
446+
subMeshCount: 0
452447
m_StaticBatchRoot: {fileID: 0}
453448
m_ProbeAnchor: {fileID: 0}
454449
m_LightProbeVolumeOverride: {fileID: 0}
455450
m_ScaleInLightmap: 1
456451
m_PreserveUVs: 0
457452
m_IgnoreNormalsForChartDetection: 0
458453
m_ImportantGI: 0
459-
m_SelectedWireframeHidden: 0
454+
m_SelectedEditorRenderState: 3
460455
m_MinimumChartSize: 4
461456
m_AutoUVMaxDistance: 0.5
462457
m_AutoUVMaxAngle: 89
463458
m_LightmapParameters: {fileID: 0}
464459
m_SortingLayerID: 0
460+
m_SortingLayer: 0
465461
m_SortingOrder: 0
466462
serializedVersion: 2
467463
m_Quality: 0
@@ -501,7 +497,7 @@ Canvas:
501497
m_PrefabInternal: {fileID: 100100000}
502498
m_GameObject: {fileID: 1000012439615790}
503499
m_Enabled: 1
504-
serializedVersion: 2
500+
serializedVersion: 3
505501
m_RenderMode: 2
506502
m_Camera: {fileID: 0}
507503
m_PlaneDistance: 100
@@ -510,6 +506,7 @@ Canvas:
510506
m_OverrideSorting: 0
511507
m_OverridePixelPerfect: 0
512508
m_SortingBucketNormalizedSize: 0
509+
m_AdditionalShaderChannelsFlag: 25
513510
m_SortingLayerID: 0
514511
m_SortingOrder: 0
515512
m_TargetDisplay: 0
@@ -522,11 +519,11 @@ RectTransform:
522519
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
523520
m_LocalPosition: {x: 0, y: 0, z: 0}
524521
m_LocalScale: {x: 1, y: 1, z: 1.0000001}
525-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
526522
m_Children:
527523
- {fileID: 224000010897006452}
528524
m_Father: {fileID: 224000011294836516}
529525
m_RootOrder: 3
526+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
530527
m_AnchorMin: {x: 0.03276894, y: 0.034720626}
531528
m_AnchorMax: {x: 0.96723104, y: 0.8348801}
532529
m_AnchoredPosition: {x: 0, y: 6.425156}
@@ -541,11 +538,11 @@ RectTransform:
541538
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
542539
m_LocalPosition: {x: 0, y: 0, z: 0}
543540
m_LocalScale: {x: 1, y: 1, z: 1}
544-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
545541
m_Children:
546542
- {fileID: 224000012046007752}
547543
m_Father: {fileID: 224000010431111768}
548544
m_RootOrder: 0
545+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
549546
m_AnchorMin: {x: 0, y: 0}
550547
m_AnchorMax: {x: 1, y: 1}
551548
m_AnchoredPosition: {x: -0.0000038146973, y: 0.0000076293945}
@@ -560,14 +557,14 @@ RectTransform:
560557
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
561558
m_LocalPosition: {x: 0, y: 0, z: 0}
562559
m_LocalScale: {x: 1, y: 1, z: 1}
563-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
564560
m_Children:
565561
- {fileID: 4000014077601618}
566562
- {fileID: 4000010544386176}
567563
- {fileID: 224000013513340820}
568564
- {fileID: 224000010431111768}
569565
m_Father: {fileID: 0}
570566
m_RootOrder: 0
567+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
571568
m_AnchorMin: {x: 0, y: 0}
572569
m_AnchorMax: {x: 0, y: 0}
573570
m_AnchoredPosition: {x: 79, y: -70}
@@ -582,13 +579,13 @@ RectTransform:
582579
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
583580
m_LocalPosition: {x: 0, y: 0, z: 0}
584581
m_LocalScale: {x: 1, y: 1, z: 1}
585-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
586582
m_Children: []
587583
m_Father: {fileID: 224000010897006452}
588584
m_RootOrder: 0
585+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
589586
m_AnchorMin: {x: 0.5, y: 1}
590587
m_AnchorMax: {x: 0.5, y: 1}
591-
m_AnchoredPosition: {x: -0.00009918213, y: 0}
588+
m_AnchoredPosition: {x: -0.0000076293945, y: 0}
592589
m_SizeDelta: {x: 279.79852, y: 0}
593590
m_Pivot: {x: 0.5, y: 1}
594591
--- !u!224 &224000013513340820
@@ -600,10 +597,10 @@ RectTransform:
600597
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
601598
m_LocalPosition: {x: 0, y: 0, z: 0}
602599
m_LocalScale: {x: 1, y: 1, z: 1}
603-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
604600
m_Children: []
605601
m_Father: {fileID: 224000011294836516}
606602
m_RootOrder: 2
603+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
607604
m_AnchorMin: {x: 0.0415801, y: 0.8602893}
608605
m_AnchorMax: {x: 0.9584199, y: 0.96668}
609606
m_AnchoredPosition: {x: -0.000005722046, y: 0}

0 commit comments

Comments
 (0)