Merge branch 'feat-item'

feat: 更新地图
feat: 更新插件
2026-05-29 17:55:15 +08:00 · 2026-05-29 17:48:16 +08:00 · 2026-05-29 06:00:00 +08:00 · 2026-05-28 22:50:54 +08:00 · 2026-05-28 22:07:46 +08:00 · 2026-05-28 20:21:04 +08:00
829 changed files with 1543 additions and 955 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+indent_style = space
+indent_size = 4
--- 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
--- 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=()

--- 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="")

--- a/Content/Arts/mx/001.uasset
+++ b/Content/Arts/mx/001.uasset
--- a/Content/Arts/mx/001_2.uasset
+++ b/Content/Arts/mx/001_2.uasset
--- a/Content/Arts/mx/Elsa/NPC/C/NPC.uasset
+++ b/Content/Arts/mx/Elsa/NPC/C/NPC.uasset
--- a/Content/Arts/mx/Elsa/NPC/C/NPC1.uasset
+++ b/Content/Arts/mx/Elsa/NPC/C/NPC1.uasset
--- a/Content/Arts/mx/Elsa/NPC/C/NPC2.uasset
+++ b/Content/Arts/mx/Elsa/NPC/C/NPC2.uasset
--- a/Content/Arts/mx/Elsa/NPC/C/NPC3.uasset
+++ b/Content/Arts/mx/Elsa/NPC/C/NPC3.uasset
--- a/Content/Arts/mx/Elsa/NPC/白模2绑定.uasset
+++ b/Content/Arts/mx/Elsa/NPC/白模2绑定.uasset
--- a/Content/Arts/mx/Elsa/NPC/白模2绑定_Skeleton.uasset
+++ b/Content/Arts/mx/Elsa/NPC/白模2绑定_Skeleton.uasset
--- a/Content/Arts/mx/Elsa/绑定好3.uasset
+++ b/Content/Arts/mx/Elsa/绑定好3.uasset
--- a/Content/Arts/mx/Elsa/绑定好4.uasset
+++ b/Content/Arts/mx/Elsa/绑定好4.uasset
--- a/Content/Arts/mx/road/低和_1001_BaseColor_Mat.uasset
+++ b/Content/Arts/mx/road/低和_1001_BaseColor_Mat.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_gesture_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_gesture_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_idle_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_idle_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_idle_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_idle_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_talk_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_talk_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_talk_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Sad_talk_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_gesture_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_gesture_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_gesture_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_gesture_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_gesture_03.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_gesture_03.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_idle_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_idle_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_idle_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_idle_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_low_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_low_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_low_03.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_low_03.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_low_04.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_low_04.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_up_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_up_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_up_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_up_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_up_03.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_Serious_talk_up_03.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_furious_idle_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_furious_idle_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_furious_idle_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_furious_idle_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_furious_talk_low.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_furious_talk_low.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_gesture_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_gesture_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_idle_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_idle_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_idle_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_idle_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_idle_03.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_idle_03.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_talk_low_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_talk_low_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_talk_low_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_talk_low_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_talk_low_03.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_laugh_talk_low_03.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_listening_idle_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_listening_idle_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_listening_idle_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_listening_idle_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_listening_idle_03.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_listening_idle_03.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_whisper_talk_01_left.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_whisper_talk_01_left.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_whisper_talk_01_right.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_whisper_talk_01_right.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_whisper_talk_02_left.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_whisper_talk_02_left.uasset
--- a/Content/Arts/动画/3/NPC/IP_Dialogue_whisper_talk_02_right.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Dialogue_whisper_talk_02_right.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_back_against_wall.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_back_against_wall.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_foot_on_curb.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_foot_on_curb.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_leaning_against_curb.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_leaning_against_curb.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_leaning_against_curb_mirrored.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_leaning_against_curb_mirrored.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_one_foot_against_wall.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_one_foot_against_wall.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_left_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_left_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_left_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_left_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_loop_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_loop_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_loop_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_loop_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_right_01.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_right_01.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_right_02.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_sitting_on_bench_right_02.uasset
--- a/Content/Arts/动画/3/NPC/IP_Static_sitting_on_curb.uasset
+++ b/Content/Arts/动画/3/NPC/IP_Static_sitting_on_curb.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_Sad_gesture_02.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_Sad_gesture_02.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_Serious_talk_low_02.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_Serious_talk_low_02.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_furious_talk_up.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_furious_talk_up.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_laugh_gesture_02.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_laugh_gesture_02.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_laugh_gesture_03.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_laugh_gesture_03.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_laugh_talk_up_01.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_laugh_talk_up_01.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_laugh_talk_up_02.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_laugh_talk_up_02.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_moving_furious.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_moving_furious.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_moving_sad.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_moving_sad.uasset
--- a/Content/Arts/动画/3/NPC/RM_Dialogue_moving_serious.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Dialogue_moving_serious.uasset
--- a/Content/Arts/动画/3/NPC/RM_Static_left_arm_against_wall.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Static_left_arm_against_wall.uasset
--- a/Content/Arts/动画/3/NPC/RM_Static_right_arm_against_wall.uasset
+++ b/Content/Arts/动画/3/NPC/RM_Static_right_arm_against_wall.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_CrouchWalk_F_Loop.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_CrouchWalk_F_Loop.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_CrouchWalk_F_Loop_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_CrouchWalk_F_Loop_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_CrouchWalk_F_To_Crouch_RU.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_CrouchWalk_F_To_Crouch_RU.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_CrouchWalk_F_To_Crouch_RU_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_CrouchWalk_F_To_Crouch_RU_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Idle_V2.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Idle_V2.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Idle_V2_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Idle_V2_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_L_90.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_L_90.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_L_90_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_L_90_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_R_90.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_R_90.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_R_90_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_R_90_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Rlx_Turn_In_Place_L_Loop.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Rlx_Turn_In_Place_L_Loop.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Rlx_Turn_In_Place_L_Loop_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Rlx_Turn_In_Place_L_Loop_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Rlx_Turn_In_Place_R_Loop.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Rlx_Turn_In_Place_R_Loop.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Rlx_Turn_In_Place_R_Loop_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_Rlx_Turn_In_Place_R_Loop_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_To_CrouchWalk_F.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_To_CrouchWalk_F.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_To_CrouchWalk_F_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_To_CrouchWalk_F_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_To_Stand_Relaxed.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_To_Stand_Relaxed.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_To_Stand_Relaxed_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Crouch_To_Stand_Relaxed_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU_Air_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU_Air_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU_Land_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU_Land_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU_Start_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Jump_RU_Start_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Loop.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Loop.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Loop_IPC.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Jog_F_Loop_IPC.uasset
--- a/Content/Arts/动画/3/NPC/walk/MOB1_Stand_Relaxed_Idle_v2.uasset
+++ b/Content/Arts/动画/3/NPC/walk/MOB1_Stand_Relaxed_Idle_v2.uasset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
meishibiezb	7f5a419415	Merge branch 'feat-item'	2026-05-29 17:55:15 +08:00
meishibiezb	7f49272b78	feat: 更新地图	2026-05-29 17:48:16 +08:00
meishibiezb	c4b8f4ca51	feat: 更新插件	2026-05-29 06:00:00 +08:00
TNT	cf71da3ad6	Merge branch 'dev-tnt'	2026-05-28 22:50:54 +08:00
TNT	c43cdd5d00	添加内容更新	2026-05-28 22:07:46 +08:00
meishibiezb	e9e7abff0e	feat: 更新插件	2026-05-28 20:21:04 +08:00
meishibiezb	7b4e2a3e56	refactor: ，，，	2026-05-27 21:00:08 +08:00
meishibiezb	90cd31edbd	Merge branch 'master' into feat-item	2026-05-27 20:59:22 +08:00
meishibiezb	ca08f14753	feat: 更新插件	2026-05-27 20:58:22 +08:00
meishibiezb	e3076f0651	feat: 插件更新	2026-05-27 20:36:20 +08:00
meishibiezb	1cf974433a	feat: 更新插件	2026-05-27 01:45:29 +08:00
meishibiezb	a6bc1c665e	feat: 添加.editorconfig	2026-05-26 19:58:19 +08:00
meishibiezb	de10ee17b9	feat: 更新插件	2026-05-22 00:00:05 +08:00
meishibiezb	244ad11d1c	feat: 添加Item插件子模块	2026-05-21 21:22:30 +08:00