Skip to content

Commit abe8baf

Browse files
Farfi55Farfi55
committed
added quit button and color preview in main menu
1 parent f417b82 commit abe8baf

File tree

5 files changed

+762
-120
lines changed

5 files changed

+762
-120
lines changed

‎Assets/Prefab/UIPlayerSlot.prefab

Lines changed: 121 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,81 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &1964263747
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: 1964263748}
12+
- component: {fileID: 1964263750}
13+
- component: {fileID: 1964263749}
14+
m_Layer: 5
15+
m_Name: PlayerColor
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!224 &1964263748
22+
RectTransform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 1964263747}
28+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_ConstrainProportionsScale: 0
32+
m_Children: []
33+
m_Father: {fileID: 3655251396628947620}
34+
m_RootOrder: 3
35+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
m_AnchorMin: {x: 0.8575098, y: 0.5528805}
37+
m_AnchorMax: {x: 1, y: 1}
38+
m_AnchoredPosition: {x: 0.15829468, y: 0.24720001}
39+
m_SizeDelta: {x: -0.31599998, y: -0.49399996}
40+
m_Pivot: {x: 0.5, y: 0.5}
41+
--- !u!222 &1964263750
42+
CanvasRenderer:
43+
m_ObjectHideFlags: 0
44+
m_CorrespondingSourceObject: {fileID: 0}
45+
m_PrefabInstance: {fileID: 0}
46+
m_PrefabAsset: {fileID: 0}
47+
m_GameObject: {fileID: 1964263747}
48+
m_CullTransparentMesh: 1
49+
--- !u!114 &1964263749
50+
MonoBehaviour:
51+
m_ObjectHideFlags: 0
52+
m_CorrespondingSourceObject: {fileID: 0}
53+
m_PrefabInstance: {fileID: 0}
54+
m_PrefabAsset: {fileID: 0}
55+
m_GameObject: {fileID: 1964263747}
56+
m_Enabled: 1
57+
m_EditorHideFlags: 0
58+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
59+
m_Name:
60+
m_EditorClassIdentifier:
61+
m_Material: {fileID: 0}
62+
m_Color: {r: 1, g: 1, b: 1, a: 1}
63+
m_RaycastTarget: 1
64+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
65+
m_Maskable: 1
66+
m_OnCullStateChanged:
67+
m_PersistentCalls:
68+
m_Calls: []
69+
m_Sprite: {fileID: 21300000, guid: 73299346033d73896a7fad974bd380ff, type: 3}
70+
m_Type: 1
71+
m_PreserveAspect: 0
72+
m_FillCenter: 1
73+
m_FillMethod: 4
74+
m_FillAmount: 1
75+
m_FillClockwise: 1
76+
m_FillOrigin: 0
77+
m_UseSpriteMesh: 0
78+
m_PixelsPerUnitMultiplier: 2
379
--- !u!1 &193003309489132236
480
GameObject:
581
m_ObjectHideFlags: 0
@@ -370,8 +446,8 @@ RectTransform:
370446
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
371447
m_AnchorMin: {x: 0, y: 0}
372448
m_AnchorMax: {x: 1, y: 1}
373-
m_AnchoredPosition: {x: -176.04004, y: 64.68341}
374-
m_SizeDelta: {x: 463.773, y: 38.462082}
449+
m_AnchoredPosition: {x: 176.04004, y: -64.68341}
450+
m_SizeDelta: {x: -423.773, y: 1.5379181}
375451
m_Pivot: {x: 0.5, y: 0.5}
376452
--- !u!222 &508068114053169120
377453
CanvasRenderer:
@@ -505,7 +581,7 @@ MonoBehaviour:
505581
m_faceColor:
506582
serializedVersion: 2
507583
rgba: 4294967295
508-
m_fontSize: 27.7
584+
m_fontSize: 26.9
509585
m_fontSizeBase: 14
510586
m_fontWeight: 400
511587
m_enableAutoSizing: 1
@@ -600,12 +676,12 @@ RectTransform:
600676
m_Children:
601677
- {fileID: 7886508897470119248}
602678
m_Father: {fileID: 3655251396628947620}
603-
m_RootOrder: 3
679+
m_RootOrder: 4
604680
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
605-
m_AnchorMin: {x: 0.5, y: 0.5}
606-
m_AnchorMax: {x: 0.5, y: 0.5}
607-
m_AnchoredPosition: {x: -151.9815, y: 1.4257}
608-
m_SizeDelta: {x: 88.6187, y: 90.851}
681+
m_AnchorMin: {x: 0.06776022, y: 0.21037848}
682+
m_AnchorMax: {x: 0.259, y: 0.8098858}
683+
m_AnchoredPosition: {x: -2.4815063, y: -0.074295044}
684+
m_SizeDelta: {x: 3.6186981, y: 1.8509979}
609685
m_Pivot: {x: 0.5, y: 0.5}
610686
--- !u!222 &6315333370676852131
611687
CanvasRenderer:
@@ -792,7 +868,7 @@ GameObject:
792868
m_Icon: {fileID: 0}
793869
m_NavMeshLayer: 0
794870
m_StaticEditorFlags: 0
795-
m_IsActive: 1
871+
m_IsActive: 0
796872
--- !u!224 &4912779600979940735
797873
RectTransform:
798874
m_ObjectHideFlags: 0
@@ -1091,7 +1167,7 @@ GameObject:
10911167
m_Icon: {fileID: 0}
10921168
m_NavMeshLayer: 0
10931169
m_StaticEditorFlags: 0
1094-
m_IsActive: 0
1170+
m_IsActive: 1
10951171
--- !u!224 &3655251396628947620
10961172
RectTransform:
10971173
m_ObjectHideFlags: 0
@@ -1107,6 +1183,7 @@ RectTransform:
11071183
- {fileID: 9021327476368665046}
11081184
- {fileID: 1153880164493522848}
11091185
- {fileID: 4386965949413558911}
1186+
- {fileID: 1964263748}
11101187
- {fileID: 8917650037332533867}
11111188
m_Father: {fileID: 4859315886159817240}
11121189
m_RootOrder: 1
@@ -1225,8 +1302,8 @@ RectTransform:
12251302
m_Father: {fileID: 8917650037332533867}
12261303
m_RootOrder: 0
12271304
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1228-
m_AnchorMin: {x: 0, y: 0}
1229-
m_AnchorMax: {x: 1, y: 1}
1305+
m_AnchorMin: {x: 0.09676594, y: 0.08583764}
1306+
m_AnchorMax: {x: 0.93548936, y: 0.9248923}
12301307
m_AnchoredPosition: {x: 0, y: 0}
12311308
m_SizeDelta: {x: 0, y: 0}
12321309
m_Pivot: {x: 0.5, y: 0.5}
@@ -1258,7 +1335,7 @@ MonoBehaviour:
12581335
m_OnCullStateChanged:
12591336
m_PersistentCalls:
12601337
m_Calls: []
1261-
m_text: '-'
1338+
m_text: _
12621339
m_isRightToLeft: 0
12631340
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
12641341
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -1285,15 +1362,15 @@ MonoBehaviour:
12851362
m_faceColor:
12861363
serializedVersion: 2
12871364
rgba: 4294967295
1288-
m_fontSize: 72
1365+
m_fontSize: 66.8
12891366
m_fontSizeBase: 24
12901367
m_fontWeight: 400
12911368
m_enableAutoSizing: 1
12921369
m_fontSizeMin: 18
1293-
m_fontSizeMax: 72
1370+
m_fontSizeMax: 75.21
12941371
m_fontStyle: 0
12951372
m_HorizontalAlignment: 2
1296-
m_VerticalAlignment: 256
1373+
m_VerticalAlignment: 4096
12971374
m_textAlignment: 65535
12981375
m_characterSpacing: 0
12991376
m_wordSpacing: 0
@@ -1364,10 +1441,10 @@ RectTransform:
13641441
m_Father: {fileID: 3655251396628947620}
13651442
m_RootOrder: 1
13661443
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1367-
m_AnchorMin: {x: 0.5, y: 0.5}
1368-
m_AnchorMax: {x: 0.5, y: 0.5}
1369-
m_AnchoredPosition: {x: -24.51971, y: 27.5844}
1370-
m_SizeDelta: {x: 152.3466, y: 38.5347}
1444+
m_AnchorMin: {x: 0.2772451, y: 0.5528805}
1445+
m_AnchorMax: {x: 0.5690553, y: 0.8098858}
1446+
m_AnchoredPosition: {x: -0.51971436, y: 0.58439636}
1447+
m_SizeDelta: {x: 2.3466034, y: 0.5346985}
13711448
m_Pivot: {x: 0.5, y: 0.5}
13721449
--- !u!222 &6662950918682519269
13731450
CanvasRenderer:
@@ -1397,7 +1474,7 @@ MonoBehaviour:
13971474
m_OnCullStateChanged:
13981475
m_PersistentCalls:
13991476
m_Calls: []
1400-
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
1477+
m_Sprite: {fileID: 21300000, guid: 73299346033d73896a7fad974bd380ff, type: 3}
14011478
m_Type: 1
14021479
m_PreserveAspect: 0
14031480
m_FillCenter: 1
@@ -1406,7 +1483,7 @@ MonoBehaviour:
14061483
m_FillClockwise: 1
14071484
m_FillOrigin: 0
14081485
m_UseSpriteMesh: 0
1409-
m_PixelsPerUnitMultiplier: 1
1486+
m_PixelsPerUnitMultiplier: 7
14101487
--- !u!114 &102006806863982688
14111488
MonoBehaviour:
14121489
m_ObjectHideFlags: 0
@@ -1525,6 +1602,7 @@ MonoBehaviour:
15251602
_playerNameInputField: {fileID: 5239172518873865379}
15261603
_playerColorDropdown: {fileID: 7100777437716326295}
15271604
_playerConfigurationDropdown: {fileID: 102006806863982688}
1605+
_playerColorImage: {fileID: 1964263749}
15281606
_playerCreatedGfx: {fileID: 2345752973947375662}
15291607
_playerNotCreatedGfx: {fileID: 1868612036898920204}
15301608
--- !u!1 &3564335147592220753
@@ -1562,7 +1640,7 @@ RectTransform:
15621640
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15631641
m_AnchorMin: {x: 0, y: 0}
15641642
m_AnchorMax: {x: 1, y: 1}
1565-
m_AnchoredPosition: {x: -7.4999924, y: -0.5}
1643+
m_AnchoredPosition: {x: -7.5, y: -0.5}
15661644
m_SizeDelta: {x: -35, y: -13}
15671645
m_Pivot: {x: 0.5, y: 0.5}
15681646
--- !u!222 &6770336577733504216
@@ -1620,7 +1698,7 @@ MonoBehaviour:
16201698
m_faceColor:
16211699
serializedVersion: 2
16221700
rgba: 4294967295
1623-
m_fontSize: 22.85
1701+
m_fontSize: 22.25
16241702
m_fontSizeBase: 14
16251703
m_fontWeight: 400
16261704
m_enableAutoSizing: 1
@@ -1980,7 +2058,7 @@ MonoBehaviour:
19802058
m_faceColor:
19812059
serializedVersion: 2
19822060
rgba: 4294967295
1983-
m_fontSize: 21.2
2061+
m_fontSize: 21.1
19842062
m_fontSizeBase: 14
19852063
m_fontWeight: 400
19862064
m_enableAutoSizing: 1
@@ -2057,8 +2135,8 @@ RectTransform:
20572135
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
20582136
m_AnchorMin: {x: 0, y: 0}
20592137
m_AnchorMax: {x: 1, y: 1}
2060-
m_AnchoredPosition: {x: -41.653564, y: 64.683044}
2061-
m_SizeDelta: {x: 463.773, y: 38.462082}
2138+
m_AnchoredPosition: {x: 41.653564, y: -64.683044}
2139+
m_SizeDelta: {x: -423.773, y: 1.5379181}
20622140
m_Pivot: {x: 0.5, y: 0.5}
20632141
--- !u!222 &8524556459375789491
20642142
CanvasRenderer:
@@ -2489,10 +2567,10 @@ RectTransform:
24892567
m_Father: {fileID: 3655251396628947620}
24902568
m_RootOrder: 0
24912569
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2492-
m_AnchorMin: {x: 0.5, y: 0.5}
2493-
m_AnchorMax: {x: 0.5, y: 0.5}
2494-
m_AnchoredPosition: {x: 42.673576, y: -22}
2495-
m_SizeDelta: {x: 286.7348, y: 44}
2570+
m_AnchorMin: {x: 0.293, y: 0.21037848}
2571+
m_AnchorMax: {x: 0.9212398, y: 0.5}
2572+
m_AnchoredPosition: {x: -4.8264236, y: -0.5}
2573+
m_SizeDelta: {x: 7.7348022, y: 1}
24962574
m_Pivot: {x: 0.5, y: 0.5}
24972575
--- !u!222 &7055938916733554688
24982576
CanvasRenderer:
@@ -2522,7 +2600,7 @@ MonoBehaviour:
25222600
m_OnCullStateChanged:
25232601
m_PersistentCalls:
25242602
m_Calls: []
2525-
m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0}
2603+
m_Sprite: {fileID: 21300000, guid: 73299346033d73896a7fad974bd380ff, type: 3}
25262604
m_Type: 1
25272605
m_PreserveAspect: 0
25282606
m_FillCenter: 1
@@ -2531,7 +2609,7 @@ MonoBehaviour:
25312609
m_FillClockwise: 1
25322610
m_FillOrigin: 0
25332611
m_UseSpriteMesh: 0
2534-
m_PixelsPerUnitMultiplier: 1
2612+
m_PixelsPerUnitMultiplier: 7
25352613
--- !u!114 &5239172518873865379
25362614
MonoBehaviour:
25372615
m_ObjectHideFlags: 0
@@ -2893,10 +2971,10 @@ RectTransform:
28932971
m_Father: {fileID: 3655251396628947620}
28942972
m_RootOrder: 2
28952973
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2896-
m_AnchorMin: {x: 0.5, y: 0.5}
2897-
m_AnchorMax: {x: 0.5, y: 0.5}
2898-
m_AnchoredPosition: {x: 127.79, y: 27.584}
2899-
m_SizeDelta: {x: 116.5, y: 38.5347}
2974+
m_AnchorMin: {x: 0.5846423, y: 0.5528805}
2975+
m_AnchorMax: {x: 0.84547144, y: 0.8098858}
2976+
m_AnchoredPosition: {x: -0.000045776367, y: 0.58399963}
2977+
m_SizeDelta: {x: 0, y: 0.8087}
29002978
m_Pivot: {x: 0.5, y: 0.5}
29012979
--- !u!222 &2367210385352761730
29022980
CanvasRenderer:
@@ -2926,7 +3004,7 @@ MonoBehaviour:
29263004
m_OnCullStateChanged:
29273005
m_PersistentCalls:
29283006
m_Calls: []
2929-
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
3007+
m_Sprite: {fileID: 21300000, guid: 73299346033d73896a7fad974bd380ff, type: 3}
29303008
m_Type: 1
29313009
m_PreserveAspect: 0
29323010
m_FillCenter: 1
@@ -2935,7 +3013,7 @@ MonoBehaviour:
29353013
m_FillClockwise: 1
29363014
m_FillOrigin: 0
29373015
m_UseSpriteMesh: 0
2938-
m_PixelsPerUnitMultiplier: 1
3016+
m_PixelsPerUnitMultiplier: 7
29393017
--- !u!114 &7100777437716326295
29403018
MonoBehaviour:
29413019
m_ObjectHideFlags: 0
@@ -3459,10 +3537,10 @@ RectTransform:
34593537
m_Father: {fileID: 4912779600979940735}
34603538
m_RootOrder: 0
34613539
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3462-
m_AnchorMin: {x: 0.5, y: 0.5}
3463-
m_AnchorMax: {x: 0.5, y: 0.5}
3464-
m_AnchoredPosition: {x: -151.9815, y: 1.4257}
3465-
m_SizeDelta: {x: 88.6187, y: 90.851}
3540+
m_AnchorMin: {x: 0.07, y: 0.20382872}
3541+
m_AnchorMax: {x: 0.259, y: 0.8233572}
3542+
m_AnchoredPosition: {x: -2.9815063, y: -0.57429504}
3543+
m_SizeDelta: {x: 4.618698, y: -1.1490021}
34663544
m_Pivot: {x: 0.5, y: 0.5}
34673545
--- !u!222 &7000416203648013602
34683546
CanvasRenderer:

‎Assets/QuitApplication.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEditor;
4+
using UnityEngine;
5+
6+
public class QuitApplication : MonoBehaviour
7+
{
8+
public void Quit()
9+
{
10+
#if UNITY_EDITOR
11+
EditorApplication.isPlaying = false;
12+
#endif
13+
Application.Quit();
14+
15+
}
16+
}

‎Assets/QuitApplication.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)