diff --git a/Assets/Resources/Music/theclappytrio.ogg b/Assets/Resources/Music/theclappytrio.ogg new file mode 100644 index 000000000..8553fcd7f Binary files /dev/null and b/Assets/Resources/Music/theclappytrio.ogg differ diff --git a/Assets/Resources/Music/theclappytrio.ogg.meta b/Assets/Resources/Music/theclappytrio.ogg.meta new file mode 100644 index 000000000..f13d37451 --- /dev/null +++ b/Assets/Resources/Music/theclappytrio.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ebc898cbaf3e679438e83c68552e527f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 97ada52ac..be741fcbd 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -138,7 +138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &49975355 Transform: m_ObjectHideFlags: 0 @@ -1359,7 +1359,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 066f6ce2bdafdfb45a8df77dfb111c22, type: 3} m_Name: m_EditorClassIdentifier: - songBpm: 130 + songBpm: 120 secPerBeat: 0 songPosition: 0 songPositionInBeats: 0 @@ -1381,7 +1381,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 51af38323954a8d44874780ba4577fb4, type: 3} + m_audioClip: {fileID: 8300000, guid: ebc898cbaf3e679438e83c68552e527f, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -3884,7 +3884,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1161847961 Transform: m_ObjectHideFlags: 0 @@ -6634,7 +6634,7 @@ MonoBehaviour: playerEntities: [] currentEvent: 0 currentPlayerEvent: 0 - txt: {fileID: 4900000, guid: cbe1a43c8ddc790498fde2e01e66d23e, type: 3} + txt: {fileID: 4900000, guid: 13908201c7935ea4c8e9d2a58b006b87, type: 3} startOffset: 1 --- !u!212 &2072389418 SpriteRenderer: diff --git a/Assets/Scripts/Beatmap.cs b/Assets/Scripts/Beatmap.cs index 75c9886d0..2184203d3 100644 --- a/Assets/Scripts/Beatmap.cs +++ b/Assets/Scripts/Beatmap.cs @@ -6,7 +6,7 @@ namespace RhythmHeavenMania [Serializable] public class Beatmap { - public double bpm; + public float bpm; public List entities; [Serializable] @@ -14,6 +14,7 @@ namespace RhythmHeavenMania { public float beat; public int track; + public float length; public string datamodel; public object Clone() diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index 2862dd739..b67e36f68 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -104,6 +104,12 @@ namespace RhythmHeavenMania return final; } + public void SetBpm(float bpm) + { + this.songBpm = bpm; + secPerBeat = 60f / songBpm; + } + public bool InThreshold(float beat) { //Check if the beat sent falls within beatThreshold diff --git a/Assets/Scripts/EventCaller.cs b/Assets/Scripts/EventCaller.cs index d9dc77349..015456646 100644 --- a/Assets/Scripts/EventCaller.cs +++ b/Assets/Scripts/EventCaller.cs @@ -66,6 +66,10 @@ namespace RhythmHeavenMania new GameAction("prepare", delegate { ForkLifter.instance.ForkLifterHand.Prepare(); }), new GameAction("gulp", delegate { ForkLifterPlayer.instance.Eat(); }), new GameAction("sigh", delegate { Jukebox.PlayOneShot("sigh"); }) + }), + new MiniGame("clappyTrio", new List() + { + new GameAction("clap", delegate { Debug.Log("bruh"); }, true ), }) }; @@ -93,7 +97,7 @@ namespace RhythmHeavenMania private void Update() { - if (GameManager.instance.currentEvent > 0 && GameManager.instance.currentEvent < GameManager.instance.Beatmap.entities.Count) + if (GameManager.instance.currentEvent >= 0 && GameManager.instance.currentEvent < GameManager.instance.Beatmap.entities.Count) currentBeat = GameManager.instance.Beatmap.entities[GameManager.instance.currentEvent].beat; } diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 39e7577ae..74e8a6959 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -34,16 +34,17 @@ namespace RhythmHeavenMania SortEventsList(); string json = txt.text; - Beatmap.entities = JsonConvert.DeserializeObject>(json); + Beatmap = JsonConvert.DeserializeObject(json); SortEventsList(); - StartCoroutine(Begin()); - GlobalGameManager.Init(); eventCaller = GetComponent(); eventCaller.Init(); + Conductor.instance.SetBpm(Beatmap.bpm); + + StartCoroutine(Begin()); } private IEnumerator Begin() diff --git a/Assets/forklifter.json b/Assets/forklifter.json index a4f859536..29259f39a 100644 --- a/Assets/forklifter.json +++ b/Assets/forklifter.json @@ -1,432 +1,625 @@ -[ - { - "beat": 9, - "datamodel": "forkLifter/pea" - }, - { - "beat": 13, - "datamodel": "forkLifter/pea" - }, - { - "beat": 18, - "datamodel": "forkLifter/pea" - }, - { - "beat": 21, - "datamodel": "forkLifter/pea" - }, - { - "beat": 25, - "datamodel": "forkLifter/pea" - }, - { - "beat": 29, - "datamodel": "forkLifter/pea" - }, - { - "beat": 34, - "datamodel": "forkLifter/pea" - }, - { - "beat": 37, - "datamodel": "forkLifter/pea" - }, - { - "beat": 41, - "datamodel": "forkLifter/pea" - }, - { - "beat": 42, - "datamodel": "forkLifter/pea" - }, - { - "beat": 45, - "datamodel": "forkLifter/pea" - }, - { - "beat": 45.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 49, - "datamodel": "forkLifter/pea" - }, - { - "beat": 50, - "datamodel": "forkLifter/pea" - }, - { - "beat": 53, - "datamodel": "forkLifter/pea" - }, - { - "beat": 53.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 57, - "datamodel": "forkLifter/pea" - }, - { - "beat": 58, - "datamodel": "forkLifter/pea" - }, - { - "beat": 62, - "datamodel": "forkLifter/pea" - }, - { - "beat": 65, - "datamodel": "forkLifter/pea" - }, - { - "beat": 66, - "datamodel": "forkLifter/pea" - }, - { - "beat": 69, - "datamodel": "forkLifter/pea" - }, - { - "beat": 69.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 73, - "datamodel": "forkLifter/pea" - }, - { - "beat": 74, - "datamodel": "forkLifter/pea" - }, - { - "beat": 77, - "datamodel": "forkLifter/pea" - }, - { - "beat": 81, - "datamodel": "forkLifter/pea" - }, - { - "beat": 82, - "datamodel": "forkLifter/pea" - }, - { - "beat": 85.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 86, - "datamodel": "forkLifter/pea" - }, - { - "beat": 86.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 90, - "datamodel": "forkLifter/pea" - }, - { - "beat": 93, - "datamodel": "forkLifter/pea" - }, - { - "beat": 94, - "datamodel": "forkLifter/pea" - }, - { - "beat": 98, - "datamodel": "forkLifter/pea" - }, - { - "beat": 101, - "datamodel": "forkLifter/pea" - }, - { - "beat": 105, - "datamodel": "forkLifter/pea" - }, - { - "beat": 106, - "datamodel": "forkLifter/pea" - }, - { - "beat": 109, - "datamodel": "forkLifter/pea" - }, - { - "beat": 114, - "datamodel": "forkLifter/pea" - }, - { - "beat": 117, - "datamodel": "forkLifter/pea" - }, - { - "beat": 118, - "datamodel": "forkLifter/pea" - }, - { - "beat": 121, - "datamodel": "forkLifter/pea" - }, - { - "beat": 122, - "datamodel": "forkLifter/pea" - }, - { - "beat": 125, - "datamodel": "forkLifter/pea" - }, - { - "beat": 126, - "datamodel": "forkLifter/pea" - }, - { - "beat": 130, - "datamodel": "forkLifter/pea" - }, - { - "beat": 133, - "datamodel": "forkLifter/pea" - }, - { - "beat": 137.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 138, - "datamodel": "forkLifter/pea" - }, - { - "beat": 141, - "datamodel": "forkLifter/pea" - }, - { - "beat": 145.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 146, - "datamodel": "forkLifter/pea" - }, - { - "beat": 149, - "datamodel": "forkLifter/pea" - }, - { - "beat": 153.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 154, - "datamodel": "forkLifter/pea" - }, - { - "beat": 157, - "datamodel": "forkLifter/pea" - }, - { - "beat": 161.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 162, - "datamodel": "forkLifter/pea" - }, - { - "beat": 165, - "datamodel": "forkLifter/topbun" - }, - { - "beat": 165.65, - "datamodel": "forkLifter/burger" - }, - { - "beat": 166.25, - "datamodel": "forkLifter/bottombun" - }, - { - "beat": 169.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 170, - "datamodel": "forkLifter/pea" - }, - { - "beat": 173, - "datamodel": "forkLifter/pea" - }, - { - "beat": 177.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 178, - "datamodel": "forkLifter/pea" - }, - { - "beat": 181, - "datamodel": "forkLifter/pea" - }, - { - "beat": 185.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 186, - "datamodel": "forkLifter/pea" - }, - { - "beat": 188.5, - "datamodel": "forkLifter/pea" - }, - { - "beat": 189, - "datamodel": "forkLifter/pea" - }, - { - "beat": 193, - "datamodel": "forkLifter/pea" - }, - { - "beat": 196, - "datamodel": "forkLifter/pea" - }, - { - "beat": 16, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 24, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 32, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 39.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 44.25, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 48, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 52.25, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 56, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 64.25, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 68.5, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 72, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 80, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 84.5, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 88.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 96.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 103.5, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 112, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 120.5, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 124.5, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 128.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 135.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 143.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 151.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 160, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 164.25, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 168.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 175.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 183.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 188.5, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 191.75, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 199, - "datamodel": "forkLifter/gulp" - }, - { - "beat": 201, - "datamodel": "forkLifter/sigh" - }, - {"beat":8.0,"datamodel":"forkLifter/prepare"},{"beat":12.0,"datamodel":"forkLifter/prepare"},{"beat":17.0,"datamodel":"forkLifter/prepare"},{"beat":20.0,"datamodel":"forkLifter/prepare"},{"beat":24.0,"datamodel":"forkLifter/prepare"},{"beat":28.0,"datamodel":"forkLifter/prepare"},{"beat":33.0,"datamodel":"forkLifter/prepare"},{"beat":36.0,"datamodel":"forkLifter/prepare"},{"beat":40.0,"datamodel":"forkLifter/prepare"},{"beat":44.0,"datamodel":"forkLifter/prepare"},{"beat":48.0,"datamodel":"forkLifter/prepare"},{"beat":52.0,"datamodel":"forkLifter/prepare"},{"beat":56.0,"datamodel":"forkLifter/prepare"},{"beat":61.0,"datamodel":"forkLifter/prepare"},{"beat":64.0,"datamodel":"forkLifter/prepare"},{"beat":68.0,"datamodel":"forkLifter/prepare"},{"beat":72.0,"datamodel":"forkLifter/prepare"},{"beat":76.0,"datamodel":"forkLifter/prepare"},{"beat":80.0,"datamodel":"forkLifter/prepare"},{"beat":84.5,"datamodel":"forkLifter/prepare"},{"beat":89.0,"datamodel":"forkLifter/prepare"},{"beat":92.0,"datamodel":"forkLifter/prepare"},{"beat":97.0,"datamodel":"forkLifter/prepare"},{"beat":100.0,"datamodel":"forkLifter/prepare"},{"beat":104.0,"datamodel":"forkLifter/prepare"},{"beat":108.0,"datamodel":"forkLifter/prepare"},{"beat":113.0,"datamodel":"forkLifter/prepare"},{"beat":116.0,"datamodel":"forkLifter/prepare"},{"beat":120.0,"datamodel":"forkLifter/prepare"},{"beat":124.0,"datamodel":"forkLifter/prepare"},{"beat":129.0,"datamodel":"forkLifter/prepare"},{"beat":132.0,"datamodel":"forkLifter/prepare"},{"beat":136.5,"datamodel":"forkLifter/prepare"},{"beat":140.0,"datamodel":"forkLifter/prepare"},{"beat":144.5,"datamodel":"forkLifter/prepare"},{"beat":148.0,"datamodel":"forkLifter/prepare"},{"beat":152.5,"datamodel":"forkLifter/prepare"},{"beat":156.0,"datamodel":"forkLifter/prepare"},{"beat":160.5,"datamodel":"forkLifter/prepare"},{"beat":164.0,"datamodel":"forkLifter/prepare"},{"beat":168.5,"datamodel":"forkLifter/prepare"},{"beat":172.0,"datamodel":"forkLifter/prepare"},{"beat":176.5,"datamodel":"forkLifter/prepare"},{"beat":180.0,"datamodel":"forkLifter/prepare"},{"beat":184.5,"datamodel":"forkLifter/prepare"},{"beat":187.5,"datamodel":"forkLifter/prepare"},{"beat":192.0,"datamodel":"forkLifter/prepare"},{"beat":195.0,"datamodel":"forkLifter/prepare"} - , - { - "beat": 206, - "datamodel": "gameManager/end" - } -] \ No newline at end of file +{ + "bpm": 130, + "entities": [ + { + "beat": 9, + "datamodel": "forkLifter/pea" + }, + { + "beat": 13, + "datamodel": "forkLifter/pea" + }, + { + "beat": 18, + "datamodel": "forkLifter/pea" + }, + { + "beat": 21, + "datamodel": "forkLifter/pea" + }, + { + "beat": 25, + "datamodel": "forkLifter/pea" + }, + { + "beat": 29, + "datamodel": "forkLifter/pea" + }, + { + "beat": 34, + "datamodel": "forkLifter/pea" + }, + { + "beat": 37, + "datamodel": "forkLifter/pea" + }, + { + "beat": 41, + "datamodel": "forkLifter/pea" + }, + { + "beat": 42, + "datamodel": "forkLifter/pea" + }, + { + "beat": 45, + "datamodel": "forkLifter/pea" + }, + { + "beat": 45.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 49, + "datamodel": "forkLifter/pea" + }, + { + "beat": 50, + "datamodel": "forkLifter/pea" + }, + { + "beat": 53, + "datamodel": "forkLifter/pea" + }, + { + "beat": 53.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 57, + "datamodel": "forkLifter/pea" + }, + { + "beat": 58, + "datamodel": "forkLifter/pea" + }, + { + "beat": 62, + "datamodel": "forkLifter/pea" + }, + { + "beat": 65, + "datamodel": "forkLifter/pea" + }, + { + "beat": 66, + "datamodel": "forkLifter/pea" + }, + { + "beat": 69, + "datamodel": "forkLifter/pea" + }, + { + "beat": 69.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 73, + "datamodel": "forkLifter/pea" + }, + { + "beat": 74, + "datamodel": "forkLifter/pea" + }, + { + "beat": 77, + "datamodel": "forkLifter/pea" + }, + { + "beat": 81, + "datamodel": "forkLifter/pea" + }, + { + "beat": 82, + "datamodel": "forkLifter/pea" + }, + { + "beat": 85.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 86, + "datamodel": "forkLifter/pea" + }, + { + "beat": 86.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 90, + "datamodel": "forkLifter/pea" + }, + { + "beat": 93, + "datamodel": "forkLifter/pea" + }, + { + "beat": 94, + "datamodel": "forkLifter/pea" + }, + { + "beat": 98, + "datamodel": "forkLifter/pea" + }, + { + "beat": 101, + "datamodel": "forkLifter/pea" + }, + { + "beat": 105, + "datamodel": "forkLifter/pea" + }, + { + "beat": 106, + "datamodel": "forkLifter/pea" + }, + { + "beat": 109, + "datamodel": "forkLifter/pea" + }, + { + "beat": 114, + "datamodel": "forkLifter/pea" + }, + { + "beat": 117, + "datamodel": "forkLifter/pea" + }, + { + "beat": 118, + "datamodel": "forkLifter/pea" + }, + { + "beat": 121, + "datamodel": "forkLifter/pea" + }, + { + "beat": 122, + "datamodel": "forkLifter/pea" + }, + { + "beat": 125, + "datamodel": "forkLifter/pea" + }, + { + "beat": 126, + "datamodel": "forkLifter/pea" + }, + { + "beat": 130, + "datamodel": "forkLifter/pea" + }, + { + "beat": 133, + "datamodel": "forkLifter/pea" + }, + { + "beat": 137.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 138, + "datamodel": "forkLifter/pea" + }, + { + "beat": 141, + "datamodel": "forkLifter/pea" + }, + { + "beat": 145.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 146, + "datamodel": "forkLifter/pea" + }, + { + "beat": 149, + "datamodel": "forkLifter/pea" + }, + { + "beat": 153.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 154, + "datamodel": "forkLifter/pea" + }, + { + "beat": 157, + "datamodel": "forkLifter/pea" + }, + { + "beat": 161.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 162, + "datamodel": "forkLifter/pea" + }, + { + "beat": 165, + "datamodel": "forkLifter/topbun" + }, + { + "beat": 165.65, + "datamodel": "forkLifter/burger" + }, + { + "beat": 166.25, + "datamodel": "forkLifter/bottombun" + }, + { + "beat": 169.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 170, + "datamodel": "forkLifter/pea" + }, + { + "beat": 173, + "datamodel": "forkLifter/pea" + }, + { + "beat": 177.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 178, + "datamodel": "forkLifter/pea" + }, + { + "beat": 181, + "datamodel": "forkLifter/pea" + }, + { + "beat": 185.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 186, + "datamodel": "forkLifter/pea" + }, + { + "beat": 188.5, + "datamodel": "forkLifter/pea" + }, + { + "beat": 189, + "datamodel": "forkLifter/pea" + }, + { + "beat": 193, + "datamodel": "forkLifter/pea" + }, + { + "beat": 196, + "datamodel": "forkLifter/pea" + }, + { + "beat": 16, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 24, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 32, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 39.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 44.25, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 48, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 52.25, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 56, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 64.25, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 68.5, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 72, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 80, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 84.5, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 88.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 96.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 103.5, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 112, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 120.5, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 124.5, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 128.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 135.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 143.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 151.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 160, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 164.25, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 168.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 175.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 183.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 188.5, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 191.75, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 199, + "datamodel": "forkLifter/gulp" + }, + { + "beat": 201, + "datamodel": "forkLifter/sigh" + }, + { + "beat": 8, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 12, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 17, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 20, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 24, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 28, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 33, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 36, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 40, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 44, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 48, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 52, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 56, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 61, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 64, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 68, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 72, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 76, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 80, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 84.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 89, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 92, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 97, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 100, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 104, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 108, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 113, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 116, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 120, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 124, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 129, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 132, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 136.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 140, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 144.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 148, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 152.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 156, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 160.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 164, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 168.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 172, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 176.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 180, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 184.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 187.5, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 192, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 195, + "datamodel": "forkLifter/prepare" + }, + { + "beat": 206, + "datamodel": "gameManager/end" + } + ] +} \ No newline at end of file diff --git a/Assets/theclappytrio.json b/Assets/theclappytrio.json new file mode 100644 index 000000000..239d51bc0 --- /dev/null +++ b/Assets/theclappytrio.json @@ -0,0 +1,10 @@ +{ + "bpm": 117.26, + "entities": [ + { + "beat": 9, + "length": 3, + "datamodel": "clappyTrio/clap" + } + ] +} \ No newline at end of file diff --git a/Assets/theclappytrio.json.meta b/Assets/theclappytrio.json.meta new file mode 100644 index 000000000..8a410c1da --- /dev/null +++ b/Assets/theclappytrio.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 13908201c7935ea4c8e9d2a58b006b87 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: