diff --git a/Assets/Scenes/Main_Menu.unity b/Assets/Scenes/Main_Menu.unity index 86a844a..dcc19c2 100644 --- a/Assets/Scenes/Main_Menu.unity +++ b/Assets/Scenes/Main_Menu.unity @@ -153,8 +153,8 @@ RectTransform: m_Children: - {fileID: 2098359454} - {fileID: 1989443925} - - {fileID: 1779447993} - {fileID: 1778332101} + - {fileID: 1779447993} m_Father: {fileID: 221552283} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -408,7 +408,7 @@ GameObject: - component: {fileID: 1778332103} - component: {fileID: 1778332102} m_Layer: 5 - m_Name: Settings (1) + m_Name: Credits m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -427,7 +427,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 142571404} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -561,7 +561,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 142571404} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} diff --git a/Assets/credit_script.cs b/Assets/Scripts/credit_script.cs similarity index 62% rename from Assets/credit_script.cs rename to Assets/Scripts/credit_script.cs index 2f89822..290d09a 100644 --- a/Assets/credit_script.cs +++ b/Assets/Scripts/credit_script.cs @@ -1,18 +1,15 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; + public class credit_script : MonoBehaviour { // Start is called before the first frame update - void Start() + public void CreditsButton() { - + SceneManager.LoadScene("Main_Credits"); } - // Update is called once per frame - void Update() - { - - } -} +} \ No newline at end of file diff --git a/Assets/credit_script.cs.meta b/Assets/Scripts/credit_script.cs.meta similarity index 100% rename from Assets/credit_script.cs.meta rename to Assets/Scripts/credit_script.cs.meta diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8798935..98fb920 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,4 +11,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Main_Game.unity guid: a8f76e9b00caa0c4d8dd7816278353d3 + - enabled: 1 + path: Assets/Scenes/Main_Credits.unity + guid: f97e723378691c045aab2acdcff9a80a m_configObjects: {} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index baafea3..a6ef183 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: Game + m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} @@ -182,7 +182,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -191,14 +191,14 @@ MonoBehaviour: y: 0 width: 912 height: 394.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 11} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 11} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -247,8 +247,8 @@ MonoBehaviour: y: 0 width: 382.40002 height: 730.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -329,7 +329,7 @@ MonoBehaviour: y: 21 width: 910 height: 352.4 - m_Scale: {x: 1.1255087, y: 1.1255087} + m_Scale: {x: 1.0589912, y: 1.0589912} m_Translation: {x: 455, y: 176.2} m_MarginLeft: 0 m_MarginRight: 0 @@ -337,10 +337,10 @@ MonoBehaviour: m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -404.26166 - y: -156.55144 - width: 808.5233 - height: 313.10287 + x: -429.65417 + y: -166.38477 + width: 859.30835 + height: 332.76953 m_MinimalGUI: 1 m_defaultScale: 1 m_LastWindowPixelSize: {x: 1137.5, y: 466.75} @@ -380,9 +380,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f0840000 - m_LastClickedID: 0 - m_ExpandedIDs: cea4ffff6cb0ffffa4b0ffffdcb0ffffb0b1ffff1eb3ffff68b3ffff8cf3ffff3af4ffff3ef5ffffee690000886a00008c6a00002a8300009e840000a2840000 + m_SelectedIDs: 80650000 + m_LastClickedID: 25984 + m_ExpandedIDs: feeeffff72efffff66f0ffff26faffff28fbffffc6630000ca6300005c65000060650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -686,9 +686,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -7.9960194, y: -1.1723579, z: -0.08618152} + m_Target: {x: -10.330032, y: -2.3811293, z: -0.13116549} speed: 2 - m_Value: {x: -7.9960194, y: -1.1723579, z: -0.08618152} + m_Value: {x: -10.330032, y: -2.3811293, z: -0.13116549} 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: 29.272413 + m_Target: 38.441887 speed: 2 - m_Value: 29.272413 + m_Value: 38.441887 m_Ortho: m_Target: 1 speed: 2 @@ -847,10 +847,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 16.600006} - m_SelectedIDs: 7c690000 - m_LastClickedID: 27004 - m_ExpandedIDs: 000000006e6900007869000000ca9a3bffffff7f + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 7e630000 + m_LastClickedID: 25470 + m_ExpandedIDs: 00000000366300003863000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -878,7 +878,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000006e690000 + m_ExpandedIDs: 000000003663000038630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -964,7 +964,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 33974 + m_LastSelectedObjectID: 25952 --- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1064,7 +1064,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 117.60004 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: