merge for SFXs (for like the nth time)
This commit is contained in:
commit
057ae35081
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.
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.
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.
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.
@ -13,7 +13,7 @@
|
|||||||
<value>Event Editor 1</value>
|
<value>Event Editor 1</value>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowLayout">
|
<property name="windowLayout">
|
||||||
<value>AAAAAgAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAAAABWgAAAAwAAAJ9wAABA0AAAVpAAAATQAACfYAAAQMAAAAAAAAAAAKAAAABWkAAABNAAAJ9gAABAwAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAAAAA44AAAAAAAAJcAAABXcAAAOPAAAAHQAACW8AAAV2AAAAAAAAAAAKAAAAA48AAAAdAAAJbwAABXY=</value>
|
<value>AAAAAgAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAAAABWgAAAAuAAAJ9wAABA0AAAVpAAAATQAACfYAAAQMAAAAAAAAAAAKAAAABWkAAABNAAAJ9gAABAwAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///kAAAAAHv///uAAAAV3AAAAAQIAAAAHgP//+IAAAAAh/////wAABBk=</value>
|
||||||
</property>
|
</property>
|
||||||
<relationship name="activePlatform">
|
<relationship name="activePlatform">
|
||||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
<value>Event Editor 1</value>
|
<value>Event Editor 1</value>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowLayout">
|
<property name="windowLayout">
|
||||||
<value>AAAAAgAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAAAABWgAAAAwAAAJ9wAABA0AAAVpAAAATQAACfYAAAQMAAAAAAAAAAAKAAAABWkAAABNAAAJ9gAABAwAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAAAAA44AAAAAAAAJcAAABXcAAAOPAAAAHQAACW8AAAV2AAAAAAAAAAAKAAAAA48AAAAdAAAJbwAABXY=</value>
|
<value>AAAAAgAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAAAABWgAAAAuAAAJ9wAABA0AAAVpAAAATQAACfYAAAQMAAAAAAAAAAAKAAAABWkAAABNAAAJ9gAABAwAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///kAAAAAHv///uAAAAV3AAAAAQIAAAAHgP//+IAAAAAh/////wAABBk=</value>
|
||||||
</property>
|
</property>
|
||||||
<relationship name="activePlatform">
|
<relationship name="activePlatform">
|
||||||
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>
|
||||||
|
BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_01.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_02.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_02.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_03.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Ambience_Ext_Birds_AiryHum_Garden_03.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Sanin/sfx_sanin_rock_teleport_rock_disappear.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Combat/Sanin/sfx_sanin_rock_teleport_rock_disappear.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Cooking/cooking_no_timer.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Cooking/cooking_no_timer.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/Ambience/Ambience_Ext_Birds_AiryHum_Garden_01.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/Ambience/Ambience_Ext_Birds_AiryHum_Garden_01.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/Ambience/Ambience_Ext_Birds_AiryHum_Garden_02.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/Ambience/Ambience_Ext_Birds_AiryHum_Garden_02.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Environment/Ambience/Ambience_Ext_Birds_AiryHum_Garden_03.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Environment/Ambience/Ambience_Ext_Birds_AiryHum_Garden_03.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Interaction/soul_pickup.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Interaction/soul_pickup.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Interaction/soul_pickup_long.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Interaction/soul_pickup_long.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/Music/camp_70.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/Music/camp_70.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/camp_70.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/camp_70.uasset
(Stored with Git LFS)
Binary file not shown.
BIN
hwanyoung2/Content/Illusions/Assets/sfx_sanin_rock_teleport_rock_disappear.uasset
(Stored with Git LFS)
BIN
hwanyoung2/Content/Illusions/Assets/sfx_sanin_rock_teleport_rock_disappear.uasset
(Stored with Git LFS)
Binary file not shown.
@ -0,0 +1,23 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<objects serializationModel="Studio.02.02.00">
|
||||||
|
<object class="AudioFile" id="{22d39fd0-e996-4516-98d5-313342831cce}">
|
||||||
|
<property name="assetPath">
|
||||||
|
<value>water reload 2.wav</value>
|
||||||
|
</property>
|
||||||
|
<property name="isStreaming">
|
||||||
|
<value>true</value>
|
||||||
|
</property>
|
||||||
|
<property name="frequencyInKHz">
|
||||||
|
<value>48</value>
|
||||||
|
</property>
|
||||||
|
<property name="channelCount">
|
||||||
|
<value>2</value>
|
||||||
|
</property>
|
||||||
|
<property name="length">
|
||||||
|
<value>10.036833333333334</value>
|
||||||
|
</property>
|
||||||
|
<relationship name="masterAssetFolder">
|
||||||
|
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
|
||||||
|
</relationship>
|
||||||
|
</object>
|
||||||
|
</objects>
|
@ -97,6 +97,9 @@
|
|||||||
</relationship>
|
</relationship>
|
||||||
</object>
|
</object>
|
||||||
<object class="EventMixerGroup" id="{2b973b05-f347-4c74-be1f-0a2c4b8fa2cf}">
|
<object class="EventMixerGroup" id="{2b973b05-f347-4c74-be1f-0a2c4b8fa2cf}">
|
||||||
|
<property name="volume">
|
||||||
|
<value>-8</value>
|
||||||
|
</property>
|
||||||
<property name="name">
|
<property name="name">
|
||||||
<value>Audio 1</value>
|
<value>Audio 1</value>
|
||||||
</property>
|
</property>
|
||||||
|
@ -68,11 +68,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</object>
|
</object>
|
||||||
<object class="MarkerTrack" id="{d4f16d79-b99d-4e6c-af3c-b89b6af2a927}" />
|
<object class="MarkerTrack" id="{d4f16d79-b99d-4e6c-af3c-b89b6af2a927}" />
|
||||||
<object class="Timeline" id="{b0140333-ac8d-4f76-876e-9bd0a7dae1aa}">
|
<object class="Timeline" id="{b0140333-ac8d-4f76-876e-9bd0a7dae1aa}" />
|
||||||
<property name="isProxyEnabled">
|
|
||||||
<value>false</value>
|
|
||||||
</property>
|
|
||||||
</object>
|
|
||||||
<object class="ActionSheet" id="{f0e9a721-429f-4a8e-951c-e6139225d2bd}">
|
<object class="ActionSheet" id="{f0e9a721-429f-4a8e-951c-e6139225d2bd}">
|
||||||
<relationship name="modules">
|
<relationship name="modules">
|
||||||
<destination>{0adfb1e0-8c81-424b-9218-56850b6fcfcb}</destination>
|
<destination>{0adfb1e0-8c81-424b-9218-56850b6fcfcb}</destination>
|
||||||
@ -112,7 +108,7 @@
|
|||||||
<object class="MixerBusPanner" id="{14536023-4e29-4209-98c2-130bbb04a815}" />
|
<object class="MixerBusPanner" id="{14536023-4e29-4209-98c2-130bbb04a815}" />
|
||||||
<object class="SingleSound" id="{3c1c50ff-d612-40f1-8030-c85fa2cce401}">
|
<object class="SingleSound" id="{3c1c50ff-d612-40f1-8030-c85fa2cce401}">
|
||||||
<property name="volume">
|
<property name="volume">
|
||||||
<value>-8</value>
|
<value>-17</value>
|
||||||
</property>
|
</property>
|
||||||
<relationship name="audioFile">
|
<relationship name="audioFile">
|
||||||
<destination>{93c03764-53e6-4ec1-909e-7e40bcb9e4d2}</destination>
|
<destination>{93c03764-53e6-4ec1-909e-7e40bcb9e4d2}</destination>
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user