From f6035eaa3880a13e91a0ab82c70f6e103fb0f0ea Mon Sep 17 00:00:00 2001 From: BRNSystems Date: Thu, 22 Jul 2021 21:52:18 +0200 Subject: [PATCH] upgraded the game --- Assets/MenuPlay.cs | 2 + Assets/Scenes/Finish.unity | 22 +- Assets/Scenes/Level1.unity | 13 ++ Assets/Scenes/Level2.unity | 13 ++ Assets/Scenes/Level3.unity | 13 ++ Assets/Scenes/Level4.unity | 13 ++ Assets/Scenes/Level5.unity | 13 ++ Assets/Scenes/Level6.unity | 13 ++ Assets/Scenes/Menu.unity | 276 +++++++++++++++++++++++++- Assets/Scenes/Tutorial.unity | 13 ++ Assets/Scripts/ESCQuit.cs | 21 ++ Assets/Scripts/ESCQuit.cs.meta | 11 + Assets/Scripts/MenuZoom.cs | 25 ++- Assets/Scripts/Rotation.cs | 2 +- Assets/Sounds/Music/Menu.mp3 | 3 + Assets/Sounds/Music/Menu.mp3.meta | 22 ++ Assets/Sounds/SFX/play.wav | 3 + Assets/Sounds/SFX/play.wav.meta | 22 ++ UserSettings/EditorUserSettings.asset | 40 ++-- 19 files changed, 504 insertions(+), 36 deletions(-) create mode 100644 Assets/Scripts/ESCQuit.cs create mode 100644 Assets/Scripts/ESCQuit.cs.meta create mode 100644 Assets/Sounds/Music/Menu.mp3 create mode 100644 Assets/Sounds/Music/Menu.mp3.meta create mode 100644 Assets/Sounds/SFX/play.wav create mode 100644 Assets/Sounds/SFX/play.wav.meta diff --git a/Assets/MenuPlay.cs b/Assets/MenuPlay.cs index 00d502b..c2fe597 100644 --- a/Assets/MenuPlay.cs +++ b/Assets/MenuPlay.cs @@ -6,6 +6,7 @@ using UnityEngine.SceneManagement; public class MenuPlay : MonoBehaviour { public LayerMask contactFilter; + public AudioSource sfx; public MenuMouse mouse; // Start is called before the first frame update void Start() @@ -18,6 +19,7 @@ public class MenuPlay : MonoBehaviour { if (Input.GetMouseButtonDown(0)){ if(Physics2D.CircleCast(mouse.pos, 1f, Vector2.zero, 0f, contactFilter)){ + sfx.Play(); SceneManager.LoadScene("Tutorial"); } } diff --git a/Assets/Scenes/Finish.unity b/Assets/Scenes/Finish.unity index a47b57f..e48ca55 100644 --- a/Assets/Scenes/Finish.unity +++ b/Assets/Scenes/Finish.unity @@ -188,9 +188,10 @@ MonoBehaviour: was my first game in Unity, so it was a bit crappy. I also want to thank - @Tucan444 for helping me out. + @Tucan444 and his very helpful parrot Kio for helping me out. - I hope you enjoyed it. + I hope you + enjoyed it. BRN Systems' m_isRightToLeft: 0 @@ -255,7 +256,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -7.812948, y: 0, z: -1.1841106, w: 1.2549968} + m_margin: {x: -7.2570496, y: 0, z: -1.1841106, w: 1.2549968} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -399,6 +400,7 @@ GameObject: - component: {fileID: 698687518} - component: {fileID: 698687517} - component: {fileID: 698687515} + - component: {fileID: 698687516} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -438,6 +440,18 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &698687516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 698687514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!81 &698687517 AudioListener: m_ObjectHideFlags: 0 @@ -473,7 +487,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 8 + orthographic size: 9 m_Depth: -1 m_CullingMask: serializedVersion: 2 diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 350e67d..8422c41 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -6355,6 +6355,7 @@ GameObject: - component: {fileID: 519420029} - component: {fileID: 519420030} - component: {fileID: 519420033} + - component: {fileID: 519420034} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -6473,6 +6474,18 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &519420034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &685738179 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index 974bd84..cd9b511 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -562,6 +562,7 @@ GameObject: - component: {fileID: 519420029} - component: {fileID: 519420030} - component: {fileID: 519420033} + - component: {fileID: 519420034} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -680,6 +681,18 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &519420034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &614575549 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level3.unity b/Assets/Scenes/Level3.unity index 18a318f..35705d9 100644 --- a/Assets/Scenes/Level3.unity +++ b/Assets/Scenes/Level3.unity @@ -1007,6 +1007,7 @@ GameObject: - component: {fileID: 519420029} - component: {fileID: 519420030} - component: {fileID: 519420033} + - component: {fileID: 519420034} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1125,6 +1126,18 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &519420034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &685738179 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level4.unity b/Assets/Scenes/Level4.unity index 27c8682..a63d27d 100644 --- a/Assets/Scenes/Level4.unity +++ b/Assets/Scenes/Level4.unity @@ -6228,6 +6228,7 @@ GameObject: - component: {fileID: 519420029} - component: {fileID: 519420030} - component: {fileID: 519420033} + - component: {fileID: 519420034} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -6346,6 +6347,18 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &519420034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &609569528 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level5.unity b/Assets/Scenes/Level5.unity index e176d4d..cda6f71 100644 --- a/Assets/Scenes/Level5.unity +++ b/Assets/Scenes/Level5.unity @@ -26177,6 +26177,7 @@ GameObject: - component: {fileID: 519420029} - component: {fileID: 519420030} - component: {fileID: 519420033} + - component: {fileID: 519420034} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -26295,6 +26296,18 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &519420034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &545109461 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level6.unity b/Assets/Scenes/Level6.unity index eb61a7a..6e328d8 100644 --- a/Assets/Scenes/Level6.unity +++ b/Assets/Scenes/Level6.unity @@ -41045,6 +41045,7 @@ GameObject: - component: {fileID: 519420029} - component: {fileID: 519420030} - component: {fileID: 519420033} + - component: {fileID: 519420034} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -41163,6 +41164,18 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &519420034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &561967386 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 0e5b5c5..6d7531c 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -224,6 +224,7 @@ MonoBehaviour: contactFilter: serializedVersion: 2 m_Bits: 32 + sfx: {fileID: 1499575167} mouse: {fileID: 1949375702} --- !u!50 &231727551 Rigidbody2D: @@ -341,6 +342,7 @@ GameObject: - component: {fileID: 581596680} - component: {fileID: 581596679} - component: {fileID: 581596682} + - component: {fileID: 581596684} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -409,7 +411,9 @@ Transform: 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_Children: [] + m_Children: + - {fileID: 1499575168} + - {fileID: 607124726} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -459,6 +463,145 @@ MonoBehaviour: m_EditorClassIdentifier: cam: {fileID: 581596680} objects: {fileID: 1027899373} +--- !u!114 &581596684 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 581596678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &607124725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 607124726} + - component: {fileID: 607124727} + m_Layer: 0 + m_Name: BGMusic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &607124726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607124725} + 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: 581596681} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &607124727 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 607124725} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3438974180290ff4fbf2ba1e21c93b6d, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &682611200 GameObject: m_ObjectHideFlags: 0 @@ -773,7 +916,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1027899374 Transform: m_ObjectHideFlags: 0 @@ -962,6 +1105,133 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1499575166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1499575168} + - component: {fileID: 1499575167} + m_Layer: 0 + m_Name: SFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1499575167 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1499575166} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 349c5213efa2f084d875db215eb07475, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &1499575168 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1499575166} + 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: 581596681} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1525150946 GameObject: m_ObjectHideFlags: 0 @@ -1045,7 +1315,7 @@ GameObject: - component: {fileID: 1608412036} - component: {fileID: 1608412035} m_Layer: 0 - m_Name: menu + m_Name: BG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scenes/Tutorial.unity b/Assets/Scenes/Tutorial.unity index dc80027..fc7cad7 100644 --- a/Assets/Scenes/Tutorial.unity +++ b/Assets/Scenes/Tutorial.unity @@ -38159,6 +38159,7 @@ GameObject: - component: {fileID: 1188223022} - component: {fileID: 1188223021} - component: {fileID: 1188223020} + - component: {fileID: 1188223025} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -38277,6 +38278,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1188223025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1188223019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9cf471439c551fd459075afc8510ea03, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1214149262 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ESCQuit.cs b/Assets/Scripts/ESCQuit.cs new file mode 100644 index 0000000..cfd064b --- /dev/null +++ b/Assets/Scripts/ESCQuit.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ESCQuit : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update () + { + if(Input.GetKeyDown(KeyCode.Escape) == true) + { + Application.Quit(); + } + } +} diff --git a/Assets/Scripts/ESCQuit.cs.meta b/Assets/Scripts/ESCQuit.cs.meta new file mode 100644 index 0000000..a76d27a --- /dev/null +++ b/Assets/Scripts/ESCQuit.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9cf471439c551fd459075afc8510ea03 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MenuZoom.cs b/Assets/Scripts/MenuZoom.cs index e38b632..eb66133 100644 --- a/Assets/Scripts/MenuZoom.cs +++ b/Assets/Scripts/MenuZoom.cs @@ -6,7 +6,8 @@ public class MenuZoom : MonoBehaviour { public Camera cam; public GameObject objects; - bool firstrun = true; + bool flag1 = true; + bool flag2 = false; // Start is called before the first frame update void Start() { @@ -16,14 +17,22 @@ public class MenuZoom : MonoBehaviour // Update is called once per frame void Update() { - if (firstrun){ - firstrun = false; - while(cam.fieldOfView > 3f){ - cam.fieldOfView -= 0.001f; + if (flag1){ + if(cam.orthographicSize > 1f){ + cam.orthographicSize -= 0.1f; } - objects.SetActive(true); - while(cam.fieldOfView < 5f){ - cam.fieldOfView += 0.001f; + else{ + flag1 = false; + flag2 = true; + objects.SetActive(true); + } + } + if(flag2){ + if(cam.orthographicSize < 5f){ + cam.orthographicSize += 0.06f; + } + else{ + flag2 = false; } } } diff --git a/Assets/Scripts/Rotation.cs b/Assets/Scripts/Rotation.cs index b405b7a..42b4ff0 100644 --- a/Assets/Scripts/Rotation.cs +++ b/Assets/Scripts/Rotation.cs @@ -10,7 +10,7 @@ public class Rotation : MonoBehaviour public bool static_center = true; public bool right_rotation = true; public bool flipping = false; - [Range(0.1f, 8)] public float speed = 1; + [Range(1f, 180f)] public float speed = 1; [Range(0, (float)Math.PI * 2)] public float flip_angle = 0; private float angle; diff --git a/Assets/Sounds/Music/Menu.mp3 b/Assets/Sounds/Music/Menu.mp3 new file mode 100644 index 0000000..726b59f --- /dev/null +++ b/Assets/Sounds/Music/Menu.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f463d41520495a6f7587ba33422b34c420d2fc4890b535c6e2842795c464e22b +size 532550 diff --git a/Assets/Sounds/Music/Menu.mp3.meta b/Assets/Sounds/Music/Menu.mp3.meta new file mode 100644 index 0000000..eb922d8 --- /dev/null +++ b/Assets/Sounds/Music/Menu.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3438974180290ff4fbf2ba1e21c93b6d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/SFX/play.wav b/Assets/Sounds/SFX/play.wav new file mode 100644 index 0000000..ce907fc --- /dev/null +++ b/Assets/Sounds/SFX/play.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d09f689558bb4ffa0f3339a81f5b0264e374dd1976a0a1dde95a8a574486246d +size 14614 diff --git a/Assets/Sounds/SFX/play.wav.meta b/Assets/Sounds/SFX/play.wav.meta new file mode 100644 index 0000000..ca6f881 --- /dev/null +++ b/Assets/Sounds/SFX/play.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 349c5213efa2f084d875db215eb07475 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 011c069..2d4cc78 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,32 +9,32 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c72151802563f22213229 - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c73150012147e623d28393930 - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c73150012147f623d28393930 - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c73150012147c623d28393930 - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c731500121479623d28393930 - flags: 0 - RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c731500121478623d28393930 - flags: 0 - RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c7919181e0b22623d28393930 flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c73150012147b623d28393930 flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c731500121478623d28393930 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c731500121479623d28393930 + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c73150012147c623d28393930 + flags: 0 + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c72151802563f22213229 + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c73150012147f623d28393930 + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c73150012147e623d28393930 + flags: 0 UnityRemoteCompression: value: 337f73 flags: 0