diff --git a/.gitmodules b/.gitmodules index b4bfb14..858ca08 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "Plugins/Dialog"] path = Plugins/Dialog url = https://gitea.msbzb.xyz/meishibiezb/Dialog.git +[submodule "Plugins/CharacterControl"] + path = Plugins/CharacterControl + url = https://gitea.msbzb.xyz/meishibiezb/CharacterControl diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini new file mode 100644 index 0000000..0b0ee4c --- /dev/null +++ b/Config/DefaultGameplayTags.ini @@ -0,0 +1,20 @@ +;METADATA=(Diff=true, UseCommands=true) +[/Script/GameplayTags.GameplayTagsSettings] +ImportTagsFromConfig=True +WarnOnInvalidTags=True +ClearInvalidTags=False +AllowEditorTagUnloading=True +AllowGameTagUnloading=False +FastReplication=False +bDynamicReplication=False +InvalidTagCharacters="\"\'," +NumBitsForContainerSize=6 +NetIndexFirstBitSegment=16 ++GameplayTagList=(Tag="Gameplay.Action.Camera.Move",DevComment="") ++GameplayTagList=(Tag="Gameplay.Action.Camera.Reset",DevComment="") ++GameplayTagList=(Tag="Gameplay.Action.Camera.Rotate",DevComment="") ++GameplayTagList=(Tag="Gameplay.Action.Camera.Zoom",DevComment="") ++GameplayTagList=(Tag="Gameplay.Action.Hello",DevComment="") ++GameplayTagList=(Tag="Gameplay.Action.Move",DevComment="") ++GameplayTagList=(Tag="Gameplay.Action.Run",DevComment="") + diff --git a/Content/Blueprints/Anim/ABP_TestChar.uasset b/Content/Blueprints/Anim/ABP_TestChar.uasset index 5afa7dc..ab8e177 100644 --- a/Content/Blueprints/Anim/ABP_TestChar.uasset +++ b/Content/Blueprints/Anim/ABP_TestChar.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c84b2311b65ab850eb73b7966fda03e5941b0268f851ca080553e0472cbb08fa -size 100130 +oid sha256:69588280240ecfa38123e34f80cd7bfa6d3d6b2dd31904ec31f41ae2bac9ddb9 +size 100152 diff --git a/Content/Blueprints/BP_NewChar.uasset b/Content/Blueprints/BP_NewChar.uasset new file mode 100644 index 0000000..a92e15f --- /dev/null +++ b/Content/Blueprints/BP_NewChar.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:803851b900697a040c1dc8a9344dd225b77eda80d21c02e8df4aa185b53764f4 +size 38582 diff --git a/Content/Blueprints/BP_TestCtl.uasset b/Content/Blueprints/BP_TestCtl.uasset index 1506592..87fa33b 100644 --- a/Content/Blueprints/BP_TestCtl.uasset +++ b/Content/Blueprints/BP_TestCtl.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00245e635d260d624275930f39a423379193f5e093a7529958e67f7a82186756 -size 19656 +oid sha256:883fc35d6deab0bba0f30ffcca2c9cc9922427cd38f392c57771e26b19699349 +size 70235 diff --git a/Content/Blueprints/BP_TestMode.uasset b/Content/Blueprints/BP_TestMode.uasset index 28be0d7..957a41b 100644 --- a/Content/Blueprints/BP_TestMode.uasset +++ b/Content/Blueprints/BP_TestMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a9a223e9429f1644e91d0e8543e5e138046a7c6a9c61db26972c5d187e5fb64 -size 21195 +oid sha256:c15abdd7aaad0f2f3401529cfbfff12f217ae1356bcbf16b700b90ab47b5f56d +size 21193 diff --git a/Content/Blueprints/Component/BP_Controller.uasset b/Content/Blueprints/Component/BP_Controller.uasset new file mode 100644 index 0000000..0b6639a --- /dev/null +++ b/Content/Blueprints/Component/BP_Controller.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf22d92ba983d9329ce488fe04729a8c454529a2b960d862fba11afb3938b3d9 +size 283243 diff --git a/Content/Blueprints/Component/BP_MoveInput.uasset b/Content/Blueprints/Component/BP_MoveInput.uasset new file mode 100644 index 0000000..5b8cb56 --- /dev/null +++ b/Content/Blueprints/Component/BP_MoveInput.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61aaf6f323bc6f20b90d689e3dc4feb5ce6a74fdba8eae7ad77a63547b34bbfa +size 80215 diff --git a/Content/Blueprints/Component/BP_SayHello.uasset b/Content/Blueprints/Component/BP_SayHello.uasset new file mode 100644 index 0000000..f4bf68f --- /dev/null +++ b/Content/Blueprints/Component/BP_SayHello.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ea45064c635fd3391bbdb2248f348473d247cfca01b92b7d9013a192768ebde +size 26286 diff --git a/Content/Blueprints/UI/WBP_Hint.uasset b/Content/Blueprints/UI/WBP_Hint.uasset index 3ebd9cb..fbd9dff 100644 --- a/Content/Blueprints/UI/WBP_Hint.uasset +++ b/Content/Blueprints/UI/WBP_Hint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f201b4e3cfac1c407a253618b451d45e30c4802a1f37c970bd4557fb8272683 -size 33151 +oid sha256:9c32f9319b58fd3d986252d17e42a2ad761c195295cafe0c61d586ee82e7f562 +size 35236 diff --git a/Content/Data/DA_InputCommands.uasset b/Content/Data/DA_InputCommands.uasset new file mode 100644 index 0000000..fde9b89 --- /dev/null +++ b/Content/Data/DA_InputCommands.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db09a4b0984ea5a7748c27c0a397b7d8788bd8e8ed5040dd06ad272bdd0d2973 +size 4649 diff --git a/Content/Inputs/IA/IA_CameraMiddle.uasset b/Content/Inputs/IA/IA_CameraMiddle.uasset new file mode 100644 index 0000000..4084601 --- /dev/null +++ b/Content/Inputs/IA/IA_CameraMiddle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb3ab80f5a1bd7c5facc03223e8d171f1029ff0d4a571d97f629f8294459e690 +size 1182 diff --git a/Content/Inputs/IA/IA_CameraRight.uasset b/Content/Inputs/IA/IA_CameraRight.uasset new file mode 100644 index 0000000..039bcd2 --- /dev/null +++ b/Content/Inputs/IA/IA_CameraRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bca07c3562925612b178b07ed4a532bff27f4dcbce6ea9644d89a67611a4d684 +size 1177 diff --git a/Content/Inputs/IA/IA_CameraRotateAction.uasset b/Content/Inputs/IA/IA_CameraRotateAction.uasset index cc6ee67..9068ba3 100644 --- a/Content/Inputs/IA/IA_CameraRotateAction.uasset +++ b/Content/Inputs/IA/IA_CameraRotateAction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:637ee74171478765d6a85ea16d0e041980afb867dc139ff79847b16ce4995c73 -size 1212 +oid sha256:3616ba22b4458af7b834080182252b5537e1bc37c64bb6504c3110099fe981a9 +size 1408 diff --git a/Content/Inputs/IA/IA_CameraZoomAction.uasset b/Content/Inputs/IA/IA_CameraZoomAction.uasset index 5a25a19..08c2a9d 100644 --- a/Content/Inputs/IA/IA_CameraZoomAction.uasset +++ b/Content/Inputs/IA/IA_CameraZoomAction.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1bfcb462070b05828c83ac009609be2c97d005c7c49c660959e11a406a61b9c -size 1202 +oid sha256:dfff6da1f7bbf31271235a219d877932537cbc33bc5f166242284f6e940eed7c +size 1398 diff --git a/Content/Inputs/IA/IA_SayHello.uasset b/Content/Inputs/IA/IA_SayHello.uasset new file mode 100644 index 0000000..206d15c --- /dev/null +++ b/Content/Inputs/IA/IA_SayHello.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8672f1f75c60f497a0bb560210035ef7be4c843e5ba6e6ab0f578361ce8167fa +size 1162 diff --git a/Content/Inputs/IMC/IMC_Context.uasset b/Content/Inputs/IMC/IMC_Context.uasset index cbb6cf2..fa63eb4 100644 --- a/Content/Inputs/IMC/IMC_Context.uasset +++ b/Content/Inputs/IMC/IMC_Context.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:185d3d5ea8d60f08f919003d85e587d15685d4d85732d9ccab8bd9bb082ee55b -size 10031 +oid sha256:f5ba8f193c1db7c392fb054f6afefbf99567e5d65467d9b94b4331475d33dbaa +size 8706 diff --git a/Plugins/CharacterControl b/Plugins/CharacterControl new file mode 160000 index 0000000..8eb8cde --- /dev/null +++ b/Plugins/CharacterControl @@ -0,0 +1 @@ +Subproject commit 8eb8cde913ac768abe09a5664610f69dbba83e19 diff --git a/Source/lonese/MyPlayerController.cpp b/Source/lonese/MyPlayerController.cpp index bfa3d48..658a704 100644 --- a/Source/lonese/MyPlayerController.cpp +++ b/Source/lonese/MyPlayerController.cpp @@ -11,4 +11,9 @@ APawn* AMyPlayerController::GetOwnedPawn() void AMyPlayerController::BeginPlay() { Super::BeginPlay(); -} \ No newline at end of file +} + +void AMyPlayerController::CalcCamera(float DeltaTime, FMinimalViewInfo& OutResult) +{ + AActor::CalcCamera(DeltaTime, OutResult); +} diff --git a/Source/lonese/MyPlayerController.h b/Source/lonese/MyPlayerController.h index e8d9691..311b90d 100644 --- a/Source/lonese/MyPlayerController.h +++ b/Source/lonese/MyPlayerController.h @@ -20,6 +20,6 @@ public: protected: virtual void BeginPlay() override; - + virtual void CalcCamera(float DeltaTime, FMinimalViewInfo& OutResult) override; private: }; diff --git a/lonese.uproject b/lonese.uproject index cc9a25a..e88ae2a 100644 --- a/lonese.uproject +++ b/lonese.uproject @@ -29,6 +29,10 @@ "Win64" ], "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/362651520df94e4fa65492dbcba44ae2" + }, + { + "Name": "StructUtils", + "Enabled": true } ] } \ No newline at end of file