From 0e5b3d6d0f61cf07a7bdce3a8cbf187cd6e09499 Mon Sep 17 00:00:00 2001 From: Balex123 Date: Tue, 28 Feb 2023 08:53:49 +0100 Subject: [PATCH] stuffs idk but yes --- Assets/Scenes/Main_Credits.unity | 209 ++++++++++++++++++ Assets/Scenes/Main_Credits.unity.meta | 7 + Assets/Scenes/Main_Menu.unity | 4 +- Assets/Scripts/GoHome.cs | 13 ++ Assets/Scripts/GoHome.cs.meta | 11 + Assets/TextMesh Pro/Fonts/pixelmix.meta | 8 + .../TextMesh Pro/Fonts/pixelmix/license.txt | 16 ++ .../Fonts/pixelmix/license.txt.meta | 7 + Assets/TextMesh Pro/Fonts/pixelmix/readme.txt | 7 + .../Fonts/pixelmix/readme.txt.meta | 7 + UserSettings/Layouts/default-2021.dwlt | 66 +++--- 11 files changed, 320 insertions(+), 35 deletions(-) create mode 100644 Assets/Scenes/Main_Credits.unity create mode 100644 Assets/Scenes/Main_Credits.unity.meta create mode 100644 Assets/Scripts/GoHome.cs create mode 100644 Assets/Scripts/GoHome.cs.meta create mode 100644 Assets/TextMesh Pro/Fonts/pixelmix.meta create mode 100644 Assets/TextMesh Pro/Fonts/pixelmix/license.txt create mode 100644 Assets/TextMesh Pro/Fonts/pixelmix/license.txt.meta create mode 100644 Assets/TextMesh Pro/Fonts/pixelmix/readme.txt create mode 100644 Assets/TextMesh Pro/Fonts/pixelmix/readme.txt.meta diff --git a/Assets/Scenes/Main_Credits.unity b/Assets/Scenes/Main_Credits.unity new file mode 100644 index 0000000..d68661f --- /dev/null +++ b/Assets/Scenes/Main_Credits.unity @@ -0,0 +1,209 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1388960952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1388960955} + - component: {fileID: 1388960954} + - component: {fileID: 1388960953} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1388960953 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388960952} + m_Enabled: 1 +--- !u!20 &1388960954 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388960952} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1388960955 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1388960952} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Main_Credits.unity.meta b/Assets/Scenes/Main_Credits.unity.meta new file mode 100644 index 0000000..1995241 --- /dev/null +++ b/Assets/Scenes/Main_Credits.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f97e723378691c045aab2acdcff9a80a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_Menu.unity b/Assets/Scenes/Main_Menu.unity index 32eb57f..f5aac6b 100644 --- a/Assets/Scenes/Main_Menu.unity +++ b/Assets/Scenes/Main_Menu.unity @@ -214,7 +214,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &142571404 RectTransform: m_ObjectHideFlags: 0 @@ -939,7 +939,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &604500610 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GoHome.cs b/Assets/Scripts/GoHome.cs new file mode 100644 index 0000000..f09043a --- /dev/null +++ b/Assets/Scripts/GoHome.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GoHome : MonoBehaviour +{ + public GameObject homeObj; + public PlayerMovement mov; + public void GoToHome() + { + mov.rb.position = homeObj.transform.position; + } +} diff --git a/Assets/Scripts/GoHome.cs.meta b/Assets/Scripts/GoHome.cs.meta new file mode 100644 index 0000000..8fc9858 --- /dev/null +++ b/Assets/Scripts/GoHome.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b958ebe37ffb63a48b75eca43413e255 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Fonts/pixelmix.meta b/Assets/TextMesh Pro/Fonts/pixelmix.meta new file mode 100644 index 0000000..dab5546 --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/pixelmix.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9806a692602485041b083bcad1176ce5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Fonts/pixelmix/license.txt b/Assets/TextMesh Pro/Fonts/pixelmix/license.txt new file mode 100644 index 0000000..c84c0ca --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/pixelmix/license.txt @@ -0,0 +1,16 @@ +The font file in this archive was created by Andrew Tyler www.AndrewTyler.net and font@andrewtyler.net +-- +You are free: + +to Share — to copy, distribute and transmit the work +Under the following conditions: + +Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work). +Noncommercial — You may not use this work for commercial purposes. +No Derivative Works — You may not alter, transform, or build upon this work. + +-- + +http://creativecommons.org/licenses/by-nc-nd/3.0/us/ + +-- diff --git a/Assets/TextMesh Pro/Fonts/pixelmix/license.txt.meta b/Assets/TextMesh Pro/Fonts/pixelmix/license.txt.meta new file mode 100644 index 0000000..20f8cd5 --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/pixelmix/license.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e882a66e3cad0164aa8689b4e5ba3f72 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Fonts/pixelmix/readme.txt b/Assets/TextMesh Pro/Fonts/pixelmix/readme.txt new file mode 100644 index 0000000..36322c5 --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/pixelmix/readme.txt @@ -0,0 +1,7 @@ +The font file in this archive was created by Andrew Tyler atyler.dev@gmail.com +License: http://creativecommons.org/licenses/by-sa/3.0/us/ +LEGAL NOTICE: +In using this font you must comply with the licensing terms described in the +file “license.txt” included with this archive. +If you redistribute the font file in this archive, it must be accompanied by +all the other files from this archive, including this one. diff --git a/Assets/TextMesh Pro/Fonts/pixelmix/readme.txt.meta b/Assets/TextMesh Pro/Fonts/pixelmix/readme.txt.meta new file mode 100644 index 0000000..aae13c8 --- /dev/null +++ b/Assets/TextMesh Pro/Fonts/pixelmix/readme.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9bd0c90ca61fbe449772d9b3cbf1d82 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 62de9da..7285944 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 780.8 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Project m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 23 + controlID: 88 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,7 +138,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 285.6 + width: 284.8 height: 730.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -164,14 +164,14 @@ MonoBehaviour: - {fileID: 9} m_Position: serializedVersion: 2 - x: 285.6 + x: 284.8 y: 0 - width: 892.80005 + width: 892.8 height: 730.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 24 + controlID: 66 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,7 +189,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 892.80005 + width: 892.8 height: 502.4 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -216,7 +216,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 502.4 - width: 892.80005 + width: 892.8 height: 228.4 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -243,9 +243,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1178.4 + x: 1177.6 y: 0 - width: 357.59998 + width: 358.40002 height: 730.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -371,7 +371,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 284.6 + width: 283.8 height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -380,9 +380,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 98640000 m_LastClickedID: 0 - m_ExpandedIDs: def7ffff24f8ffffbaf9ffffdaf9ffff28fbffff + m_ExpandedIDs: 46f9ffff18fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -426,9 +426,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 285.6 + x: 284.80002 y: 73.6 - width: 890.80005 + width: 890.8 height: 481.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -669,7 +669,7 @@ MonoBehaviour: containerId: overlay-toolbar__top floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -686,9 +686,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 38.677048, y: 42.435905, z: -6.5025387} + m_Target: {x: 5.584161, y: -1.1013582, z: -5.765829} speed: 2 - m_Value: {x: 38.677048, y: 42.435905, z: -6.5025387} + m_Value: {x: 5.584161, y: -1.1013582, z: -5.765829} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -739,9 +739,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 63.98936 + m_Target: 33.29527 speed: 2 - m_Value: 63.98936 + m_Value: 33.29527 m_Ortho: m_Target: 1 speed: 2 @@ -814,9 +814,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 285.6 + x: 284.80002 y: 576 - width: 890.80005 + width: 890.8 height: 207.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -835,22 +835,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\alex.andersson2\Documents\RatAttack2D m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 68.600006} - m_SelectedIDs: 80640000 - m_LastClickedID: 25728 - m_ExpandedIDs: 000000002a6400002c6400002e6400003064000000ca9a3bffffff7f + m_SelectedIDs: 52640000 + m_LastClickedID: 25682 + m_ExpandedIDs: 000000003c6400003e640000406400004264000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -878,7 +878,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000002a6400002c6400002e64000030640000 + m_ExpandedIDs: 000000003c6400003e6400004064000042640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -905,7 +905,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -964,7 +964,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 46572 + m_LastSelectedObjectID: 33302 --- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1049,9 +1049,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1178.4 + x: 1177.6 y: 73.6 - width: 356.59998 + width: 357.40002 height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -1064,7 +1064,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 40.799988 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: