From 27e503b8b86950aaa6657c44bbe1693d9a3fdb67 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Thu, 8 Aug 2024 08:44:48 +0900 Subject: [PATCH] push before merge --- .../Character/PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../PlayerCharacter/Playables/Haesol/BP_Haesol.uasset | 4 ++-- .../Content/Hwanyoung/Interactables/ItemDataTable.uasset | 4 ++-- hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap | 4 ++-- .../Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset | 3 --- 5 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index ed80ae50..bf9b697b 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23a4d0aa11585f753f134d29391a469d7d758f76dae3fe8e006424915e666e09 -size 312 +oid sha256:dc83fa0467b25c0ee93eaf3bc2cd5b21cc6e8951e1956f70a44fd00757d4c969 +size 273 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset index 22c3ad8d..ed42d7b8 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a0c2e2645beb62bb4ae5f171b209ff46ebfec722d112ce78480aa53840cbaf48 -size 312 +oid sha256:b313d633bc2ed79b61bfb2b6c44574222a5bb5ae768508bff76157e0e83ffe2b +size 273 diff --git a/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset index 23cec42e..0f67946b 100644 --- a/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset +++ b/hwanyoung2/Content/Hwanyoung/Interactables/ItemDataTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d9edc81afe947b77daa1a8dc44cf1f561198118e9b6420a95bf57cfa4bca8c5 -size 310 +oid sha256:0ddd170979983cd6d9a5bb3b8c0f0c186a2c34355c94a67187fcb07426b014d3 +size 271 diff --git a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap index fac2c555..18cd0b6d 100644 --- a/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap +++ b/hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbac0c6f098dddfecd64db3f5df625bc2c68d2320400bd63bbb5dbf730f117b7 -size 313 +oid sha256:23c585c2ad166ac40442b753ec120a6cb460295cf4a4c2f4ccb69a03b11a38b9 +size 272 diff --git a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset b/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset deleted file mode 100644 index b51db3b2..00000000 --- a/hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/A2/H9MJMZCFVTV40932SFK4YJ.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da98602c0b14babd30967deda72cc5b971fe3d2e8bb335afe717c70526c798de -size 4155