From 4c9d3cdc7c54f8d0266a6e79c1a79851ca056115 Mon Sep 17 00:00:00 2001 From: Ji Yoon Rhee Date: Mon, 12 May 2025 22:53:21 +0900 Subject: [PATCH] merging from sfx branch for rock fall --- .../Illusions/Assets/Combat/sfx_combat_rockfall.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_huge_neu_ground_1.uasset | 4 ++-- .../sfx_impact_rock_fall_large_neu_ground_1.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_medium_grass_1.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_medium_grass_2.uasset | 4 ++-- .../Environment/sfx_impact_rock_fall_medium_grass_3.uasset | 4 ++-- .../sfx_impact_rock_fall_medium_neu_ground_1.uasset | 4 ++-- .../sfx_impact_rock_fall_medium_neu_ground_2.uasset | 4 ++-- .../sfx_impact_rock_fall_medium_neu_ground_3.uasset | 4 ++-- .../Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset | 3 +++ .../Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset | 3 +++ 11 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset create mode 100644 hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset diff --git a/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset b/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset index cced57fb..190cfbea 100644 --- a/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset +++ b/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fafebcf8c12049340128bb5d14d4ff591642b483cb9e9e51965a86d7ea65e67b -size 132451 +oid sha256:32ba294973e27fdfd975d494322fc5135f4a0aceb3a39cf3ca7d60dab65f5c6e +size 132814 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 index adfcfc49..018ec11d 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad4fb7759f30b5b997ec73df4ef1e7ca14f31c88bb9ae721778012d2c4abbe4c -size 152934 +oid sha256:080c85310cc99e29c18e5434dc8a39ccc5942bd3b25da23df9fb8f7b4d75f2b0 +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 index 119352a6..858f3d8e 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08371361ff7b90229cfe6ab07b31f2b9b78677d3bcea6ace60048cd612c63d11 -size 93826 +oid sha256:e69ea3d969ef4601ecdcebf4854a779561076c0ed4e394459c98641aed3137ec +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 index 7e0b49f8..fbdab61b 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:896daeffc2b0ed3efeaeeec0717eaaa7652fbe1036e3427e36028fca49d8265a -size 67829 +oid sha256:d3a77b66cb3c02a60ac66455106e285794bc61d0b1697b0680c49d91325d9d5b +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 index 65d05096..855bf0f9 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d914fa29a96e1b64a1811ab3e1c05109e0f19cf9a41f9cf9fbe3037f0703a06 -size 55592 +oid sha256:8705b6c7eb51fe122271634951759a9ad06304823ea3f47a5537f8341f56c123 +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 index 08f5459f..d9e0b3fb 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3286bde346ce4c9cd709088b6e72b906f0bfb24b7943263e1b562e30102b46c8 -size 48114 +oid sha256:798b9f7e7430234c23ff211f206fd4dc8204e8474cec37875bac4ed989488dfd +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 index 70efe2b8..f80fa2eb 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8e2d6149913a3ac573fdaa0281e6602710ad9122ae194c2394bc06db73f34eb -size 77320 +oid sha256:a72f163f8e744472a07680712e5b1bf68375b39bb8add998fff08a4eb0e700e9 +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 index 19494577..63997e36 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3bf2ee9ca683faf5989d157b1d89fea265f0c2b4fddadbee677227c3d1efb202 -size 66049 +oid sha256:bcce04679d9cd28cc06a6f0471e82981a0d137f273fe6ef7dbd4f3b9565a91af +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 index 7cd34f92..08f3ae0d 100644 --- 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 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ce4cc9c7a34fee8108ab6532c72420fb5da4e4c5105e9aec3d8bf8e713ec564 -size 63439 +oid sha256:76fc6b0b0a8b5ab61d1f0c4dd48bbcea9ab58f220609aa0984b6221a20852c29 +size 63455 diff --git a/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset b/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset new file mode 100644 index 00000000..97166d69 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26b6eec1a54f3650ce0f3352e17bef37e506c790211b04f3f73fae874914cf10 +size 10262840 diff --git a/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset b/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset new file mode 100644 index 00000000..32a7f820 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Assets/Music/BunnyPuzzle_Mix_ending.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8807ed7611cafbc94b230a82b4e831c9a362530b9c27554573179f5c44640c61 +size 11421631