Compare commits

...

7 Commits

Author SHA1 Message Date
benroshio
38c1531c51 +fmod changes 2024-07-18 18:43:26 -04:00
benroshio
5b111fd551 Buff added 2024-07-18 18:42:37 -04:00
benroshio
119362de63 Merge remote-tracking branch 'origin/main' into fmod-integration 2024-07-14 18:49:31 -04:00
Ji Yoon Rhee
f55937e63c got the buff skill implementation started as well as the AOE skill base blueprint class 2024-07-13 10:10:53 +09:00
Ji Yoon Rhee
21b5f7f53f blocking 2024-07-13 07:49:22 +09:00
Ji Yoon Rhee
79e9c28851 fixed the issues with animation montages not playing at command 2024-07-03 21:20:19 +09:00
Ji Yoon Rhee
75b078f5e3 created event dispatchers for damage blocking, death, and such 2024-06-30 23:25:01 +09:00
102 changed files with 343 additions and 192 deletions

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Buff_Water.uasset (Stored with Git LFS) Normal file

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.

View File

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

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="Mixer" id="{69156779-4c9f-4c75-933c-0886f67a1e32}" />
</objects>

View File

@ -13,7 +13,7 @@
<value>Mixer 1</value> <value>Mixer 1</value>
</property> </property>
<property name="windowLayout"> <property name="windowLayout">
<value>AAAABgAAAB4ATQBpAHgAZQByACAAUgBvAHUAdABpAG4AZwAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQjAAAADgBNAGkAeABlAHIAIAAyAAAAQgHZ0MsAAwAAAAAC4wAAAbYAAAdyAAAFlQAAAuQAAAHVAAAHcQAABZQAAAAAAAAAAAoAAAAC5AAAAdUAAAdxAAAFlAAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///kZAAAAEv///aYAAAPRAAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMgAAAEIB2dDLAAMAAAAAAxkAAAD7AAAHOgAAA6wAAAMaAAABGgAABzkAAAOrAAAAAAAAAAAKAAAAAxoAAAEaAAAHOQAAA6sAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///pbAAABxv///noAAAUJAAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAeAEUAdgBlAG4AdAAgAEIAcgBvAHcAcwBlAHIAIAAxAAAAQgHZ0MsAAwAA///7eAAAAIH///0JAAADcP//+3kAAACg///9CAAAA28AAAABAAAAAAeA///7eQAAAKD///0IAAADbw==</value> <value>AAAABgAAAB4ATQBpAHgAZQByACAAUgBvAHUAdABpAG4AZwAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQjAAAADgBNAGkAeABlAHIAIAAyAAAAQgHZ0MsAAwAA///5DwAAAA////2eAAAD7v//+RAAAAAu///9nQAAA+0AAAABAAAAAAeA///5EAAAAC7///2dAAAD7QAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///qQAAAAjv///x0AAARNAAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMgAAAEIB2dDLAAMAAAAAAxkAAAD7AAAHOgAAA6wAAAMaAAABGgAABzkAAAOrAAAAAAAAAAAKAAAAAxoAAAEaAAAHOQAAA6sAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///pbAAABxv///noAAAUJAAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAeAEUAdgBlAG4AdAAgAEIAcgBvAHcAcwBlAHIAIAAxAAAAQgHZ0MsAAwAA///7eAAAAIH///0JAAADcP//+3kAAACg///9CAAAA28AAAABAAAAAAeA///7eQAAAKD///0IAAADbw==</value>
</property> </property>
<relationship name="activePlatform"> <relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination> <destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>

View File

@ -13,7 +13,7 @@
<value>Mixer 1</value> <value>Mixer 1</value>
</property> </property>
<property name="windowLayout"> <property name="windowLayout">
<value>AAAABgAAAB4ATQBpAHgAZQByACAAUgBvAHUAdABpAG4AZwAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQjAAAADgBNAGkAeABlAHIAIAAyAAAAQgHZ0MsAAwAAAAAC4wAAAbYAAAdyAAAFlQAAAuQAAAHVAAAHcQAABZQAAAAAAAAAAAoAAAAC5AAAAdUAAAdxAAAFlAAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///kZAAAAEv///aYAAAPRAAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMgAAAEIB2dDLAAMAAAAAAxkAAAD7AAAHOgAAA6wAAAMaAAABGgAABzkAAAOrAAAAAAAAAAAKAAAAAxoAAAEaAAAHOQAAA6sAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///pbAAABxv///noAAAUJAAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAeAEUAdgBlAG4AdAAgAEIAcgBvAHcAcwBlAHIAIAAxAAAAQgHZ0MsAAwAA///7eAAAAIH///0JAAADcP//+3kAAACg///9CAAAA28AAAABAAAAAAeA///7eQAAAKD///0IAAADbw==</value> <value>AAAABgAAAB4ATQBpAHgAZQByACAAUgBvAHUAdABpAG4AZwAgADEAAABCAdnQywADAAAAAAQ3AAABNQAABcgAAAQkAAAEOAAAAVQAAAXHAAAEIwAAAAAAAAAACgAAAAQ4AAABVAAABccAAAQjAAAADgBNAGkAeABlAHIAIAAyAAAAQgHZ0MsAAwAA///5DwAAAA////2eAAAD7v//+RAAAAAu///9nQAAA+0AAAABAAAAAAeA///5EAAAAC7///2dAAAD7QAAAA4ATQBpAHgAZQByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///qQAAAAjv///x0AAARNAAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMgAAAEIB2dDLAAMAAAAAAxkAAAD7AAAHOgAAA6wAAAMaAAABGgAABzkAAAOrAAAAAAAAAAAKAAAAAxoAAAEaAAAHOQAAA6sAAAAcAEUAdgBlAG4AdAAgAEUAZABpAHQAbwByACAAMQAAAEIB2dDLAAMAAP//+H/////4AAAAAAAABBD///pbAAABxv///noAAAUJAAAAAQIAAAAHgP//+IAAAAAX/////wAABA8AAAAeAEUAdgBlAG4AdAAgAEIAcgBvAHcAcwBlAHIAIAAxAAAAQgHZ0MsAAwAA///7eAAAAIH///0JAAADcP//+3kAAACg///9CAAAA28AAAABAAAAAAeA///7eQAAAKD///0IAAADbw==</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/Combat/Buff Haesol.wav (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Sword block 2.wav (Stored with Git LFS) Normal file

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/Sword_block_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="AudioFile" id="{35250175-caa9-4d8d-aa28-1720b27d2ff6}">
<property name="assetPath">
<value>Combat/Buff Haesol.wav</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>5.0637916666666669</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="AudioFile" id="{493e8317-989e-4d6e-bc2c-5c3348dd64d2}">
<property name="assetPath">
<value>Sword block 2.wav</value>
</property>
<property name="frequencyInKHz">
<value>48</value>
</property>
<property name="channelCount">
<value>2</value>
</property>
<property name="length">
<value>2.625</value>
</property>
<relationship name="masterAssetFolder">
<destination>{4f34473d-1e56-44db-8dd1-60284d90f95e}</destination>
</relationship>
</object>
</objects>

View File

@ -0,0 +1,187 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="Event" id="{22f0f47b-9dce-4a71-b215-9668c4ce6825}">
<property name="color">
<value>Purple</value>
</property>
<property name="name">
<value>Buff Water</value>
</property>
<property name="outputFormat">
<value>1</value>
</property>
<relationship name="folder">
<destination>{58f76323-7476-4fc2-9d75-933801901ec4}</destination>
</relationship>
<relationship name="mixer">
<destination>{af726d92-4328-4de9-b5dd-d8874c648af4}</destination>
</relationship>
<relationship name="masterTrack">
<destination>{2f5d0c95-8190-4951-8c59-a056e41cfd3b}</destination>
</relationship>
<relationship name="mixerInput">
<destination>{af118af2-72eb-43d8-8daa-c6c01d372c02}</destination>
</relationship>
<relationship name="automatableProperties">
<destination>{5d896bef-2c95-4169-91b7-28426708f031}</destination>
</relationship>
<relationship name="markerTracks">
<destination>{bac516fb-dcc9-4418-8ac7-f9937df65533}</destination>
</relationship>
<relationship name="groupTracks">
<destination>{0af32da2-2ff3-4d75-8497-e0e9c70aba0c}</destination>
<destination>{208fe279-3406-4e51-9f2f-cb4e290bb696}</destination>
</relationship>
<relationship name="timeline">
<destination>{fdde2e99-ec9c-43fc-9876-f7637e41584b}</destination>
</relationship>
<relationship name="banks">
<destination>{9c5265c8-c3c8-41f5-9212-f803a3d9a96e}</destination>
</relationship>
</object>
<object class="EventMixer" id="{af726d92-4328-4de9-b5dd-d8874c648af4}">
<relationship name="masterBus">
<destination>{0290bfea-d610-41c6-a3ef-11aa6699ec13}</destination>
</relationship>
</object>
<object class="MasterTrack" id="{2f5d0c95-8190-4951-8c59-a056e41cfd3b}">
<relationship name="mixerGroup">
<destination>{0290bfea-d610-41c6-a3ef-11aa6699ec13}</destination>
</relationship>
</object>
<object class="MixerInput" id="{af118af2-72eb-43d8-8daa-c6c01d372c02}">
<relationship name="effectChain">
<destination>{c4b353c3-1704-4ad3-8652-b75c798cf2af}</destination>
</relationship>
<relationship name="panner">
<destination>{5e56cac0-4790-4abe-8403-b66dab6917f2}</destination>
</relationship>
<relationship name="output">
<destination>{b652127b-31f3-4ae6-b245-1a19a8f778fb}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{5d896bef-2c95-4169-91b7-28426708f031}" />
<object class="MarkerTrack" id="{bac516fb-dcc9-4418-8ac7-f9937df65533}" />
<object class="GroupTrack" id="{0af32da2-2ff3-4d75-8497-e0e9c70aba0c}">
<relationship name="modules">
<destination>{b7e295e4-8d0d-4ae1-a91d-71ae5603f58b}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{3a1187c3-2614-48d7-ada6-c81ad51c516c}</destination>
</relationship>
</object>
<object class="GroupTrack" id="{208fe279-3406-4e51-9f2f-cb4e290bb696}">
<relationship name="modules">
<destination>{e6b8535e-2b44-4a87-82c6-00aec893ff83}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{076bd00b-7bab-4247-b61b-b84006389a12}</destination>
</relationship>
</object>
<object class="Timeline" id="{fdde2e99-ec9c-43fc-9876-f7637e41584b}">
<relationship name="modules">
<destination>{e6b8535e-2b44-4a87-82c6-00aec893ff83}</destination>
<destination>{b7e295e4-8d0d-4ae1-a91d-71ae5603f58b}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{0290bfea-d610-41c6-a3ef-11aa6699ec13}">
<relationship name="effectChain">
<destination>{282c648d-2301-48f1-aba7-dfce8ca21d17}</destination>
</relationship>
<relationship name="panner">
<destination>{52bcce8b-3e57-4a77-8afe-d99834e519e2}</destination>
</relationship>
<relationship name="mixer">
<destination>{af726d92-4328-4de9-b5dd-d8874c648af4}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{c4b353c3-1704-4ad3-8652-b75c798cf2af}">
<relationship name="effects">
<destination>{6d139ee5-c3a1-4121-b1fa-2ecbbfba74b2}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{5e56cac0-4790-4abe-8403-b66dab6917f2}" />
<object class="SingleSound" id="{b7e295e4-8d0d-4ae1-a91d-71ae5603f58b}">
<property name="length">
<value>4.4837916666666739</value>
</property>
<property name="timelockedOffset">
<value>0.57999999999999996</value>
</property>
<relationship name="audioFile">
<destination>{35250175-caa9-4d8d-aa28-1720b27d2ff6}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{3a1187c3-2614-48d7-ada6-c81ad51c516c}">
<property name="name">
<value>Audio 1</value>
</property>
<relationship name="effectChain">
<destination>{4baf8a10-b70d-47b1-9233-93abfacaf54d}</destination>
</relationship>
<relationship name="panner">
<destination>{f54592a9-6ad6-4322-b16e-db8bbb676519}</destination>
</relationship>
<relationship name="output">
<destination>{0290bfea-d610-41c6-a3ef-11aa6699ec13}</destination>
</relationship>
</object>
<object class="SnapshotModule" id="{e6b8535e-2b44-4a87-82c6-00aec893ff83}">
<relationship name="modulators">
<destination>{313de78b-9814-45cd-9134-57e37ccb62c1}</destination>
</relationship>
<relationship name="event">
<destination>{1fdd81d6-add9-4e95-a5c1-b886d24d9052}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{076bd00b-7bab-4247-b61b-b84006389a12}">
<property name="name">
<value>Audio 2</value>
</property>
<relationship name="effectChain">
<destination>{bb01528e-0377-4cf8-8c37-547e10c106da}</destination>
</relationship>
<relationship name="panner">
<destination>{a66c4ce6-3f54-46fb-ad13-5f6802c743bf}</destination>
</relationship>
<relationship name="output">
<destination>{0290bfea-d610-41c6-a3ef-11aa6699ec13}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{282c648d-2301-48f1-aba7-dfce8ca21d17}">
<relationship name="effects">
<destination>{f8aa8ec0-a0b6-43b5-b4c7-338c1882a09b}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{52bcce8b-3e57-4a77-8afe-d99834e519e2}" />
<object class="MixerBusFader" id="{6d139ee5-c3a1-4121-b1fa-2ecbbfba74b2}" />
<object class="MixerBusEffectChain" id="{4baf8a10-b70d-47b1-9233-93abfacaf54d}">
<relationship name="effects">
<destination>{f7fd3011-a8d3-4dc1-8408-14a70580ce8f}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{f54592a9-6ad6-4322-b16e-db8bbb676519}" />
<object class="ADSRModulator" id="{313de78b-9814-45cd-9134-57e37ccb62c1}">
<property name="nameOfPropertyBeingModulated">
<value>intensity</value>
</property>
<property name="attackTime">
<value>147.435928</value>
</property>
<property name="peakValue">
<value>100</value>
</property>
<property name="sustainValue">
<value>100</value>
</property>
</object>
<object class="MixerBusEffectChain" id="{bb01528e-0377-4cf8-8c37-547e10c106da}">
<relationship name="effects">
<destination>{cd58e522-b126-4ccf-8fd6-a4d0cbb6eb94}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{a66c4ce6-3f54-46fb-ad13-5f6802c743bf}" />
<object class="MixerBusFader" id="{f8aa8ec0-a0b6-43b5-b4c7-338c1882a09b}" />
<object class="MixerBusFader" id="{f7fd3011-a8d3-4dc1-8408-14a70580ce8f}" />
<object class="MixerBusFader" id="{cd58e522-b126-4ccf-8fd6-a4d0cbb6eb94}" />
</objects>

View File

@ -64,7 +64,7 @@
<object class="MarkerTrack" id="{5281751b-d239-4d3a-b117-4abdfe4ae16e}" /> <object class="MarkerTrack" id="{5281751b-d239-4d3a-b117-4abdfe4ae16e}" />
<object class="GroupTrack" id="{10f2b999-3e22-456b-aff2-01472494e586}"> <object class="GroupTrack" id="{10f2b999-3e22-456b-aff2-01472494e586}">
<relationship name="modules"> <relationship name="modules">
<destination>{8ffd615b-5561-467f-9f0f-ab9953615cae}</destination> <destination>{bc5b7684-99b2-42b4-b3ba-ea8403bdf97f}</destination>
</relationship> </relationship>
<relationship name="mixerGroup"> <relationship name="mixerGroup">
<destination>{7f1acd74-4e2c-4f5a-8551-b7f3a3a2a367}</destination> <destination>{7f1acd74-4e2c-4f5a-8551-b7f3a3a2a367}</destination>
@ -80,8 +80,8 @@
</object> </object>
<object class="Timeline" id="{95d464e3-2c83-4bbf-a2f3-c6afaa2bbc4d}"> <object class="Timeline" id="{95d464e3-2c83-4bbf-a2f3-c6afaa2bbc4d}">
<relationship name="modules"> <relationship name="modules">
<destination>{8ffd615b-5561-467f-9f0f-ab9953615cae}</destination>
<destination>{69dfa2ee-a8f8-499a-8594-aa376a4d408a}</destination> <destination>{69dfa2ee-a8f8-499a-8594-aa376a4d408a}</destination>
<destination>{bc5b7684-99b2-42b4-b3ba-ea8403bdf97f}</destination>
</relationship> </relationship>
</object> </object>
<object class="EventMixerMaster" id="{147cb647-49a4-4f58-ae7f-e233404e9361}"> <object class="EventMixerMaster" id="{147cb647-49a4-4f58-ae7f-e233404e9361}">
@ -101,15 +101,15 @@
</relationship> </relationship>
</object> </object>
<object class="MixerBusPanner" id="{b198faf4-8d81-4a2c-b4cd-64b17ea5fcd9}" /> <object class="MixerBusPanner" id="{b198faf4-8d81-4a2c-b4cd-64b17ea5fcd9}" />
<object class="SingleSound" id="{8ffd615b-5561-467f-9f0f-ab9953615cae}"> <object class="SingleSound" id="{bc5b7684-99b2-42b4-b3ba-ea8403bdf97f}">
<property name="length"> <property name="length">
<value>1.8999999999999999</value> <value>2.3849999999999998</value>
</property> </property>
<property name="timelockedOffset"> <property name="timelockedOffset">
<value>0.10000000000000001</value> <value>0.23999999999999999</value>
</property> </property>
<relationship name="audioFile"> <relationship name="audioFile">
<destination>{30b14116-1f37-44dd-b072-d31963ed1eed}</destination> <destination>{493e8317-989e-4d6e-bc2c-5c3348dd64d2}</destination>
</relationship> </relationship>
</object> </object>
<object class="EventMixerGroup" id="{7f1acd74-4e2c-4f5a-8551-b7f3a3a2a367}"> <object class="EventMixerGroup" id="{7f1acd74-4e2c-4f5a-8551-b7f3a3a2a367}">

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More