diff --git a/Game/Assets/Music.meta b/Game/Assets/Music.meta new file mode 100644 index 0000000..bb59250 --- /dev/null +++ b/Game/Assets/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aee9bd741c8d6d543936cf37432d275d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Music/BGmusic_demo.mp3 b/Game/Assets/Music/BGmusic_demo.mp3 new file mode 100644 index 0000000..e13c2a5 Binary files /dev/null and b/Game/Assets/Music/BGmusic_demo.mp3 differ diff --git a/Game/Assets/Music/BGmusic_demo.mp3.meta b/Game/Assets/Music/BGmusic_demo.mp3.meta new file mode 100644 index 0000000..7c22120 --- /dev/null +++ b/Game/Assets/Music/BGmusic_demo.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a46d0a2aa43161647946319748a88139 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index 3671799..8194f26 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -5111,6 +5111,135 @@ Transform: - {fileID: 1254187537} m_Father: {fileID: 526821486} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &802661188 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 802661190} + - component: {fileID: 802661189} + m_Layer: 0 + m_Name: SFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &802661189 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 802661188} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {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 +--- !u!4 &802661190 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 802661188} + 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: 1923174356} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &806330341 stripped Transform: m_CorrespondingSourceObject: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3} @@ -9145,6 +9274,135 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} +--- !u!1 &1586504372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1586504374} + - component: {fileID: 1586504373} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1586504373 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586504372} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {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 +--- !u!4 &1586504374 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1586504372} + 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: 1923174356} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1602216077 stripped Transform: m_CorrespondingSourceObject: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} @@ -10942,7 +11200,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7100472280186483774, guid: 5bb8206709807ff4cae9583b3ee3e67d, type: 3} m_PrefabInstance: {fileID: 1885956586} m_PrefabAsset: {fileID: 0} +<<<<<<< Updated upstream --- !u!1 &1924660664 +======= +--- !u!1 &1923174354 +>>>>>>> Stashed changes GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -10950,22 +11212,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: +<<<<<<< Updated upstream - component: {fileID: 1924660665} - component: {fileID: 1924660667} - component: {fileID: 1924660666} m_Layer: 0 m_Name: frame_25_delay-0.04s_0 +======= + - component: {fileID: 1923174356} + - component: {fileID: 1923174355} + m_Layer: 0 + m_Name: AudioManager +>>>>>>> Stashed changes m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 +<<<<<<< Updated upstream m_IsActive: 0 --- !u!4 &1924660665 +======= + m_IsActive: 1 +--- !u!114 &1923174355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1923174354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf3cb896d15dce149a13f70e47c35794, type: 3} + m_Name: + m_EditorClassIdentifier: '::' + musicSource: {fileID: 1586504373} + SFXSource: {fileID: 802661189} + bgm: {fileID: 8300000, guid: a46d0a2aa43161647946319748a88139, type: 3} + fallDamage: {fileID: 0} +--- !u!4 &1923174356 +>>>>>>> Stashed changes Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} +<<<<<<< Updated upstream m_GameObject: {fileID: 1924660664} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} @@ -11056,6 +11347,19 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 +======= + m_GameObject: {fileID: 1923174354} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -14.17394, y: 8.08983, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1586504374} + - {fileID: 802661190} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +>>>>>>> Stashed changes --- !u!1001 &1927423311 PrefabInstance: m_ObjectHideFlags: 0 @@ -12382,3 +12686,8 @@ SceneRoots: - {fileID: 1681788161} - {fileID: 1445156949} - {fileID: 750131492} +<<<<<<< Updated upstream +======= + - {fileID: 809899008} + - {fileID: 1923174356} +>>>>>>> Stashed changes diff --git a/Game/Assets/Scripts/AudioManager.cs b/Game/Assets/Scripts/AudioManager.cs new file mode 100644 index 0000000..82fead4 --- /dev/null +++ b/Game/Assets/Scripts/AudioManager.cs @@ -0,0 +1,18 @@ +using UnityEngine; + +public class AudioManager : MonoBehaviour +{ + [SerializeField] AudioSource musicSource; + [SerializeField] AudioSource SFXSource; + + public AudioClip bgm; + public AudioClip fallDamage; + + private void Start() + { + musicSource.clip = bgm; + musicSource.Play(); + } + + +} diff --git a/Game/Assets/Scripts/AudioManager.cs.meta b/Game/Assets/Scripts/AudioManager.cs.meta new file mode 100644 index 0000000..d12cd45 --- /dev/null +++ b/Game/Assets/Scripts/AudioManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: cf3cb896d15dce149a13f70e47c35794 \ No newline at end of file