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

Resolve conflict: use remote version of dragon_ult_uncut.uasset

Browse Source
This commit is contained in:
wonjoon 2025-05-05 20:23:35 +09:00
commit b7a4095ee3
14 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Resources/BP_PuzzleArea.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.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/UI/Dialogue_HUD/BP_DialogueWidget.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Images/T_BunnySprite_Base.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Images/T_BunnySprite_Happy.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/UI/Images/T_BunnySprite_Sad.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)
View File

Binary file not shown.