Skip to content

Commit e5017bd

Browse files
committed
fixed some menus
1 parent 94dc4f6 commit e5017bd

File tree

3 files changed

+94
-33
lines changed

3 files changed

+94
-33
lines changed

Assets/Resources/Prefabs/ScoreboardUI.prefab

+87-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,70 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &4062906459399764753
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 117402207243016130}
12+
- component: {fileID: 5829524964014193199}
13+
m_Layer: 5
14+
m_Name: GeneralUI
15+
m_TagString: Untagged
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!224 &117402207243016130
21+
RectTransform:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_GameObject: {fileID: 4062906459399764753}
27+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
28+
m_LocalPosition: {x: 0, y: 0, z: 0}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_Children:
31+
- {fileID: 7285619471405880302}
32+
- {fileID: 2008432877184803067}
33+
- {fileID: 7285619471223153550}
34+
m_Father: {fileID: 7285619470209417366}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
m_AnchorMin: {x: 0, y: 0}
38+
m_AnchorMax: {x: 1, y: 1}
39+
m_AnchoredPosition: {x: 0, y: 0}
40+
m_SizeDelta: {x: 0, y: 0}
41+
m_Pivot: {x: 0.5, y: 0.5}
42+
--- !u!114 &5829524964014193199
43+
MonoBehaviour:
44+
m_ObjectHideFlags: 0
45+
m_CorrespondingSourceObject: {fileID: 0}
46+
m_PrefabInstance: {fileID: 0}
47+
m_PrefabAsset: {fileID: 0}
48+
m_GameObject: {fileID: 4062906459399764753}
49+
m_Enabled: 1
50+
m_EditorHideFlags: 0
51+
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
52+
m_Name:
53+
m_EditorClassIdentifier:
54+
m_Padding:
55+
m_Left: 0
56+
m_Right: 0
57+
m_Top: 150
58+
m_Bottom: 0
59+
m_ChildAlignment: 4
60+
m_Spacing: 0
61+
m_ChildForceExpandWidth: 1
62+
m_ChildForceExpandHeight: 1
63+
m_ChildControlWidth: 0
64+
m_ChildControlHeight: 0
65+
m_ChildScaleWidth: 0
66+
m_ChildScaleHeight: 0
67+
m_ReverseArrangement: 0
368
--- !u!1 &7285619469710161191
469
GameObject:
570
m_ObjectHideFlags: 0
@@ -201,10 +266,8 @@ RectTransform:
201266
m_LocalPosition: {x: 0, y: 0, z: 0}
202267
m_LocalScale: {x: 0, y: 0, z: 0}
203268
m_Children:
204-
- {fileID: 7285619471405880302}
205-
- {fileID: 2008432877184803067}
269+
- {fileID: 117402207243016130}
206270
- {fileID: 7285619470843390565}
207-
- {fileID: 7285619471223153550}
208271
- {fileID: 7601786997317013242}
209272
m_Father: {fileID: 0}
210273
m_RootOrder: 0
@@ -307,7 +370,7 @@ RectTransform:
307370
m_Children:
308371
- {fileID: 7285619471473666960}
309372
m_Father: {fileID: 7285619470209417366}
310-
m_RootOrder: 2
373+
m_RootOrder: 1
311374
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
312375
m_AnchorMin: {x: 1, y: 0}
313376
m_AnchorMax: {x: 1, y: 0}
@@ -438,13 +501,13 @@ RectTransform:
438501
m_Children:
439502
- {fileID: 7285619469710161188}
440503
- {fileID: 7285619469820916992}
441-
m_Father: {fileID: 7285619470209417366}
442-
m_RootOrder: 3
504+
m_Father: {fileID: 117402207243016130}
505+
m_RootOrder: 2
443506
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
444507
m_AnchorMin: {x: 0, y: 0}
445-
m_AnchorMax: {x: 1, y: 0}
446-
m_AnchoredPosition: {x: 0, y: 15}
447-
m_SizeDelta: {x: 0, y: 100}
508+
m_AnchorMax: {x: 0, y: 0}
509+
m_AnchoredPosition: {x: 0, y: 0}
510+
m_SizeDelta: {x: 2460, y: 100}
448511
m_Pivot: {x: 0.5, y: 0}
449512
--- !u!114 &7285619471223153551
450513
MonoBehaviour:
@@ -497,16 +560,16 @@ RectTransform:
497560
m_PrefabInstance: {fileID: 0}
498561
m_PrefabAsset: {fileID: 0}
499562
m_GameObject: {fileID: 7285619471405880297}
500-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
563+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
501564
m_LocalPosition: {x: 0, y: 0, z: 0}
502565
m_LocalScale: {x: 1, y: 1, z: 1}
503566
m_Children: []
504-
m_Father: {fileID: 7285619470209417366}
567+
m_Father: {fileID: 117402207243016130}
505568
m_RootOrder: 0
506569
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
507-
m_AnchorMin: {x: 0.5, y: 1}
508-
m_AnchorMax: {x: 0.5, y: 1}
509-
m_AnchoredPosition: {x: 0, y: -250}
570+
m_AnchorMin: {x: 0, y: 0}
571+
m_AnchorMax: {x: 0, y: 0}
572+
m_AnchoredPosition: {x: 0, y: 0}
510573
m_SizeDelta: {x: 500, y: 200}
511574
m_Pivot: {x: 0.5, y: 1}
512575
--- !u!222 &7285619471405880300
@@ -659,7 +722,7 @@ Transform:
659722
m_LocalScale: {x: 1, y: 1, z: 1}
660723
m_Children: []
661724
m_Father: {fileID: 7285619470209417366}
662-
m_RootOrder: 4
725+
m_RootOrder: 2
663726
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
664727
--- !u!114 &1273558886309726141
665728
MonoBehaviour:
@@ -674,15 +737,12 @@ MonoBehaviour:
674737
m_Name:
675738
m_EditorClassIdentifier:
676739
currentMenu: {fileID: 0}
677-
easyLevels: []
678-
mediumLevels: []
679-
hardLevels: []
680740
--- !u!1001 &7285619469788819211
681741
PrefabInstance:
682742
m_ObjectHideFlags: 0
683743
serializedVersion: 2
684744
m_Modification:
685-
m_TransformParent: {fileID: 7285619470209417366}
745+
m_TransformParent: {fileID: 117402207243016130}
686746
m_Modifications:
687747
- target: {fileID: 9134667016470098165, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
688748
propertyPath: m_AnchorMax.y
@@ -874,19 +934,19 @@ PrefabInstance:
874934
objectReference: {fileID: 0}
875935
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
876936
propertyPath: m_AnchorMax.x
877-
value: 0.5
937+
value: 0
878938
objectReference: {fileID: 0}
879939
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
880940
propertyPath: m_AnchorMax.y
881-
value: 0.5
941+
value: 0
882942
objectReference: {fileID: 0}
883943
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
884944
propertyPath: m_AnchorMin.x
885-
value: 0.5
945+
value: 0
886946
objectReference: {fileID: 0}
887947
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
888948
propertyPath: m_AnchorMin.y
889-
value: 0.5
949+
value: 0
890950
objectReference: {fileID: 0}
891951
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
892952
propertyPath: m_SizeDelta.x
@@ -914,23 +974,23 @@ PrefabInstance:
914974
objectReference: {fileID: 0}
915975
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
916976
propertyPath: m_LocalRotation.x
917-
value: 0
977+
value: -0
918978
objectReference: {fileID: 0}
919979
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
920980
propertyPath: m_LocalRotation.y
921-
value: 0
981+
value: -0
922982
objectReference: {fileID: 0}
923983
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
924984
propertyPath: m_LocalRotation.z
925-
value: 0
985+
value: -0
926986
objectReference: {fileID: 0}
927987
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
928988
propertyPath: m_AnchoredPosition.x
929989
value: 0
930990
objectReference: {fileID: 0}
931991
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
932992
propertyPath: m_AnchoredPosition.y
933-
value: -150
993+
value: 0
934994
objectReference: {fileID: 0}
935995
- target: {fileID: 9134667016815136752, guid: da520f30f80210c4fbfdc79b0997faea, type: 3}
936996
propertyPath: m_LocalEulerAnglesHint.x

Assets/Scenes/WinMenuWithoutSavingScore.unity

+2-1
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ MonoBehaviour:
155155
m_EditorClassIdentifier:
156156
m_MoveRepeatDelay: 0.5
157157
m_MoveRepeatRate: 0.1
158+
m_XRTrackingOrigin: {fileID: 0}
158159
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
159160
m_PointAction: {fileID: 1054132383583890850, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
160161
m_MoveAction: {fileID: 3710738434707379630, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
@@ -326,7 +327,7 @@ Camera:
326327
m_Enabled: 1
327328
serializedVersion: 2
328329
m_ClearFlags: 1
329-
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
330+
m_BackGroundColor: {r: 0.30980393, g: 0.42401236, b: 0.77254903, a: 0}
330331
m_projectionMatrixMode: 1
331332
m_GateFitMode: 2
332333
m_FOVAxisMode: 0

UserSettings/EditorUserSettings.asset

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ EditorUserSettings:
2121
value: 22424703114646680e0b0227036c7315001214396305293438251860adcd3b3cf7eb33bacb3f29393557a1290a371526
2222
flags: 0
2323
RecentlyUsedScenePath-5:
24-
value: 22424703114646680e0b0227036c6819183a1d243966333e243d04
24+
value: 22424703114646680e0b0227036c7315001214396305293438251862adc5352bfba81aecf13f336d7717e1351027
2525
flags: 0
2626
RecentlyUsedScenePath-6:
27-
value: 22424703114646680e0b0227036c6819183a1d24391f2f2425260827d1e12231ece005eae8283a722c0ce6281d
27+
value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
2828
flags: 0
2929
RecentlyUsedScenePath-7:
30-
value: 22424703114646680e0b0227036c6819183a1d243905293438251860acf53a31f6fe
30+
value: 22424703114646680e0b0227036c6819183a1d243966333e243d04
3131
flags: 0
3232
RecentlyUsedScenePath-8:
33-
value: 22424703114646680e0b0227036c7315001214396305293438251862adc5352bfba81aecf13f336d7717e1351027
33+
value: 22424703114646680e0b0227036c6819183a1d243905293438251860acf53a31f6fe
3434
flags: 0
3535
RecentlyUsedScenePath-9:
36-
value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
36+
value: 22424703114646680e0b0227036c6819183a1d24391f2f2425260827d1e12231ece005eae8283a722c0ce6281d
3737
flags: 0
3838
vcSharedLogLevel:
3939
value: 0d5e400f0650

0 commit comments

Comments
 (0)