From 4fe8d7d18cda2897b8385ebfd84bd66f205568b7 Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Wed, 24 Mar 2021 11:24:23 +0000 Subject: [PATCH 1/4] added parameter driven audio --- .../Assets/CaiStuff/Music/Drone_Revival.ogg | 3 + .../Assets/CaiStuff/Music/Drum1_Revival.ogg | 3 + .../Assets/CaiStuff/Music/Drum2_Revival.ogg | 3 + .../Assets/CaiStuff/Music/Duduk_Revival.ogg | 3 + .../CaiStuff/Music/Dulcimer_Revival.ogg | 3 + .../Assets/CaiStuff/Music/Harp_Revival.ogg | 3 + .../Assets/CaiStuff/Music/Strings_Revival.ogg | 3 + .../Build/Desktop/Master.strings.bank | 4 +- game/FMOD Project/Build/Desktop/Music.bank | 2 +- ...{0daea465-a7b2-4bd2-9767-6b360a9ba415}.xml | 23 + ...{2799af44-591d-4467-9bf2-0cab469936d0}.xml | 23 + ...{29bf479f-9f5b-4e7e-a41b-53ba1be1c4fe}.xml | 23 + ...{64c02115-632b-4b26-bc5a-3d4f9c1d8b66}.xml | 23 + ...{7791ff6e-6591-46ea-a99e-bb7e814d5285}.xml | 23 + ...{7da5447e-ade3-406c-a2f2-a60c5e45e484}.xml | 23 + ...{8ad7a488-230d-451c-b205-f6a73a9756d0}.xml | 23 + ...{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml | 935 ++++++++++++++++++ ...{d01e404e-c96c-4ae2-8b17-9a47d5fd5bd3}.xml | 25 + 18 files changed, 1145 insertions(+), 3 deletions(-) create mode 100644 game/FMOD Project/Assets/CaiStuff/Music/Drone_Revival.ogg create mode 100644 game/FMOD Project/Assets/CaiStuff/Music/Drum1_Revival.ogg create mode 100644 game/FMOD Project/Assets/CaiStuff/Music/Drum2_Revival.ogg create mode 100644 game/FMOD Project/Assets/CaiStuff/Music/Duduk_Revival.ogg create mode 100644 game/FMOD Project/Assets/CaiStuff/Music/Dulcimer_Revival.ogg create mode 100644 game/FMOD Project/Assets/CaiStuff/Music/Harp_Revival.ogg create mode 100644 game/FMOD Project/Assets/CaiStuff/Music/Strings_Revival.ogg create mode 100644 game/FMOD Project/Metadata/AudioFile/{0daea465-a7b2-4bd2-9767-6b360a9ba415}.xml create mode 100644 game/FMOD Project/Metadata/AudioFile/{2799af44-591d-4467-9bf2-0cab469936d0}.xml create mode 100644 game/FMOD Project/Metadata/AudioFile/{29bf479f-9f5b-4e7e-a41b-53ba1be1c4fe}.xml create mode 100644 game/FMOD Project/Metadata/AudioFile/{64c02115-632b-4b26-bc5a-3d4f9c1d8b66}.xml create mode 100644 game/FMOD Project/Metadata/AudioFile/{7791ff6e-6591-46ea-a99e-bb7e814d5285}.xml create mode 100644 game/FMOD Project/Metadata/AudioFile/{7da5447e-ade3-406c-a2f2-a60c5e45e484}.xml create mode 100644 game/FMOD Project/Metadata/AudioFile/{8ad7a488-230d-451c-b205-f6a73a9756d0}.xml create mode 100644 game/FMOD Project/Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml create mode 100644 game/FMOD Project/Metadata/ParameterPreset/{d01e404e-c96c-4ae2-8b17-9a47d5fd5bd3}.xml diff --git a/game/FMOD Project/Assets/CaiStuff/Music/Drone_Revival.ogg b/game/FMOD Project/Assets/CaiStuff/Music/Drone_Revival.ogg new file mode 100644 index 0000000..bf52349 --- /dev/null +++ b/game/FMOD Project/Assets/CaiStuff/Music/Drone_Revival.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae5a5d6d3dd20467b024d2108d5dfbe2d142e2c8459a8efef5f77f5430f52c71 +size 11668488 diff --git a/game/FMOD Project/Assets/CaiStuff/Music/Drum1_Revival.ogg b/game/FMOD Project/Assets/CaiStuff/Music/Drum1_Revival.ogg new file mode 100644 index 0000000..4ea828c --- /dev/null +++ b/game/FMOD Project/Assets/CaiStuff/Music/Drum1_Revival.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd7d871c52551ad1f6af39a3bce1884e1bb6646f92e7eac3c5031ef70f0eb6ee +size 11754626 diff --git a/game/FMOD Project/Assets/CaiStuff/Music/Drum2_Revival.ogg b/game/FMOD Project/Assets/CaiStuff/Music/Drum2_Revival.ogg new file mode 100644 index 0000000..e78ea7d --- /dev/null +++ b/game/FMOD Project/Assets/CaiStuff/Music/Drum2_Revival.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d63ed0a3ca547a0cb62ba2eb0d956092883aa49e819d05d0af1c24ab91c55bf8 +size 12278792 diff --git a/game/FMOD Project/Assets/CaiStuff/Music/Duduk_Revival.ogg b/game/FMOD Project/Assets/CaiStuff/Music/Duduk_Revival.ogg new file mode 100644 index 0000000..11932e3 --- /dev/null +++ b/game/FMOD Project/Assets/CaiStuff/Music/Duduk_Revival.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff637cb2c7fa62b55334f6869f54031cf5412aa8d0d5e75235e369f9985f6e3c +size 10547743 diff --git a/game/FMOD Project/Assets/CaiStuff/Music/Dulcimer_Revival.ogg b/game/FMOD Project/Assets/CaiStuff/Music/Dulcimer_Revival.ogg new file mode 100644 index 0000000..7664c07 --- /dev/null +++ b/game/FMOD Project/Assets/CaiStuff/Music/Dulcimer_Revival.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:486bc3678b239b0b41e810aec743dc2ff7a043487777edef21c574cb32575756 +size 11392372 diff --git a/game/FMOD Project/Assets/CaiStuff/Music/Harp_Revival.ogg b/game/FMOD Project/Assets/CaiStuff/Music/Harp_Revival.ogg new file mode 100644 index 0000000..cb196b8 --- /dev/null +++ b/game/FMOD Project/Assets/CaiStuff/Music/Harp_Revival.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0181b02b372c083affcc0d2cd17f804df9afd0adb6c5d756fe509be0d3bd1c39 +size 11496574 diff --git a/game/FMOD Project/Assets/CaiStuff/Music/Strings_Revival.ogg b/game/FMOD Project/Assets/CaiStuff/Music/Strings_Revival.ogg new file mode 100644 index 0000000..c24fb01 --- /dev/null +++ b/game/FMOD Project/Assets/CaiStuff/Music/Strings_Revival.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff8608ff5e72985650082a64cfeeb2903ddd3e913249700f07dc895794ed978b +size 13606431 diff --git a/game/FMOD Project/Build/Desktop/Master.strings.bank b/game/FMOD Project/Build/Desktop/Master.strings.bank index 2bcfa46..8541af4 100644 --- a/game/FMOD Project/Build/Desktop/Master.strings.bank +++ b/game/FMOD Project/Build/Desktop/Master.strings.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5f05fff251b212c40fc2cfba1db44c39e48d681c25ddf54691972b47caacc0a -size 2406 +oid sha256:bf4146d89d00d98a5e32c2e90b0ee80d7e6e4d70b7019887ea15ce8f86ce242e +size 2454 diff --git a/game/FMOD Project/Build/Desktop/Music.bank b/game/FMOD Project/Build/Desktop/Music.bank index e07ec43..ce13da1 100644 --- a/game/FMOD Project/Build/Desktop/Music.bank +++ b/game/FMOD Project/Build/Desktop/Music.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6968abbd3d45ad306f0040c69ecc537a61c40dc91f9fb5f2aa2ac72ab4c5620 +oid sha256:0df6f66bc033cacdfac38644a5f11f07fc6768f919411ddaadb54f7963ac9ec9 size 3298368 diff --git a/game/FMOD Project/Metadata/AudioFile/{0daea465-a7b2-4bd2-9767-6b360a9ba415}.xml b/game/FMOD Project/Metadata/AudioFile/{0daea465-a7b2-4bd2-9767-6b360a9ba415}.xml new file mode 100644 index 0000000..d1fc202 --- /dev/null +++ b/game/FMOD Project/Metadata/AudioFile/{0daea465-a7b2-4bd2-9767-6b360a9ba415}.xml @@ -0,0 +1,23 @@ + + + + + CaiStuff/Music/Duduk_Revival.ogg + + + true + + + 48 + + + 2 + + + 240 + + + {4c43130b-9186-4fb6-9d65-a9acdac70927} + + + diff --git a/game/FMOD Project/Metadata/AudioFile/{2799af44-591d-4467-9bf2-0cab469936d0}.xml b/game/FMOD Project/Metadata/AudioFile/{2799af44-591d-4467-9bf2-0cab469936d0}.xml new file mode 100644 index 0000000..a86babb --- /dev/null +++ b/game/FMOD Project/Metadata/AudioFile/{2799af44-591d-4467-9bf2-0cab469936d0}.xml @@ -0,0 +1,23 @@ + + + + + CaiStuff/Music/Drum1_Revival.ogg + + + true + + + 48 + + + 2 + + + 240 + + + {4c43130b-9186-4fb6-9d65-a9acdac70927} + + + diff --git a/game/FMOD Project/Metadata/AudioFile/{29bf479f-9f5b-4e7e-a41b-53ba1be1c4fe}.xml b/game/FMOD Project/Metadata/AudioFile/{29bf479f-9f5b-4e7e-a41b-53ba1be1c4fe}.xml new file mode 100644 index 0000000..975e9a4 --- /dev/null +++ b/game/FMOD Project/Metadata/AudioFile/{29bf479f-9f5b-4e7e-a41b-53ba1be1c4fe}.xml @@ -0,0 +1,23 @@ + + + + + CaiStuff/Music/Drone_Revival.ogg + + + true + + + 48 + + + 2 + + + 239.99066666666667 + + + {4c43130b-9186-4fb6-9d65-a9acdac70927} + + + diff --git a/game/FMOD Project/Metadata/AudioFile/{64c02115-632b-4b26-bc5a-3d4f9c1d8b66}.xml b/game/FMOD Project/Metadata/AudioFile/{64c02115-632b-4b26-bc5a-3d4f9c1d8b66}.xml new file mode 100644 index 0000000..b9b2776 --- /dev/null +++ b/game/FMOD Project/Metadata/AudioFile/{64c02115-632b-4b26-bc5a-3d4f9c1d8b66}.xml @@ -0,0 +1,23 @@ + + + + + CaiStuff/Music/Dulcimer_Revival.ogg + + + true + + + 48 + + + 2 + + + 240 + + + {4c43130b-9186-4fb6-9d65-a9acdac70927} + + + diff --git a/game/FMOD Project/Metadata/AudioFile/{7791ff6e-6591-46ea-a99e-bb7e814d5285}.xml b/game/FMOD Project/Metadata/AudioFile/{7791ff6e-6591-46ea-a99e-bb7e814d5285}.xml new file mode 100644 index 0000000..aaae2e9 --- /dev/null +++ b/game/FMOD Project/Metadata/AudioFile/{7791ff6e-6591-46ea-a99e-bb7e814d5285}.xml @@ -0,0 +1,23 @@ + + + + + CaiStuff/Music/Strings_Revival.ogg + + + true + + + 48 + + + 2 + + + 240 + + + {4c43130b-9186-4fb6-9d65-a9acdac70927} + + + diff --git a/game/FMOD Project/Metadata/AudioFile/{7da5447e-ade3-406c-a2f2-a60c5e45e484}.xml b/game/FMOD Project/Metadata/AudioFile/{7da5447e-ade3-406c-a2f2-a60c5e45e484}.xml new file mode 100644 index 0000000..cbae83c --- /dev/null +++ b/game/FMOD Project/Metadata/AudioFile/{7da5447e-ade3-406c-a2f2-a60c5e45e484}.xml @@ -0,0 +1,23 @@ + + + + + CaiStuff/Music/Drum2_Revival.ogg + + + true + + + 48 + + + 2 + + + 240 + + + {4c43130b-9186-4fb6-9d65-a9acdac70927} + + + diff --git a/game/FMOD Project/Metadata/AudioFile/{8ad7a488-230d-451c-b205-f6a73a9756d0}.xml b/game/FMOD Project/Metadata/AudioFile/{8ad7a488-230d-451c-b205-f6a73a9756d0}.xml new file mode 100644 index 0000000..7adb1d5 --- /dev/null +++ b/game/FMOD Project/Metadata/AudioFile/{8ad7a488-230d-451c-b205-f6a73a9756d0}.xml @@ -0,0 +1,23 @@ + + + + + CaiStuff/Music/Harp_Revival.ogg + + + true + + + 48 + + + 2 + + + 240 + + + {4c43130b-9186-4fb6-9d65-a9acdac70927} + + + diff --git a/game/FMOD Project/Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml b/game/FMOD Project/Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml new file mode 100644 index 0000000..9943de5 --- /dev/null +++ b/game/FMOD Project/Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml @@ -0,0 +1,935 @@ + + + + + MultiMusic + + + 1 + + + {c2692448-301e-417a-8ade-796c6589bfa4} + + + {3cd8cc07-3c13-497b-b2d9-fdfe9991bb23} + + + {471966e7-8229-4eac-aa8b-15b23714bdf0} + + + {50081354-562f-4f5a-ac37-dc9a6d8ad6e8} + + + {2e8db04d-71c6-4d17-8411-5ac45cda8e81} + + + {0e7f964f-d5aa-41b8-9ce4-3a9989ab8ba3} + {ae15c544-7b89-4de0-8c44-60781199fe69} + + + {6c774751-7313-4de4-b7aa-2d91cd5c5825} + {944b5308-a92e-426d-9ed0-e0cb0d142c3b} + {7f3a0e7f-91ca-43f5-9445-5131ec6071b6} + {c74a87cf-8bfe-4491-9ae4-7874256c63e8} + {f21713d0-8ef6-47c8-ad72-84f9fcafbbad} + {d91dbbff-f03e-4e07-afed-f9f799a8229f} + {6248a429-27e0-4d34-99ab-40cf3e58f729} + + + {ac56b76b-ed52-4abc-bacf-e241f0b92d99} + + + {8bc0275e-94eb-4024-b89d-63231d94cd52} + + + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + {d9a0afdb-a550-474f-9d71-09e90167d03b} + + + {20eb3033-f2c0-4663-ac3b-7c09810799e2} + + + {af9d027a-3a1f-49a8-a9ef-4cbe20673632} + + + + + + + + {5be87ea0-c9e9-4e76-9117-e228cafdb7dc} + + + {ad2cb92c-b9a6-4265-aeb9-03a6f92dea7a} + + + + + {31a3c98e-edfb-4ea4-a303-d5ed339bb9f7} + + + {f87a767c-dbb8-4765-8f87-8bfdba24dec6} + + + {44e25c53-b86f-4431-aebf-7dcaac0d8fa8} + + + + + {b35115d1-7cee-4fc3-b17a-27ea347f4ea8} + + + {60308324-af1d-4a12-a72a-3c1de4267004} + + + {f5583678-b9e6-481f-94ad-1b30f96724e9} + + + + + {a3da53d0-5d2e-491d-b3c6-bad550eef604} + + + {73f7abb6-9790-430a-bf1d-9db1bc7f061f} + + + {ccbfb252-4140-4375-85f8-1bd310b8f6f4} + + + + + {046618ba-dda7-4538-9949-273e597b6706} + + + {7d1c67cc-38fe-467b-a5d8-2a3858e44227} + + + {45f23d95-371e-4ed3-9488-f644585f6881} + + + + + {791389f3-0f3a-4355-96a1-0d453f7f6327} + + + {2ee304b2-d043-493d-a81e-c432a0520f0b} + + + {c26431b0-7249-464b-9b0a-389ec301d8e7} + + + + + {fcca5bfa-29f9-4eea-b8d0-3d96ee23ddd8} + + + {8c2dc9ac-d932-482a-aa4f-1f157dd81acc} + + + {621ea6fd-eb64-4e73-94c8-c2ec640f51ad} + + + + + {5be87ea0-c9e9-4e76-9117-e228cafdb7dc} + {f87a767c-dbb8-4765-8f87-8bfdba24dec6} + {60308324-af1d-4a12-a72a-3c1de4267004} + {73f7abb6-9790-430a-bf1d-9db1bc7f061f} + {7d1c67cc-38fe-467b-a5d8-2a3858e44227} + {2ee304b2-d043-493d-a81e-c432a0520f0b} + {8c2dc9ac-d932-482a-aa4f-1f157dd81acc} + + + {752864a2-0e17-44b3-abeb-5f37bc370790} + {c659ce53-d1fa-461a-95dc-a3c29491963e} + + + + + {363abdd4-9c62-4d83-bc5d-93ac23791a37} + + + + + {9eb0a6a0-d75a-4081-94d5-f6a6b70fe49d} + + + {487d3fef-6e2b-41e6-adb1-9dccfcd503de} + + + {3cd8cc07-3c13-497b-b2d9-fdfe9991bb23} + + + + + {14bfacc6-3adc-47c0-bb52-49a971d9abbe} + + + + + + 239.99066666666667 + + + {29bf479f-9f5b-4e7e-a41b-53ba1be1c4fe} + + + + + Audio 1 + + + {570bb876-feee-4a86-915a-4e0f9ff69cc9} + + + {5cacd313-6659-4d7f-bb86-ff9be1c53129} + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + {a936af92-7f9a-430b-b743-2d96b45af766} + + + + + 240 + + + {2799af44-591d-4467-9bf2-0cab469936d0} + + + + + Audio 2 + + + {a936af92-7f9a-430b-b743-2d96b45af766} + + + {2bb62ae7-a145-4748-b2fb-95724d674186} + + + {91efc556-92e2-4a3d-a628-46cc678200e7} + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + {a0a9abb2-5e9e-40fb-b443-077dd18e7f9b} + + + + + 240 + + + {7da5447e-ade3-406c-a2f2-a60c5e45e484} + + + + + Audio 3 + + + {a0a9abb2-5e9e-40fb-b443-077dd18e7f9b} + + + {b7699a3e-ce5f-4c80-81cb-280e7676fbaf} + + + {648688e8-b605-4dc4-867f-20e18e6aea93} + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + {6b3aa8b0-69f1-47e3-bfbb-f8552794c2ea} + + + + + 240 + + + {0daea465-a7b2-4bd2-9767-6b360a9ba415} + + + + + Audio 4 + + + {6b3aa8b0-69f1-47e3-bfbb-f8552794c2ea} + + + {c5e3636f-34a1-452d-874b-6e55419ecc20} + + + {e29fb5d1-e74c-402c-b59b-e1f592cbca38} + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + {00017e73-e0a7-40b2-93fa-c61bc4c3c68a} + + + + + 240 + + + {64c02115-632b-4b26-bc5a-3d4f9c1d8b66} + + + + + Audio 5 + + + {00017e73-e0a7-40b2-93fa-c61bc4c3c68a} + + + {64de2432-338f-4236-b9ab-a41395d63ff9} + + + {08de776c-b1a5-4654-94da-434e99d63981} + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + {5814e725-08b1-473b-b308-e8aaf6b7085e} + + + + + 240 + + + {8ad7a488-230d-451c-b205-f6a73a9756d0} + + + + + Audio 6 + + + {5814e725-08b1-473b-b308-e8aaf6b7085e} + + + {c94abac8-8549-44f7-8a98-984574227b80} + + + {df76b566-575a-47ef-8d7d-6ca94128e800} + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + {62bf6c49-5bd3-4337-b2cb-6c8a6b5f6483} + + + + + 240 + + + {7791ff6e-6591-46ea-a99e-bb7e814d5285} + + + + + Audio 7 + + + {62bf6c49-5bd3-4337-b2cb-6c8a6b5f6483} + + + {ab069752-0b17-4e71-afb1-76b77b5b0055} + + + {bec7e3b3-e71b-42b3-bcd5-3ab6a436d358} + + + {9d226aed-c62b-4783-b216-97795d0eaa2e} + + + + + 0 + + + 240 + + + {ac56b76b-ed52-4abc-bacf-e241f0b92d99} + + + {0e7f964f-d5aa-41b8-9ce4-3a9989ab8ba3} + + + + + 0 + + + 88 + + + {ac56b76b-ed52-4abc-bacf-e241f0b92d99} + + + {ae15c544-7b89-4de0-8c44-60781199fe69} + + + + + {31102b09-9ed1-4840-a365-082aa2430abc} + + + + + + + {1db0e3b3-78be-49e5-a5dc-545d2cb8b606} + + + + + + volume + + + {7edd7884-42b4-4c1a-adae-65a302af9dcf} + + + + + {2f1ff9a1-b37b-4f38-a2b3-ca81d45f55b6} + + + + + + volume + + + {d87a1cd8-56fb-4eba-a3c3-e34664e67460} + + + + + {447df5bb-d7b6-4cc0-b092-32f1e5355aa3} + + + + + + volume + + + {84acebcc-fee9-4177-984c-ad0604176c8f} + + + + + {f0be04f5-6246-4d24-8ab6-51a0d07b53ab} + + + + + + volume + + + {d5ec6953-d345-4fff-baa2-d5fd8cc777e0} + + + + + {4e9612b8-0fe0-4587-a123-5cdb432349c1} + + + + + + volume + + + {24dcf7f1-04d0-467f-9e30-485efdc515e3} + + + + + {7503756a-c2d6-4fe3-8320-d020101bd5af} + + + + + + volume + + + {e9599c67-eb6d-4db6-a01b-aa1747b1984f} + + + + + {ec898b38-0ef5-4d4e-98e9-343faa7e747a} + + + + + + + + {363abdd4-9c62-4d83-bc5d-93ac23791a37} + + + {a70b2b65-5dec-45d3-beda-514c4bba2488} + {746f4131-85e7-4652-86e6-d2f275610e83} + {ea959a39-9050-425f-a082-45699a33bcad} + {9793f0a1-4659-4362-a9e9-c9eac8413ac5} + {65b7f639-da3b-4a81-8a54-33d4c8fcf645} + {05440316-a8ce-40a4-a50c-03728b9a2acc} + {430297ab-0f86-4a22-8ab6-12f383045859} + + + + + + {363abdd4-9c62-4d83-bc5d-93ac23791a37} + + + {e6ef9971-7853-41a7-97e4-e8d9b9189f92} + {bb7db530-8cdf-45db-8811-4136f15913b2} + {4c3cdeff-7aea-4d5f-915b-2ee4b803708f} + {a08dde8e-07e7-453c-a91f-2ea158e49973} + {b11d548b-b15c-4721-a97f-24fc3218704d} + {ace9cccd-6c9c-4816-a624-416bdc246539} + {e64b67ff-7644-44ac-9774-a04827bb2909} + + + + + + {363abdd4-9c62-4d83-bc5d-93ac23791a37} + + + {3eba93b6-d05a-4030-a5f8-5c35d3abd4df} + {6e02b289-1d5a-4126-bc0d-81d398e5af48} + {8fcbe311-2b95-4514-aa5d-00dc7f8c379a} + {9e7e6dd8-acea-4103-af13-da90f7bf4cf3} + {920dd0ee-dcfd-495b-a4ed-20f3777e293b} + {977ec38e-ed9e-49eb-85c7-1c41f3fb6b7c} + {5497f2b4-0ccd-4e9b-9584-408cb1bea4e0} + + + + + + {363abdd4-9c62-4d83-bc5d-93ac23791a37} + + + {6a70fc18-470c-401c-b77a-6ca7dbcfbe11} + {e6df99ae-3844-4149-904d-3237c7bcaa3d} + {2bdd1532-375a-43b0-9365-0cc74b13ba9d} + {e67ec99c-bcb5-4d67-9ace-bcc4ef434fde} + {7c924ae5-d76f-4249-8e4a-d22136dd1eb4} + {c6006dc4-4ce1-4ad2-b641-47dd1973fe52} + {f4a5b944-c5b2-4099-80dc-edd814fe965f} + + + + + + {363abdd4-9c62-4d83-bc5d-93ac23791a37} + + + {af839da4-b6b6-4514-a64b-42cf8ec52857} + {4f8d330e-45e8-4acf-920f-59c87168b639} + {961f7282-54f3-4b42-bc88-ff28c4f5a79e} + {36fd8715-01f4-4ccb-a3d5-7191f24ec968} + {0143b8c1-a8b8-4f18-b138-3d0d85650bcd} + {16e646d5-57dc-4bb5-87f9-7e3a2fa15d6e} + {c3696f82-bb16-402c-a487-3bfca8787310} + + + + + + {363abdd4-9c62-4d83-bc5d-93ac23791a37} + + + {5425355e-f125-4780-ae5f-578ae3523d8b} + {d867b137-378c-4512-8fdd-ffe16751523a} + {98eb66cd-c526-4d51-9207-b45916292b50} + {ce95a0f3-d7e4-4066-a377-0c1d9fae2cfc} + {ebc57ff3-e259-463c-a497-a6b1fd808621} + {0797956e-ac01-4ae7-940d-0c7c3da8685d} + {2d552517-4abe-4af6-b9fd-3f1ad136933f} + + + + + + 1 + + + -80 + + + + + 2 + + + 3.81469727e-06 + + + + + 5 + + + 3.81469727e-06 + + + + + 4 + + + 3.81469727e-06 + + + + + 7 + + + 3.81469727e-06 + + + + + 6 + + + 3.81469727e-06 + + + + + 3 + + + 3.81469727e-06 + + + + + 3 + + + 3.81469727e-06 + + + + + 2 + + + -80 + + + + + 5 + + + 3.81469727e-06 + + + + + 4 + + + 3.81469727e-06 + + + + + 7 + + + 3.81469727e-06 + + + + + 6 + + + 3.81469727e-06 + + + + + 1 + + + -80 + + + + + 4 + + + 3.81469727e-06 + + + + + 3 + + + -80 + + + + + 5 + + + 3.81469727e-06 + + + + + 7 + + + 3.81469727e-06 + + + + + 6 + + + 3.81469727e-06 + + + + + 1 + + + -80 + + + + + 2 + + + -80 + + + + + 5 + + + 3.81469727e-06 + + + + + 4 + + + -80 + + + + + 7 + + + 3.81469727e-06 + + + + + 6 + + + 3.81469727e-06 + + + + + 1 + + + -80 + + + + + 3 + + + -80 + + + + + 2 + + + -80 + + + + + 6 + + + 3.81469727e-06 + + + + + 5 + + + -80 + + + + + 4 + + + -80 + + + + + 7 + + + 3.81469727e-06 + + + + + 1 + + + -80 + + + + + 3 + + + -80 + + + + + 2 + + + -80 + + + + + 7 + + + 3.81469727e-06 + + + + + 6 + + + -80 + + + + + 5 + + + -80 + + + + + 4 + + + -80 + + + + + 1 + + + -80 + + + + + 3 + + + -80 + + + + + 2 + + + -80 + + + diff --git a/game/FMOD Project/Metadata/ParameterPreset/{d01e404e-c96c-4ae2-8b17-9a47d5fd5bd3}.xml b/game/FMOD Project/Metadata/ParameterPreset/{d01e404e-c96c-4ae2-8b17-9a47d5fd5bd3}.xml new file mode 100644 index 0000000..1017846 --- /dev/null +++ b/game/FMOD Project/Metadata/ParameterPreset/{d01e404e-c96c-4ae2-8b17-9a47d5fd5bd3}.xml @@ -0,0 +1,25 @@ + + + + + Track + + + {a418e0de-c7d0-05c9-280a-b529dc02e12e} + + + {363abdd4-9c62-4d83-bc5d-93ac23791a37} + + + + + 1 + + + 7 + + + 1 + + + From 7d786ecdf61a80c419e3a1e6c853580bcc48e0fb Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Wed, 24 Mar 2021 11:25:57 +0000 Subject: [PATCH 2/4] added parameter driven audio --- game/FMOD Project/Build/Desktop/Master.strings.bank | 4 ++-- game/FMOD Project/Build/Desktop/Music.bank | 4 ++-- .../Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/game/FMOD Project/Build/Desktop/Master.strings.bank b/game/FMOD Project/Build/Desktop/Master.strings.bank index 8541af4..7b167b2 100644 --- a/game/FMOD Project/Build/Desktop/Master.strings.bank +++ b/game/FMOD Project/Build/Desktop/Master.strings.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf4146d89d00d98a5e32c2e90b0ee80d7e6e4d70b7019887ea15ce8f86ce242e -size 2454 +oid sha256:bc81eb2a4b0f46ed3439a6306a37c2aa316b59563a27bf3a70372af412275633 +size 2506 diff --git a/game/FMOD Project/Build/Desktop/Music.bank b/game/FMOD Project/Build/Desktop/Music.bank index ce13da1..b59c59e 100644 --- a/game/FMOD Project/Build/Desktop/Music.bank +++ b/game/FMOD Project/Build/Desktop/Music.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0df6f66bc033cacdfac38644a5f11f07fc6768f919411ddaadb54f7963ac9ec9 -size 3298368 +oid sha256:a3bb41a32e3159e1cc90a01eddc6964619e91e5a7c8b2dc77c91ae497055d3c6 +size 24374496 diff --git a/game/FMOD Project/Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml b/game/FMOD Project/Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml index 9943de5..3044fbf 100644 --- a/game/FMOD Project/Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml +++ b/game/FMOD Project/Metadata/Event/{31df9f24-adf7-4f91-b27d-e3714d13fb34}.xml @@ -41,6 +41,9 @@ {8bc0275e-94eb-4024-b89d-63231d94cd52} + + {9ad4be16-4f5a-4e4c-a013-f35de106f106} + From 9bcde1e028591d51dc9f9255c96057b1a14a9155 Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Wed, 24 Mar 2021 11:50:07 +0000 Subject: [PATCH 3/4] added music triggers --- game/Assets/Prefabs/AudioManager.prefab | 3 +- game/Assets/Prefabs/Music.meta | 8 + .../Prefabs/Music/MusicTriggerZone.prefab | 60 +++++ .../Music/MusicTriggerZone.prefab.meta | 7 + game/Assets/Scenes/Main.unity | 243 ++++++++++++++++++ game/Assets/Scripts/Audio/AudioManager.cs | 35 ++- game/Assets/Scripts/Audio/MusicTriggerZone.cs | 19 ++ .../Scripts/Audio/MusicTriggerZone.cs.meta | 11 + 8 files changed, 380 insertions(+), 6 deletions(-) create mode 100644 game/Assets/Prefabs/Music.meta create mode 100644 game/Assets/Prefabs/Music/MusicTriggerZone.prefab create mode 100644 game/Assets/Prefabs/Music/MusicTriggerZone.prefab.meta create mode 100644 game/Assets/Scripts/Audio/MusicTriggerZone.cs create mode 100644 game/Assets/Scripts/Audio/MusicTriggerZone.cs.meta diff --git a/game/Assets/Prefabs/AudioManager.prefab b/game/Assets/Prefabs/AudioManager.prefab index 69a3877..0010d5b 100644 --- a/game/Assets/Prefabs/AudioManager.prefab +++ b/game/Assets/Prefabs/AudioManager.prefab @@ -44,7 +44,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 27f3f5345a3cb684195f070b3d44bc05, type: 3} m_Name: m_EditorClassIdentifier: - _musicId: event:/Music/WIPMusic + _musicId: event:/Music/MultiMusic + _trackDeltaPerSecond: 2.5 _musicBus: BusName: Music PlayerPref: {fileID: 11400000, guid: 45598e626e9c27c428f33cca2dd341e2, type: 2} diff --git a/game/Assets/Prefabs/Music.meta b/game/Assets/Prefabs/Music.meta new file mode 100644 index 0000000..3013a0f --- /dev/null +++ b/game/Assets/Prefabs/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1767ed7c727a304f90471918467166d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Music/MusicTriggerZone.prefab b/game/Assets/Prefabs/Music/MusicTriggerZone.prefab new file mode 100644 index 0000000..57bf976 --- /dev/null +++ b/game/Assets/Prefabs/Music/MusicTriggerZone.prefab @@ -0,0 +1,60 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1670603406037581903 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1670603406037581902} + - component: {fileID: 1670603406037581897} + - component: {fileID: 1670603406037581898} + m_Layer: 0 + m_Name: MusicTriggerZone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1670603406037581902 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670603406037581903} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -26, y: 0, z: 57} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1670603406037581897 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670603406037581903} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 10, y: 10, z: 1} + m_Center: {x: 0, y: 5, z: 0} +--- !u!114 &1670603406037581898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670603406037581903} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 42ae269bbe33edf4fb811511820ba248, type: 3} + m_Name: + m_EditorClassIdentifier: + _track: 7 diff --git a/game/Assets/Prefabs/Music/MusicTriggerZone.prefab.meta b/game/Assets/Prefabs/Music/MusicTriggerZone.prefab.meta new file mode 100644 index 0000000..dbc7e2f --- /dev/null +++ b/game/Assets/Prefabs/Music/MusicTriggerZone.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69243a66990c1e7459a7579bf6208a7d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 5b78c24..6d15cf6 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -662,6 +662,39 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3ea432459c1408040880f4c027fab559, type: 3} m_PrefabInstance: {fileID: 3060674078935020117} m_PrefabAsset: {fileID: 0} +--- !u!1 &239903584 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 239903585} + m_Layer: 0 + m_Name: MusicTriggers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &239903585 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239903584} + 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_Children: + - {fileID: 796404683} + - {fileID: 1869566704} + - {fileID: 1060814304} + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &240211937 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} @@ -2358,6 +2391,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} m_PrefabInstance: {fileID: 3060674078300009146} m_PrefabAsset: {fileID: 0} +--- !u!4 &796404683 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + m_PrefabInstance: {fileID: 1670603406786800517} + m_PrefabAsset: {fileID: 0} --- !u!1 &797647646 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} @@ -3096,6 +3134,84 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ef7a51de2c5c5c5438ce6fea733533b2, type: 3} m_PrefabInstance: {fileID: 3060674079011159413} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1060814303 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 239903585} + m_Modifications: + - target: {fileID: 1670603406037581897, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_Size.x + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581897, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_Size.y + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581897, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_Size.z + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581898, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: _track + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.x + value: 14.5 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.z + value: -31 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581903, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_Name + value: MusicTriggerZone (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} +--- !u!4 &1060814304 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + m_PrefabInstance: {fileID: 1060814303} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1063558645 PrefabInstance: m_ObjectHideFlags: 0 @@ -5997,6 +6113,72 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a31c57c3ca869448a5849436b526efa, type: 3} m_PrefabInstance: {fileID: 3060674078962375218} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1869566703 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 239903585} + m_Modifications: + - target: {fileID: 1670603406037581898, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: _track + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.x + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.z + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.97629607 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.y + value: -0.21643952 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581903, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_Name + value: MusicTriggerZone (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} +--- !u!4 &1869566704 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + m_PrefabInstance: {fileID: 1869566703} + m_PrefabAsset: {fileID: 0} --- !u!1 &1871781663 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3} @@ -6768,6 +6950,67 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1001 &1670603406786800517 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 239903585} + m_Modifications: + - target: {fileID: 1670603406037581898, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: _track + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.x + value: -26 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalPosition.z + value: 57 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581902, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1670603406037581903, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} + propertyPath: m_Name + value: MusicTriggerZone + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69243a66990c1e7459a7579bf6208a7d, type: 3} --- !u!1001 &3060674077596672761 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/game/Assets/Scripts/Audio/AudioManager.cs b/game/Assets/Scripts/Audio/AudioManager.cs index 1823439..f585dfe 100644 --- a/game/Assets/Scripts/Audio/AudioManager.cs +++ b/game/Assets/Scripts/Audio/AudioManager.cs @@ -1,9 +1,10 @@ using System.Collections; using System.Collections.Generic; +using System.Diagnostics; using UnityEngine; using FMOD; -using FMOD.Studio; using FMODUnity; +using EventInstance = FMOD.Studio.EventInstance; [RequireComponent(typeof(FMODUnity.StudioBankLoader))] public class AudioManager : MonoBehaviour @@ -26,6 +27,14 @@ public class AudioManager : MonoBehaviour [EventRef] private string _musicId; + [SerializeField] + private float _trackDeltaPerSecond; + + private const string TRACK_PARAM = "Track"; + + private float _currentTrack = 1f; + private int _targetTrack = 1; + [SerializeField] private AdjustableAudioBus _musicBus; @@ -37,20 +46,36 @@ public class AudioManager : MonoBehaviour [SerializeField] private AdjustableAudioBus _uiBus; - - public AudioManager Instance { get; private set; } + + private static AudioManager _instance; private EventInstance _musicInstance; + public static void SetTrack( int track, bool forceLower = false ) + { + if ( forceLower || track > _instance._targetTrack ) + { + _instance._targetTrack = track; + } + } + + void Update() + { + float dt = Time.deltaTime; + float maxDelta = dt * _trackDeltaPerSecond; + _currentTrack = Mathf.MoveTowards( _currentTrack, (float) _targetTrack, maxDelta ); + _musicInstance.setParameterByName( TRACK_PARAM, _currentTrack ); + } + void Awake() { - if ( Instance != null ) + if ( _instance != null ) { Destroy( gameObject ); return; } - Instance = this; + _instance = this; GetComponent().enabled = true; diff --git a/game/Assets/Scripts/Audio/MusicTriggerZone.cs b/game/Assets/Scripts/Audio/MusicTriggerZone.cs new file mode 100644 index 0000000..265438a --- /dev/null +++ b/game/Assets/Scripts/Audio/MusicTriggerZone.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MusicTriggerZone : MonoBehaviour +{ + [SerializeField] + [Range( 1, 7 )] + private int _track = 1; + + [SerializeField] + private bool _forceIfLower; + + private void OnTriggerEnter( Collider other ) + { + AudioManager.SetTrack( _track, _forceIfLower ); + } +} diff --git a/game/Assets/Scripts/Audio/MusicTriggerZone.cs.meta b/game/Assets/Scripts/Audio/MusicTriggerZone.cs.meta new file mode 100644 index 0000000..cc0390d --- /dev/null +++ b/game/Assets/Scripts/Audio/MusicTriggerZone.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 42ae269bbe33edf4fb811511820ba248 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 317a1ea53b87b1c2dcf2fbb2e6f6d053662e75d1 Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Wed, 24 Mar 2021 11:52:01 +0000 Subject: [PATCH 4/4] settings tweaked --- game/Assets/Prefabs/AudioManager.prefab | 2 +- game/Assets/Scenes/Main.unity | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/game/Assets/Prefabs/AudioManager.prefab b/game/Assets/Prefabs/AudioManager.prefab index 0010d5b..e4a283a 100644 --- a/game/Assets/Prefabs/AudioManager.prefab +++ b/game/Assets/Prefabs/AudioManager.prefab @@ -45,7 +45,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _musicId: event:/Music/MultiMusic - _trackDeltaPerSecond: 2.5 + _trackDeltaPerSecond: 0.5 _musicBus: BusName: Music PlayerPref: {fileID: 11400000, guid: 45598e626e9c27c428f33cca2dd341e2, type: 2} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 6d15cf6..cfd5b10 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -58370,15 +58370,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} propertyPath: m_LocalPosition.x - value: 953.24054 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} propertyPath: m_LocalPosition.y - value: 546.3486 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} propertyPath: m_LocalPosition.z - value: 366.31305 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8182946073398961947, guid: e6d7cef5acc5fa648b624bfc6d857e8b, type: 3} propertyPath: m_LocalRotation.w