From 59e3451649b4cd0188b7fb9c53e9ef828c2120cc Mon Sep 17 00:00:00 2001 From: Zenny Date: Tue, 16 Aug 2022 09:27:55 -0700 Subject: [PATCH] Implement working BGM player --- Assets/Audio/BGM/BGM.prefab | 54 ++++ Assets/Audio/BGM/BGM.prefab.meta | 7 + .../MOUNTAIN SCENE 1 - GEOMETRY.fbx.meta | 4 +- Assets/BGs/Snow/Snow C/Materials.meta | 8 + .../MOUNTAIN SCENE 3 - UNLAYERED.mat | 80 +++++ .../MOUNTAIN SCENE 3 - UNLAYERED.mat.meta | 8 + Assets/Scenes/Snow/SnowA.unity | 288 +++++++++++++++++- Assets/Scenes/Snow/SnowB.unity | 72 ++++- Assets/Scenes/Snow/SnowC.unity | 168 +++++----- Assets/Scenes/Temple/TempleB.unity | 13 + Assets/Scenes/Temple/TempleC.unity | 13 + Assets/Scenes/Temple/TempleD.unity | 13 + Assets/Scenes/Temple/TempleSanctum.unity | 13 + Assets/Scripts/Audio/BGM.cs | 33 ++ .../UnloadScene.cs.meta => Audio/BGM.cs.meta} | 2 +- Assets/Scripts/Audio/BGMManager.cs | 85 +++--- Assets/Scripts/SceneManagement/UnloadScene.cs | 20 -- Assets/Singleton/SingletonManager.prefab | 102 +------ Assets/SpawnPoints/WorldMap To Snow A.prefab | 99 ++++++ .../WorldMap To Snow A.prefab.meta | 7 + 20 files changed, 829 insertions(+), 260 deletions(-) create mode 100644 Assets/Audio/BGM/BGM.prefab create mode 100644 Assets/Audio/BGM/BGM.prefab.meta create mode 100644 Assets/BGs/Snow/Snow C/Materials.meta create mode 100644 Assets/BGs/Snow/Snow C/Materials/MOUNTAIN SCENE 3 - UNLAYERED.mat create mode 100644 Assets/BGs/Snow/Snow C/Materials/MOUNTAIN SCENE 3 - UNLAYERED.mat.meta create mode 100644 Assets/Scripts/Audio/BGM.cs rename Assets/Scripts/{SceneManagement/UnloadScene.cs.meta => Audio/BGM.cs.meta} (83%) delete mode 100644 Assets/Scripts/SceneManagement/UnloadScene.cs create mode 100644 Assets/SpawnPoints/WorldMap To Snow A.prefab create mode 100644 Assets/SpawnPoints/WorldMap To Snow A.prefab.meta diff --git a/Assets/Audio/BGM/BGM.prefab b/Assets/Audio/BGM/BGM.prefab new file mode 100644 index 0000000..f69214b --- /dev/null +++ b/Assets/Audio/BGM/BGM.prefab @@ -0,0 +1,54 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2471171845959243517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2471171845959243507} + - component: {fileID: 2471171845959243506} + m_Layer: 0 + m_Name: BGM + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2471171845959243507 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471171845959243517} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 98.34296, y: 74.178635, z: -4002.145} + 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} +--- !u!114 &2471171845959243506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2471171845959243517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3} + m_Name: + m_EditorClassIdentifier: + backgroundMusic: + - {fileID: 8300000, guid: 3b5765e9830162448a81b1ba84c5dd91, type: 3} + - {fileID: 8300000, guid: 7ec6116eaa70bb64d9b0e30763c77adb, type: 3} + - {fileID: 8300000, guid: 269192823cbbfdd46bac8719d24d4b28, type: 3} + - {fileID: 8300000, guid: 79a5e6bec678bf847a3ee6852890a652, type: 3} + - {fileID: 8300000, guid: 6991bca0f1ae4d043add1f351106f24b, type: 3} + - {fileID: 8300000, guid: 49921f7980927f44c8697ca791fe002b, type: 3} + - {fileID: 8300000, guid: 22d7e3c026615e4488ba2fd9afa47c7e, type: 3} diff --git a/Assets/Audio/BGM/BGM.prefab.meta b/Assets/Audio/BGM/BGM.prefab.meta new file mode 100644 index 0000000..5e73865 --- /dev/null +++ b/Assets/Audio/BGM/BGM.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bc4dd6e772668d64f95ce6ea28022290 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BGs/Snow/Snow A/MOUNTAIN SCENE 1 - GEOMETRY.fbx.meta b/Assets/BGs/Snow/Snow A/MOUNTAIN SCENE 1 - GEOMETRY.fbx.meta index 8758b92..7160ca4 100644 --- a/Assets/BGs/Snow/Snow A/MOUNTAIN SCENE 1 - GEOMETRY.fbx.meta +++ b/Assets/BGs/Snow/Snow A/MOUNTAIN SCENE 1 - GEOMETRY.fbx.meta @@ -35,7 +35,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 10 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.099999994 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/BGs/Snow/Snow C/Materials.meta b/Assets/BGs/Snow/Snow C/Materials.meta new file mode 100644 index 0000000..81f6972 --- /dev/null +++ b/Assets/BGs/Snow/Snow C/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8440125e65601f48acab9cdde949563 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/BGs/Snow/Snow C/Materials/MOUNTAIN SCENE 3 - UNLAYERED.mat b/Assets/BGs/Snow/Snow C/Materials/MOUNTAIN SCENE 3 - UNLAYERED.mat new file mode 100644 index 0000000..691197c --- /dev/null +++ b/Assets/BGs/Snow/Snow C/Materials/MOUNTAIN SCENE 3 - UNLAYERED.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MOUNTAIN SCENE 3 - UNLAYERED + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + 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} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 46df36b6e86c7d546b7749990da17542, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/BGs/Snow/Snow C/Materials/MOUNTAIN SCENE 3 - UNLAYERED.mat.meta b/Assets/BGs/Snow/Snow C/Materials/MOUNTAIN SCENE 3 - UNLAYERED.mat.meta new file mode 100644 index 0000000..33c5a28 --- /dev/null +++ b/Assets/BGs/Snow/Snow C/Materials/MOUNTAIN SCENE 3 - UNLAYERED.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05bd6eb415000aa4a92a6595d0225bb2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Snow/SnowA.unity b/Assets/Scenes/Snow/SnowA.unity index 594827b..5c5d027 100644 --- a/Assets/Scenes/Snow/SnowA.unity +++ b/Assets/Scenes/Snow/SnowA.unity @@ -387,6 +387,88 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &834263002 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1990968323811559735, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1853094968961178454, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_ClearFlags + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1853094968961178454, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_CullingMask.m_Bits + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e72a0706702deec48925ee98f7374a45, type: 3} + propertyPath: m_Name + value: Level Geometry + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e72a0706702deec48925ee98f7374a45, type: 3} +--- !u!1 &834263003 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 65702495048144492, guid: e72a0706702deec48925ee98f7374a45, type: 3} + m_PrefabInstance: {fileID: 834263002} + m_PrefabAsset: {fileID: 0} +--- !u!81 &834263004 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 834263003} + m_Enabled: 1 --- !u!1 &941599302 GameObject: m_ObjectHideFlags: 0 @@ -560,6 +642,46 @@ Transform: m_Father: {fileID: 1102152980} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &986184873 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -391268320553695201, guid: e72a0706702deec48925ee98f7374a45, type: 3} + m_PrefabInstance: {fileID: 834263002} + m_PrefabAsset: {fileID: 0} +--- !u!54 &986184877 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 986184873} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &986184878 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 986184873} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -8803937527578110353, guid: e72a0706702deec48925ee98f7374a45, type: 3} +--- !u!4 &1022257483 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + m_PrefabInstance: {fileID: 4444781351624639928} + m_PrefabAsset: {fileID: 0} --- !u!1 &1102152979 GameObject: m_ObjectHideFlags: 0 @@ -691,6 +813,110 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1141076724} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1286612307 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.x + value: 39.765285 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.y + value: 36.31613 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.z + value: -13.348324 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768175, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Name + value: SingletonManager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} +--- !u!1 &1480372042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1480372044} + - component: {fileID: 1480372043} + m_Layer: 0 + m_Name: Player Spawn Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1480372043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1480372042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 743cce483f727904a87ef002d24ec8d6, type: 3} + m_Name: + m_EditorClassIdentifier: + _player: {fileID: 0} + _playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3} + _spawnLocation: {fileID: 4444781350606630130, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} +--- !u!4 &1480372044 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1480372042} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 205.60696, y: 9.356201, z: 1.4173756} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1722175107 GameObject: m_ObjectHideFlags: 0 @@ -715,10 +941,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1722175107} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.8281841, y: 0.07656479, z: -5.1600647} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1022257483} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -993,3 +1220,60 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1001 &4444781351624639928 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1722175108} + m_Modifications: + - target: {fileID: 4444781350606630130, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_Name + value: WorldMap To Snow A + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalPosition.x + value: 17.93 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalPosition.y + value: 1.29 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalPosition.z + value: -43.06 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4444781350606630131, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b21bc040da74d16478b34b7a96b9ba7d, type: 3} diff --git a/Assets/Scenes/Snow/SnowB.unity b/Assets/Scenes/Snow/SnowB.unity index 488048a..f025f64 100644 --- a/Assets/Scenes/Snow/SnowB.unity +++ b/Assets/Scenes/Snow/SnowB.unity @@ -215,7 +215,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -1853094968961178454, guid: 48d872dde42d8a8479d845c6b3fb3518, type: 3} propertyPath: m_CullingMask.m_Bits - value: 128 + value: 136 objectReference: {fileID: 0} - target: {fileID: 65702495048144492, guid: 48d872dde42d8a8479d845c6b3fb3518, type: 3} propertyPath: m_Layer @@ -227,6 +227,19 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 48d872dde42d8a8479d845c6b3fb3518, type: 3} +--- !u!1 &145667363 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 65702495048144492, guid: 48d872dde42d8a8479d845c6b3fb3518, type: 3} + m_PrefabInstance: {fileID: 145667362} + m_PrefabAsset: {fileID: 0} +--- !u!81 &145667364 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145667363} + m_Enabled: 1 --- !u!1 &293610880 GameObject: m_ObjectHideFlags: 0 @@ -342,6 +355,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &611999064 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.x + value: 39.765285 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.y + value: 36.31613 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.z + value: -13.348324 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768175, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Name + value: SingletonManager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} --- !u!1 &708740407 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Snow/SnowC.unity b/Assets/Scenes/Snow/SnowC.unity index fb499fe..0246b0e 100644 --- a/Assets/Scenes/Snow/SnowC.unity +++ b/Assets/Scenes/Snow/SnowC.unity @@ -37,8 +37,8 @@ RenderSettings: m_ReflectionBounces: 1 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -132,7 +132,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: bfd7d3a6fef198440ba822090afd086d, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bfd7d3a6fef198440ba822090afd086d, type: 3} propertyPath: m_LocalPosition.x @@ -180,11 +180,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -1853094968961178454, guid: bfd7d3a6fef198440ba822090afd086d, type: 3} propertyPath: m_CullingMask.m_Bits - value: 128 + value: 136 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: bfd7d3a6fef198440ba822090afd086d, type: 3} propertyPath: m_Name - value: MOUNTAIN SCENE 3 - GEOMETRY + value: Level Geometry objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bfd7d3a6fef198440ba822090afd086d, type: 3} @@ -201,7 +201,7 @@ GameObject: - component: {fileID: 293610882} - component: {fileID: 293610881} m_Layer: 0 - m_Name: Quad + m_Name: BG Layer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -241,7 +241,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 62b4980dcad7635449983176f7d3017e, type: 2} + - {fileID: 2100000, guid: 05bd6eb415000aa4a92a6595d0225bb2, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -285,102 +285,21 @@ Transform: m_Children: - {fileID: 963194228} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &705507993 +--- !u!1 &645160877 stripped GameObject: + m_CorrespondingSourceObject: {fileID: 65702495048144492, guid: bfd7d3a6fef198440ba822090afd086d, type: 3} + m_PrefabInstance: {fileID: 149243603} + m_PrefabAsset: {fileID: 0} +--- !u!81 &645160880 +AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 705507995} - - component: {fileID: 705507994} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &705507994 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 705507993} + m_GameObject: {fileID: 645160877} m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 1 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &705507995 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 705507993} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: -748.4, y: 3, z: -432.1} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &727202430 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8391222552659086748, guid: bfd7d3a6fef198440ba822090afd086d, type: 3} @@ -491,3 +410,60 @@ Transform: m_Father: {fileID: 293610884} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1219681491 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.x + value: 39.765285 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.y + value: 36.31613 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalPosition.z + value: -13.348324 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3584299649024768175, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} + propertyPath: m_Name + value: SingletonManager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} diff --git a/Assets/Scenes/Temple/TempleB.unity b/Assets/Scenes/Temple/TempleB.unity index 3cef21c..859c78e 100644 --- a/Assets/Scenes/Temple/TempleB.unity +++ b/Assets/Scenes/Temple/TempleB.unity @@ -401,6 +401,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &546913424 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 65702495048144492, guid: 325339469f6b77d4a8f54684fbc34abc, type: 3} + m_PrefabInstance: {fileID: 2018795829} + m_PrefabAsset: {fileID: 0} +--- !u!81 &546913425 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546913424} + m_Enabled: 1 --- !u!64 &596794302 MeshCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Temple/TempleC.unity b/Assets/Scenes/Temple/TempleC.unity index 9ce7dc6..0eef187 100644 --- a/Assets/Scenes/Temple/TempleC.unity +++ b/Assets/Scenes/Temple/TempleC.unity @@ -298,6 +298,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &287253150 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 65702495048144492, guid: 4c88c808114e5ed4f847bc9020d6d14d, type: 3} + m_PrefabInstance: {fileID: 590303671} + m_PrefabAsset: {fileID: 0} +--- !u!81 &287253151 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 287253150} + m_Enabled: 1 --- !u!1 &293610880 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Temple/TempleD.unity b/Assets/Scenes/Temple/TempleD.unity index 908404d..634233e 100644 --- a/Assets/Scenes/Temple/TempleD.unity +++ b/Assets/Scenes/Temple/TempleD.unity @@ -608,6 +608,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &278738902 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 65702495048144492, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3} + m_PrefabInstance: {fileID: 1206682667} + m_PrefabAsset: {fileID: 0} +--- !u!81 &278738903 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 278738902} + m_Enabled: 1 --- !u!64 &279674606 MeshCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Temple/TempleSanctum.unity b/Assets/Scenes/Temple/TempleSanctum.unity index d1dc849..5d7b1fd 100644 --- a/Assets/Scenes/Temple/TempleSanctum.unity +++ b/Assets/Scenes/Temple/TempleSanctum.unity @@ -227,6 +227,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &288895278 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 65702495048144492, guid: 8854e21a3403ff44cbcaf57ed29d74eb, type: 3} + m_PrefabInstance: {fileID: 288895274} + m_PrefabAsset: {fileID: 0} +--- !u!81 &288895279 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 288895278} + m_Enabled: 1 --- !u!1 &293610880 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Audio/BGM.cs b/Assets/Scripts/Audio/BGM.cs new file mode 100644 index 0000000..8f86ecd --- /dev/null +++ b/Assets/Scripts/Audio/BGM.cs @@ -0,0 +1,33 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace Scampz.GameJam.Assets.Scripts.Audio +{ + public class BGM : MonoBehaviour + { + [SerializeField] + private AudioClip[] backgroundMusic; + + public AudioClip GetClipFromSceneType(Scene scene) + { + AudioClip audioClipToPlay = null; + + if (scene.name.Contains("Temple")) + audioClipToPlay = backgroundMusic[0]; + if (scene.name.Contains("Sanctum")) + audioClipToPlay = backgroundMusic[1]; + if (scene.name.Contains("Snow")) + audioClipToPlay = backgroundMusic[2]; + if (scene.name.Equals("SnowC")) + audioClipToPlay = backgroundMusic[3]; + if (scene.name.Contains("Airship")) + audioClipToPlay = backgroundMusic[4]; + if (scene.name.Equals("AirshipInside")) + audioClipToPlay = backgroundMusic[5]; + if (scene.name.Contains("Void")) + audioClipToPlay = backgroundMusic[6]; + + return audioClipToPlay; + } + } +} diff --git a/Assets/Scripts/SceneManagement/UnloadScene.cs.meta b/Assets/Scripts/Audio/BGM.cs.meta similarity index 83% rename from Assets/Scripts/SceneManagement/UnloadScene.cs.meta rename to Assets/Scripts/Audio/BGM.cs.meta index c80a659..8663c0d 100644 --- a/Assets/Scripts/SceneManagement/UnloadScene.cs.meta +++ b/Assets/Scripts/Audio/BGM.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 492cbb8b94f132345bc45c0c471d3867 +guid: 62078f3dc064b304a9a033d66fa1157a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Audio/BGMManager.cs b/Assets/Scripts/Audio/BGMManager.cs index 9ed9765..84a8737 100644 --- a/Assets/Scripts/Audio/BGMManager.cs +++ b/Assets/Scripts/Audio/BGMManager.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Linq; +using Scampz.GameJam.Assets.Scripts.Audio; using UnityEngine; using UnityEngine.SceneManagement; @@ -9,52 +8,64 @@ namespace Scampz.GameJam.Assets.Scripts { [SerializeField] - private AudioClip[] backgroundMusic; + private BGM _backgroundMusic; - private static BGMManager _instance; private static AudioSource _audioSource; - public static BGMManager Instance + private void Awake() { - get + if (_audioSource == null) { - if (!_instance) - { - _instance = new GameObject().AddComponent(); - _instance.name = _instance.GetType().ToString(); - _audioSource = new GameObject().AddComponent(); - DontDestroyOnLoad(_instance.gameObject); - DontDestroyOnLoad(_audioSource.gameObject); - } + _audioSource = new GameObject().AddComponent(); + _audioSource.loop = true; + DontDestroyOnLoad(_audioSource.gameObject); + } - return _instance; + if (_backgroundMusic == null) + { + Instantiate(_backgroundMusic); + DontDestroyOnLoad(_backgroundMusic.gameObject); } } - public void PlaySong() + private void OnEnable() { + SceneManager.activeSceneChanged += PlayNextSongIfAreaChange; + } + + private void OnDisable() + { + SceneManager.activeSceneChanged -= PlayNextSongIfAreaChange; + } + + private void PlayNextSongIfAreaChange(Scene oldScene, Scene newScene) + { + if (_audioSource.clip == null) + { + var newMusic = _backgroundMusic.GetClipFromSceneType(newScene); + PlayBGM(newMusic); + return; + } + + Debug.Log($"Changed scenes to " + newScene.name); + var newAudioClip = _backgroundMusic.GetClipFromSceneType(newScene); + + if (_audioSource.clip.name != newAudioClip.name) + { + PlayBGM(newAudioClip); + } + Debug.Log($"Playing BGM: " + _backgroundMusic.name); + + } + + public void PlayBGM(AudioClip audioClip) + { + if (_audioSource == null && _audioSource.clip == audioClip) + return; + _audioSource.Stop(); - - var sceneCount = SceneManager.sceneCount; - var scenes = new List(); - - for (var i = 0; i < sceneCount; ++i) - scenes.Add(SceneManager.GetSceneAt(i)); - - AudioClip audioClipToPlay = null; - - if (scenes.Any(x => x.name.Contains("Temple"))) - audioClipToPlay = backgroundMusic[0]; - if (scenes.Any(x => x.name.Contains("Sanctum"))) - audioClipToPlay = backgroundMusic[1]; - - if (audioClipToPlay != _audioSource.clip) - { - _audioSource.clip = audioClipToPlay; - _audioSource.Play(); - } + _audioSource.clip = audioClip; + _audioSource.Play(); } - - } } diff --git a/Assets/Scripts/SceneManagement/UnloadScene.cs b/Assets/Scripts/SceneManagement/UnloadScene.cs deleted file mode 100644 index c596f0b..0000000 --- a/Assets/Scripts/SceneManagement/UnloadScene.cs +++ /dev/null @@ -1,20 +0,0 @@ -using UnityEngine; - -namespace Scampz.GameJam -{ - public class UnloadScene : MonoBehaviour - { - [SerializeField] - private string scene; - private bool unloaded = false; - - void OnTriggerEnter(Collider collider) - { - if (!unloaded) - { - unloaded = true; - GameManager.Instance.UnloadScene(scene); - } - } - } -} diff --git a/Assets/Singleton/SingletonManager.prefab b/Assets/Singleton/SingletonManager.prefab index 8ebda5c..5736f3e 100644 --- a/Assets/Singleton/SingletonManager.prefab +++ b/Assets/Singleton/SingletonManager.prefab @@ -44,7 +44,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 253db048700363d419cdd2430bb39594, type: 3} m_Name: m_EditorClassIdentifier: - _player: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3} --- !u!1 &3584299649024768175 GameObject: m_ObjectHideFlags: 0 @@ -90,7 +89,6 @@ GameObject: m_Component: - component: {fileID: 3584299649035273204} - component: {fileID: 3584299649035273207} - - component: {fileID: 9052846114851158357} m_Layer: 0 m_Name: BGM Manager m_TagString: Untagged @@ -125,105 +123,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 978ba66c51f1aa942bb951304a3dc54d, type: 3} m_Name: m_EditorClassIdentifier: - backgroundMusic: - - {fileID: 8300000, guid: 3b5765e9830162448a81b1ba84c5dd91, type: 3} - - {fileID: 8300000, guid: 7ec6116eaa70bb64d9b0e30763c77adb, type: 3} ---- !u!82 &9052846114851158357 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3584299649035273206} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - 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 + _backgroundMusic: {fileID: 2471171845959243506, guid: bc4dd6e772668d64f95ce6ea28022290, type: 3} --- !u!1 &3584299649216310804 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/SpawnPoints/WorldMap To Snow A.prefab b/Assets/SpawnPoints/WorldMap To Snow A.prefab new file mode 100644 index 0000000..a1518b0 --- /dev/null +++ b/Assets/SpawnPoints/WorldMap To Snow A.prefab @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4444781350606630130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4444781350606630131} + - component: {fileID: 4444781350606630134} + - component: {fileID: 4444781350606630133} + - component: {fileID: 4444781350606630132} + m_Layer: 0 + m_Name: WorldMap To Snow A + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4444781350606630131 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4444781350606630130} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 17.93, y: 1.29, z: -43.06} + m_LocalScale: {x: 0.051153, y: 0.051153, z: 0.051153} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4444781350606630134 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4444781350606630130} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4444781350606630133 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4444781350606630130} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!135 &4444781350606630132 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4444781350606630130} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/SpawnPoints/WorldMap To Snow A.prefab.meta b/Assets/SpawnPoints/WorldMap To Snow A.prefab.meta new file mode 100644 index 0000000..5ead6a5 --- /dev/null +++ b/Assets/SpawnPoints/WorldMap To Snow A.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b21bc040da74d16478b34b7a96b9ba7d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: