diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..4e5a58d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +root = true + +[*] +charset = utf-8 +insert_final_newline = true +indent_style = space +indent_size = 4 diff --git a/.gitmodules b/.gitmodules index 858ca08..c6b9797 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "Plugins/CharacterControl"] path = Plugins/CharacterControl url = https://gitea.msbzb.xyz/meishibiezb/CharacterControl +[submodule "Plugins/Item"] + path = Plugins/Item + url = https://gitea.msbzb.xyz/meishibiezb/Item diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index a80bc3d..1318b76 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -2,4 +2,7 @@ ProjectID=2986EC0E4EEBB5E464388C874F51F09C ProjectName=First Person BP Game Template +[/Script/Item.ItemRegistrySettings] +ItemDataTables=(("TestItemDef", "/Game/Data/Item/TestItemDefTable.TestItemDefTable")) +ViewStrategies=() diff --git a/Config/DefaultGameplayTags.ini b/Config/DefaultGameplayTags.ini index 0b0ee4c..fe9350a 100644 --- a/Config/DefaultGameplayTags.ini +++ b/Config/DefaultGameplayTags.ini @@ -17,4 +17,5 @@ NetIndexFirstBitSegment=16 +GameplayTagList=(Tag="Gameplay.Action.Hello",DevComment="") +GameplayTagList=(Tag="Gameplay.Action.Move",DevComment="") +GameplayTagList=(Tag="Gameplay.Action.Run",DevComment="") ++GameplayTagList=(Tag="Gameplay.Item.Property.Test",DevComment="") diff --git a/Content/Blueprints/Component/BP_SayHello.uasset b/Content/Blueprints/Component/BP_SayHello.uasset index af02505..ae7d8fb 100644 --- a/Content/Blueprints/Component/BP_SayHello.uasset +++ b/Content/Blueprints/Component/BP_SayHello.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ba82dd3ddb2ee0ae53219333e5bfec44afe98daa290bd2aad867bebc04025d2 -size 54565 +oid sha256:659759d6dc888a524105c0a84e4c2fa3eb8eebb1110763b7a1a36c5d05502976 +size 94018 diff --git a/Content/Blueprints/Playground/BP_Bomb.uasset b/Content/Blueprints/Playground/BP_Bomb.uasset new file mode 100644 index 0000000..9382319 --- /dev/null +++ b/Content/Blueprints/Playground/BP_Bomb.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c49e52dd7b08b391c2c84c87f1c34c74993db1f7f53b067db53c79d47963430b +size 242833 diff --git a/Content/Blueprints/Playground/BP_DropItemInvComp.uasset b/Content/Blueprints/Playground/BP_DropItemInvComp.uasset new file mode 100644 index 0000000..02eda5c --- /dev/null +++ b/Content/Blueprints/Playground/BP_DropItemInvComp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0fcf0653632c6c07738ca9376dfd4d23b12f92f9b784df06bc86b771e50d1d0 +size 34461 diff --git a/Content/Blueprints/Playground/BP_InventoryComp.uasset b/Content/Blueprints/Playground/BP_InventoryComp.uasset index 6f99066..0980c5d 100644 --- a/Content/Blueprints/Playground/BP_InventoryComp.uasset +++ b/Content/Blueprints/Playground/BP_InventoryComp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46b3a2789206ddbfdc9c30b87218d9b8f7dea98cd6900dcd3444199481769f3a -size 38690 +oid sha256:c32b55b844b3495e5ff88b8f5bf0f622867832ca451a76598a5d97b17fa2ad5c +size 144980 diff --git a/Content/Blueprints/Playground/BP_TestItem.uasset b/Content/Blueprints/Playground/BP_TestItem.uasset index e76c521..e1fc4a6 100644 --- a/Content/Blueprints/Playground/BP_TestItem.uasset +++ b/Content/Blueprints/Playground/BP_TestItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6aaf11557065dd770c4781b240071c5f596fda64a8d3651e0e0ac688744d02e2 -size 108266 +oid sha256:85ee901e2b36ea4898dedcfcc0a98bd45096e5cf11fc16efd61e0e8971d4a000 +size 98720 diff --git a/Content/Data/Item/TestItemDefTable.uasset b/Content/Data/Item/TestItemDefTable.uasset index f1c7a37..b45fec2 100644 --- a/Content/Data/Item/TestItemDefTable.uasset +++ b/Content/Data/Item/TestItemDefTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d86ac7ff650f0e05efceff88f119141f8d37fd62cde1eb1749171cbeaa0a437e -size 3021 +oid sha256:739a97acd41af622599944d106b465934c39a2fcca304cb05ebc0f4351cb827c +size 4375 diff --git a/Content/地图关卡/Playground.umap b/Content/地图关卡/Playground.umap index a243875..ecf7e76 100644 --- a/Content/地图关卡/Playground.umap +++ b/Content/地图关卡/Playground.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f06ae97b09ef8c3fde5946b2f20df2cb07ca7fa1e07a8a6c83859e9151b2f21 -size 224306 +oid sha256:d1f0c381c359e04fd514baf7a690210257163b0b3c84bdc306e7b8be98647b86 +size 228697 diff --git a/Plugins/Item b/Plugins/Item new file mode 160000 index 0000000..05ff071 --- /dev/null +++ b/Plugins/Item @@ -0,0 +1 @@ +Subproject commit 05ff0714e199ad84947b08990a8d81ef7b2ebd9e