From 765940c2c1ee661c4290e6a938c8b2b500152de5 Mon Sep 17 00:00:00 2001 From: Dizel Date: Wed, 29 Jan 2025 14:11:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D1=81?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D0=B0=D0=B9=D0=BD=D0=BE=D0=B9=20=D0=BC=D1=83?= =?UTF-8?q?=D0=B7=D1=8B=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Game/Game Scence.unity | 158 +++++++++++++++++- Assets/Crossy Road VR/Sounds/Musics.meta | 8 + .../Sounds/Musics/Among Us - Trap Remix.mp3 | 3 + .../Musics/Among Us - Trap Remix.mp3.meta | 23 +++ .../Sounds/Musics/CRWFRD - Angry Birdz.mp3 | 3 + .../Musics/CRWFRD - Angry Birdz.mp3.meta | 23 +++ .../Sounds/Musics/Jasper Byrne - Hotline.mp3 | 3 + .../Musics/Jasper Byrne - Hotline.mp3.meta | 23 +++ .../Sounds/Musics/M O O N - Crystals.mp3 | 3 + .../Sounds/Musics/M O O N - Crystals.mp3.meta | 23 +++ ...mbie - mini games walnout (trap remix).mp3 | 3 + ...- mini games walnout (trap remix).mp3.meta | 23 +++ .../Sounds/Musics/Scattle - Knock Knock.mp3 | 3 + .../Musics/Scattle - Knock Knock.mp3.meta | 23 +++ Assets/RandomMusicSelectScript.cs | 32 ++++ Assets/RandomMusicSelectScript.cs.meta | 11 ++ 16 files changed, 364 insertions(+), 1 deletion(-) create mode 100644 Assets/Crossy Road VR/Sounds/Musics.meta create mode 100644 Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3 create mode 100644 Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3.meta create mode 100644 Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3 create mode 100644 Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3.meta create mode 100644 Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3 create mode 100644 Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3.meta create mode 100644 Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3 create mode 100644 Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3.meta create mode 100644 Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3 create mode 100644 Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3.meta create mode 100644 Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3 create mode 100644 Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3.meta create mode 100644 Assets/RandomMusicSelectScript.cs create mode 100644 Assets/RandomMusicSelectScript.cs.meta diff --git a/Assets/Crossy Road VR/Scenes/Game/Game Scence.unity b/Assets/Crossy Road VR/Scenes/Game/Game Scence.unity index 71d3a54..94b9cf5 100644 --- a/Assets/Crossy Road VR/Scenes/Game/Game Scence.unity +++ b/Assets/Crossy Road VR/Scenes/Game/Game Scence.unity @@ -122,6 +122,154 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &889366719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 889366720} + - component: {fileID: 889366722} + - component: {fileID: 889366721} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &889366720 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889366719} + 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: 1832352350} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &889366721 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889366719} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 0.2 + 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!114 &889366722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889366719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57b6a86afb37be341a1589bb98bdeb60, type: 3} + m_Name: + m_EditorClassIdentifier: + _MusicClipList: + - {fileID: 8300000, guid: ab50ca0fe44166e458f7c6f96dca3413, type: 3} + - {fileID: 8300000, guid: e3cc6a5f177942a4f96a97913c8b3d11, type: 3} + - {fileID: 8300000, guid: 257122f42cf9fe74e9146f3e374f4df1, type: 3} + - {fileID: 8300000, guid: 056fef58ca9d41746aeaac1649ee6e49, type: 3} + - {fileID: 8300000, guid: 992aed4c1adf91a449d2ee7fe0a2e270, type: 3} + - {fileID: 8300000, guid: ad4624927aa471b4f9969fa6aded149b, type: 3} --- !u!1 &894356741 GameObject: m_ObjectHideFlags: 0 @@ -2151,6 +2299,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 359741391555935905, guid: d345ba61556173847ba32546368899cd, type: 3} m_PrefabInstance: {fileID: 1744412849} m_PrefabAsset: {fileID: 0} +--- !u!4 &1832352350 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7715044902281673486, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3} + m_PrefabInstance: {fileID: 1879847889} + m_PrefabAsset: {fileID: 0} --- !u!1 &1870866336 GameObject: m_ObjectHideFlags: 0 @@ -2342,7 +2495,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7715044902281673486, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3} + insertIndex: -1 + addedObject: {fileID: 889366720} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ece2161f7d9e2a143b4ddb22c44736e1, type: 3} --- !u!1 &1991568987 diff --git a/Assets/Crossy Road VR/Sounds/Musics.meta b/Assets/Crossy Road VR/Sounds/Musics.meta new file mode 100644 index 0000000..abd8148 --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b5a15d9e3c7da24b8eb455648dc883b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3 b/Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3 new file mode 100644 index 0000000..c84a7b2 --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9a40824eea2041e5469075017398e5fda030e37da3b8f4c33611b51aabb216f +size 2322225 diff --git a/Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3.meta b/Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3.meta new file mode 100644 index 0000000..22f3e45 --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/Among Us - Trap Remix.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: ab50ca0fe44166e458f7c6f96dca3413 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3 b/Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3 new file mode 100644 index 0000000..7b8868d --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75d043bec630b610f9ed1faf63eaa7ca9277330995ce77c8ec115c83817f663b +size 5282109 diff --git a/Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3.meta b/Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3.meta new file mode 100644 index 0000000..a2f705b --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/CRWFRD - Angry Birdz.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e3cc6a5f177942a4f96a97913c8b3d11 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3 b/Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3 new file mode 100644 index 0000000..37de331 --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab9b641b0f068a61c7061ba521eaa2f186bb7c4b68f903af70687c46b2832afe +size 3073581 diff --git a/Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3.meta b/Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3.meta new file mode 100644 index 0000000..d46b617 --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/Jasper Byrne - Hotline.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 257122f42cf9fe74e9146f3e374f4df1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3 b/Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3 new file mode 100644 index 0000000..2df4e9f --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c947907f8da420a3568156a065ba41e0226dcbd89f3442205a69dd280d8932c1 +size 11590053 diff --git a/Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3.meta b/Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3.meta new file mode 100644 index 0000000..a881f4d --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/M O O N - Crystals.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 056fef58ca9d41746aeaac1649ee6e49 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3 b/Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3 new file mode 100644 index 0000000..253be01 --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b51bf8dceba33d36a583dd877595324979b3e73dd3e9031b04e016c5c3cadaa +size 4482957 diff --git a/Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3.meta b/Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3.meta new file mode 100644 index 0000000..21deb9b --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/Plants vs zombie - mini games walnout (trap remix).mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 992aed4c1adf91a449d2ee7fe0a2e270 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3 b/Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3 new file mode 100644 index 0000000..c230621 --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d25cabc06fd4e90e1d351590ed7c378a327451a207ba936ee2186a778a7c4a50 +size 3917157 diff --git a/Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3.meta b/Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3.meta new file mode 100644 index 0000000..bfcfe75 --- /dev/null +++ b/Assets/Crossy Road VR/Sounds/Musics/Scattle - Knock Knock.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: ad4624927aa471b4f9969fa6aded149b +AudioImporter: + externalObjects: {} + serializedVersion: 7 + 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/Assets/RandomMusicSelectScript.cs b/Assets/RandomMusicSelectScript.cs new file mode 100644 index 0000000..836b27b --- /dev/null +++ b/Assets/RandomMusicSelectScript.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(AudioSource))] +public class RandomMusicSelectScript : MonoBehaviour +{ + [SerializeField] List _MusicClipList; + + private AudioSource _Audio; + + // Start is called before the first frame update + void Start() + { + _Audio = GetComponent(); + _Audio.clip = GetRandomObject(_MusicClipList); + _Audio.Play(); + } + + T GetRandomObject(List list) + { + // проверка на пустоту списка + if (list == null || list.Count == 0) + { + return default; + } + + // Генерация случайного индекса + int randomIndex = UnityEngine.Random.Range(0, list.Count); + return list[randomIndex]; + } +} diff --git a/Assets/RandomMusicSelectScript.cs.meta b/Assets/RandomMusicSelectScript.cs.meta new file mode 100644 index 0000000..3d905cc --- /dev/null +++ b/Assets/RandomMusicSelectScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 57b6a86afb37be341a1589bb98bdeb60 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: