From 627dd7e0b44600f60b01ae932762128a01afe02c Mon Sep 17 00:00:00 2001 From: 7heIVIaze Date: Mon, 17 Feb 2025 17:16:49 +0900 Subject: [PATCH] implement haesol's passive --- README.md | 2 +- hwanyoung2/.vsconfig | 12 ++++++++---- .../PlayerCharacter/BP_PlayerCharacterBase.uasset | 4 ++-- .../Animations/BP_PhysAttackMeleeHaesol.uasset | 4 ++-- .../Sequences/Anim_Sword_1H_Attack_Slash1.uasset | 4 ++-- .../Sequences/Anim_Sword_1H_Attack_Slash2.uasset | 4 ++-- .../Sequences/Anim_Sword_1H_Attack_Slash4.uasset | 4 ++-- .../Sequences/Anim_Sword_1H_Attack_Slash6.uasset | 4 ++-- .../Playables/Haesol/BP_Haesol.uasset | 4 ++-- .../Haesol/Weapons/BP_HaesolWeaponBase.uasset | 4 ++-- .../SKM_Soldier_10_PhysicsAsset.uasset | 4 ++-- .../Content/Hwanyoung/Levels/Spring-Sharon.umap | 2 +- .../Hwando/Anim_Hwando_Attack1_Soldier.uasset | 4 ++-- .../Hwando/Anim_Hwando_Attack2_Soldier.uasset | 4 ++-- .../Hwando/Anim_Hwando_Attack3_Soldier1.uasset | 4 ++-- .../Meshs/Characters/Meshs/NewIKRig.uasset | 3 --- .../FMODStudio/Source/FMODStudio/FMODStudio.Build.cs | 4 ---- .../FMODStudioEditor/FMODStudioEditor.Build.cs | 1 - hwanyoung2/Source/hwanyoung2.Target.cs | 6 +++--- hwanyoung2/Source/hwanyoung2/hwanyoung2.Build.cs | 5 +---- hwanyoung2/Source/hwanyoung2Editor.Target.cs | 4 ++-- hwanyoung2/hwanyoung2.uproject | 4 ---- 22 files changed, 40 insertions(+), 51 deletions(-) delete mode 100644 hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/NewIKRig.uasset diff --git a/README.md b/README.md index 10c94a6c..04d5198b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# Illusion: Legends of Lost Souls (UE5.3) +# Illusion: Legends of Lost Souls (UE5.1) diff --git a/hwanyoung2/.vsconfig b/hwanyoung2/.vsconfig index 1a9d7180..b9be5257 100644 --- a/hwanyoung2/.vsconfig +++ b/hwanyoung2/.vsconfig @@ -1,13 +1,17 @@ -{ +{ "version": "1.0", "components": [ "Microsoft.Net.Component.4.6.2.TargetingPack", - "Microsoft.VisualStudio.Component.VC.14.36.17.6.x86.x64", + "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.Tools.x86.x64", - "Microsoft.VisualStudio.Component.Windows10SDK.22000", + "Microsoft.VisualStudio.Component.Windows10SDK", "Microsoft.VisualStudio.Workload.CoreEditor", "Microsoft.VisualStudio.Workload.ManagedDesktop", + "Microsoft.VisualStudio.Workload.NativeCrossPlat", "Microsoft.VisualStudio.Workload.NativeDesktop", - "Microsoft.VisualStudio.Workload.NativeGame" + "Microsoft.VisualStudio.Workload.NativeGame", + "Microsoft.VisualStudio.Workload.Universal" ] } diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/BP_PlayerCharacterBase.uasset index 606b9553..083208d3 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:46fc754668d319eda14a5c2bc9e2576c861e8a84ee9c83a124b14d33cc134ae9 -size 364212 +oid sha256:e58d34410c77f04ba9f66318e9483fc88675a433b3078c7a725fa2b2bd84a358 +size 353869 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset index 00b24730..465ebcf7 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/BP_PhysAttackMeleeHaesol.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30eb2322e0da77b0fd597e45998c2fb2a858bd1f3a3b434c10bad4c73ae919f7 -size 47013 +oid sha256:330ab9c65668108cad5103422f4ba14649a76cf4eb3a10f72e7ae5b56bf0a42d +size 47266 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash1.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash1.uasset index aceba91b..d4d5e167 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash1.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0453fbb144a40c0269ad5ebee8ae1742cd9f6395a198a92e9237d19baf00ff8 -size 519536 +oid sha256:b63784a0f0ec7ac9ab3f54df8e583876195447a478441a7df86bade1adb22451 +size 345233 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash2.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash2.uasset index 03e6edaa..104fdaa8 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash2.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cc5cb18b3e16b51e7120e957c0a61050d06e5f63be37eab21d57c909420f761 -size 780794 +oid sha256:90d4a74fc5e5435b5b9b308d3cdf23f432ebc099f7650bd338180de9b0eb91c6 +size 414919 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash4.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash4.uasset index 274fbc7f..9238f004 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash4.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash4.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5881cc915464916e2a718c8c6784d5fda6dbf2265cec0678c420fc277b71f832 -size 653369 +oid sha256:56ab4ef97b52e2c3307ca395d5e4822a60b4688eb7f286114f0f99320c9c279c +size 345331 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash6.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash6.uasset index 7e215303..411e99ba 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash6.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Animations/Sequences/Anim_Sword_1H_Attack_Slash6.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f35730b2dc575ae7606c1f0cce4e2d05a39c990b01a1288e5e4b679d1bf0a403 -size 756660 +oid sha256:c627169f11cfaa606d67fa087806d48a51081622ecc8ff48139fe400a14970ba +size 383389 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 5c25b83e..4ee7e73a 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:ca068c9f935f6aac10e07ccf64b23e810de6bce3a4d588c4798b029288158698 -size 1081124 +oid sha256:09f73df939fdfbc3c509193a3842623e94dfff02ec67aab7de5cd434e55398b8 +size 951790 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolWeaponBase.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolWeaponBase.uasset index 066baf88..a9e16b0d 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolWeaponBase.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/Weapons/BP_HaesolWeaponBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f479af74f27a6f3bddf1e4b858e0dc9150bd0a98cad68f1ea8f5244033be667 -size 81495 +oid sha256:07e251a6ab28d7db7aef79187ad776587bb6fd3717b311cf6c14217d4c361e4c +size 63073 diff --git a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/SKM_Soldier_10_PhysicsAsset.uasset b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/SKM_Soldier_10_PhysicsAsset.uasset index 5e20c348..4a9ee99f 100644 --- a/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/SKM_Soldier_10_PhysicsAsset.uasset +++ b/hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/SKM_Soldier_10_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67b3194cfb5e375d21b6f10e919a7a69c5b39897e464257f1cc8e4ea54c5560b -size 47670 +oid sha256:e42d68809b329eafab55889f9b96a930cfc0c2e7f90119c96c1b187b4d16bde2 +size 48394 diff --git a/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap b/hwanyoung2/Content/Hwanyoung/Levels/Spring-Sharon.umap index ec57dc69..0811eae1 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:7ad5b0c1ecdbee89be9df125344fd98e51f44dce8d6e0da8a33c53336649b39e +oid sha256:6ba605106ef277514a11e78c6db36f2fd2378c085f62084bc7a110d20bcc48cc size 3528809 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack1_Soldier.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack1_Soldier.uasset index 842ded41..c1b54ff5 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack1_Soldier.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack1_Soldier.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc8e0ded5f7b02ec94d385e3f12406a32606c6bc1062f0b4ba64941db067e760 -size 1301368 +oid sha256:0b8640624b093c5b56702b7e943fc629cf19ff6300c41a713fdf7abba43a1291 +size 780732 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack2_Soldier.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack2_Soldier.uasset index 39a02823..c7adae82 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack2_Soldier.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack2_Soldier.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:524f5f8cfb0f9deb661e4bef91cded08cf4386873db97a86355207eacd8e901a -size 1517693 +oid sha256:cdee1760ad733e0a4d7645f27068efe4fa5abc43e9299da0d4cf452ffb7e85fc +size 918922 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack3_Soldier1.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack3_Soldier1.uasset index ddce89fa..e0860977 100644 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack3_Soldier1.uasset +++ b/hwanyoung2/Content/KoreanTraditionalMartialArts/Animations/Hwando/Anim_Hwando_Attack3_Soldier1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c55b20f2fb6b860bf0a53e5d1c110e418469529718815ff8bf17bee99a46884 -size 2822940 +oid sha256:9188ee74be2935e95b1cb2d553564dd507c2c2fd14d6dab5119d6d0b7b570943 +size 1846292 diff --git a/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/NewIKRig.uasset b/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/NewIKRig.uasset deleted file mode 100644 index 16730a55..00000000 --- a/hwanyoung2/Content/KoreanTraditionalMartialArts/Meshs/Characters/Meshs/NewIKRig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eea3ad68ab1160532dd0e2e913b855726664143ffe8075f57567897b935c51b7 -size 57647 diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs index 48c3e313..a3dab514 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudio/FMODStudio.Build.cs @@ -25,12 +25,10 @@ namespace UnrealBuildTool.Rules PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PrivatePCHHeaderFile = "Private/FMODStudioPrivatePCH.h"; - bEnableUndefinedIdentifierWarnings = false; bUseUnity = false; PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "Public/FMOD")); PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Classes")); - bEnableUndefinedIdentifierWarnings = false; PublicDependencyModuleNames.AddRange( new string[] @@ -71,13 +69,11 @@ namespace UnrealBuildTool.Rules { configName = "L"; PublicDefinitions.Add("FMODSTUDIO_LINK_LOGGING=1"); - //PublicDefinitions.Add("__has_feature(x)=0"); } else { configName = ""; PublicDefinitions.Add("FMODSTUDIO_LINK_RELEASE=1"); - //PublicDefinitions.Add("__has_feature(x)=0"); } string linkExtension = ""; diff --git a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs index 7799d64f..02a14931 100644 --- a/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs +++ b/hwanyoung2/Plugins/FMODStudio/Source/FMODStudioEditor/FMODStudioEditor.Build.cs @@ -15,7 +15,6 @@ namespace UnrealBuildTool.Rules PrivatePCHHeaderFile = "Private/FMODStudioEditorPrivatePCH.h"; bUseUnity = false; - bEnableUndefinedIdentifierWarnings = false; PrivateIncludePaths.AddRange( new string[] { diff --git a/hwanyoung2/Source/hwanyoung2.Target.cs b/hwanyoung2/Source/hwanyoung2.Target.cs index 27b3f62d..631229ff 100644 --- a/hwanyoung2/Source/hwanyoung2.Target.cs +++ b/hwanyoung2/Source/hwanyoung2.Target.cs @@ -8,8 +8,8 @@ public class hwanyoung2Target : TargetRules public hwanyoung2Target(TargetInfo Target) : base(Target) { Type = TargetType.Game; - DefaultBuildSettings = BuildSettingsVersion.Latest; - IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_3; + DefaultBuildSettings = BuildSettingsVersion.V2; + IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; ExtraModuleNames.Add("hwanyoung2"); - } + } } diff --git a/hwanyoung2/Source/hwanyoung2/hwanyoung2.Build.cs b/hwanyoung2/Source/hwanyoung2/hwanyoung2.Build.cs index a1ccf878..a6b09ba5 100644 --- a/hwanyoung2/Source/hwanyoung2/hwanyoung2.Build.cs +++ b/hwanyoung2/Source/hwanyoung2/hwanyoung2.Build.cs @@ -9,8 +9,5 @@ public class hwanyoung2 : ModuleRules PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "HeadMountedDisplay", "EnhancedInput" }); - //PublicDefinitions.Add("NO__HAS_FEATURE"); - //PublicDefinitions.Add("__has_feature(x)=0"); - bEnableUndefinedIdentifierWarnings = false; - } + } } diff --git a/hwanyoung2/Source/hwanyoung2Editor.Target.cs b/hwanyoung2/Source/hwanyoung2Editor.Target.cs index b32f63eb..8ac81fca 100644 --- a/hwanyoung2/Source/hwanyoung2Editor.Target.cs +++ b/hwanyoung2/Source/hwanyoung2Editor.Target.cs @@ -8,8 +8,8 @@ public class hwanyoung2EditorTarget : TargetRules public hwanyoung2EditorTarget(TargetInfo Target) : base(Target) { Type = TargetType.Editor; - DefaultBuildSettings = BuildSettingsVersion.Latest; - IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_3; + DefaultBuildSettings = BuildSettingsVersion.V2; + IncludeOrderVersion = EngineIncludeOrderVersion.Unreal5_1; ExtraModuleNames.Add("hwanyoung2"); } } diff --git a/hwanyoung2/hwanyoung2.uproject b/hwanyoung2/hwanyoung2.uproject index 10df1ecf..68786868 100644 --- a/hwanyoung2/hwanyoung2.uproject +++ b/hwanyoung2/hwanyoung2.uproject @@ -54,10 +54,6 @@ { "Name": "FMODStudioNiagara", "Enabled": true - }, - { - "Name": "SkeletalMeshModelingTools", - "Enabled": true } ] } \ No newline at end of file