Merge branch 'master' into feat-item

2026-05-27 20:59:22 +08:00
parent de10ee17b9 ca08f14753
commit 90cd31edbd
333 changed files with 978 additions and 34 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/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/UI/纹理/Vector.uasset
+++ b/Content/Arts/UI/纹理/Vector.uasset
--- a/Content/Arts/UI/纹理/血条框1.uasset
+++ b/Content/Arts/UI/纹理/血条框1.uasset
--- a/Content/Arts/UI/纹理/资金底框.uasset
+++ b/Content/Arts/UI/纹理/资金底框.uasset
--- a/Content/Arts/UI/血条/环型血条.uasset
+++ b/Content/Arts/UI/血条/环型血条.uasset
--- a/Content/Arts/UI/血条/环型血条_Inst.uasset
+++ b/Content/Arts/UI/血条/环型血条_Inst.uasset
--- a/Content/Arts/mx/001.uasset
+++ b/Content/Arts/mx/001.uasset
--- a/Content/Arts/mx/Elsa/T/1.uasset
+++ b/Content/Arts/mx/Elsa/T/1.uasset
--- a/Content/Arts/mx/Elsa/T/NZ_DM_blinn10_BaseColor.uasset
+++ b/Content/Arts/mx/Elsa/T/NZ_DM_blinn10_BaseColor.uasset
--- a/Content/Arts/mx/Elsa/T/NZ_DM_blinn10_Normal.uasset
+++ b/Content/Arts/mx/Elsa/T/NZ_DM_blinn10_Normal.uasset
--- a/Content/Arts/mx/Elsa/T/NZ_DM_blinn10_OcclusionRoughnessMetallic.uasset
+++ b/Content/Arts/mx/Elsa/T/NZ_DM_blinn10_OcclusionRoughnessMetallic.uasset
--- a/Content/Arts/mx/Elsa/T/NZ_DM_blinn8_BaseColor.uasset
+++ b/Content/Arts/mx/Elsa/T/NZ_DM_blinn8_BaseColor.uasset
--- a/Content/Arts/mx/Elsa/T/NZ_DM_blinn8_Emissive.uasset
+++ b/Content/Arts/mx/Elsa/T/NZ_DM_blinn8_Emissive.uasset
--- a/Content/Arts/mx/Elsa/T/NZ_DM_blinn8_Normal.uasset
+++ b/Content/Arts/mx/Elsa/T/NZ_DM_blinn8_Normal.uasset
--- a/Content/Arts/mx/Elsa/T/NZ_DM_blinn8_OcclusionRoughnessMetallic.uasset
+++ b/Content/Arts/mx/Elsa/T/NZ_DM_blinn8_OcclusionRoughnessMetallic.uasset
--- a/Content/Arts/mx/Elsa/T/低和_1001_BaseColor_Mat.uasset
+++ b/Content/Arts/mx/Elsa/T/低和_1001_BaseColor_Mat.uasset
--- a/Content/Arts/mx/Elsa/T/低和_1001_BaseColor_Mat1.uasset
+++ b/Content/Arts/mx/Elsa/T/低和_1001_BaseColor_Mat1.uasset
--- a/Content/Arts/mx/Elsa/绑定好3.uasset
+++ b/Content/Arts/mx/Elsa/绑定好3.uasset
--- a/Content/Arts/mx/Elsa/绑定好3_PhysicsAsset.uasset
+++ b/Content/Arts/mx/Elsa/绑定好3_PhysicsAsset.uasset
--- a/Content/Arts/mx/Elsa/绑定好4.uasset
+++ b/Content/Arts/mx/Elsa/绑定好4.uasset
--- a/Content/Arts/mx/Elsa/绑定好4_PhysicsAsset.uasset
+++ b/Content/Arts/mx/Elsa/绑定好4_PhysicsAsset.uasset
--- a/Content/Arts/mx/Elsa/绑定好5.uasset
+++ b/Content/Arts/mx/Elsa/绑定好5.uasset
--- a/Content/Arts/mx/Elsa/绑定好5_PhysicsAsset.uasset
+++ b/Content/Arts/mx/Elsa/绑定好5_PhysicsAsset.uasset
--- a/Content/Arts/关卡序列/1.uasset
+++ b/Content/Arts/关卡序列/1.uasset
--- a/Content/Arts/动画/3/Anim_Hold_Pistol/Driving_Anim_Hold_Pistol.uasset
+++ b/Content/Arts/动画/3/Anim_Hold_Pistol/Driving_Anim_Hold_Pistol.uasset
--- a/Content/Arts/动画/3/其他动作/Anim_Clap_Hands.uasset
+++ b/Content/Arts/动画/3/其他动作/Anim_Clap_Hands.uasset
--- a/Content/Arts/动画/3/其他动作/Anim_Shout.uasset
+++ b/Content/Arts/动画/3/其他动作/Anim_Shout.uasset
--- a/Content/Arts/动画/3/其他动作/Anim_Use_Item.uasset
+++ b/Content/Arts/动画/3/其他动作/Anim_Use_Item.uasset
--- a/Content/Arts/动画/3/其他动作/Anim_Work_Assemble.uasset
+++ b/Content/Arts/动画/3/其他动作/Anim_Work_Assemble.uasset
--- a/Content/Arts/动画/3/其他动作/Anim_cheer.uasset
+++ b/Content/Arts/动画/3/其他动作/Anim_cheer.uasset
--- a/Content/Arts/动画/3/坐着/Anim_Eat_Sitting.uasset
+++ b/Content/Arts/动画/3/坐着/Anim_Eat_Sitting.uasset
--- a/Content/Arts/动画/3/坐着/Anim_Sit_Ground.uasset
+++ b/Content/Arts/动画/3/坐着/Anim_Sit_Ground.uasset
--- a/Content/Arts/动画/3/坐着/Anim_Sit_Idle.uasset
+++ b/Content/Arts/动画/3/坐着/Anim_Sit_Idle.uasset
--- a/Content/Arts/动画/3/坐着/MOB1_Crouch_To_Stand_Relaxed.uasset
+++ b/Content/Arts/动画/3/坐着/MOB1_Crouch_To_Stand_Relaxed.uasset
--- a/Content/Arts/动画/3/坐着/MOB1_Crouch_To_Stand_Relaxed_IPC.uasset
+++ b/Content/Arts/动画/3/坐着/MOB1_Crouch_To_Stand_Relaxed_IPC.uasset
--- a/Content/Arts/动画/3/奔跑/Anim_Run_01-In_Place.uasset
+++ b/Content/Arts/动画/3/奔跑/Anim_Run_01-In_Place.uasset
--- a/Content/Arts/动画/3/奔跑/Anim_Run_01-Root_Motion.uasset
+++ b/Content/Arts/动画/3/奔跑/Anim_Run_01-Root_Motion.uasset
--- a/Content/Arts/动画/3/奔跑/Anim_Run_Carry-In_Place.uasset
+++ b/Content/Arts/动画/3/奔跑/Anim_Run_Carry-In_Place.uasset
--- a/Content/Arts/动画/3/奔跑/Anim_Run_Carry-Root_Motion.uasset
+++ b/Content/Arts/动画/3/奔跑/Anim_Run_Carry-Root_Motion.uasset
--- a/Content/Arts/动画/3/奔跑/MOB1_Jog_F_Loop.uasset
+++ b/Content/Arts/动画/3/奔跑/MOB1_Jog_F_Loop.uasset
--- a/Content/Arts/动画/3/奔跑/MOB1_Jog_F_Loop_IPC.uasset
+++ b/Content/Arts/动画/3/奔跑/MOB1_Jog_F_Loop_IPC.uasset
--- a/Content/Arts/动画/3/奔跑/MOB1_Stand_Relaxed_To_Jog_F.uasset
+++ b/Content/Arts/动画/3/奔跑/MOB1_Stand_Relaxed_To_Jog_F.uasset
--- a/Content/Arts/动画/3/奔跑/MOB1_Stand_Relaxed_To_Jog_F_IPC.uasset
+++ b/Content/Arts/动画/3/奔跑/MOB1_Stand_Relaxed_To_Jog_F_IPC.uasset
--- a/Content/Arts/动画/3/害怕/Anim_Beaten_up.uasset
+++ b/Content/Arts/动画/3/害怕/Anim_Beaten_up.uasset
--- a/Content/Arts/动画/3/害怕/Anim_Duck.uasset
+++ b/Content/Arts/动画/3/害怕/Anim_Duck.uasset
--- a/Content/Arts/动画/3/对话/Anim_Strafe_Right-Root_Motion.uasset
+++ b/Content/Arts/动画/3/对话/Anim_Strafe_Right-Root_Motion.uasset
--- a/Content/Arts/动画/3/对话/Anim_Talk_01.uasset
+++ b/Content/Arts/动画/3/对话/Anim_Talk_01.uasset
--- a/Content/Arts/动画/3/对话/Anim_Talk_02.uasset
+++ b/Content/Arts/动画/3/对话/Anim_Talk_02.uasset
--- a/Content/Arts/动画/3/对话/说话1.uasset
+++ b/Content/Arts/动画/3/对话/说话1.uasset
--- a/Content/Arts/动画/3/待机/Anim_Idle_01.uasset
+++ b/Content/Arts/动画/3/待机/Anim_Idle_01.uasset
--- a/Content/Arts/动画/3/待机/Anim_Idle_02.uasset
+++ b/Content/Arts/动画/3/待机/Anim_Idle_02.uasset
--- a/Content/Arts/动画/3/待机/Anim_Idle_Drunk.uasset
+++ b/Content/Arts/动画/3/待机/Anim_Idle_Drunk.uasset
--- a/Content/Arts/动画/3/待机/Anim_Lean_Against_Wall.uasset
+++ b/Content/Arts/动画/3/待机/Anim_Lean_Against_Wall.uasset
--- a/Content/Arts/动画/3/待机/Anim_Listen_01.uasset
+++ b/Content/Arts/动画/3/待机/Anim_Listen_01.uasset
--- a/Content/Arts/动画/3/待机/Anim_Look_Around.uasset
+++ b/Content/Arts/动画/3/待机/Anim_Look_Around.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Idle_v2.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Idle_v2.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Idle_v2_IPC.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Idle_v2_IPC.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_L_90.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_L_90.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_L_90_IPC.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_L_90_IPC.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_Center.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_Center.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_D90.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_D90.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_L90.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_L90.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_R90.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_R90.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_U90.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_Look_U90.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_R_90.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_R_90.uasset
--- a/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_R_90_IPC.uasset
+++ b/Content/Arts/动画/3/待机/MOB1_Stand_Relaxed_R_90_IPC.uasset
--- a/Content/Arts/动画/3/待机/待机1.uasset
+++ b/Content/Arts/动画/3/待机/待机1.uasset
--- a/Content/Arts/动画/3/投掷/Anim_Throw.uasset
+++ b/Content/Arts/动画/3/投掷/Anim_Throw.uasset
--- a/Content/Arts/动画/3/拾取/Anim_Pick_Item.uasset
+++ b/Content/Arts/动画/3/拾取/Anim_Pick_Item.uasset
--- a/Content/Arts/动画/3/拾取/Anim_Put_Item.uasset
+++ b/Content/Arts/动画/3/拾取/Anim_Put_Item.uasset
--- a/Content/Arts/动画/3/拾取/拾取1.uasset
+++ b/Content/Arts/动画/3/拾取/拾取1.uasset
--- a/Content/Arts/动画/3/死亡/Anim_Breakdown_01.uasset
+++ b/Content/Arts/动画/3/死亡/Anim_Breakdown_01.uasset
--- a/Content/Arts/动画/3/死亡/Anim_Breakdown_02.uasset
+++ b/Content/Arts/动画/3/死亡/Anim_Breakdown_02.uasset
--- a/Content/Arts/动画/3/沿墙走/Anim_Strafe_Left-In_Place.uasset
+++ b/Content/Arts/动画/3/沿墙走/Anim_Strafe_Left-In_Place.uasset
--- a/Content/Arts/动画/3/沿墙走/Anim_Strafe_Left-Root_Motion.uasset
+++ b/Content/Arts/动画/3/沿墙走/Anim_Strafe_Left-Root_Motion.uasset
--- a/Content/Arts/动画/3/沿墙走/Anim_Strafe_Right-In_Place.uasset
+++ b/Content/Arts/动画/3/沿墙走/Anim_Strafe_Right-In_Place.uasset
--- a/Content/Arts/动画/3/游泳/Anim_Drown.uasset
+++ b/Content/Arts/动画/3/游泳/Anim_Drown.uasset
--- a/Content/Arts/动画/3/游泳/Anim_Swim-In_Place.uasset
+++ b/Content/Arts/动画/3/游泳/Anim_Swim-In_Place.uasset
--- a/Content/Arts/动画/3/游泳/Anim_Swim-Root_Motion.uasset
+++ b/Content/Arts/动画/3/游泳/Anim_Swim-Root_Motion.uasset
--- a/Content/Arts/动画/3/翻滚/Anim_Jump_01-In_Place.uasset
+++ b/Content/Arts/动画/3/翻滚/Anim_Jump_01-In_Place.uasset
--- a/Content/Arts/动画/3/翻滚/Anim_Jump_01-Root_Motion.uasset
+++ b/Content/Arts/动画/3/翻滚/Anim_Jump_01-Root_Motion.uasset
--- a/Content/Arts/动画/3/翻滚/翻滚1.uasset
+++ b/Content/Arts/动画/3/翻滚/翻滚1.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_01-In_Place.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_01-In_Place.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_01-Root_Motion.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_01-Root_Motion.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Carry_01-In_Place.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Carry_01-In_Place.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Carry_01-Root_Motion.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Carry_01-Root_Motion.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Carry_02-In_Place.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Carry_02-In_Place.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Carry_02-Root_Motion.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Carry_02-Root_Motion.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Drunk-In_Place.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Drunk-In_Place.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Drunk-Root_Motion.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Drunk-Root_Motion.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Injured-In_Place.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Injured-In_Place.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Injured-Root_Motion.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Injured-Root_Motion.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Push-In_Place.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Push-In_Place.uasset
--- a/Content/Arts/动画/3/走/Anim_Walk_Push-Root_Motion.uasset
+++ b/Content/Arts/动画/3/走/Anim_Walk_Push-Root_Motion.uasset
--- a/Content/Arts/动画/3/走/MF_Walk_Fwd1.uasset
+++ b/Content/Arts/动画/3/走/MF_Walk_Fwd1.uasset
--- a/Content/Arts/动画/3/走/MM_Walk_Fwd1.uasset
+++ b/Content/Arts/动画/3/走/MM_Walk_Fwd1.uasset
--- a/Content/Arts/动画/3/走/MOB1_Stand_Relaxed_To_Walk_F.uasset
+++ b/Content/Arts/动画/3/走/MOB1_Stand_Relaxed_To_Walk_F.uasset
--- a/Content/Arts/动画/3/走/MOB1_Stand_Relaxed_To_Walk_F_IPC.uasset
+++ b/Content/Arts/动画/3/走/MOB1_Stand_Relaxed_To_Walk_F_IPC.uasset
--- a/Content/Arts/动画/3/走/MOB1_Stand_Rlx_Turn_In_Place_L_Loop.uasset
+++ b/Content/Arts/动画/3/走/MOB1_Stand_Rlx_Turn_In_Place_L_Loop.uasset
--- a/Show More
+++ b/Show More