solve merge confliction
This commit is contained in:
commit
2a64c6f684
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
|
||||
hwanyoung2/Content/Illusions/.cache/\{d547300b-f688-4816-b2a8-0edd5f5e77a1\}.pdc
|
Binary file not shown.
Binary file not shown.
BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/DRAGON_ULT_2.uasset
(Stored with Git LFS)
Normal file
BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/DRAGON_ULT_2.uasset
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
(Stored with Git LFS)
BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="MasterAssetFolder" id="{4f34473d-1e56-44db-8dd1-60284d90f95e}" />
|
||||
</objects>
|
@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="ObsoleteObject" id="{4ff730ba-f1d1-4efd-9dfe-1811ce2538c2}" />
|
||||
<object class="Mixer" id="{69156779-4c9f-4c75-933c-0886f67a1e32}" />
|
||||
</objects>
|
@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="Workspace" id="{7566e94e-8228-4fb9-ac5e-6a0103d5bf81}">
|
||||
<relationship name="projectSettings">
|
||||
<destination>{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}</destination>
|
||||
</relationship>
|
||||
<relationship name="changelist">
|
||||
<destination>{c81ff576-a715-479d-877b-e0a0201464b5}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="ProjectSettings" id="{ce30ebda-7d4b-4a2c-ad18-34f04ac67163}">
|
||||
<property name="openWindows">
|
||||
<value>Event Editor 1</value>
|
||||
</property>
|
||||
<property name="windowLayout">
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+dcAAAGU///+1AAABusAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
</property>
|
||||
<relationship name="activePlatform">
|
||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="WorkspaceChangelist" id="{c81ff576-a715-479d-877b-e0a0201464b5}" />
|
||||
</objects>
|
Binary file not shown.
Binary file not shown.
@ -13,7 +13,7 @@
|
||||
<value>Event Editor 1</value>
|
||||
</property>
|
||||
<property name="windowLayout">
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAAAAAAAAAAAAAAAAT/AAAFdwAAAAEAAAAfAAAE/gAABXYAAAAAAAAAAAoAAAAAAQAAAB8AAAT+AAAFdgAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
<value>AAAACQAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAAAAAI+AAABHgAABs0AAAT9AAACPwAAAT0AAAbMAAAE/AAAAAAAAAAACgAAAAI/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAAAAAAhQAAAaEAAAUUAAAEkAAAAIYAAAHAAAAFEwAABI8AAAAAAAAAAAoAAAAAhgAAAcAAAAUTAAAEjwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+dcAAAGU///+1AAABusAAAABAgAAAAeA///4gAAAACH/////AAAEGQAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANvAAAAFgBBAHUAZABpAG8AIABCAGkAbgAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQj</value>
|
||||
</property>
|
||||
<relationship name="activePlatform">
|
||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||
|
BIN
hwanyoung2/Content/Illusions/Assets/dragon_ult_uncut.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/dragon_ult_uncut.uasset
(Stored with Git LFS)
Binary file not shown.
@ -1,12 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="AudioFile" id="{d547300b-f688-4816-b2a8-0edd5f5e77a1}">
|
||||
<object class="AudioFile" id="{0e3a2e3e-32e4-4182-8018-361bb31c6d39}">
|
||||
<property name="assetPath">
|
||||
<value>dragon ult uncut.ogg</value>
|
||||
</property>
|
||||
<property name="isStreaming">
|
||||
<value>true</value>
|
||||
</property>
|
||||
<property name="frequencyInKHz">
|
||||
<value>44.0999985</value>
|
||||
</property>
|
@ -1,23 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="AudioFile" id="{d547300b-f688-4816-b2a8-0edd5f5e77a1}">
|
||||
<property name="assetPath">
|
||||
<value>dragon ult uncut.ogg</value>
|
||||
</property>
|
||||
<property name="isStreaming">
|
||||
<value>true</value>
|
||||
</property>
|
||||
<property name="frequencyInKHz">
|
||||
<value>44.0999985</value>
|
||||
</property>
|
||||
<property name="channelCount">
|
||||
<value>2</value>
|
||||
</property>
|
||||
<property name="length">
|
||||
<value>17.316916099773241</value>
|
||||
</property>
|
||||
<relationship name="masterAssetFolder">
|
||||
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
</objects>
|
@ -0,0 +1,341 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<objects serializationModel="Studio.02.02.00">
|
||||
<object class="Event" id="{2c53e528-3d38-4697-96c5-32980c294c0e}">
|
||||
<property name="name">
|
||||
<value>DRAGON ULT 2</value>
|
||||
</property>
|
||||
<property name="outputFormat">
|
||||
<value>1</value>
|
||||
</property>
|
||||
<relationship name="folder">
|
||||
<destination>{58f76323-7476-4fc2-9d75-933801901ec4}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixer">
|
||||
<destination>{e78db093-8662-4b52-b4c2-27f5f13a2aa1}</destination>
|
||||
</relationship>
|
||||
<relationship name="masterTrack">
|
||||
<destination>{75a8e001-1c9b-43df-83f8-0fc2b56a3adc}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixerInput">
|
||||
<destination>{c8f63a89-5667-4732-bcbf-0780bdd2e11a}</destination>
|
||||
</relationship>
|
||||
<relationship name="automatableProperties">
|
||||
<destination>{811d452a-1435-4819-84b5-0c3e3cae0349}</destination>
|
||||
</relationship>
|
||||
<relationship name="markerTracks">
|
||||
<destination>{5a2450db-6667-425d-bbee-fb40bf2873af}</destination>
|
||||
</relationship>
|
||||
<relationship name="groupTracks">
|
||||
<destination>{3bcaf40d-b4d5-43fa-abee-f5de929623ad}</destination>
|
||||
<destination>{84b6b9bb-885e-4a45-b7f6-b496e88192d6}</destination>
|
||||
<destination>{56f3b70f-0fed-4b5f-8161-fc3870c91287}</destination>
|
||||
</relationship>
|
||||
<relationship name="timeline">
|
||||
<destination>{8617d690-2271-40d4-9662-0eda88a27a93}</destination>
|
||||
</relationship>
|
||||
<relationship name="banks">
|
||||
<destination>{9c5265c8-c3c8-41f5-9212-f803a3d9a96e}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixer" id="{e78db093-8662-4b52-b4c2-27f5f13a2aa1}">
|
||||
<relationship name="masterBus">
|
||||
<destination>{04db269d-e3f3-4e52-9239-e604808f4257}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MasterTrack" id="{75a8e001-1c9b-43df-83f8-0fc2b56a3adc}">
|
||||
<relationship name="mixerGroup">
|
||||
<destination>{04db269d-e3f3-4e52-9239-e604808f4257}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerInput" id="{c8f63a89-5667-4732-bcbf-0780bdd2e11a}">
|
||||
<relationship name="effectChain">
|
||||
<destination>{7f83e373-71d4-4e9a-9aac-14af7921dd66}</destination>
|
||||
</relationship>
|
||||
<relationship name="panner">
|
||||
<destination>{709a7c29-b4aa-47d9-9616-41e32635c67f}</destination>
|
||||
</relationship>
|
||||
<relationship name="output">
|
||||
<destination>{b652127b-31f3-4ae6-b245-1a19a8f778fb}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventAutomatableProperties" id="{811d452a-1435-4819-84b5-0c3e3cae0349}">
|
||||
<property name="maxVoices">
|
||||
<value>1</value>
|
||||
</property>
|
||||
<property name="voiceStealing">
|
||||
<value>3</value>
|
||||
</property>
|
||||
<property name="dopplerEnabled">
|
||||
<value>true</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="MarkerTrack" id="{5a2450db-6667-425d-bbee-fb40bf2873af}" />
|
||||
<object class="GroupTrack" id="{3bcaf40d-b4d5-43fa-abee-f5de929623ad}">
|
||||
<relationship name="modules">
|
||||
<destination>{190a5e2e-a281-4aa6-8715-34c5325cc58a}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixerGroup">
|
||||
<destination>{24ed7aa6-9d65-497e-969f-5c6d5418d7e5}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="GroupTrack" id="{84b6b9bb-885e-4a45-b7f6-b496e88192d6}">
|
||||
<relationship name="automationTracks">
|
||||
<destination>{a7d79f3d-5ce8-417c-b16b-a2ed61889736}</destination>
|
||||
</relationship>
|
||||
<relationship name="modules">
|
||||
<destination>{30f952b0-c313-468b-938c-a82b2a746cc0}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixerGroup">
|
||||
<destination>{6bac274b-ff29-44f8-b4a9-a6cb4a47a007}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="GroupTrack" id="{56f3b70f-0fed-4b5f-8161-fc3870c91287}">
|
||||
<relationship name="modules">
|
||||
<destination>{e7d6b88f-01ea-4ff4-a7da-0325a261f074}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixerGroup">
|
||||
<destination>{97f4d1fb-724d-4456-ac98-180723ebe325}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="Timeline" id="{8617d690-2271-40d4-9662-0eda88a27a93}">
|
||||
<relationship name="modules">
|
||||
<destination>{30f952b0-c313-468b-938c-a82b2a746cc0}</destination>
|
||||
<destination>{190a5e2e-a281-4aa6-8715-34c5325cc58a}</destination>
|
||||
<destination>{e7d6b88f-01ea-4ff4-a7da-0325a261f074}</destination>
|
||||
</relationship>
|
||||
<relationship name="markers">
|
||||
<destination>{01d62ab0-e0c5-4da9-97d1-ed76b83a0ef4}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerMaster" id="{04db269d-e3f3-4e52-9239-e604808f4257}">
|
||||
<relationship name="modulators">
|
||||
<destination>{83ad9faf-088c-43d6-8482-06a8ee8e57ec}</destination>
|
||||
</relationship>
|
||||
<relationship name="effectChain">
|
||||
<destination>{9b6997d9-a7fc-4798-9988-d358dee4773a}</destination>
|
||||
</relationship>
|
||||
<relationship name="panner">
|
||||
<destination>{3cc569d9-f390-4060-a574-28b5a8d16aec}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixer">
|
||||
<destination>{e78db093-8662-4b52-b4c2-27f5f13a2aa1}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusEffectChain" id="{7f83e373-71d4-4e9a-9aac-14af7921dd66}">
|
||||
<relationship name="effects">
|
||||
<destination>{beda7139-97cb-4ad8-ad2d-f1c07ef9a691}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{709a7c29-b4aa-47d9-9616-41e32635c67f}" />
|
||||
<object class="SingleSound" id="{190a5e2e-a281-4aa6-8715-34c5325cc58a}">
|
||||
<property name="length">
|
||||
<value>16.216916099773226</value>
|
||||
</property>
|
||||
<property name="timelockedOffset">
|
||||
<value>1.0999999999999999</value>
|
||||
</property>
|
||||
<property name="name" />
|
||||
<relationship name="audioFile">
|
||||
<destination>{0e3a2e3e-32e4-4182-8018-361bb31c6d39}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerGroup" id="{24ed7aa6-9d65-497e-969f-5c6d5418d7e5}">
|
||||
<property name="name">
|
||||
<value>Audio 1</value>
|
||||
</property>
|
||||
<relationship name="effectChain">
|
||||
<destination>{61c7a995-2421-4b00-81e9-1261b61e3614}</destination>
|
||||
</relationship>
|
||||
<relationship name="panner">
|
||||
<destination>{2d0e6da4-cf73-4857-a3dd-f36379690097}</destination>
|
||||
</relationship>
|
||||
<relationship name="output">
|
||||
<destination>{04db269d-e3f3-4e52-9239-e604808f4257}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="AutomationTrack" id="{a7d79f3d-5ce8-417c-b16b-a2ed61889736}">
|
||||
<relationship name="automator">
|
||||
<destination>{f49bf3c8-fe2f-41ab-a74f-8c8438117af2}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="SnapshotModule" id="{30f952b0-c313-468b-938c-a82b2a746cc0}">
|
||||
<property name="length">
|
||||
<value>17.316916099773241</value>
|
||||
</property>
|
||||
<relationship name="automators">
|
||||
<destination>{f49bf3c8-fe2f-41ab-a74f-8c8438117af2}</destination>
|
||||
</relationship>
|
||||
<relationship name="modulators">
|
||||
<destination>{2752ac74-bc6e-48be-a077-45f698c9f366}</destination>
|
||||
</relationship>
|
||||
<relationship name="fadeOutCurve">
|
||||
<destination>{8fd84073-cd87-4e5e-ac35-536d4f907b56}</destination>
|
||||
</relationship>
|
||||
<relationship name="event">
|
||||
<destination>{1fdd81d6-add9-4e95-a5c1-b886d24d9052}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerGroup" id="{6bac274b-ff29-44f8-b4a9-a6cb4a47a007}">
|
||||
<property name="name">
|
||||
<value>Audio 2</value>
|
||||
</property>
|
||||
<relationship name="effectChain">
|
||||
<destination>{ac441c70-6be2-4cb6-9c96-e4a12d6d93f3}</destination>
|
||||
</relationship>
|
||||
<relationship name="panner">
|
||||
<destination>{baf8e683-fa7f-462a-a19d-dec82a271fa1}</destination>
|
||||
</relationship>
|
||||
<relationship name="output">
|
||||
<destination>{04db269d-e3f3-4e52-9239-e604808f4257}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="SingleSound" id="{e7d6b88f-01ea-4ff4-a7da-0325a261f074}">
|
||||
<property name="length">
|
||||
<value>5.2479365079365046</value>
|
||||
</property>
|
||||
<property name="timelockedOffset">
|
||||
<value>0.89999999999999969</value>
|
||||
</property>
|
||||
<relationship name="fadeInCurve">
|
||||
<destination>{90a0c32a-a628-44f7-a9b7-71525c64e21e}</destination>
|
||||
</relationship>
|
||||
<relationship name="audioFile">
|
||||
<destination>{e98f2cdc-356e-48ac-941c-015f07a4db36}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerGroup" id="{97f4d1fb-724d-4456-ac98-180723ebe325}">
|
||||
<property name="volume">
|
||||
<value>-5.5</value>
|
||||
</property>
|
||||
<property name="name">
|
||||
<value>Audio 3</value>
|
||||
</property>
|
||||
<relationship name="effectChain">
|
||||
<destination>{d1fe02a6-f855-4c89-a33b-9e583677d5bd}</destination>
|
||||
</relationship>
|
||||
<relationship name="panner">
|
||||
<destination>{fbaf47f6-c7e9-4a7f-ad57-8001f9b9e590}</destination>
|
||||
</relationship>
|
||||
<relationship name="output">
|
||||
<destination>{04db269d-e3f3-4e52-9239-e604808f4257}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="NamedMarker" id="{01d62ab0-e0c5-4da9-97d1-ed76b83a0ef4}">
|
||||
<property name="position">
|
||||
<value>2.625</value>
|
||||
</property>
|
||||
<property name="name">
|
||||
<value>end</value>
|
||||
</property>
|
||||
<relationship name="timeline">
|
||||
<destination>{8617d690-2271-40d4-9662-0eda88a27a93}</destination>
|
||||
</relationship>
|
||||
<relationship name="markerTrack">
|
||||
<destination>{5a2450db-6667-425d-bbee-fb40bf2873af}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="RandomizerModulator" id="{83ad9faf-088c-43d6-8482-06a8ee8e57ec}">
|
||||
<property name="nameOfPropertyBeingModulated">
|
||||
<value>pitch</value>
|
||||
</property>
|
||||
<property name="amount">
|
||||
<value>7.5</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="MixerBusEffectChain" id="{9b6997d9-a7fc-4798-9988-d358dee4773a}">
|
||||
<relationship name="effects">
|
||||
<destination>{a25c9a50-6588-4404-a4c1-9205b44836a1}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{3cc569d9-f390-4060-a574-28b5a8d16aec}" />
|
||||
<object class="MixerBusFader" id="{beda7139-97cb-4ad8-ad2d-f1c07ef9a691}" />
|
||||
<object class="MixerBusEffectChain" id="{61c7a995-2421-4b00-81e9-1261b61e3614}">
|
||||
<relationship name="effects">
|
||||
<destination>{3d6f921b-dc46-4cc3-8a0b-3490820369f4}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{2d0e6da4-cf73-4857-a3dd-f36379690097}" />
|
||||
<object class="Automator" id="{f49bf3c8-fe2f-41ab-a74f-8c8438117af2}">
|
||||
<property name="nameOfPropertyBeingAutomated">
|
||||
<value>intensity</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="ADSRModulator" id="{2752ac74-bc6e-48be-a077-45f698c9f366}">
|
||||
<property name="nameOfPropertyBeingModulated">
|
||||
<value>intensity</value>
|
||||
</property>
|
||||
<property name="peakValue">
|
||||
<value>100</value>
|
||||
</property>
|
||||
<property name="sustainValue">
|
||||
<value>100</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="FadeCurve" id="{8fd84073-cd87-4e5e-ac35-536d4f907b56}">
|
||||
<relationship name="startPoint">
|
||||
<destination>{89b5c8b5-cabb-4e31-89f5-9b9e177aecce}</destination>
|
||||
</relationship>
|
||||
<relationship name="endPoint">
|
||||
<destination>{1f9b426c-baf6-4f07-b534-5b11f9c0c592}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusEffectChain" id="{ac441c70-6be2-4cb6-9c96-e4a12d6d93f3}">
|
||||
<relationship name="effects">
|
||||
<destination>{8ee3d06f-1a4f-4842-a9e5-d6d32b54c290}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{baf8e683-fa7f-462a-a19d-dec82a271fa1}" />
|
||||
<object class="FadeCurve" id="{90a0c32a-a628-44f7-a9b7-71525c64e21e}">
|
||||
<relationship name="startPoint">
|
||||
<destination>{fcb6aa17-35dc-4eaa-8fec-d343e6964ccc}</destination>
|
||||
</relationship>
|
||||
<relationship name="endPoint">
|
||||
<destination>{b394b01f-3e93-4314-b5cb-ee73911041c0}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusEffectChain" id="{d1fe02a6-f855-4c89-a33b-9e583677d5bd}">
|
||||
<relationship name="effects">
|
||||
<destination>{20f82cf6-ca05-480a-843a-2799bd97e1c4}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{fbaf47f6-c7e9-4a7f-ad57-8001f9b9e590}" />
|
||||
<object class="MixerBusFader" id="{a25c9a50-6588-4404-a4c1-9205b44836a1}" />
|
||||
<object class="MixerBusFader" id="{3d6f921b-dc46-4cc3-8a0b-3490820369f4}" />
|
||||
<object class="AutomationPoint" id="{89b5c8b5-cabb-4e31-89f5-9b9e177aecce}">
|
||||
<property name="position">
|
||||
<value>16.941916099773241</value>
|
||||
</property>
|
||||
<property name="value">
|
||||
<value>100</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="AutomationPoint" id="{1f9b426c-baf6-4f07-b534-5b11f9c0c592}">
|
||||
<property name="position">
|
||||
<value>17.316916099773241</value>
|
||||
</property>
|
||||
<property name="value">
|
||||
<value>0</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="MixerBusFader" id="{8ee3d06f-1a4f-4842-a9e5-d6d32b54c290}" />
|
||||
<object class="AutomationPoint" id="{fcb6aa17-35dc-4eaa-8fec-d343e6964ccc}">
|
||||
<property name="position">
|
||||
<value>0</value>
|
||||
</property>
|
||||
<property name="value">
|
||||
<value>0</value>
|
||||
</property>
|
||||
<property name="curveShape">
|
||||
<value>-0.2547189</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="AutomationPoint" id="{b394b01f-3e93-4314-b5cb-ee73911041c0}">
|
||||
<property name="position">
|
||||
<value>0.20000000000000001</value>
|
||||
</property>
|
||||
<property name="value">
|
||||
<value>1</value>
|
||||
</property>
|
||||
</object>
|
||||
<object class="MixerBusFader" id="{20f82cf6-ca05-480a-843a-2799bd97e1c4}" />
|
||||
</objects>
|
@ -60,7 +60,7 @@
|
||||
<object class="MarkerTrack" id="{256b3158-1510-4471-8517-ca7849bdc9c5}" />
|
||||
<object class="GroupTrack" id="{a60168b6-8999-4deb-bc1e-5a91b1d29cdb}">
|
||||
<relationship name="modules">
|
||||
<destination>{859cc583-9bd3-4b10-84f3-3655db2385cc}</destination>
|
||||
<destination>{e506887c-70c3-4146-8c09-50946e227065}</destination>
|
||||
</relationship>
|
||||
<relationship name="mixerGroup">
|
||||
<destination>{94341f26-cfe6-47ae-8dff-0a151c028c6d}</destination>
|
||||
@ -68,7 +68,7 @@
|
||||
</object>
|
||||
<object class="Timeline" id="{9c7fc3ec-1709-4e94-b3b3-4279fa71e776}">
|
||||
<relationship name="modules">
|
||||
<destination>{859cc583-9bd3-4b10-84f3-3655db2385cc}</destination>
|
||||
<destination>{e506887c-70c3-4146-8c09-50946e227065}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerMaster" id="{c583f399-6ab4-4f4a-997f-77c308ad48c5}">
|
||||
@ -88,12 +88,12 @@
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="MixerBusPanner" id="{7f1607a0-60c6-4217-b33d-55704b0ddb36}" />
|
||||
<object class="SingleSound" id="{859cc583-9bd3-4b10-84f3-3655db2385cc}">
|
||||
<object class="SingleSound" id="{e506887c-70c3-4146-8c09-50946e227065}">
|
||||
<property name="length">
|
||||
<value>17.316916099773241</value>
|
||||
</property>
|
||||
<relationship name="audioFile">
|
||||
<destination>{d547300b-f688-4816-b2a8-0edd5f5e77a1}</destination>
|
||||
<destination>{0e3a2e3e-32e4-4182-8018-361bb31c6d39}</destination>
|
||||
</relationship>
|
||||
</object>
|
||||
<object class="EventMixerGroup" id="{94341f26-cfe6-47ae-8dff-0a151c028c6d}">
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user