diff --git a/hwanyoung2/Config/DefaultEngine.ini b/hwanyoung2/Config/DefaultEngine.ini index e38dbf31..ff0f1d9c 100644 --- a/hwanyoung2/Config/DefaultEngine.ini +++ b/hwanyoung2/Config/DefaultEngine.ini @@ -238,6 +238,7 @@ ManualIPAddress= +Profiles=(Name="Vehicle",CollisionEnabled=QueryAndPhysics,bCanModify=False,ObjectTypeName="Vehicle",CustomResponses=,HelpMessage="Vehicle object that blocks Vehicle, WorldStatic, and WorldDynamic. All other channels will be set to default.") +Profiles=(Name="UI",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="WorldDynamic",CustomResponses=((Channel="WorldStatic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility"),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Overlap),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="WorldStatic object that overlaps all actors by default. All new custom channels will use its own default response. ") +Profiles=(Name="WaterBodyCollision",CollisionEnabled=QueryOnly,bCanModify=False,ObjectTypeName="",CustomResponses=((Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Pawn",Response=ECR_Overlap),(Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Overlap),(Channel="Vehicle",Response=ECR_Overlap),(Channel="Destructible",Response=ECR_Overlap)),HelpMessage="Default Water Collision Profile (Created by Water Plugin)") ++DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="GroundOnly") -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") diff --git a/hwanyoung2/Content/FMOD/Desktop/Master.bank b/hwanyoung2/Content/FMOD/Desktop/Master.bank index 932a1e19..95a08e43 100644 Binary files a/hwanyoung2/Content/FMOD/Desktop/Master.bank and b/hwanyoung2/Content/FMOD/Desktop/Master.bank differ diff --git a/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank b/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank index 366c6ed9..2f10784f 100644 Binary files a/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank and b/hwanyoung2/Content/FMOD/Desktop/Master.strings.bank differ diff --git a/hwanyoung2/Content/FMOD/Events/SFX/Combat/Sfx_combat_rockfall.uasset b/hwanyoung2/Content/FMOD/Events/SFX/Combat/Sfx_combat_rockfall.uasset new file mode 100644 index 00000000..f91872b9 --- /dev/null +++ b/hwanyoung2/Content/FMOD/Events/SFX/Combat/Sfx_combat_rockfall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8106304ed7b7f5f11a5bad077dfc23fb3e58ae7c26dc2d824dd667a641b30fe +size 1523 diff --git a/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset b/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset index 4e59b478..0fe0fd0a 100644 --- a/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset +++ b/hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f89ea8b04ca2a3d94500b2fbcdf78261a70d623e44e9a09bf5e7d9fac379247a -size 24559 +oid sha256:48298dabbb8c1a3f95ac6045314de3845a0024d9ed4f6885bf5ece7442e1eb0c +size 24748 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_Goblin.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_Goblin.uasset index 246f0091..75a9ea73 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_Goblin.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Mobs/BP_Goblin.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:091e57723442bbef1d204811df8616482838d70e724621ad089fcba53f7a19a6 -size 301551 +oid sha256:e9542ed750610278759596077ddf4608a234a9cc63e7560bf92c5662575dc0e4 +size 309959 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 ec1f2e34..e4acc468 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:2451d0148efbb485ce7560aae8162d129940a74448fcc0340619ded727eb67f4 -size 181735 +oid sha256:217e75da21c747e1489588619589b2c8f6c0beff40f3b72f3d357be346cb5812 +size 185810 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index d7ef7c1b..b2623b47 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:be9f99ce74e62a76e569182a838926d256cc209fe52ec2eb42b57d746c9e0288 -size 634250 +oid sha256:134226e673477384f3de135dc4edc660f83fdb5fabb26ef2afc9ecc31956b4cd +size 645690 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 542fb4f1..0d71ca8e 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:6014b5e6dc48a02213693e9a9d18fe5aa5f0b7a51f93800959d0c7cbfb515332 -size 1682987 +oid sha256:485e5da8e796140b2e4a0c60a7b11922a5cd298e77318d3e3281f41b865597a9 +size 1799418 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset index da152913..c5d0d411 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_HaesolUlt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfc391cb2b3afa18584fbae150645c6b1d70326c1b9fa091d9cc973d623830ac -size 570479 +oid sha256:797ed5dbfbfcb55abaaef1771fa726881df3fd77c5da9b9a85e0ed669fda10a0 +size 568975 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_OcclusionMasking.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_OcclusionMasking.uasset new file mode 100644 index 00000000..d981f01d --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MF_OcclusionMasking.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c052c3396e8c40933f960161e51555acf5604a4fce2f531f632ebb61b901c108 +size 28756 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MPC_PlayerLocations.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MPC_PlayerLocations.uasset new file mode 100644 index 00000000..61cbc44c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/MPC_PlayerLocations.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c745d8b8bcd0a5f8f3ce6890e5eadd9746ad23480e90dc39f79207101eeef5b +size 1946 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/M_TestMasking.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/M_TestMasking.uasset new file mode 100644 index 00000000..695e44cb --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/M_TestMasking.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6e20ee2b64a38d7317b2b49622294d22f0c73c37dfe3752edd185710c5ed8c9 +size 11233 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset index 09c85cd0..38c35385 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/SystemBP/DialogueableSystem/BP_DialogueComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0b32ef8c70c258056b57a7c8e5110d2c89bf4c294bbb572689f171e5a9c25c6 -size 408643 +oid sha256:9397e2e40a4da0d5577caa6d38c880935f153b89a86300cb54ac922a4db99ba8 +size 406521 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap b/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap index 597ca314..608419bc 100644 --- a/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap +++ b/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f8fb9eb25035dc719cf81519dbe571a707a076ae8c2f5cb6047be0febf56589 -size 3537456 +oid sha256:db3c1cfaec99b082ac05981fcb90b54f0773104515f5e92161f2f6bba718d5df +size 3552224 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap index 8a88001b..12491ef4 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:a4b615c2f2308d1983909c1ecdc6cabcc82580e7a24b5669b8ae5a437de1d85b -size 21777364 +oid sha256:230e50385a08e75dbff481674420b2db6b1ae1db56d4a9e1b8a91eff70fa7502 +size 21861287 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookedItemSlot.uasset b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookedItemSlot.uasset index aeaad2de..a71f7b5e 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookedItemSlot.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookedItemSlot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68f02660f30684a91cf04cc735351fcc08892882bb7c35d276e6d02017a9a2b5 -size 142800 +oid sha256:a2c5e799a40d859a21438e65028e307b58d7098062e477a04714b8f1c8f5cabc +size 143173 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset index 92863081..4a9e2ef3 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CookingHUDWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb2ea6d63b7e0609d189fb2bd0f6dd82f904e5163abde3165b9fdce71fd302b5 -size 243880 +oid sha256:0a0683cc1223d4175140ab1a8172e0e9de46800dc1e4f15a6564c03c07866a16 +size 250556 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftedItemSlot.uasset b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftedItemSlot.uasset index 233af4da..ef566853 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftedItemSlot.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftedItemSlot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89bcf34a47c3e35c7f9004d5ff397334a8b377289d443e3aee302744d5efa74f -size 131347 +oid sha256:4acbb27dd96b216732365ff767896b9152189720cb702ec4c2316b64507e1949 +size 92234 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingHUDWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingHUDWidget.uasset index 558a0ddf..ae852620 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingHUDWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingHUDWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc65dc8f4a77cc3e1736e0aee71d8a2dd6d1b52398ea520e98ed58d04a3bcc6c -size 244163 +oid sha256:db08d640636c8b05c6e7a4255c54ccb18bf071035f0dab5f8462e22041bfd485 +size 245298 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingItemSlot.uasset b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingItemSlot.uasset index 6391c5ed..f04c6b5d 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingItemSlot.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_CraftingItemSlot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b21a9a4016f0c8987b9ba27e13996bdfc4dd48a962f71b8083f736b56f5a9c1 -size 143269 +oid sha256:a48390fed593273c4e62f7db76b9f33f75d7250eaa570272af6af2f6c29d9da9 +size 143054 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_IngredientItemSlot.uasset b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_IngredientItemSlot.uasset new file mode 100644 index 00000000..c0f09a61 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/UI/Crafting_HUD/BP_IngredientItemSlot.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a983205999b613d8d8cd7013a1d59f4259edae4dfc4208f2e14e00f8a571fda7 +size 142861 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar.uasset index 9c469082..d10b3aed 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b09dfada7ac2ed4840d139917a317f3ecfa128522e6312afdb7b3da008a0701 -size 9772 +oid sha256:4ea7ccd0e50b02a95422516002f2b50397e99eb0505f93132dd70fee02b3a6eb +size 11070 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar2.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar2.uasset new file mode 100644 index 00000000..2a9cab67 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e33d62283c9edc199d1cb2d8603b958417751496e98e6b89c202430159d58b28 +size 8274 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar3.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar3.uasset new file mode 100644 index 00000000..89a84646 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MI_CircularProgressBar3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:038a9a758f5e8df7be810cce70cb295b9b1452fc7796067f79a55306d7c7e71c +size 10490 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MPC_CircularProgressBar.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MPC_CircularProgressBar.uasset index 08476cbc..bc7b9c07 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MPC_CircularProgressBar.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/MPC_CircularProgressBar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c7d9a06ea5e5bdc0195b33f8b9c67efcc05770747aa40c53efc81167b6e0102 -size 2108 +oid sha256:97667b69959849a3a5944f353f1cbf5e3068f8cb451629c8bc9843af5aad4d02 +size 2450 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar2.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar2.uasset new file mode 100644 index 00000000..639e4459 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e2bfd0cb88d0e19419c7811917532a2d12743b482c4cfcc49232bb6c466abf99 +size 29958 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar3.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar3.uasset new file mode 100644 index 00000000..1a25efa5 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/CircleProgressBar/M_CircularProgressBar3.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a31389fed52e7051cf59c1a79ae12eff7a817f6cab52bec76392ea198d68099 +size 30039 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.uasset b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.uasset index 72113bf6..a055a419 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Player_HUD/WG_PlayerHUD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03175472d05bae6327ac1f6ca096d6d5b237b4e81f6481697f8d14af712beeda -size 218658 +oid sha256:2cd4e15a18d8108e6dc025f1399365fe99d64b8c4f2e876fdead0bbc70368e02 +size 247545 diff --git a/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br b/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br index 29260934..956c40d6 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br and b/hwanyoung2/Content/Illusions/.cache/buildrecords/Desktop/Master.br differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/170AFF4F.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/170AFF4F.fobj index 14270d08..1482c70b 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/170AFF4F.fobj and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/170AFF4F.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1B426A3A.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1B426A3A.fobj index 13b1ed3d..9c2df4d2 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1B426A3A.fobj and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/1B426A3A.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/29930ED8.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/29930ED8.fobj index dc7db965..6774e139 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/29930ED8.fobj and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/29930ED8.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2FB0F714.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2FB0F714.fobj index 0ba059e3..6f2cc6e7 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2FB0F714.fobj and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/2FB0F714.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/531D1531.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/531D1531.fobj new file mode 100644 index 00000000..f40e61d0 Binary files /dev/null and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/531D1531.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5BE6C2CD.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5BE6C2CD.fobj index 8adfe633..195d1edb 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5BE6C2CD.fobj and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/5BE6C2CD.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9E6CFC80.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9E6CFC80.fobj index 1d7c0352..a74e914a 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9E6CFC80.fobj and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/9E6CFC80.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B95E813A.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B95E813A.fobj index 461bcfeb..c988eadf 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B95E813A.fobj and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/B95E813A.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E9870F0E.fobj b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E9870F0E.fobj index 0ed2dcbd..b666f6c7 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E9870F0E.fobj and b/hwanyoung2/Content/Illusions/.cache/fsbcache/Desktop/E9870F0E.fobj differ diff --git a/hwanyoung2/Content/Illusions/.cache/{0699e8a1-abef-4972-ab61-9364bab2308e}.pdc b/hwanyoung2/Content/Illusions/.cache/{0699e8a1-abef-4972-ab61-9364bab2308e}.pdc index 44cc0def..d552810c 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{0699e8a1-abef-4972-ab61-9364bab2308e}.pdc and b/hwanyoung2/Content/Illusions/.cache/{0699e8a1-abef-4972-ab61-9364bab2308e}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{17e9a725-f744-4eb2-8909-7295a503aa8c}.pdc b/hwanyoung2/Content/Illusions/.cache/{17e9a725-f744-4eb2-8909-7295a503aa8c}.pdc index 94094405..ddd8040a 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{17e9a725-f744-4eb2-8909-7295a503aa8c}.pdc and b/hwanyoung2/Content/Illusions/.cache/{17e9a725-f744-4eb2-8909-7295a503aa8c}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{4b998eec-40b0-4eeb-ba44-b7db16b49f99}.pdc b/hwanyoung2/Content/Illusions/.cache/{4b998eec-40b0-4eeb-ba44-b7db16b49f99}.pdc index d79671c2..96f57f48 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{4b998eec-40b0-4eeb-ba44-b7db16b49f99}.pdc and b/hwanyoung2/Content/Illusions/.cache/{4b998eec-40b0-4eeb-ba44-b7db16b49f99}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{5b819579-862b-4c43-b94f-cd508ca6dac2}.pdc b/hwanyoung2/Content/Illusions/.cache/{5b819579-862b-4c43-b94f-cd508ca6dac2}.pdc new file mode 100644 index 00000000..c03440ce Binary files /dev/null and b/hwanyoung2/Content/Illusions/.cache/{5b819579-862b-4c43-b94f-cd508ca6dac2}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{648b6f80-5b53-444b-b49e-8aa458ad4bec}.pdc b/hwanyoung2/Content/Illusions/.cache/{648b6f80-5b53-444b-b49e-8aa458ad4bec}.pdc index ba044797..ecff66dc 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{648b6f80-5b53-444b-b49e-8aa458ad4bec}.pdc and b/hwanyoung2/Content/Illusions/.cache/{648b6f80-5b53-444b-b49e-8aa458ad4bec}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{64d86f99-ae2c-48b6-87b3-0b39ee7fca75}.pdc b/hwanyoung2/Content/Illusions/.cache/{64d86f99-ae2c-48b6-87b3-0b39ee7fca75}.pdc index 614ce546..7d261b64 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{64d86f99-ae2c-48b6-87b3-0b39ee7fca75}.pdc and b/hwanyoung2/Content/Illusions/.cache/{64d86f99-ae2c-48b6-87b3-0b39ee7fca75}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{672385ed-a502-4909-acf7-2400d29ef85d}.pdc b/hwanyoung2/Content/Illusions/.cache/{672385ed-a502-4909-acf7-2400d29ef85d}.pdc index 8faccbba..506d12ce 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{672385ed-a502-4909-acf7-2400d29ef85d}.pdc and b/hwanyoung2/Content/Illusions/.cache/{672385ed-a502-4909-acf7-2400d29ef85d}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{6cdd6960-1c45-42ca-9632-8ec2dc672e64}.pdc b/hwanyoung2/Content/Illusions/.cache/{6cdd6960-1c45-42ca-9632-8ec2dc672e64}.pdc index ba1b11bd..bd8d88c7 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{6cdd6960-1c45-42ca-9632-8ec2dc672e64}.pdc and b/hwanyoung2/Content/Illusions/.cache/{6cdd6960-1c45-42ca-9632-8ec2dc672e64}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{71941cbd-1220-4880-b736-2efe47c07e5e}.pdc b/hwanyoung2/Content/Illusions/.cache/{71941cbd-1220-4880-b736-2efe47c07e5e}.pdc index 1bc8f318..2a05f7eb 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{71941cbd-1220-4880-b736-2efe47c07e5e}.pdc and b/hwanyoung2/Content/Illusions/.cache/{71941cbd-1220-4880-b736-2efe47c07e5e}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{8265718d-854c-4d9a-8af2-40bc18153c60}.pdc b/hwanyoung2/Content/Illusions/.cache/{8265718d-854c-4d9a-8af2-40bc18153c60}.pdc index e3a3db01..76445bd0 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{8265718d-854c-4d9a-8af2-40bc18153c60}.pdc and b/hwanyoung2/Content/Illusions/.cache/{8265718d-854c-4d9a-8af2-40bc18153c60}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{9001ae30-02fb-4854-90db-4e2dd7fa4499}.pdc b/hwanyoung2/Content/Illusions/.cache/{9001ae30-02fb-4854-90db-4e2dd7fa4499}.pdc index 111b780f..66e3ff86 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{9001ae30-02fb-4854-90db-4e2dd7fa4499}.pdc and b/hwanyoung2/Content/Illusions/.cache/{9001ae30-02fb-4854-90db-4e2dd7fa4499}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{946a6da0-29a2-4a50-b6ec-da50b3a9ca7b}.pdc b/hwanyoung2/Content/Illusions/.cache/{946a6da0-29a2-4a50-b6ec-da50b3a9ca7b}.pdc index fe408bde..4f70c0ae 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{946a6da0-29a2-4a50-b6ec-da50b3a9ca7b}.pdc and b/hwanyoung2/Content/Illusions/.cache/{946a6da0-29a2-4a50-b6ec-da50b3a9ca7b}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{98f90c10-d94e-4a1c-b2f6-9fa8055eee67}.pdc b/hwanyoung2/Content/Illusions/.cache/{98f90c10-d94e-4a1c-b2f6-9fa8055eee67}.pdc index e09cd6b7..52f13a2f 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{98f90c10-d94e-4a1c-b2f6-9fa8055eee67}.pdc and b/hwanyoung2/Content/Illusions/.cache/{98f90c10-d94e-4a1c-b2f6-9fa8055eee67}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{a0047bf8-354b-43ee-ad37-0e5200548fe4}.pdc b/hwanyoung2/Content/Illusions/.cache/{a0047bf8-354b-43ee-ad37-0e5200548fe4}.pdc index 902f9008..26380a23 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{a0047bf8-354b-43ee-ad37-0e5200548fe4}.pdc and b/hwanyoung2/Content/Illusions/.cache/{a0047bf8-354b-43ee-ad37-0e5200548fe4}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.cache/{d30e718a-8894-4449-8c83-f8765f19c094}.pdc b/hwanyoung2/Content/Illusions/.cache/{d30e718a-8894-4449-8c83-f8765f19c094}.pdc index 291ebfa3..f7c60200 100644 Binary files a/hwanyoung2/Content/Illusions/.cache/{d30e718a-8894-4449-8c83-f8765f19c094}.pdc and b/hwanyoung2/Content/Illusions/.cache/{d30e718a-8894-4449-8c83-f8765f19c094}.pdc differ diff --git a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml index 0b31d618..356b9fbb 100644 --- a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml +++ b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml @@ -13,11 +13,15 @@ Event Editor 1 +<<<<<<< HEAD <<<<<<< Updated upstream AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAO/AAABEgAACcYAAAVAAAADwAAAAS8AAAnFAAAFPwAAAAAAAAAACgAAAAPAAAABLwAACcUAAAU/ ======= AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACCwAAABMAAAaYAAAD0gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAAB4gAABEgAAAYBAAAHNgAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3 >>>>>>> Stashed changes +======= + AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAPeAAAA0AAACeUAAAT+AAAD3wAAAO0AAAnkAAAE/QAAAAAAAAAACgAAAAPfAAAA7QAACeQAAAT9 +>>>>>>> origin/main {44345994-b449-453f-9198-e8f3accd1e71} diff --git a/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml b/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml index 0b31d618..356b9fbb 100644 --- a/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml +++ b/hwanyoung2/Content/Illusions/.user/Metadata/Workspace.user.xml @@ -13,11 +13,15 @@ Event Editor 1 +<<<<<<< HEAD <<<<<<< Updated upstream AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAO/AAABEgAACcYAAAVAAAADwAAAAS8AAAnFAAAFPwAAAAAAAAAACgAAAAPAAAABLwAACcUAAAU/ ======= AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAACCwAAABMAAAaYAAAD0gAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3AAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAD/////////+AAACgAAAAV4AAAB4gAABEgAAAYBAAAHNgAAAAACAAAACgAAAAAAAAAAFwAACf8AAAV3 >>>>>>> Stashed changes +======= + AAAAAwAAAA4ATQBpAHgAZQByACAAMgAAAEIB2dDLAAMAAP//+H8AAAACAAAAAAAABBr///tSAAABaP///98AAAUnAAAAAQIAAAAHgP//+IAAAAAh/////wAABBkAAAAOAE0AaQB4AGUAcgAgADEAAABCAdnQywADAAAAAAIK////9wAABpkAAAPUAAACCwAAABQAAAaYAAAD0wAAAAAAAAAACgAAAAILAAAAFAAABpgAAAPTAAAAHABFAHYAZQBuAHQAIABFAGQAaQB0AG8AcgAgADEAAABCAdnQywADAAAAAAPeAAAA0AAACeUAAAT+AAAD3wAAAO0AAAnkAAAE/QAAAAAAAAAACgAAAAPfAAAA7QAACeQAAAT9 +>>>>>>> origin/main {44345994-b449-453f-9198-e8f3accd1e71} diff --git a/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.ogg b/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.ogg new file mode 100644 index 00000000..5d9f130c Binary files /dev/null and b/hwanyoung2/Content/Illusions/Assets/Combat/sfx_combat_rockfall.ogg differ 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 c96645b1..adfcfc49 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:f5574e51928b6f4ffacbbf435accb2cbc360b4b579487d686e6542d8b2b427f6 -size 153222 +oid sha256:ad4fb7759f30b5b997ec73df4ef1e7ca14f31c88bb9ae721778012d2c4abbe4c +size 152934 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 c32b07ee..119352a6 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:245629941b46fe175ef57a3f17d03af8742f0a8f4d8d835a2e7565427a49f332 -size 94113 +oid sha256:08371361ff7b90229cfe6ab07b31f2b9b78677d3bcea6ace60048cd612c63d11 +size 93826 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 b348fcd9..7e0b49f8 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:40647a4c5147213e8a23dcc1f68efe69f5c5184f6b4d50ff945ee288cbad4b5d -size 67915 +oid sha256:896daeffc2b0ed3efeaeeec0717eaaa7652fbe1036e3427e36028fca49d8265a +size 67829 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 ed149a08..65d05096 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:0b9a487b712264813b6a485c45b235675e0b96a6c9b3a3c84a488dcaed25d0a2 -size 55844 +oid sha256:1d914fa29a96e1b64a1811ab3e1c05109e0f19cf9a41f9cf9fbe3037f0703a06 +size 55592 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 ef275c0e..08f5459f 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:14706f7b3bd32490bd9e41032c73c839cee88ae144477ef2e52af05fa4730023 -size 48070 +oid sha256:3286bde346ce4c9cd709088b6e72b906f0bfb24b7943263e1b562e30102b46c8 +size 48114 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 fa2bd337..70efe2b8 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:e19e6d58c52ce6a11cb64923bd1775655c71db6a51dec05504c1a62bddccdaf7 -size 77718 +oid sha256:b8e2d6149913a3ac573fdaa0281e6602710ad9122ae194c2394bc06db73f34eb +size 77320 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 50affb5d..19494577 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:6bb12f85c8fc83d1cc54b69db75f9c1f6b7259ef1c8f7b5ca2379551deaf514b -size 66050 +oid sha256:3bf2ee9ca683faf5989d157b1d89fea265f0c2b4fddadbee677227c3d1efb202 +size 66049 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 0c57ea54..7cd34f92 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:3cedb6ed66c3d906d3d586a5bdc6fe842696b02f086798259d647c7d2eb4abdf -size 63455 +oid sha256:8ce4cc9c7a34fee8108ab6532c72420fb5da4e4c5105e9aec3d8bf8e713ec564 +size 63439 diff --git a/hwanyoung2/Content/Illusions/Metadata/AudioFile/{5b819579-862b-4c43-b94f-cd508ca6dac2}.xml b/hwanyoung2/Content/Illusions/Metadata/AudioFile/{5b819579-862b-4c43-b94f-cd508ca6dac2}.xml new file mode 100644 index 00000000..4dee96df --- /dev/null +++ b/hwanyoung2/Content/Illusions/Metadata/AudioFile/{5b819579-862b-4c43-b94f-cd508ca6dac2}.xml @@ -0,0 +1,20 @@ + + + + + Combat/sfx_combat_rockfall.ogg + + + 44.0999985 + + + 2 + + + 1.9093197278911564 + + + {4f34473d-1e56-44db-8dd1-60284d90f95e} + + + diff --git a/hwanyoung2/Content/Illusions/Metadata/Event/{35e7a138-8110-4ea7-af86-de51da53fb11}.xml b/hwanyoung2/Content/Illusions/Metadata/Event/{35e7a138-8110-4ea7-af86-de51da53fb11}.xml index a7db75cb..a289a26f 100644 --- a/hwanyoung2/Content/Illusions/Metadata/Event/{35e7a138-8110-4ea7-af86-de51da53fb11}.xml +++ b/hwanyoung2/Content/Illusions/Metadata/Event/{35e7a138-8110-4ea7-af86-de51da53fb11}.xml @@ -92,6 +92,9 @@ 0.99451247165532874 + + {d403b625-aeae-4182-a8eb-c48a12bd5b1b} + {0699e8a1-abef-4972-ab61-9364bab2308e} @@ -118,6 +121,14 @@ + + + {bbd58e19-e8f6-48c7-b951-7d6ad76ec6e3} + + + {d077e780-834b-4714-87de-5da415614f61} + + {aea0a5b4-a3df-4ebd-995d-a89dadb2f933} @@ -126,5 +137,24 @@ + + + 0.20000000000000001 + + + 1 + + + 0.25471893 + + + + + 0.99451247165532874 + + + 0 + + diff --git a/hwanyoung2/Content/Illusions/Metadata/Event/{4423ea21-e180-4c9d-a429-ce66ff44430e}.xml b/hwanyoung2/Content/Illusions/Metadata/Event/{4423ea21-e180-4c9d-a429-ce66ff44430e}.xml new file mode 100644 index 00000000..7b44efd8 --- /dev/null +++ b/hwanyoung2/Content/Illusions/Metadata/Event/{4423ea21-e180-4c9d-a429-ce66ff44430e}.xml @@ -0,0 +1,130 @@ + + + + + sfx_combat_rockfall + + + 2 + + + {58f76323-7476-4fc2-9d75-933801901ec4} + + + {87e9511b-a906-4818-9fa2-03ff0a8ffa31} + + + {dbe8b006-1d6b-4f8e-9382-ef018e10f33a} + + + {7bab40e2-437c-4f97-ac08-e1328593959e} + + + {6016af8e-621a-445a-ad8e-fbfa1ae5061f} + + + {ee5da0eb-1936-45e2-8eb3-9dd7066eb81c} + + + {8f5c9965-6fef-4d76-97e3-584ef0d03a07} + + + {b039b557-bf89-47fa-9177-e5015ba53f38} + + + {9c5265c8-c3c8-41f5-9212-f803a3d9a96e} + + + + + {7b15ffdc-07c9-4b41-a994-9ceecadfc0c7} + + + + + {7b15ffdc-07c9-4b41-a994-9ceecadfc0c7} + + + + + {62aa9dfa-991c-4126-8475-20194a66207b} + + + {50717840-2cc9-491c-b413-7340ad5b3f18} + + + {b652127b-31f3-4ae6-b245-1a19a8f778fb} + + + + + + + {cc5a9467-e8ad-4b9e-bd13-4e2c984b5220} + + + {ee3696e9-f679-4872-8f97-38107bfca7bc} + + + + + {cc5a9467-e8ad-4b9e-bd13-4e2c984b5220} + + + + + {f27edbe9-486a-470a-af7c-a3b07d4f4150} + + + {52bc35d6-26e7-4c00-9129-17aafe45e092} + + + {87e9511b-a906-4818-9fa2-03ff0a8ffa31} + + + + + {60c01ea8-d825-411d-95a4-70033773c2cb} + + + + + + 1.9093197278911564 + + + {5b819579-862b-4c43-b94f-cd508ca6dac2} + + + + + Audio 1 + + + {fbee173f-3caf-41b9-9cf6-e82a94891f83} + + + {66be466a-e427-4f02-9fc1-6de297b77028} + + + {7b15ffdc-07c9-4b41-a994-9ceecadfc0c7} + + + + + {d8e169f5-f38c-45e3-9d6f-3a4a1917282a} + {4e3fc033-d377-4845-8e28-b8401c5b8cff} + + + + + + + {1a2e3810-28e4-4994-a16b-eacf84680d71} + + + + + + + diff --git a/hwanyoung2/Content/Illusions/Metadata/Event/{bea5e6fd-07b7-46eb-adb6-0dc62c6fc30c}.xml b/hwanyoung2/Content/Illusions/Metadata/Event/{bea5e6fd-07b7-46eb-adb6-0dc62c6fc30c}.xml index a958f863..9141d84b 100644 --- a/hwanyoung2/Content/Illusions/Metadata/Event/{bea5e6fd-07b7-46eb-adb6-0dc62c6fc30c}.xml +++ b/hwanyoung2/Content/Illusions/Metadata/Event/{bea5e6fd-07b7-46eb-adb6-0dc62c6fc30c}.xml @@ -92,6 +92,9 @@ 1.6081859410430839 + + {f88a8106-0bcd-4543-b110-9906f66d7ab7} + {648b6f80-5b53-444b-b49e-8aa458ad4bec} @@ -118,6 +121,14 @@ + + + {85ec304d-fc0c-457d-b5cf-5134579cdb8a} + + + {fd300c04-9466-4e02-a11c-8deb3489ae75} + + {35e9573f-6759-4967-adca-a4e9c8d1ed15} @@ -126,5 +137,24 @@ + + + 1.1500000000000001 + + + 1 + + + 0.25471893 + + + + + 1.6081859410430839 + + + 0 + + diff --git a/hwanyoung2/Content/KTP_Effect/Particles/Fly/Expolison_02_06.uasset b/hwanyoung2/Content/KTP_Effect/Particles/Fly/Expolison_02_06.uasset index d702c35a..e011d890 100644 --- a/hwanyoung2/Content/KTP_Effect/Particles/Fly/Expolison_02_06.uasset +++ b/hwanyoung2/Content/KTP_Effect/Particles/Fly/Expolison_02_06.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf22fd2093de4f84ad6a92a60ab5a1dfad8bb7b233ffe609785f9087c13dd7ff -size 6199583 +oid sha256:855533f9f2ab958c2cdad774b3d8a9672ea49615d87b7299d02a702a90c8c470 +size 3581154 diff --git a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin index 710bbf93..6fe5543c 100644 Binary files a/hwanyoung2/Intermediate/ReimportCache/3688439234.bin and b/hwanyoung2/Intermediate/ReimportCache/3688439234.bin differ