From 9cff9cd35b5b066ff54fb7e2f47bd0079a99c7b5 Mon Sep 17 00:00:00 2001 From: 7heIVIaze Date: Sun, 8 Jun 2025 08:57:02 +0900 Subject: [PATCH] merge --- .../PlayerCharacter/BP_HYPlayerCharacController.uasset | 4 ++-- .../Hwanyoung/Interactables/BP_HaetaeStatueCamp.uasset | 3 +++ hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap | 4 ++-- .../Content/Hwanyoung/UI/Player_HUD/WG_HaeTaeHUD.uasset | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 hwanyoung2/Content/Hwanyoung/Interactables/BP_HaetaeStatueCamp.uasset create mode 100644 hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_HaeTaeHUD.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset index f4a24157..8d410d04 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4a8feb520ed2f50bc7e6e77819f357970cfb5171865afdc813aa1b312ac32f1 -size 399972 +oid sha256:3fa242a685af87ee2e646ce872b164286001eecf97f0fb33c952b892d647564f +size 419565 diff --git a/hwanyoung2/Content/Hwanyoung/Interactables/BP_HaetaeStatueCamp.uasset b/hwanyoung2/Content/Hwanyoung/Interactables/BP_HaetaeStatueCamp.uasset new file mode 100644 index 00000000..dfa3d0a2 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Interactables/BP_HaetaeStatueCamp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90e4639c3bcfde3b7339807615956ea3e017a0088186c7d6de6267a49f94e0c7 +size 46553 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap index e32882a5..d878dd18 100644 --- a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap +++ b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f46f3d2b09d5f2632d441193b07d7b97f96ff7ecc277de42a85f5f7d2dfbaefc -size 26566432 +oid sha256:0f429837265a593618c48d0804974eab03807263fced9be0b3233d53476d3929 +size 26567976 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_HaeTaeHUD.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_HaeTaeHUD.uasset new file mode 100644 index 00000000..2f5a69b2 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_HaeTaeHUD.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c9305a2a5ed821ee6f6dad886ca2ca7afe20149c0fc58998fa0a5655ce69b3a +size 86325