neroberovero/Illusion-UE5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

complete merge

Browse Source
This commit is contained in:
Ji Yoon Rhee 2025-05-03 08:52:55 +09:00
commit d0980840ad
56 changed files with 301 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
hwanyoung2/Content/FMOD/Desktop/Master.bank
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Desktop/Master.strings.bank
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/Events/SFX/Combat/Dragon_Ult_(crashing_waves_of_four_dragon_kings)/Dragon_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Materials/Concretes/M_Floor_Concrete_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Materials/Concretes/M_Roof_Concrete_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Materials/Concretes/M_Roof_Concrete_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Materials/Woods/M_Floor_wood.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Materials/Woods/M_Pattern_01.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Materials/Woods/M_Pattern_02.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Materials/Woods/M_Pillar_Wood_01.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Meshes/Building_Floors/SM_Floor_10.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Meshes/Building_Pillars/SM_Pillar_10.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Meshes/Building_Pillars/SM_Pillar_9.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Meshes/Building_Railings/SM_Railing_10.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Meshes/Building_Railings/SM_Railing_4.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Meshes/Roof_Foundations/SM_Roof_Foundation_14.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Meshes/Roofs/SM_Roof_11.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Floor_Concrete_02_BC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Floor_Concrete_02_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Floor_wood_BC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Floor_wood_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Pillar_Wood_01_BC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Pillar_Wood_01_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Roof_Concrete_01_BC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Roof_Concrete_01_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Roof_Concrete_02_BC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Roof_Concrete_02_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Wood_Pattern_01_BC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/HouseOfChangwon/Textures/T_Wood_Pattern_02_BC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/DT_DiaglueTable.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/MPSystem/AC_MPSystem.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Levels/_GENERATED/MyCom/Stairs_6224D60D.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueOptionWidget.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Dialogue_HUD/BP_DialogueWidget.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/3A57EAF8.fobj Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.cache/{d547300b-f688-4816-b2a8-0edd5f5e77a1}.pdc Normal file
View File

Binary file not shown.

4
hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="MasterAssetFolder" id="{4f34473d-1e56-44db-8dd1-60284d90f95e}" />
</objects>

23
hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml
View File

@ -1,23 +0,0 @@
<?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/AAABPQAABswAAAT8AAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA//////////gAAAoAAAAFeAAAAIYAAAHAAAAFEwAABI8AAAAAAgAAAAoAAAAAAAAAABcAAAn/AAAFdwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4fwAAAAIAAAAAAAAEGv//+IMAAABk///9gAAABBYAAAABAgAAAAeA///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>

23
hwanyoung2/Content/Illusions/.unsaved/Metadata/AudioFile/{d547300b-f688-4816-b2a8-0edd5f5e77a1}.xml Normal file
View File

@ -0,0 +1,23 @@
<?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>

2
hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Mixer.user.xml → hwanyoung2/Content/Illusions/.unsaved/Metadata/Event/{4ff730ba-f1d1-4efd-9dfe-1811ce2538c2}.xml
View File

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

133
hwanyoung2/Content/Illusions/.unsaved/Metadata/Event/{bc8f13ed-8783-4e69-8dac-132b7783a4c0}.xml Normal file
View File

@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="Event" id="{bc8f13ed-8783-4e69-8dac-132b7783a4c0}">
<property name="name">
<value>Dragon 1</value>
</property>
<property name="outputFormat">
<value>2</value>
</property>
<relationship name="folder">
<destination>{6b62b736-8a10-493e-93b4-17b6b7b1bf14}</destination>
</relationship>
<relationship name="mixer">
<destination>{e6d109e1-ab85-4e5c-95e6-d0a10df0d54c}</destination>
</relationship>
<relationship name="masterTrack">
<destination>{eeb4656a-be4e-45de-8417-70a5e978057b}</destination>
</relationship>
<relationship name="mixerInput">
<destination>{818421cb-351f-4db4-ba64-3f2a44cd8af8}</destination>
</relationship>
<relationship name="automatableProperties">
<destination>{68bf11d7-ea47-4997-a98e-910f5647f9b5}</destination>
</relationship>
<relationship name="markerTracks">
<destination>{256b3158-1510-4471-8517-ca7849bdc9c5}</destination>
</relationship>
<relationship name="groupTracks">
<destination>{a60168b6-8999-4deb-bc1e-5a91b1d29cdb}</destination>
</relationship>
<relationship name="timeline">
<destination>{9c7fc3ec-1709-4e94-b3b3-4279fa71e776}</destination>
</relationship>
<relationship name="banks">
<destination>{9c5265c8-c3c8-41f5-9212-f803a3d9a96e}</destination>
</relationship>
</object>
<object class="EventMixer" id="{e6d109e1-ab85-4e5c-95e6-d0a10df0d54c}">
<relationship name="masterBus">
<destination>{c583f399-6ab4-4f4a-997f-77c308ad48c5}</destination>
</relationship>
</object>
<object class="MasterTrack" id="{eeb4656a-be4e-45de-8417-70a5e978057b}">
<relationship name="mixerGroup">
<destination>{c583f399-6ab4-4f4a-997f-77c308ad48c5}</destination>
</relationship>
</object>
<object class="MixerInput" id="{818421cb-351f-4db4-ba64-3f2a44cd8af8}">
<relationship name="effectChain">
<destination>{4812b0cd-1579-4f74-94a0-c91cd2c8bf50}</destination>
</relationship>
<relationship name="panner">
<destination>{7f1607a0-60c6-4217-b33d-55704b0ddb36}</destination>
</relationship>
<relationship name="output">
<destination>{ac0156d5-fdee-4b48-ac6c-2bffcb52ba19}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{68bf11d7-ea47-4997-a98e-910f5647f9b5}" />
<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>
</relationship>
<relationship name="mixerGroup">
<destination>{94341f26-cfe6-47ae-8dff-0a151c028c6d}</destination>
</relationship>
</object>
<object class="Timeline" id="{9c7fc3ec-1709-4e94-b3b3-4279fa71e776}">
<relationship name="modules">
<destination>{859cc583-9bd3-4b10-84f3-3655db2385cc}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{c583f399-6ab4-4f4a-997f-77c308ad48c5}">
<relationship name="effectChain">
<destination>{2016e3c1-ffae-4bed-8a43-2058657060d9}</destination>
</relationship>
<relationship name="panner">
<destination>{18bd8942-67b0-433e-ba5d-c240a16e41e5}</destination>
</relationship>
<relationship name="mixer">
<destination>{e6d109e1-ab85-4e5c-95e6-d0a10df0d54c}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{4812b0cd-1579-4f74-94a0-c91cd2c8bf50}">
<relationship name="effects">
<destination>{e409167a-609f-4d88-aa59-52ab72e17f3f}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{7f1607a0-60c6-4217-b33d-55704b0ddb36}" />
<object class="SingleSound" id="{859cc583-9bd3-4b10-84f3-3655db2385cc}">
<property name="length">
<value>17.316916099773241</value>
</property>
<relationship name="audioFile">
<destination>{d547300b-f688-4816-b2a8-0edd5f5e77a1}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{94341f26-cfe6-47ae-8dff-0a151c028c6d}">
<property name="volume">
<value>-13</value>
</property>
<property name="name">
<value>Audio 1</value>
</property>
<relationship name="effectChain">
<destination>{4566e960-7440-44c8-ab5e-9a85775efb1d}</destination>
</relationship>
<relationship name="panner">
<destination>{a6de3f0e-d6ed-42f2-92ac-8a8483d70acc}</destination>
</relationship>
<relationship name="output">
<destination>{c583f399-6ab4-4f4a-997f-77c308ad48c5}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{2016e3c1-ffae-4bed-8a43-2058657060d9}">
<relationship name="effects">
<destination>{b1c0542f-d1af-46ec-826d-5dcfb3866a70}</destination>
<destination>{4feb51ab-cbe6-40d0-b604-fc3284f00cae}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{18bd8942-67b0-433e-ba5d-c240a16e41e5}" />
<object class="MixerBusFader" id="{e409167a-609f-4d88-aa59-52ab72e17f3f}" />
<object class="MixerBusEffectChain" id="{4566e960-7440-44c8-ab5e-9a85775efb1d}">
<relationship name="effects">
<destination>{5f232bb8-593a-4aed-91ad-dc04d78f6d5d}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{a6de3f0e-d6ed-42f2-92ac-8a8483d70acc}" />
<object class="MixerBusFader" id="{b1c0542f-d1af-46ec-826d-5dcfb3866a70}" />
<object class="SpatialiserEffect" id="{4feb51ab-cbe6-40d0-b604-fc3284f00cae}" />
<object class="MixerBusFader" id="{5f232bb8-593a-4aed-91ad-dc04d78f6d5d}" />
</objects>

11
hwanyoung2/Content/Illusions/.unsaved/Metadata/EventFolder/{6b62b736-8a10-493e-93b4-17b6b7b1bf14}.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="EventFolder" id="{6b62b736-8a10-493e-93b4-17b6b7b1bf14}">
<property name="name">
<value>Dragon Ult (crashing waves of four dragon kings)</value>
</property>
<relationship name="folder">
<destination>{58f76323-7476-4fc2-9d75-933801901ec4}</destination>
</relationship>
</object>
</objects>

BIN
hwanyoung2/Content/Illusions/.unsaved/dragon ult uncut.ogg Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/.unsaved/metadataFileMapping.data Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Illusions/Assets/dragon ult uncut.ogg Normal file
View File

Binary file not shown.

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

Binary file not shown.

23
hwanyoung2/Content/Illusions/Metadata/AudioFile/{d547300b-f688-4816-b2a8-0edd5f5e77a1}.xml Normal file
View File

@ -0,0 +1,23 @@
<?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>

BIN
hwanyoung2/Content/Illusions/_unsaved/dragon_ult_uncut.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Intermediate/ReimportCache/3688439234.bin
View File

Binary file not shown.