Create 新建文本文档.txt

Merge branch 'Dev_main' of https://git.eazygame.cn/Effect/c_101 into Dev_main
吸收_王鑫
2024-11-15 16:51:38 +08:00 · 2024-11-15 16:43:40 +08:00 · 2024-11-15 16:18:59 +08:00 · 2024-11-11 10:37:21 +08:00 · 2024-11-11 10:19:40 +08:00 · 2024-11-08 19:17:47 +08:00
762 changed files with 1759 additions and 390 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -47,6 +47,9 @@ r.Shadow.Virtual.Enable=1
 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
 r.DefaultFeature.LocalExposure.HighlightContrastScale=0.8
 r.DefaultFeature.LocalExposure.ShadowContrastScale=0.8
 r.DefaultFeature.AutoExposure=False
 r.AntiAliasingMethod=4
 r.DefaultFeature.MotionBlur=True
 [/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
 CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'
@ -74,3 +77,6 @@ ConnectionType=USBOnly
 bUseManualIPAddress=False
 ManualIPAddress=
 [/Script/RenderDocPlugin.RenderDocPluginSettings]
 renderdoc.AutoAttach=True
--- a/Content/2/3/Circle.uasset
+++ b/Content/2/3/Circle.uasset
--- a/Content/2/3/M_plane.uasset
+++ b/Content/2/3/M_plane.uasset
--- a/Content/2/3/M_plane_Inst1.uasset
+++ b/Content/2/3/M_plane_Inst1.uasset
--- a/Content/2/3/polySurface1480_rgb_PivotPos_a_ParentIndexInt_UV_2.uasset
+++ b/Content/2/3/polySurface1480_rgb_PivotPos_a_ParentIndexInt_UV_2.uasset
--- a/Content/2/3/zxcc.uasset
+++ b/Content/2/3/zxcc.uasset
--- a/Content/CommonLiberal/CommonFXLiberal/Ribbon/Ribbon.uasset
+++ b/Content/CommonLiberal/CommonFXLiberal/Ribbon/Ribbon.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakRGB_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakRGB_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTextureDissolve_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTextureDissolve_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTexture_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTexture_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Common_VFX_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Common_VFX_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Decal_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Decal_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Default_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Default_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_DeriveHDRfromLDR_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_DeriveHDRfromLDR_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Dissolve02_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Dissolve02_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FX_ParticleColor_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FX_ParticleColor_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FlowMap_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FlowMap_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FresnelFunction_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FresnelFunction_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Fresnel_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Fresnel_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Mask_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Mask_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_MaterialFunction_TexSV_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_MaterialFunction_TexSV_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refine.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refine.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refraction_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refraction_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Shine_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Shine_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_UVAnimation_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_UVAnimation_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VectorToRadialValue.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VectorToRadialValue.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VertexAnimation_LY_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VertexAnimation_LY_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VertexAnimation_Texture.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VertexAnimation_Texture.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Effect_001.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Effect_001.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Effect_002.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Effect_002.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Smoke.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Smoke.uasset
--- a/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Smoke_Inst.uasset
+++ b/Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Smoke_Inst.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Common_Plane_yyh_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Common_Plane_yyh_001.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Common_hemisphere_yyh_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Common_hemisphere_yyh_001.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Common_yyh_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Common_yyh_001.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Plane_YYH_002.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Plane_YYH_002.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Plane_YYH_003.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Plane_YYH_003.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_line_Plane_yyh_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_line_Plane_yyh_001.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_ring_yyh_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_ring_yyh_001.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Cylinder_NoCap.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Cylinder_NoCap.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Grid.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Grid.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Plane_LXC_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Plane_LXC_001.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Ring_LXC_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Ring_LXC_001.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Ring_LXC_003.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Ring_LXC_003.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Rotator_Circle.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Rotator_Circle.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Sphere.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Sphere.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/fx_Ring_double_lxc_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/fx_Ring_double_lxc_001.uasset
--- a/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/fx_thorn_common_lxc_001.uasset
+++ b/Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/fx_thorn_common_lxc_001.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Blueprints/BP_DemoDisplay.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Blueprints/BP_DemoDisplay.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Blueprints/BP_DemoRoom.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Blueprints/BP_DemoRoom.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_Display_Blue.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_Display_Blue.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_TileBlack.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_TileBlack.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_Tile_Ceiling.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_Tile_Ceiling.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Display.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Display.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Emi_Only.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Emi_Only.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Glow.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Glow.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Metal.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Metal.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_2.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_2.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_Glossy.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_Glossy.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_Grey.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_Grey.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_UELogo.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_UELogo.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/Textures/T_GrungySurface_slnneipc_4K_MR.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/Textures/T_GrungySurface_slnneipc_4K_MR.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Corner_B.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Corner_B.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Curve_B.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Curve_B.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_EdgeCurve_B.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_EdgeCurve_B.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Main_B.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Main_B.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Side_B.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Side_B.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Floor_Corner.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Floor_Corner.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Floor_Edge.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Floor_Edge.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Pipe.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Pipe.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_1MPanel.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_1MPanel.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_1MPanel2.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_1MPanel2.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_RoundEdge.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_RoundEdge.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Curve.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Curve.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Wall.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Wall.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Wall2.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Wall2.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TagBar_Middle.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TagBar_Middle.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TagBar_TitleCap.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TagBar_TitleCap.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MPillar.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MPillar.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MPillar_B.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MPillar_B.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MWall.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MWall.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_Edge.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_Edge.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurveEdge.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurveEdge.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurveEdge2.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurveEdge2.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurve_B.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurve_B.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TrimFeature_MetalTrim_Bend.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TrimFeature_MetalTrim_Bend.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TrimFeature_MetalTrim_Straight.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TrimFeature_MetalTrim_Straight.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/UELogo.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/UELogo.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/DT_Colourways.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/DT_Colourways.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/E_EnclosureLevel.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/E_EnclosureLevel.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/E_RoomLighting.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/E_RoomLighting.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/S_Colour.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/S_Colour.uasset
--- a/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/S_RoomSettings.uasset
+++ b/Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/S_RoomSettings.uasset
--- a/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_002.uasset
+++ b/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_002.uasset
--- a/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_016.uasset
+++ b/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_016.uasset
--- a/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_017.uasset
+++ b/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_017.uasset
--- a/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_018.uasset
+++ b/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_018.uasset
--- a/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_019.uasset
+++ b/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_019.uasset
--- a/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_020.uasset
+++ b/Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_020.uasset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wangxiner55	0a06a3cf84	Create 新建文本文档.txt	2024-11-15 16:51:38 +08:00
wangxiner55	40e8dae3bc	Merge branch 'Dev_main' of https://git.eazygame.cn/Effect/c_101 into Dev_main	2024-11-15 16:43:40 +08:00
wangxiner55	f5af4f8663	吸收_王鑫	2024-11-15 16:18:59 +08:00
hcjwwww	1f79908744	Merge branch 'Dev_main' of http://47.108.239.202:3001/Effect/c_101 into Dev_main	2024-11-11 10:37:21 +08:00
hcjwwww	8943251cf6	进程1	2024-11-11 10:19:40 +08:00
hcjwwww	3f69b88a91	xin	2024-11-08 19:17:47 +08:00
wangxiner55	7ed822fa84	Ini_Curson_1_full_Up	2024-11-08 18:27:32 +08:00
YinHaoovo	6125e77bfc	111	2024-11-08 18:17:24 +08:00
YinHaoovo	e155b198f3	Merge branch 'Dev_main' of http://47.108.239.202:3001/Effect/c_101 into Dev_main	2024-11-08 17:51:39 +08:00
YinHaoovo	a41bca97c1	Merge branch 'Dev_main' of http://47.108.239.202:3001/Effect/c_101 into Dev_main	2024-11-08 17:49:22 +08:00
XXXXCHUAN1	744f500498	lxc 刘序川蓄力爆点特效提交	2024-11-08 17:46:31 +08:00
YinHaoovo	20874e83de	yyh 蓄力进度3	2024-11-08 17:43:21 +08:00
hcjwwww	37ff4c6350	进程9	2024-11-08 17:42:07 +08:00
hcjwwww	183343e5dc	Merge branch 'HCJ_BF' into Dev_main	2024-11-08 17:39:42 +08:00
hcjwwww	24bdfea6d1	hcj	2024-11-08 17:32:59 +08:00
hcjwwww	c7fb65a976	Merge branch 'HCJ_BF' into Dev_main	2024-11-08 17:27:38 +08:00
hcjwwww	52c17d2703	进程8	2024-11-08 17:20:58 +08:00
hcjwwww	39260c1319	Merge branch 'Dev_main' of http://47.108.239.202:3001/Effect/c_101 into Dev_main	2024-11-08 16:51:40 +08:00
hcjwwww	cc254d6363	进程7	2024-11-08 16:22:51 +08:00
YinHaoovo	0485a3b0c4	yyh 蓄力进度2	2024-11-08 15:18:13 +08:00
XXXXCHUAN1	2f9ad27814	LXC 刘序川蓄力爆点特效作业提交	2024-11-08 15:04:51 +08:00
hcjwwww	6fc6e0583f	进度6	2024-11-08 15:00:12 +08:00
hcjwwww	6edf93fa2d	Merge branch 'Dev_main' of http://47.108.239.202:3001/Effect/c_101 into Dev_main	2024-11-08 11:50:17 +08:00
hcjwwww	e71ddeb579	进度5	2024-11-08 11:50:06 +08:00
YinHaoovo	372697303b	Merge branch 'Dev_main' of http://47.108.239.202:3001/Effect/c_101 into Dev_main	2024-11-08 10:40:43 +08:00
YinHaoovo	6eb37e0475	yyh 蓄力进度	2024-11-08 10:40:18 +08:00
wangxiner55	78c96277c6	Ini_Boom_FX Ini_Boom_FX	2024-11-08 10:38:33 +08:00
YinHaoovo	4bdda32482	Merge branch 'Dev_main' of http://47.108.239.202:3001/Effect/c_101 into Dev_main	2024-11-04 11:55:08 +08:00
YinHaoovo	737c6b7d88	yyh buildup更改	2024-11-04 11:53:04 +08:00
wangxiner55	c7be3259f6	通用材质Effect——新增材质动态maskuv参数 (#4 ) 材质mask新增加了uv的动态参数设置 Co-authored-by: wangxiner55 <1468441589@qq.com> Co-committed-by: wangxiner55 <1468441589@qq.com>	2024-11-04 11:37:50 +08:00
hcjwwww	71f1867d46	进度3	2024-11-04 11:17:20 +08:00
hcjwwww	61438f5c44	Error_yyh	2024-10-30 11:52:49 +08:00
hcjwwww	b1f3ada0ad	hcj_Error_yyh_update	2024-10-30 11:52:30 +08:00
XXXXCHUAN1	bdec8320ad	lxc_吸收特效修改	2024-10-30 11:21:28 +08:00