Merge branch 'main' into Chaz

This commit is contained in:
Hozach (Audio)
2025-05-09 11:23:07 -04:00
121 changed files with 721 additions and 123 deletions

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<<<<<<<< HEAD:hwanyoung2/Content/Illusions/Metadata/AudioFile/{b2169853-b48f-4277-88da-5624e38cc480}.xml
<object class="AudioFile" id="{b2169853-b48f-4277-88da-5624e38cc480}">
========
<object class="AudioFile" id="{0e3a2e3e-32e4-4182-8018-361bb31c6d39}">
>>>>>>>> main:hwanyoung2/Content/Illusions/Metadata/AudioFile/{0e3a2e3e-32e4-4182-8018-361bb31c6d39}.xml
<property name="assetPath">
<value>Music/music_spring_co_mix2.wav</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>243.18164583333333</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

View File

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<<<<<<<< HEAD:hwanyoung2/Content/Illusions/Metadata/AudioFile/{b2169853-b48f-4277-88da-5624e38cc480}.xml
<object class="AudioFile" id="{b2169853-b48f-4277-88da-5624e38cc480}">
========
<object class="AudioFile" id="{0e3a2e3e-32e4-4182-8018-361bb31c6d39}">
>>>>>>>> main:hwanyoung2/Content/Illusions/Metadata/AudioFile/{0e3a2e3e-32e4-4182-8018-361bb31c6d39}.xml
<property name="assetPath">
<value>Music/music_spring_co_mix2.wav</value>
</property>
<property name="isStreaming">
<value>true</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>

View File

@ -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>