Skip to content

Commit 9087e2e

Browse files
authored
Intro logo and other branding/naming changes (#32)
* Add logo as 3d model * Font assets * Replace Google logo with Open Blocks but keep backup * Intro animation clips and controllers * Minor package updates * We have more than one intro animation gameobject now * Initial stab at an intro animation. Update desktop header * Update project settings naming. Add splash logo * Intro tweaks * dotnet format * openblocks not openbrush
1 parent f8d3c64 commit 9087e2e

Some content is hidden

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

49 files changed

+14076
-19958
lines changed

Assets/DesktopApp/Prefabs/Desktop.prefab

Lines changed: 125 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -594,84 +594,6 @@ MonoBehaviour:
594594
m_FillOrigin: 0
595595
m_UseSpriteMesh: 0
596596
m_PixelsPerUnitMultiplier: 1
597-
--- !u!1 &1091877758343546
598-
GameObject:
599-
m_ObjectHideFlags: 0
600-
m_CorrespondingSourceObject: {fileID: 0}
601-
m_PrefabInstance: {fileID: 0}
602-
m_PrefabAsset: {fileID: 0}
603-
serializedVersion: 6
604-
m_Component:
605-
- component: {fileID: 224396917128763040}
606-
- component: {fileID: 222195330367204118}
607-
- component: {fileID: 114776042844352852}
608-
m_Layer: 5
609-
m_Name: txt
610-
m_TagString: Untagged
611-
m_Icon: {fileID: 0}
612-
m_NavMeshLayer: 0
613-
m_StaticEditorFlags: 0
614-
m_IsActive: 1
615-
--- !u!224 &224396917128763040
616-
RectTransform:
617-
m_ObjectHideFlags: 0
618-
m_CorrespondingSourceObject: {fileID: 0}
619-
m_PrefabInstance: {fileID: 0}
620-
m_PrefabAsset: {fileID: 0}
621-
m_GameObject: {fileID: 1091877758343546}
622-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
623-
m_LocalPosition: {x: 0, y: 0, z: 0}
624-
m_LocalScale: {x: 1, y: 1, z: 1}
625-
m_Children: []
626-
m_Father: {fileID: 224514221716291376}
627-
m_RootOrder: 1
628-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
629-
m_AnchorMin: {x: 0, y: 0.5}
630-
m_AnchorMax: {x: 0, y: 0.5}
631-
m_AnchoredPosition: {x: 80, y: 0}
632-
m_SizeDelta: {x: 48, y: 48}
633-
m_Pivot: {x: 0.5, y: 0.5}
634-
--- !u!222 &222195330367204118
635-
CanvasRenderer:
636-
m_ObjectHideFlags: 0
637-
m_CorrespondingSourceObject: {fileID: 0}
638-
m_PrefabInstance: {fileID: 0}
639-
m_PrefabAsset: {fileID: 0}
640-
m_GameObject: {fileID: 1091877758343546}
641-
m_CullTransparentMesh: 0
642-
--- !u!114 &114776042844352852
643-
MonoBehaviour:
644-
m_ObjectHideFlags: 0
645-
m_CorrespondingSourceObject: {fileID: 0}
646-
m_PrefabInstance: {fileID: 0}
647-
m_PrefabAsset: {fileID: 0}
648-
m_GameObject: {fileID: 1091877758343546}
649-
m_Enabled: 1
650-
m_EditorHideFlags: 0
651-
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
652-
m_Name:
653-
m_EditorClassIdentifier:
654-
m_Material: {fileID: 0}
655-
m_Color: {r: 0, g: 0, b: 0, a: 0.8627451}
656-
m_RaycastTarget: 0
657-
m_Maskable: 1
658-
m_OnCullStateChanged:
659-
m_PersistentCalls:
660-
m_Calls: []
661-
m_FontData:
662-
m_Font: {fileID: 12800000, guid: 23f7af4d1287b8c43ac9c3a2b11a98d5, type: 3}
663-
m_FontSize: 24
664-
m_FontStyle: 0
665-
m_BestFit: 0
666-
m_MinSize: 1
667-
m_MaxSize: 40
668-
m_Alignment: 3
669-
m_AlignByGeometry: 0
670-
m_RichText: 1
671-
m_HorizontalOverflow: 1
672-
m_VerticalOverflow: 0
673-
m_LineSpacing: 1
674-
m_Text: Blocks
675597
--- !u!1 &1125553332758458
676598
GameObject:
677599
m_ObjectHideFlags: 0
@@ -4552,3 +4474,128 @@ Camera:
45524474
m_OcclusionCulling: 1
45534475
m_StereoConvergence: 10
45544476
m_StereoSeparation: 0.022
4477+
--- !u!1001 &4091297069553961283
4478+
PrefabInstance:
4479+
m_ObjectHideFlags: 0
4480+
serializedVersion: 2
4481+
m_Modification:
4482+
m_TransformParent: {fileID: 224514221716291376}
4483+
m_Modifications:
4484+
- target: {fileID: 4090627511924346937, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4485+
type: 3}
4486+
propertyPath: m_Name
4487+
value: Logo Text
4488+
objectReference: {fileID: 0}
4489+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4490+
type: 3}
4491+
propertyPath: m_Pivot.x
4492+
value: 0.5
4493+
objectReference: {fileID: 0}
4494+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4495+
type: 3}
4496+
propertyPath: m_Pivot.y
4497+
value: 0.5
4498+
objectReference: {fileID: 0}
4499+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4500+
type: 3}
4501+
propertyPath: m_RootOrder
4502+
value: 1
4503+
objectReference: {fileID: 0}
4504+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4505+
type: 3}
4506+
propertyPath: m_AnchorMax.x
4507+
value: 0
4508+
objectReference: {fileID: 0}
4509+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4510+
type: 3}
4511+
propertyPath: m_AnchorMax.y
4512+
value: 0.5
4513+
objectReference: {fileID: 0}
4514+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4515+
type: 3}
4516+
propertyPath: m_AnchorMin.x
4517+
value: 0
4518+
objectReference: {fileID: 0}
4519+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4520+
type: 3}
4521+
propertyPath: m_AnchorMin.y
4522+
value: 0.5
4523+
objectReference: {fileID: 0}
4524+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4525+
type: 3}
4526+
propertyPath: m_SizeDelta.x
4527+
value: 148
4528+
objectReference: {fileID: 0}
4529+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4530+
type: 3}
4531+
propertyPath: m_SizeDelta.y
4532+
value: 48
4533+
objectReference: {fileID: 0}
4534+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4535+
type: 3}
4536+
propertyPath: m_LocalPosition.x
4537+
value: 0
4538+
objectReference: {fileID: 0}
4539+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4540+
type: 3}
4541+
propertyPath: m_LocalPosition.y
4542+
value: 0
4543+
objectReference: {fileID: 0}
4544+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4545+
type: 3}
4546+
propertyPath: m_LocalPosition.z
4547+
value: 0
4548+
objectReference: {fileID: 0}
4549+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4550+
type: 3}
4551+
propertyPath: m_LocalRotation.w
4552+
value: 1
4553+
objectReference: {fileID: 0}
4554+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4555+
type: 3}
4556+
propertyPath: m_LocalRotation.x
4557+
value: -0
4558+
objectReference: {fileID: 0}
4559+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4560+
type: 3}
4561+
propertyPath: m_LocalRotation.y
4562+
value: -0
4563+
objectReference: {fileID: 0}
4564+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4565+
type: 3}
4566+
propertyPath: m_LocalRotation.z
4567+
value: -0
4568+
objectReference: {fileID: 0}
4569+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4570+
type: 3}
4571+
propertyPath: m_AnchoredPosition.x
4572+
value: 122
4573+
objectReference: {fileID: 0}
4574+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4575+
type: 3}
4576+
propertyPath: m_AnchoredPosition.y
4577+
value: -12
4578+
objectReference: {fileID: 0}
4579+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4580+
type: 3}
4581+
propertyPath: m_LocalEulerAnglesHint.x
4582+
value: 0
4583+
objectReference: {fileID: 0}
4584+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4585+
type: 3}
4586+
propertyPath: m_LocalEulerAnglesHint.y
4587+
value: 0
4588+
objectReference: {fileID: 0}
4589+
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4590+
type: 3}
4591+
propertyPath: m_LocalEulerAnglesHint.z
4592+
value: 0
4593+
objectReference: {fileID: 0}
4594+
m_RemovedComponents: []
4595+
m_SourcePrefab: {fileID: 100100000, guid: ce363bb6d67b30c4b8e58c1d819c8dac, type: 3}
4596+
--- !u!224 &224396917128763040 stripped
4597+
RectTransform:
4598+
m_CorrespondingSourceObject: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
4599+
type: 3}
4600+
m_PrefabInstance: {fileID: 4091297069553961283}
4601+
m_PrefabAsset: {fileID: 0}

Assets/Models/Logo Materials.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: Cyan
11+
m_Shader: {fileID: 4800000, guid: db15f2077a2c7674488c3e27d565d8c8, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Floats:
59+
- _BumpScale: 1
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 0
63+
- _EmissiveAmount: 0
64+
- _GlossMapScale: 1
65+
- _Glossiness: 0
66+
- _GlossyReflections: 1
67+
- _Metallic: 0
68+
- _Mirror: 0.1
69+
- _Mode: 0
70+
- _OcclusionStrength: 1
71+
- _OverrideAmount: 0
72+
- _Parallax: 0.02
73+
- _RefractiveIndex: 1.3
74+
- _Roughness: 0.4
75+
- _SmoothnessTextureChannel: 0
76+
- _SpecularHighlights: 1
77+
- _SrcBlend: 1
78+
- _UVSec: 0
79+
- _ZWrite: 1
80+
m_Colors:
81+
- _Color: {r: 0, g: 0.9806144, b: 1, a: 1}
82+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
83+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
84+
- _OverrideColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}

Assets/Models/Logo Materials/Cyan.mat.meta

Lines changed: 8 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)