diff --git a/hwanyoung2/.vsconfig b/hwanyoung2/.vsconfig index b9be5257..1a9d7180 100644 --- a/hwanyoung2/.vsconfig +++ b/hwanyoung2/.vsconfig @@ -1,17 +1,13 @@ -{ +{ "version": "1.0", "components": [ "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.ARM64", - "Microsoft.VisualStudio.Component.VC.14.33.17.3.x86.x64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", + "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.Windows10SDK", + "Microsoft.VisualStudio.Component.Windows10SDK.22000", "Microsoft.VisualStudio.Workload.CoreEditor", "Microsoft.VisualStudio.Workload.ManagedDesktop", - "Microsoft.VisualStudio.Workload.NativeCrossPlat", "Microsoft.VisualStudio.Workload.NativeDesktop", - "Microsoft.VisualStudio.Workload.NativeGame", - "Microsoft.VisualStudio.Workload.Universal" + "Microsoft.VisualStudio.Workload.NativeGame" ] } diff --git a/hwanyoung2/Content/Haena_v02/Texture/Bodies/Body/T_Haena_Body_SPEC.uasset b/hwanyoung2/Content/Haena_v02/Texture/Bodies/Body/T_Haena_Body_SPEC.uasset new file mode 100644 index 00000000..a617e59f --- /dev/null +++ b/hwanyoung2/Content/Haena_v02/Texture/Bodies/Body/T_Haena_Body_SPEC.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a82943d0fec57ad3c2d8e219d160d2341a90b3a9329a068a0739cb1c1a0cf2e +size 8394959 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset index 26cf5ffd..a950b617 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86f9ec81d2ca298a9e6d07e018a7b6d8c0bc73720d05f8be533f464951680519 -size 92698 +oid sha256:9de208198b58ee8da3ab0fe1bc7f58bed869b5f5042a9630ce27b882ff003724 +size 102421 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset index 7f19e00a..5bf8031f 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_SaninStoneTrail.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fcc4f5049c1e55a213ade591cb7f129044a60620f1ccd979db2ed6c3d3a550d -size 64086 +oid sha256:00cd6da98a126b0d8165fa3cbf504188720e375412baa26717f9178e8074ca74 +size 93599 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset index 43893ff2..f48e7c07 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2794a4e212ab37eb8313fea58823b7c88335e23d0e719adc330e483870dfbdff -size 162610 +oid sha256:9f57870a122493a92f43df142c186f7f24c442d34e1fed719b6e5967201ee527 +size 161504 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset index 89d5510c..2f2d49db 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86943ab62f565a43ecdec981d9fdb7bed06b318b0cb9f39060d5cf8255611309 -size 646368 +oid sha256:8abd619b6530e6720edf98cc8eeecc8c4cd24a4870910274330b6ab5eb51df9e +size 652053 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset index 5337de86..62a0711e 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4631eca015b4971d23b543d605c1f3dffd5d71dc35e9edde0842cf4e67338c3 -size 60305 +oid sha256:91e81117c8db10fceacf29d85d0988f8e22bb11a47049cfe9c8cc50666483383 +size 60411 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset index 9313c5de..7384517e 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BT_Tasks/BTT_SaninTeleport.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6396d0e32e568116c41a48c7dc679312e2e246d9aa8fa121e49b634f418af861 -size 33266 +oid sha256:13e59e4d1386d8a3502562ff4a31c61927ca0ebecfe759ccd7f0cf4c3ef7b070 +size 39269 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660.uasset new file mode 100644 index 00000000..b8e9df3d --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a08466466e2c47ff6f0f1776469b9b72b7c0958b97e47e5af279a250d263f28 +size 2737858 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_2.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_2.uasset new file mode 100644 index 00000000..869270fb --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3587d068882e39aa71acc1bf73db4269e5e65a4dad8132c878173174c334354 +size 654158 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Attack1.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Attack1.uasset new file mode 100644 index 00000000..e9214e66 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Attack1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ee3fd0283ddab8d56680a20b9b9e9458370d47e127eb4511ea434984324a49f +size 788506 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Guard.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Guard.uasset new file mode 100644 index 00000000..f1f8971d --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Guard.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec4bd34d57e5dc3b7df34fe2b9f3f93cabf7bc2955eae701a03a679382c08f76 +size 614499 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill1.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill1.uasset new file mode 100644 index 00000000..47ec3a6c --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eee8703ec89979bdcafca366523858fee5818ea491c8ef6611e13cc30bc0b08 +size 1294581 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill2.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill2.uasset new file mode 100644 index 00000000..a216f730 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Anim_20660_Skill2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d9b1be660bdb623784d75d3457a42a0900fa72c778d58d2e7453860f2f66ed3 +size 1222485 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_PhysicsAsset.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_PhysicsAsset.uasset new file mode 100644 index 00000000..a06b45cd --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d9099797ffc71fa6e888cfdff4f0b0f21093e3f873941447e9c84a8e0eca994 +size 10577 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Skeleton.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Skeleton.uasset new file mode 100644 index 00000000..32f9bb53 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c436666f0b32f18cf0e5040b9bb0eeb5df63bbce616c9659b332fa913743102c +size 25501 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_SlashLightRim.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_SlashLightRim.uasset new file mode 100644 index 00000000..fba8a381 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_SlashLightRim.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3a154dadff8dfb2e236d9ebb922c6814a54325dbe6f2fa882a119ada2dff504 +size 14076 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_mask.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_mask.uasset new file mode 100644 index 00000000..a3529dd1 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660_mask.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73e5db4072b39096565bf88f1c2cc734be3d5c7868872080606cbd44564cb449 +size 365726 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660out0_tex00.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660out0_tex00.uasset new file mode 100644 index 00000000..941aa450 --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Dragon/Assets/20660out0_tex00.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32dcf797c8ce6e2dbb522c2ed0c34f82ed16f8e4cc553a4494d9c9fe3907445b +size 657587 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset index e1c4ec65..26a99ca6 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_BossField.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5e9d65d8c12c0ec0c0299de39d4d546b8e9d14f50d4e9b81570fb6bab69ef79 -size 23866 +oid sha256:561ad5435b4bec0461fddaa3ce1a10ebf06a48d8a354de3347c8a73211070730 +size 38972 diff --git a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset index 25a98e40..0a327549 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:78316665d5a024971ddbba76c8f6dddd0ff9f017dd9fea25537b6eb713208992 -size 935122 +oid sha256:15e3c5d4d03c2cacd7664ac36b49081aae0fe3e71cb2ed55e915398469a53c00 +size 957821 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_HYPlayerCharacController.uasset index 0b0194b3..7da3d5e5 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:ab7dcb4a119318020238d7d41dd67c9ef0f9fdfe8db50144bb27d7df35802bd7 -size 250752 +oid sha256:40257490376214f1d2ba35d96bc9b7b301a0c788f240050a7999f048dc50a747 +size 250813 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index fbf5339d..461522dc 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:82b58a73480463f2a8dda7c6d3909bfa69f8b9b0c829dce9bf997def5d6d585a -size 390531 +oid sha256:6c4860bcad6a7743df6b51846666efb119ddf58f605cf64b088852cb1f28df6c +size 390102 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/IKRig/IK_RIVERSPIRIT_M_01.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/IKRig/IK_RIVERSPIRIT_M_01.uasset new file mode 100644 index 00000000..52b9a87b --- /dev/null +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/IKRig/IK_RIVERSPIRIT_M_01.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0276c391c50d71ce1712424c791351c729a58e125a1fea1b5beb7548c2806353 +size 171059 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset index 1b51fe59..efae4b73 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_HaesolNormalBS.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bda5e4907c8e98c0bbac1ca0803072d83177283e0e9fc5264cab2026f568259f -size 9753 +oid sha256:7aa121ace66c391c00aac3e52b98425f6777be767fa111a915689e3429cd7d0f +size 9744 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset index 839e0114..a58d7203 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/MM_Run_Fwd.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c590b7e4dde73eb4fd85c6bcf9aaee57fc733a078da1cbe418c1fbbc6b098fed +oid sha256:1a5078fe0e94c3ecdb9aa1b29618be40e35851251b3038fec9c4713e4b6b0a4a size 643834 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 0a7c77f4..b68132c0 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:4e94135fe2c8bfcf7464c570d090be21d7a79122164cb88da4c20276ea604bad -size 1487820 +oid sha256:ddcf726c452429b6efbaed2be5371f069528e422309564e51ed78ab25f5d13ca +size 1490360 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset index 12245ed5..3e6361bf 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/BP_AOEBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:488402798ee4033f9a94bd4c1c7448cbb6721d3038e622d8f4745e8893fcc0af -size 106216 +oid sha256:8648b3fe7cd9a4c21fe45cb9a5fa3cef2bd6c0a8581919159478052a98d63671 +size 107338 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset index 2aae445a..15977141 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_AOE_Storm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fd2da3c7a369e54ad2521a54807196c2e0388e62cbf8997f2b91f016eb09915 -size 412213 +oid sha256:caaada160accb281377d1d203165e9f2b7850ea04658b0650bcab3336c96da66 +size 419072 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset index 196b8558..ecc178ee 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a402b8cfc0193996f9dad1c10351369e427c810a02a830ab28c36ea973b902ba -size 40472 +oid sha256:af393ae24747fa87fa17971ec654ee0acae38f2f89c4c98bab2e918562bd176b +size 67250 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset index 0ca3750e..2afa0d95 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_LargeGonggiStone.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:af6c9205b5aa3ddd07290c4c2ae7f50aa8838b3d25ec1c6d175261908b0d911c -size 114303 +oid sha256:6db374550f4c4074b477c4b63f37d783843140630a62dce0018398c1c18009b4 +size 128624 diff --git a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset index 4b46c266..a0491202 100644 --- a/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset +++ b/hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ProjectileBP/BP_RockProjectile.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:722c1b716aaa120134d440071d5ceba7c967aec9b524947de28384df9b6080e2 -size 159841 +oid sha256:43f5f0580d595b0fb4fd113f690005530bc39fda7c1d2652e3582a61c31ab313 +size 158611 diff --git a/hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset b/hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset index ee6ecb83..34499bac 100644 --- a/hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset +++ b/hwanyoung2/Content/Hwanyoung/Interactables/BP_CraftingTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9693ef62a519fb936c351eeacbe7f226520209a9fd5708afa5925825c70d1328 -size 41551 +oid sha256:bdfefb6a4a182b44b8ad96d6cd207a3225928c1695f950951b03df06a3427691 +size 41249 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap b/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap index 2999fdb8..d69746a7 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:e24a79627d5e70628b0f15cede9c9121ebddab5139ca63230bee1cf0c23814b1 -size 3541919 +oid sha256:fc12d51d22ebebb157c13facdfd5a8627c8eeb3f4c8f1837e0cd97667b5868ac +size 3541584 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap b/hwanyoung2/Content/Hwanyoung/Levels/Sprink_TEST.umap index 01b82fcc..48129649 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:f31277744c20ee1b794a436076a11df59efb0f4dca27b89db9e152886883b9d4 -size 16708441 +oid sha256:c2cfc246647bdc7ea9778f6f4d78307178714406eaa589d18cbea621c3c5aa2b +size 17006391 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset index 66df130a..2f5a16cf 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryItemToolTip.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2353c62ac04de6cba4291920d2ca53c4881a45e60a52193a01d93a25751c97c -size 93235 +oid sha256:50f8c1db5874192f80cbfebe161c7f77f3f1aec4daa24419a9f421fb8948a334 +size 95009 diff --git a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset index 6d8c1081..30a026a4 100644 --- a/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset +++ b/hwanyoung2/Content/Hwanyoung/UI/Inventory_HUD/BP_InventoryWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cefdddcc6ddc414f635a72c572866f379288ef078c7e6f1b11f88244672189a -size 61141 +oid sha256:47bbda6dc18cf546bcbbfa18380cef3cb6de8d4857818fcb525c6f0522d28de8 +size 61345 diff --git a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_16.uasset b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_16.uasset index 75442994..f155d08e 100644 --- a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_16.uasset +++ b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_16.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5025d23bcb4ea4164a456b53a42383424cb96fcb352a4ecfd5bbc8acc7b77972 -size 2117750 +oid sha256:2d0c6075643cd3e78b43f30f67dd1c8c57339b1ba69b3f0499d39b8f45d7daeb +size 2117923 diff --git a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_23.uasset b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_23.uasset index 70c36b7b..d71cf662 100644 --- a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_23.uasset +++ b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_23.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7c1235a5aa4c6d648e6ba414b7bb99497fcb12382cc391dc371f0c3d2a6d36a -size 3168687 +oid sha256:bf561c0a1ecdc88d2ff16216af030762cef02ee9871eec8afcd9b735ce169a07 +size 1902954 diff --git a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_9.uasset b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_9.uasset index becd25f2..4320578b 100644 --- a/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_9.uasset +++ b/hwanyoung2/Content/Stone_and_Erth_VFX/Prefab/NS_Erth_Stone_VFX_9.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:437be691b845dab27540308c3edad40612f06e0862757314c6541d3d05ad62fd -size 3595893 +oid sha256:5cce41a8262a4905b807edb00a294792acc72fc2626b8aad5b7b94531062230a +size 3153062 diff --git a/hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp b/hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp index 7f5ac57d..672f9623 100644 --- a/hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp +++ b/hwanyoung2/Intermediate/Build/Win64/UnrealEditor/Inc/hwanyoung2/UHT/Timestamp @@ -1,3 +1,4 @@ +<<<<<<< HEAD C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAIController.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\CraftingInfo.h @@ -15,3 +16,22 @@ C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hw C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2Character.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYPlayerCharacController.h C:\Users\benja\Desktop\Halloween JAm\Illusions\Illusion-UE5\hwanyoung2\Source\hwanyoung2\InventoryItem.h +======= +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\CraftingInfo.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2Character.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\hwanyoung2GameMode.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HwanyoungAssetManager.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAIController.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYGameStateBase.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAttackComponent.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYAutomaticPickUp.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYManualPickUp.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYEnemyBase.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYInteractableActor.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYMoneyAutoPickUp.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYProjectileAttackComponent.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\InventoryItem.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYSaveGameActor.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYPlayerCharacController.h +C:\Users\MyCom\Documents\Unreal Projects\Illusion-UE5\hwanyoung2\Source\hwanyoung2\HYConsumableItem.h +>>>>>>> main diff --git a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-afmodambientsound.html b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-afmodambientsound.html index 3d223d6c..170d7c83 100644 --- a/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-afmodambientsound.html +++ b/hwanyoung2/Plugins/FMODStudio/Docs/api-reference-afmodambientsound.html @@ -7,7 +7,7 @@
Unreal Integration 2.02
+Unreal Integration 2.03
See Also: UFMODAudioComponent