From 0eefdf1dfe8bcb97c74ce50d37046db0b655ebe8 Mon Sep 17 00:00:00 2001 From: BRNSystems Date: Wed, 21 Jul 2021 16:51:01 +0200 Subject: [PATCH] Edited finish --- Assets/Scenes/Finish.unity | 154 ++++++++++++++++++ Assets/Sprites/Background/LastBG.png | 3 + Assets/Sprites/Background/LastBG.png.meta | 96 +++++++++++ Assets/Sprites/Background/Materials.meta | 8 + .../Sprites/Background/Materials/LastBG.mat | 105 ++++++++++++ .../Background/Materials/LastBG.mat.meta | 8 + README.md | 11 +- UserSettings/EditorUserSettings.asset | 8 +- 8 files changed, 384 insertions(+), 9 deletions(-) create mode 100644 Assets/Sprites/Background/LastBG.png create mode 100644 Assets/Sprites/Background/LastBG.png.meta create mode 100644 Assets/Sprites/Background/Materials.meta create mode 100644 Assets/Sprites/Background/Materials/LastBG.mat create mode 100644 Assets/Sprites/Background/Materials/LastBG.mat.meta diff --git a/Assets/Scenes/Finish.unity b/Assets/Scenes/Finish.unity index bb83f40..4e2c924 100644 --- a/Assets/Scenes/Finish.unity +++ b/Assets/Scenes/Finish.unity @@ -580,3 +580,157 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &1574308003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1574308005} + - component: {fileID: 1574308004} + m_Layer: 0 + m_Name: LastBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1574308004 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574308003} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 752b4712a2646c94c8b8b0a776b86665, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 8.04, y: 8.04} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1574308005 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1574308003} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 10} + m_LocalScale: {x: 4, y: 2, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1942352409 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1942352411} + - component: {fileID: 1942352410} + m_Layer: 0 + m_Name: Global Light 2D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1942352410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942352409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_LightType: 4 + m_BlendStyleIndex: 0 + m_FalloffIntensity: 0.5 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_LightVolumeOpacity: 0 + m_ApplyToSortingLayers: 00000000 + m_LightCookieSprite: {fileID: 0} + m_UseNormalMap: 0 + m_LightOrder: 0 + m_AlphaBlendOnOverlap: 0 + m_ShadowIntensity: 0 + m_ShadowVolumeIntensity: 0 + m_PointLightInnerAngle: 360 + m_PointLightOuterAngle: 360 + m_PointLightInnerRadius: 0 + m_PointLightOuterRadius: 1 + m_PointLightDistance: 3 + m_PointLightQuality: 1 + m_ShapeLightParametricSides: 5 + m_ShapeLightParametricAngleOffset: 0 + m_ShapeLightParametricRadius: 1 + m_ShapeLightFalloffSize: 0.5 + m_ShapeLightFalloffOffset: {x: 0, y: 0} + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} +--- !u!4 &1942352411 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1942352409} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.3731413, y: 2.9299264, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Sprites/Background/LastBG.png b/Assets/Sprites/Background/LastBG.png new file mode 100644 index 0000000..5b18ed4 --- /dev/null +++ b/Assets/Sprites/Background/LastBG.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d5574d698fa9ded90ed4e6719b9226c60f026bb2b7363488d8c2340e3503a63 +size 5929 diff --git a/Assets/Sprites/Background/LastBG.png.meta b/Assets/Sprites/Background/LastBG.png.meta new file mode 100644 index 0000000..7dac7d9 --- /dev/null +++ b/Assets/Sprites/Background/LastBG.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 752b4712a2646c94c8b8b0a776b86665 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Background/Materials.meta b/Assets/Sprites/Background/Materials.meta new file mode 100644 index 0000000..317ec02 --- /dev/null +++ b/Assets/Sprites/Background/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7bb829c109b308e48a462118fb340e00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Background/Materials/LastBG.mat b/Assets/Sprites/Background/Materials/LastBG.mat new file mode 100644 index 0000000..54dcc49 --- /dev/null +++ b/Assets/Sprites/Background/Materials/LastBG.mat @@ -0,0 +1,105 @@ +%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: LastBG + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, 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} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 752b4712a2646c94c8b8b0a776b86665, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _BumpFace: 0 + - _BumpOutline: 0 + - _ColorMask: 15 + - _CullMode: 0 + - _Diffuse: 0.5 + - _FaceDilate: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 5 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0 + - _PerspectiveFilter: 0.875 + - _Reflectivity: 10 + - _ScaleRatioA: 1 + - _ScaleRatioB: 1 + - _ScaleRatioC: 1 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _SpecularPower: 2 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 512 + - _TextureWidth: 512 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.5 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/Sprites/Background/Materials/LastBG.mat.meta b/Assets/Sprites/Background/Materials/LastBG.mat.meta new file mode 100644 index 0000000..8be2810 --- /dev/null +++ b/Assets/Sprites/Background/Materials/LastBG.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7ea6d46e4aecab4abe529b8319fde4c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/README.md b/README.md index 1a8205c..9979bf4 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,13 @@ Hello this will be my entry to the [GeoJam2021](https://itch.io/jam/geojam-2021) ### [Sprites](https://github.com/BRNSystems/GeoJam2021/tree/master/Sprites/): +[LastBG](https://github.com/BRNSystems/GeoJam2021/tree/master/Sprites/Background/LastBG.png) -[@BRNSystems](https://github.com/BRNSystems/)(Self compiled [Aseprite](https://www.aseprite.org/)) +Everything else: [@BRNSystems](https://github.com/BRNSystems/)(Self compiled [Aseprite](https://www.aseprite.org/)) ### [Fonts](https://github.com/BRNSystems/GeoJam2021/tree/master/Fonts/): -Impact - Added into game by [Tucan444](https://github.com/Tucan444/) +Impact - Added into game by [@Tucan444](https://github.com/Tucan444/) ### [Scripts](https://github.com/BRNSystems/GeoJam2021/tree/master/Assets/Scripts/): @@ -19,11 +20,11 @@ Impact - Added into game by [Tucan444](https://github.com/Tucan444/) [Character Controller 2D](https://github.com/BRNSystems/GeoJam2021/blob/master/Assets/Scripts/CharacterController2D.cs) - [@Brackeys](https://github.com/Brackeys/) - [Original](https://github.com/Brackeys/2D-Character-Controller/blob/master/CharacterController2D.cs) and [@BRNSystems](https://github.com/BRNSystems/) -[Death](https://github.com/BRNSystems/GeoJam2021/blob/master/Assets/Scripts/Death.cs) - [Tucan444](https://github.com/Tucan444/) and [@BRNSystems](https://github.com/BRNSystems/) +[Death](https://github.com/BRNSystems/GeoJam2021/blob/master/Assets/Scripts/Death.cs) - [@Tucan444](https://github.com/Tucan444/) and [@BRNSystems](https://github.com/BRNSystems/) [CheckPoint](https://github.com/BRNSystems/GeoJam2021/blob/master/Assets/Scripts/Checkpoint.cs) - [@BRNSystems](https://github.com/BRNSystems/) -[PlayerControls](https://github.com/BRNSystems/GeoJam2021/blob/master/Assets/Scripts/PlayerControls.cs) - [@BRNSystems](https://github.com/BRNSystems/) and [Tucan444](https://github.com/Tucan444/) +[PlayerControls](https://github.com/BRNSystems/GeoJam2021/blob/master/Assets/Scripts/PlayerControls.cs) - [@BRNSystems](https://github.com/BRNSystems/) and [@Tucan444](https://github.com/Tucan444/) [SpawnStorage](https://github.com/BRNSystems/GeoJam2021/blob/master/Assets/Scripts/SpawnStorage.cs) - [@BRNSystems](https://github.com/BRNSystems/) @@ -32,7 +33,7 @@ Impact - Added into game by [Tucan444](https://github.com/Tucan444/) ### [Physic Materials](https://github.com/BRNSystems/GeoJam2021/tree/master/Physic_Materials/): -[@BRNSystems](https://github.com/BRNSystems/) and [Tucan444](https://github.com/Tucan444/) +[@BRNSystems](https://github.com/BRNSystems/) and [@Tucan444](https://github.com/Tucan444/) ### [Sounds](https://github.com/BRNSystems/GeoJam2021/tree/master/Sounds): diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index bcf084d..fe1c0ea 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,14 +9,14 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7919181e0b22623d28393930 - flags: 0 - RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c73150012147b623d28393930 flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c7919181e0b22623d28393930 + flags: 0 UnityRemoteCompression: value: 337f73 flags: 0