Skip to content

Commit

Permalink
Intro logo and other branding/naming changes (#32)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
andybak authored Aug 14, 2024
1 parent f8d3c64 commit 9087e2e
Show file tree
Hide file tree
Showing 49 changed files with 14,076 additions and 19,958 deletions.
203 changes: 125 additions & 78 deletions Assets/DesktopApp/Prefabs/Desktop.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -594,84 +594,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1091877758343546
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 224396917128763040}
- component: {fileID: 222195330367204118}
- component: {fileID: 114776042844352852}
m_Layer: 5
m_Name: txt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &224396917128763040
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1091877758343546}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224514221716291376}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 80, y: 0}
m_SizeDelta: {x: 48, y: 48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222195330367204118
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1091877758343546}
m_CullTransparentMesh: 0
--- !u!114 &114776042844352852
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1091877758343546}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.8627451}
m_RaycastTarget: 0
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 23f7af4d1287b8c43ac9c3a2b11a98d5, type: 3}
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Blocks
--- !u!1 &1125553332758458
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4552,3 +4474,128 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1001 &4091297069553961283
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 224514221716291376}
m_Modifications:
- target: {fileID: 4090627511924346937, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_Name
value: Logo Text
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_SizeDelta.x
value: 148
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_SizeDelta.y
value: 48
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 122
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -12
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ce363bb6d67b30c4b8e58c1d819c8dac, type: 3}
--- !u!224 &224396917128763040 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4312762671368462307, guid: ce363bb6d67b30c4b8e58c1d819c8dac,
type: 3}
m_PrefabInstance: {fileID: 4091297069553961283}
m_PrefabAsset: {fileID: 0}
8 changes: 8 additions & 0 deletions Assets/Models/Logo Materials.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 84 additions & 0 deletions Assets/Models/Logo Materials/Cyan.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Cyan
m_Shader: {fileID: 4800000, guid: db15f2077a2c7674488c3e27d565d8c8, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EmissiveAmount: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mirror: 0.1
- _Mode: 0
- _OcclusionStrength: 1
- _OverrideAmount: 0
- _Parallax: 0.02
- _RefractiveIndex: 1.3
- _Roughness: 0.4
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 0.9806144, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
- _OverrideColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
8 changes: 8 additions & 0 deletions Assets/Models/Logo Materials/Cyan.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9087e2e

Please sign in to comment.