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

Try to Implement Dialogue System and Improve the Crafting UI

Browse Source
This commit is contained in:
7heIVIaze 2025-04-29 16:38:23 +09:00
parent 4e963403ad
commit af0ac5c5c2
22 changed files with 84 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Dialogue/BP_DialogueComponent.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.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/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
hwanyoung2/Intermediate/Build/SourceFileCache.bin
View File

Binary file not shown.

54
hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp
View File

@ -1,37 +1,17 @@
<<<<<<< HEAD D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\CraftingInfo.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAIController.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2Character.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\CraftingInfo.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAIController.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYManualPickUp.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2GameMode.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2GameMode.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAttackComponent.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYInteractableActor.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAutomaticPickUp.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAutomaticPickUp.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYConsumableItem.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYSaveGameActor.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYEnemyBase.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYEnemyBase.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYInteractableActor.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYConsumableItem.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYManualPickUp.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYMoneyAutoPickUp.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYMoneyAutoPickUp.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYProjectileAttackComponent.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYGameStateBase.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAttackComponent.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYPlayerCharacController.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYGameStateBase.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYProjectileAttackComponent.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2Character.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\InventoryItem.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYPlayerCharacController.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYSaveGameActor.h
C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\InventoryItem.h
=======
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\CraftingInfo.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2Character.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2GameMode.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAIController.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYGameStateBase.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAttackComponent.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAutomaticPickUp.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYManualPickUp.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYEnemyBase.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYInteractableActor.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYMoneyAutoPickUp.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYProjectileAttackComponent.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\InventoryItem.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYSaveGameActor.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYPlayerCharacController.h
C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYConsumableItem.h
>>>>>>> main

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

Binary file not shown.

46
hwanyoung2/Plugins/FMODStudio/Intermediate/Build/Win64/UnrealEditor/Inc/FMODStudio/UHT/Timestamp
View File

@ -1,23 +1,23 @@
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAmbientSound.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAudioComponent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAsset.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBus.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBank.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAmbientSound.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBus.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAsset.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBlueprintStatics.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBank.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAudioComponent.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBlueprintStatics.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODEvent.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODPort.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODPort.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshot.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshot.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODEvent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSettings.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshotReverb.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshotReverb.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODVCA.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODVCA.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSettings.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkComponent.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkSettings.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkSettings.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLink\Public\FMODAudioLinkComponent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODAssetLookup.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODAssetLookup.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODBankLookup.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODBankLookup.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSection.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSectionTemplate.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSection.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterTrack.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterTrack.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSectionTemplate.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLinkEditor\Private\FMODAudioLinkSettingsFactory.h D:\Unreal\Hwanyoung\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODAudioLinkEditor\Private\FMODAudioLinkSettingsFactory.h