Skip to content

Commit 7cc4aee

Browse files
authored
Update to Main Menu- now with 3D background and Logo garden (#215)
1 parent 4c8dbbc commit 7cc4aee

File tree

14 files changed

+901
-123
lines changed

14 files changed

+901
-123
lines changed

Assets/BossRoom/Prefabs/UI/CharSel_Background.prefab

Lines changed: 359 additions & 88 deletions
Large diffs are not rendered by default.

Assets/BossRoom/Prefabs/UnityLogo.prefab

Lines changed: 286 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,180 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &630803024441172499
3+
--- !u!1 &813433419005793441
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
serializedVersion: 6
1010
m_Component:
11-
- component: {fileID: 4830495133983295676}
12-
- component: {fileID: 3896334357925260767}
13-
- component: {fileID: 8873642300272255832}
11+
- component: {fileID: 5819218367807517706}
12+
- component: {fileID: 7478160891267628888}
13+
- component: {fileID: 7593168301171033980}
14+
m_Layer: 5
15+
m_Name: Room8Logo
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!224 &5819218367807517706
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: 813433419005793441}
28+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 16.963217}
30+
m_LocalScale: {x: 0.37489715, y: 0.37489715, z: 0.37489715}
31+
m_Children: []
32+
m_Father: {fileID: 6728233343538482565}
33+
m_RootOrder: 2
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
m_AnchorMin: {x: 1, y: 0}
36+
m_AnchorMax: {x: 1, y: 0}
37+
m_AnchoredPosition: {x: -51.619446, y: 37.927025}
38+
m_SizeDelta: {x: 240, y: 240}
39+
m_Pivot: {x: 1, y: 0}
40+
--- !u!222 &7478160891267628888
41+
CanvasRenderer:
42+
m_ObjectHideFlags: 0
43+
m_CorrespondingSourceObject: {fileID: 0}
44+
m_PrefabInstance: {fileID: 0}
45+
m_PrefabAsset: {fileID: 0}
46+
m_GameObject: {fileID: 813433419005793441}
47+
m_CullTransparentMesh: 1
48+
--- !u!114 &7593168301171033980
49+
MonoBehaviour:
50+
m_ObjectHideFlags: 0
51+
m_CorrespondingSourceObject: {fileID: 0}
52+
m_PrefabInstance: {fileID: 0}
53+
m_PrefabAsset: {fileID: 0}
54+
m_GameObject: {fileID: 813433419005793441}
55+
m_Enabled: 1
56+
m_EditorHideFlags: 0
57+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
58+
m_Name:
59+
m_EditorClassIdentifier:
60+
m_Material: {fileID: 0}
61+
m_Color: {r: 1, g: 1, b: 1, a: 1}
62+
m_RaycastTarget: 0
63+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
64+
m_Maskable: 1
65+
m_OnCullStateChanged:
66+
m_PersistentCalls:
67+
m_Calls: []
68+
m_Sprite: {fileID: 21300000, guid: db4fcca0a37980a43a5f38ff7323ae9f, type: 3}
69+
m_Type: 0
70+
m_PreserveAspect: 1
71+
m_FillCenter: 1
72+
m_FillMethod: 4
73+
m_FillAmount: 1
74+
m_FillClockwise: 1
75+
m_FillOrigin: 0
76+
m_UseSpriteMesh: 0
77+
m_PixelsPerUnitMultiplier: 1
78+
--- !u!1 &1627823859708323626
79+
GameObject:
80+
m_ObjectHideFlags: 0
81+
m_CorrespondingSourceObject: {fileID: 0}
82+
m_PrefabInstance: {fileID: 0}
83+
m_PrefabAsset: {fileID: 0}
84+
serializedVersion: 6
85+
m_Component:
86+
- component: {fileID: 6728233343538482565}
87+
- component: {fileID: 2901635766932728038}
1488
m_Layer: 5
1589
m_Name: UnityLogo
1690
m_TagString: Untagged
1791
m_Icon: {fileID: 0}
1892
m_NavMeshLayer: 0
1993
m_StaticEditorFlags: 0
2094
m_IsActive: 1
21-
--- !u!224 &4830495133983295676
95+
--- !u!224 &6728233343538482565
2296
RectTransform:
2397
m_ObjectHideFlags: 0
2498
m_CorrespondingSourceObject: {fileID: 0}
2599
m_PrefabInstance: {fileID: 0}
26100
m_PrefabAsset: {fileID: 0}
27-
m_GameObject: {fileID: 630803024441172499}
101+
m_GameObject: {fileID: 1627823859708323626}
28102
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29103
m_LocalPosition: {x: 0, y: 0, z: 0}
30-
m_LocalScale: {x: 1, y: 1, z: 1}
31-
m_Children: []
104+
m_LocalScale: {x: 2.8461382, y: 2.8461382, z: 2.8461382}
105+
m_Children:
106+
- {fileID: 1396111946460101824}
107+
- {fileID: 2904591236590417859}
108+
- {fileID: 5819218367807517706}
109+
- {fileID: 5582095487201022060}
32110
m_Father: {fileID: 0}
33111
m_RootOrder: 0
34112
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
113+
m_AnchorMin: {x: 0.5, y: 0}
114+
m_AnchorMax: {x: 0.5, y: 0}
115+
m_AnchoredPosition: {x: 0, y: 0}
116+
m_SizeDelta: {x: 240, y: 240}
117+
m_Pivot: {x: 0.5, y: 0}
118+
--- !u!222 &2901635766932728038
119+
CanvasRenderer:
120+
m_ObjectHideFlags: 0
121+
m_CorrespondingSourceObject: {fileID: 0}
122+
m_PrefabInstance: {fileID: 0}
123+
m_PrefabAsset: {fileID: 0}
124+
m_GameObject: {fileID: 1627823859708323626}
125+
m_CullTransparentMesh: 1
126+
--- !u!1 &4522556800561366607
127+
GameObject:
128+
m_ObjectHideFlags: 0
129+
m_CorrespondingSourceObject: {fileID: 0}
130+
m_PrefabInstance: {fileID: 0}
131+
m_PrefabAsset: {fileID: 0}
132+
serializedVersion: 6
133+
m_Component:
134+
- component: {fileID: 5582095487201022060}
135+
- component: {fileID: 2069529997113232863}
136+
- component: {fileID: 4088805848748580578}
137+
m_Layer: 5
138+
m_Name: UnityLogo
139+
m_TagString: Untagged
140+
m_Icon: {fileID: 0}
141+
m_NavMeshLayer: 0
142+
m_StaticEditorFlags: 0
143+
m_IsActive: 1
144+
--- !u!224 &5582095487201022060
145+
RectTransform:
146+
m_ObjectHideFlags: 0
147+
m_CorrespondingSourceObject: {fileID: 0}
148+
m_PrefabInstance: {fileID: 0}
149+
m_PrefabAsset: {fileID: 0}
150+
m_GameObject: {fileID: 4522556800561366607}
151+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
152+
m_LocalPosition: {x: 0, y: 0, z: 16.963217}
153+
m_LocalScale: {x: 0.8751499, y: 0.8751499, z: 0.8751499}
154+
m_Children: []
155+
m_Father: {fileID: 6728233343538482565}
156+
m_RootOrder: 3
157+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35158
m_AnchorMin: {x: 1, y: 0}
36159
m_AnchorMax: {x: 1, y: 0}
37-
m_AnchoredPosition: {x: -240, y: 200}
160+
m_AnchoredPosition: {x: -164.51392, y: 16.923376}
38161
m_SizeDelta: {x: 240, y: 240}
39162
m_Pivot: {x: 1, y: 0}
40-
--- !u!222 &3896334357925260767
163+
--- !u!222 &2069529997113232863
41164
CanvasRenderer:
42165
m_ObjectHideFlags: 0
43166
m_CorrespondingSourceObject: {fileID: 0}
44167
m_PrefabInstance: {fileID: 0}
45168
m_PrefabAsset: {fileID: 0}
46-
m_GameObject: {fileID: 630803024441172499}
169+
m_GameObject: {fileID: 4522556800561366607}
47170
m_CullTransparentMesh: 1
48-
--- !u!114 &8873642300272255832
171+
--- !u!114 &4088805848748580578
49172
MonoBehaviour:
50173
m_ObjectHideFlags: 0
51174
m_CorrespondingSourceObject: {fileID: 0}
52175
m_PrefabInstance: {fileID: 0}
53176
m_PrefabAsset: {fileID: 0}
54-
m_GameObject: {fileID: 630803024441172499}
177+
m_GameObject: {fileID: 4522556800561366607}
55178
m_Enabled: 1
56179
m_EditorHideFlags: 0
57180
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -75,3 +198,153 @@ MonoBehaviour:
75198
m_FillOrigin: 0
76199
m_UseSpriteMesh: 0
77200
m_PixelsPerUnitMultiplier: 1
201+
--- !u!1 &5659031706063841556
202+
GameObject:
203+
m_ObjectHideFlags: 0
204+
m_CorrespondingSourceObject: {fileID: 0}
205+
m_PrefabInstance: {fileID: 0}
206+
m_PrefabAsset: {fileID: 0}
207+
serializedVersion: 6
208+
m_Component:
209+
- component: {fileID: 1396111946460101824}
210+
- component: {fileID: 1354513213091276539}
211+
- component: {fileID: 5893485489383260158}
212+
m_Layer: 5
213+
m_Name: SFLogo
214+
m_TagString: Untagged
215+
m_Icon: {fileID: 0}
216+
m_NavMeshLayer: 0
217+
m_StaticEditorFlags: 0
218+
m_IsActive: 1
219+
--- !u!224 &1396111946460101824
220+
RectTransform:
221+
m_ObjectHideFlags: 0
222+
m_CorrespondingSourceObject: {fileID: 0}
223+
m_PrefabInstance: {fileID: 0}
224+
m_PrefabAsset: {fileID: 0}
225+
m_GameObject: {fileID: 5659031706063841556}
226+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
227+
m_LocalPosition: {x: 0, y: 0, z: 16.963217}
228+
m_LocalScale: {x: 0.2879422, y: 0.2879422, z: 0.2879422}
229+
m_Children: []
230+
m_Father: {fileID: 6728233343538482565}
231+
m_RootOrder: 0
232+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
233+
m_AnchorMin: {x: 1, y: 0}
234+
m_AnchorMax: {x: 1, y: 0}
235+
m_AnchoredPosition: {x: 146.67712, y: 37.3}
236+
m_SizeDelta: {x: 240, y: 240}
237+
m_Pivot: {x: 1, y: 0}
238+
--- !u!222 &1354513213091276539
239+
CanvasRenderer:
240+
m_ObjectHideFlags: 0
241+
m_CorrespondingSourceObject: {fileID: 0}
242+
m_PrefabInstance: {fileID: 0}
243+
m_PrefabAsset: {fileID: 0}
244+
m_GameObject: {fileID: 5659031706063841556}
245+
m_CullTransparentMesh: 1
246+
--- !u!114 &5893485489383260158
247+
MonoBehaviour:
248+
m_ObjectHideFlags: 0
249+
m_CorrespondingSourceObject: {fileID: 0}
250+
m_PrefabInstance: {fileID: 0}
251+
m_PrefabAsset: {fileID: 0}
252+
m_GameObject: {fileID: 5659031706063841556}
253+
m_Enabled: 1
254+
m_EditorHideFlags: 0
255+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
256+
m_Name:
257+
m_EditorClassIdentifier:
258+
m_Material: {fileID: 0}
259+
m_Color: {r: 1, g: 1, b: 1, a: 1}
260+
m_RaycastTarget: 0
261+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
262+
m_Maskable: 1
263+
m_OnCullStateChanged:
264+
m_PersistentCalls:
265+
m_Calls: []
266+
m_Sprite: {fileID: 21300000, guid: 8b704eb1afcdb4b469679f41a7f6e07e, type: 3}
267+
m_Type: 0
268+
m_PreserveAspect: 1
269+
m_FillCenter: 1
270+
m_FillMethod: 4
271+
m_FillAmount: 1
272+
m_FillClockwise: 1
273+
m_FillOrigin: 0
274+
m_UseSpriteMesh: 0
275+
m_PixelsPerUnitMultiplier: 1
276+
--- !u!1 &8204615639488035838
277+
GameObject:
278+
m_ObjectHideFlags: 0
279+
m_CorrespondingSourceObject: {fileID: 0}
280+
m_PrefabInstance: {fileID: 0}
281+
m_PrefabAsset: {fileID: 0}
282+
serializedVersion: 6
283+
m_Component:
284+
- component: {fileID: 2904591236590417859}
285+
- component: {fileID: 4516547201382349879}
286+
- component: {fileID: 3222444386290518859}
287+
m_Layer: 5
288+
m_Name: JHLogo
289+
m_TagString: Untagged
290+
m_Icon: {fileID: 0}
291+
m_NavMeshLayer: 0
292+
m_StaticEditorFlags: 0
293+
m_IsActive: 1
294+
--- !u!224 &2904591236590417859
295+
RectTransform:
296+
m_ObjectHideFlags: 0
297+
m_CorrespondingSourceObject: {fileID: 0}
298+
m_PrefabInstance: {fileID: 0}
299+
m_PrefabAsset: {fileID: 0}
300+
m_GameObject: {fileID: 8204615639488035838}
301+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
302+
m_LocalPosition: {x: 0, y: 0, z: 16.963217}
303+
m_LocalScale: {x: 0.2879422, y: 0.2879422, z: 0.2879422}
304+
m_Children: []
305+
m_Father: {fileID: 6728233343538482565}
306+
m_RootOrder: 1
307+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
308+
m_AnchorMin: {x: 1, y: 0}
309+
m_AnchorMax: {x: 1, y: 0}
310+
m_AnchoredPosition: {x: 48.06018, y: 38.802147}
311+
m_SizeDelta: {x: 240, y: 240}
312+
m_Pivot: {x: 1, y: 0}
313+
--- !u!222 &4516547201382349879
314+
CanvasRenderer:
315+
m_ObjectHideFlags: 0
316+
m_CorrespondingSourceObject: {fileID: 0}
317+
m_PrefabInstance: {fileID: 0}
318+
m_PrefabAsset: {fileID: 0}
319+
m_GameObject: {fileID: 8204615639488035838}
320+
m_CullTransparentMesh: 1
321+
--- !u!114 &3222444386290518859
322+
MonoBehaviour:
323+
m_ObjectHideFlags: 0
324+
m_CorrespondingSourceObject: {fileID: 0}
325+
m_PrefabInstance: {fileID: 0}
326+
m_PrefabAsset: {fileID: 0}
327+
m_GameObject: {fileID: 8204615639488035838}
328+
m_Enabled: 1
329+
m_EditorHideFlags: 0
330+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
331+
m_Name:
332+
m_EditorClassIdentifier:
333+
m_Material: {fileID: 0}
334+
m_Color: {r: 1, g: 1, b: 1, a: 1}
335+
m_RaycastTarget: 0
336+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
337+
m_Maskable: 1
338+
m_OnCullStateChanged:
339+
m_PersistentCalls:
340+
m_Calls: []
341+
m_Sprite: {fileID: 21300000, guid: 9212dfff105ad2c4b95ace52ae931384, type: 3}
342+
m_Type: 0
343+
m_PreserveAspect: 1
344+
m_FillCenter: 1
345+
m_FillMethod: 4
346+
m_FillAmount: 1
347+
m_FillClockwise: 1
348+
m_FillOrigin: 0
349+
m_UseSpriteMesh: 0
350+
m_PixelsPerUnitMultiplier: 1
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:8bfaec7eab23696295a495e54bbab784a26d89ec04a2f6143b30d442be657893
3-
size 38743
2+
oid sha256:fd1c5ad96be593c5454871baa09c150043749e7c69730dc5d5000486636c283c
3+
size 43435
Lines changed: 3 additions & 0 deletions
Loading

Assets/BossRoom/Textures/UI/Title_BG.png.meta renamed to Assets/BossRoom/Textures/UI/JHayesMnS_logo.png.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/BossRoom/Textures/UI/Lobby_BG.png

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)