From ffcd1cac980deecfbe8b1b973fdfab6407310816 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Sun, 11 May 2025 12:26:02 +0900 Subject: [PATCH] merge with chaz's branch --- .../Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset | 4 ++-- .../Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset | 4 ++-- .../Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset | 3 +++ .../sfx_impact_rock_fall_large_neu_ground_1.uasset | 3 +++ .../Environment/sfx_impact_rock_fall_medium_grass_1.uasset | 3 +++ .../Environment/sfx_impact_rock_fall_medium_grass_2.uasset | 3 +++ .../Environment/sfx_impact_rock_fall_medium_grass_3.uasset | 3 +++ .../sfx_impact_rock_fall_medium_neu_ground_1.uasset | 3 +++ .../sfx_impact_rock_fall_medium_neu_ground_2.uasset | 3 +++ .../sfx_impact_rock_fall_medium_neu_ground_3.uasset | 3 +++ 11 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset index 831bb7f0..91856dcb 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_PuzzleNPCBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc511c3869d6e43171396f217f9a5731fbf2d0c164618f4900e149c172291b03 -size 495756 +oid sha256:50d1a601fbcc6a9499e0673879008a9c7b1c14715aad217d2baa18daca3c4bef +size 502000 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset index 499723f8..ec1f2e34 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_Bunny.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db88625f2cd646e50cfcba7597a343ef89e716015e0d1a66d2ddce6704d96d95 -size 185439 +oid sha256:2451d0148efbb485ce7560aae8162d129940a74448fcc0340619ded727eb67f4 +size 181735 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset index 03b0c0f2..1ab17231 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Bunny/BP_BunnyPuzzleArea.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20a9c6965fe12d35dbae82845bf0803bfa09e8366f6eecb3acf6397275663686 -size 120598 +oid sha256:67d33d0b50cad4206fe6d8072cd0ef4d2a2d3709e150d925932c63736eac0a5d +size 144453 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset new file mode 100644 index 00000000..c96645b1 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5574e51928b6f4ffacbbf435accb2cbc360b4b579487d686e6542d8b2b427f6 +size 153222 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset new file mode 100644 index 00000000..c32b07ee --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_large_neu_ground_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:245629941b46fe175ef57a3f17d03af8742f0a8f4d8d835a2e7565427a49f332 +size 94113 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset new file mode 100644 index 00000000..b348fcd9 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40647a4c5147213e8a23dcc1f68efe69f5c5184f6b4d50ff945ee288cbad4b5d +size 67915 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset new file mode 100644 index 00000000..ed149a08 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b9a487b712264813b6a485c45b235675e0b96a6c9b3a3c84a488dcaed25d0a2 +size 55844 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset new file mode 100644 index 00000000..ef275c0e --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_grass_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:14706f7b3bd32490bd9e41032c73c839cee88ae144477ef2e52af05fa4730023 +size 48070 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset new file mode 100644 index 00000000..fa2bd337 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e19e6d58c52ce6a11cb64923bd1775655c71db6a51dec05504c1a62bddccdaf7 +size 77718 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset new file mode 100644 index 00000000..50affb5d --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bb12f85c8fc83d1cc54b69db75f9c1f6b7259ef1c8f7b5ca2379551deaf514b +size 66050 diff --git a/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset new file mode 100644 index 00000000..0c57ea54 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Environment/sfx_impact_rock_fall_medium_neu_ground_3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cedb6ed66c3d906d3d586a5bdc6fe842696b02f086798259d647c7d2eb4abdf +size 63455