From 1f98f32212a2e0ced365030956d1e5465149a795 Mon Sep 17 00:00:00 2001 From: Patience Zampasi Date: Mon, 4 Mar 2024 22:13:23 +0100 Subject: [PATCH] Modification de la scene et du changement de scenes -> Plus fluide et plus normal --- Assets/Scenes/Level_One.unity | 2 +- Assets/Scenes/LoadingScene.unity | 267 ++++++++++++++++++ Assets/Scenes/LoadingScene.unity.meta | 7 + Assets/Scenes/MainMenu.unity | 140 ++++----- Assets/Scripts/Main Menu.meta | 8 + Assets/{ => Scripts/Main Menu}/DontDestroy.cs | 3 +- .../Main Menu}/DontDestroy.cs.meta | 0 Assets/{ => Scripts/Main Menu}/HealthBar.cs | 0 .../{ => Scripts/Main Menu}/HealthBar.cs.meta | 0 Assets/{ => Scripts/Main Menu}/MainMenu.cs | 15 +- .../{ => Scripts/Main Menu}/MainMenu.cs.meta | 0 Assets/{ => Scripts/Main Menu}/PauseMenu.cs | 0 .../{ => Scripts/Main Menu}/PauseMenu.cs.meta | 0 .../{ => Scripts/Main Menu}/SettingsMenu.cs | 0 .../Main Menu}/SettingsMenu.cs.meta | 0 Assets/Scripts/Scenes.meta | 8 + Assets/Scripts/Scenes/Load.cs | 20 ++ Assets/Scripts/Scenes/Load.cs.meta | 11 + Assets/Scripts/Scenes/LoaderCallBack.cs | 19 ++ Assets/Scripts/Scenes/LoaderCallBack.cs.meta | 11 + Assets/Scripts/Scenes/SceneName.cs | 7 + Assets/Scripts/Scenes/SceneName.cs.meta | 11 + ProjectSettings/EditorBuildSettings.asset | 3 + 23 files changed, 461 insertions(+), 71 deletions(-) create mode 100644 Assets/Scenes/LoadingScene.unity create mode 100644 Assets/Scenes/LoadingScene.unity.meta create mode 100644 Assets/Scripts/Main Menu.meta rename Assets/{ => Scripts/Main Menu}/DontDestroy.cs (93%) rename Assets/{ => Scripts/Main Menu}/DontDestroy.cs.meta (100%) rename Assets/{ => Scripts/Main Menu}/HealthBar.cs (100%) rename Assets/{ => Scripts/Main Menu}/HealthBar.cs.meta (100%) rename Assets/{ => Scripts/Main Menu}/MainMenu.cs (71%) rename Assets/{ => Scripts/Main Menu}/MainMenu.cs.meta (100%) rename Assets/{ => Scripts/Main Menu}/PauseMenu.cs (100%) rename Assets/{ => Scripts/Main Menu}/PauseMenu.cs.meta (100%) rename Assets/{ => Scripts/Main Menu}/SettingsMenu.cs (100%) rename Assets/{ => Scripts/Main Menu}/SettingsMenu.cs.meta (100%) create mode 100644 Assets/Scripts/Scenes.meta create mode 100644 Assets/Scripts/Scenes/Load.cs create mode 100644 Assets/Scripts/Scenes/Load.cs.meta create mode 100644 Assets/Scripts/Scenes/LoaderCallBack.cs create mode 100644 Assets/Scripts/Scenes/LoaderCallBack.cs.meta create mode 100644 Assets/Scripts/Scenes/SceneName.cs create mode 100644 Assets/Scripts/Scenes/SceneName.cs.meta diff --git a/Assets/Scenes/Level_One.unity b/Assets/Scenes/Level_One.unity index b574e8d..9da2614 100644 --- a/Assets/Scenes/Level_One.unity +++ b/Assets/Scenes/Level_One.unity @@ -605,7 +605,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -338, y: 189} + m_AnchoredPosition: {x: -464, y: 200} m_SizeDelta: {x: 206.2901, y: 35.0852} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &470368145 diff --git a/Assets/Scenes/LoadingScene.unity b/Assets/Scenes/LoadingScene.unity new file mode 100644 index 0000000..1a3e472 --- /dev/null +++ b/Assets/Scenes/LoadingScene.unity @@ -0,0 +1,267 @@ +%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: 3 + 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 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &957388406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 957388408} + - component: {fileID: 957388407} + m_Layer: 0 + m_Name: LoaderCallBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &957388407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 957388406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea26c648913046041885aa5482d8c4f4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &957388408 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 957388406} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1034431353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1034431356} + - component: {fileID: 1034431355} + - component: {fileID: 1034431354} + 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 &1034431354 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034431353} + m_Enabled: 1 +--- !u!20 &1034431355 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034431353} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + 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 &1034431356 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034431353} + serializedVersion: 2 + 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1034431356} + - {fileID: 957388408} diff --git a/Assets/Scenes/LoadingScene.unity.meta b/Assets/Scenes/LoadingScene.unity.meta new file mode 100644 index 0000000..f13f95b --- /dev/null +++ b/Assets/Scenes/LoadingScene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a96c198aca9ab7443841cb37a7c54bcb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 76ea50d..21dc8ff 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -788,17 +788,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382758721} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1510328159} - m_Father: {fileID: 1776384193} + m_Father: {fileID: 1081529481} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0000066757, y: 47} + m_AnchoredPosition: {x: 0, y: 47} m_SizeDelta: {x: 176.3636, y: 43.8462} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &382758723 @@ -844,19 +844,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 382758724} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1776384189} - m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp - m_MethodName: StartGame - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &382758724 MonoBehaviour: m_ObjectHideFlags: 0 @@ -920,12 +908,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 410467779} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1776384193} + m_Father: {fileID: 1081529481} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1000,17 +988,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 411730549} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1861048104} - m_Father: {fileID: 1776384193} + m_Father: {fileID: 1081529481} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0000066757, y: -111} + m_AnchoredPosition: {x: 0, y: -111} m_SizeDelta: {x: 176.3636, y: 43.8462} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &411730551 @@ -1057,7 +1045,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1776384189} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: QuitGame m_Mode: 1 @@ -2036,6 +2024,62 @@ MonoBehaviour: m_EditorClassIdentifier: audioMixer: {fileID: 24100000, guid: 3c9e45a164a51664cb33058ac7a5bc76, type: 2} resolutionDropdown: {fileID: 865570730} +--- !u!1 &1081529480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1081529481} + - component: {fileID: 1081529482} + m_Layer: 5 + m_Name: MainMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1081529481 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081529480} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 382758722} + - {fileID: 1591080909} + - {fileID: 411730550} + - {fileID: 410467780} + m_Father: {fileID: 1776384193} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1081529482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1081529480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be4b19c65b8c89743a3a368876b70d3b, type: 3} + m_Name: + m_EditorClassIdentifier: + levelToLoad: Level_One + settingPanel: {fileID: 1591080908} + gameName: {fileID: 410467779} + startButton: {fileID: 382758723} --- !u!1 &1136922582 GameObject: m_ObjectHideFlags: 0 @@ -2296,7 +2340,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377996569} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 @@ -2392,7 +2436,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1776384189} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: SettingsClose m_Mode: 1 @@ -2810,13 +2854,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1591080908} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2051816769} - m_Father: {fileID: 1776384193} + m_Father: {fileID: 1081529481} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2867,7 +2911,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1776384189} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp m_MethodName: SettingsOpen m_Mode: 1 @@ -2929,30 +2973,13 @@ GameObject: - component: {fileID: 1776384192} - component: {fileID: 1776384191} - component: {fileID: 1776384190} - - component: {fileID: 1776384189} - - component: {fileID: 1776384194} m_Layer: 5 - m_Name: MainMenuBtns + m_Name: UI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1776384189 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1776384188} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: be4b19c65b8c89743a3a368876b70d3b, type: 3} - m_Name: - m_EditorClassIdentifier: - levelToLoad: Level_One - settingPanel: {fileID: 1077706797} - gameName: {fileID: 410467779} --- !u!114 &1776384190 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2982,12 +3009,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 3840, y: 2160} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -3028,10 +3055,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 382758722} - - {fileID: 1591080909} - - {fileID: 411730550} - - {fileID: 410467780} + - {fileID: 1081529481} - {fileID: 1377996570} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3040,18 +3064,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &1776384194 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1776384188} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 593914ec04f2f294ea5d393ace4b40db, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1801890756 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Main Menu.meta b/Assets/Scripts/Main Menu.meta new file mode 100644 index 0000000..f86e52d --- /dev/null +++ b/Assets/Scripts/Main Menu.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3891ea4c07a3e6d4d98f811a8b07c36b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DontDestroy.cs b/Assets/Scripts/Main Menu/DontDestroy.cs similarity index 93% rename from Assets/DontDestroy.cs rename to Assets/Scripts/Main Menu/DontDestroy.cs index ba21baa..adc0ed9 100644 --- a/Assets/DontDestroy.cs +++ b/Assets/Scripts/Main Menu/DontDestroy.cs @@ -24,8 +24,7 @@ public class DontDestroy : MonoBehaviour Destroy(gameObject); } } - - DontDestroyOnLoad(gameObject); + // DontDestroyOnLoad(gameObject); } } diff --git a/Assets/DontDestroy.cs.meta b/Assets/Scripts/Main Menu/DontDestroy.cs.meta similarity index 100% rename from Assets/DontDestroy.cs.meta rename to Assets/Scripts/Main Menu/DontDestroy.cs.meta diff --git a/Assets/HealthBar.cs b/Assets/Scripts/Main Menu/HealthBar.cs similarity index 100% rename from Assets/HealthBar.cs rename to Assets/Scripts/Main Menu/HealthBar.cs diff --git a/Assets/HealthBar.cs.meta b/Assets/Scripts/Main Menu/HealthBar.cs.meta similarity index 100% rename from Assets/HealthBar.cs.meta rename to Assets/Scripts/Main Menu/HealthBar.cs.meta diff --git a/Assets/MainMenu.cs b/Assets/Scripts/Main Menu/MainMenu.cs similarity index 71% rename from Assets/MainMenu.cs rename to Assets/Scripts/Main Menu/MainMenu.cs index cd70ccf..0f245f6 100644 --- a/Assets/MainMenu.cs +++ b/Assets/Scripts/Main Menu/MainMenu.cs @@ -2,16 +2,23 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; public class MainMenu : MonoBehaviour { - public string levelToLoad; - public GameObject settingPanel; public GameObject gameName; - public void StartGame() + + [SerializeField] private Button startButton; + + private void Start() { - SceneManager.LoadScene(levelToLoad); + startButton.onClick.AddListener(StartGame); + } + + private void StartGame() + { + Load.Loader(SceneName.Level_One); Time.timeScale = 1; } diff --git a/Assets/MainMenu.cs.meta b/Assets/Scripts/Main Menu/MainMenu.cs.meta similarity index 100% rename from Assets/MainMenu.cs.meta rename to Assets/Scripts/Main Menu/MainMenu.cs.meta diff --git a/Assets/PauseMenu.cs b/Assets/Scripts/Main Menu/PauseMenu.cs similarity index 100% rename from Assets/PauseMenu.cs rename to Assets/Scripts/Main Menu/PauseMenu.cs diff --git a/Assets/PauseMenu.cs.meta b/Assets/Scripts/Main Menu/PauseMenu.cs.meta similarity index 100% rename from Assets/PauseMenu.cs.meta rename to Assets/Scripts/Main Menu/PauseMenu.cs.meta diff --git a/Assets/SettingsMenu.cs b/Assets/Scripts/Main Menu/SettingsMenu.cs similarity index 100% rename from Assets/SettingsMenu.cs rename to Assets/Scripts/Main Menu/SettingsMenu.cs diff --git a/Assets/SettingsMenu.cs.meta b/Assets/Scripts/Main Menu/SettingsMenu.cs.meta similarity index 100% rename from Assets/SettingsMenu.cs.meta rename to Assets/Scripts/Main Menu/SettingsMenu.cs.meta diff --git a/Assets/Scripts/Scenes.meta b/Assets/Scripts/Scenes.meta new file mode 100644 index 0000000..f98ebbc --- /dev/null +++ b/Assets/Scripts/Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ad63a621ed0388469b3d33fbc029434 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scenes/Load.cs b/Assets/Scripts/Scenes/Load.cs new file mode 100644 index 0000000..18453e0 --- /dev/null +++ b/Assets/Scripts/Scenes/Load.cs @@ -0,0 +1,20 @@ + +using UnityEngine.SceneManagement; + +public static class Load +{ + private static SceneName _targetScene; + + public static void Loader(SceneName targetScene) { + + _targetScene = targetScene; + + SceneManager.LoadScene(SceneName.LoadingScene.ToString()); + } + + public static void LoaderCallBack() + { + SceneManager.LoadScene(_targetScene.ToString()); + } + +} diff --git a/Assets/Scripts/Scenes/Load.cs.meta b/Assets/Scripts/Scenes/Load.cs.meta new file mode 100644 index 0000000..49129c2 --- /dev/null +++ b/Assets/Scripts/Scenes/Load.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2cb8bf98efc69af4aaee0ab2525c13ee +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scenes/LoaderCallBack.cs b/Assets/Scripts/Scenes/LoaderCallBack.cs new file mode 100644 index 0000000..174b756 --- /dev/null +++ b/Assets/Scripts/Scenes/LoaderCallBack.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LoaderCallBack : MonoBehaviour +{ + private bool _firstUpdate; + + private void Update() + { + if (!_firstUpdate) + { + _firstUpdate = true; + Load.LoaderCallBack(); + } + } + + +} diff --git a/Assets/Scripts/Scenes/LoaderCallBack.cs.meta b/Assets/Scripts/Scenes/LoaderCallBack.cs.meta new file mode 100644 index 0000000..a57b548 --- /dev/null +++ b/Assets/Scripts/Scenes/LoaderCallBack.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ea26c648913046041885aa5482d8c4f4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scenes/SceneName.cs b/Assets/Scripts/Scenes/SceneName.cs new file mode 100644 index 0000000..5780288 --- /dev/null +++ b/Assets/Scripts/Scenes/SceneName.cs @@ -0,0 +1,7 @@ +public enum SceneName +{ + MainMenuScene, + LoadingScene, + Level_One + +} diff --git a/Assets/Scripts/Scenes/SceneName.cs.meta b/Assets/Scripts/Scenes/SceneName.cs.meta new file mode 100644 index 0000000..16a2689 --- /dev/null +++ b/Assets/Scripts/Scenes/SceneName.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 67036570d6ccce44aa387adbd838ac6c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d6eabad..2799080 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -14,4 +14,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 8c9cfa26abfee488c85f1582747f6a02 + - enabled: 1 + path: Assets/Scenes/LoadingScene.unity + guid: a96c198aca9ab7443841cb37a7c54bcb m_configObjects: {}