Compare commits

base: Effect:Dev

Branches Tags

Effect:Dev

Effect:Dev_YYH

Effect:Dev_wy

Effect:Dev_SZH

Effect:Dev_LXL

Effect:Dev_XH

Effect:Dev_HCJ

Effect:Dev-Lsb

Effect:Dev_lxc

Effect:xxxxchuan1-patch-1

Effect:Dev_WX

Effect:yinhao-patch-1

Effect:Dev_LZY

Effect:Dev_LXY

Effect:Dev_ZYH

Effect:YINKAMISAMA

Effect:Dev_main

Effect:Dev_lw

Effect:master

Effect:YYH_BF

Effect:Dev_BF

Effect:Main

..

compare: Effect:Dev_lxc

Branches Tags

Effect:Dev_YYH

Effect:Dev_wy

Effect:Dev_SZH

Effect:Dev_LXL

Effect:Dev_XH

Effect:Dev_HCJ

Effect:Dev-Lsb

Effect:Dev_lxc

Effect:xxxxchuan1-patch-1

Effect:Dev_WX

Effect:yinhao-patch-1

Effect:Dev_LZY

Effect:Dev_LXY

Effect:Dev_ZYH

Effect:YINKAMISAMA

Effect:Dev_main

Effect:Dev_lw

Effect:master

Effect:YYH_BF

Effect:Dev_BF

Effect:Dev

Effect:Main

21 Commits

Dev ... Dev_lxc

Author	SHA1	Message	Date
xxxxchuan1	759faea473	Merge pull request 'M_FX_Character' (#9) from xxxxchuan1-patch-1 into Dev_lxc ... Reviewed-on: https://git.eazygame.cn/Effect/c_101/pulls/9	2024-11-29 16:41:36 +08:00
xxxxchuan1	1eb5eb5db5	M_FX_Character ... A_新增_2024_11_29 角色材质变更 添加了流光/mask/菲尼尔	2024-11-29 16:41:13 +08:00
XXXXCHUAN1	6cf6ce827d	刘序川黑洞吸收特效提交	2024-11-15 16:25:20 +08:00
XXXXCHUAN1	744f500498	lxc ... 刘序川蓄力爆点特效提交	2024-11-08 17:46:31 +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
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
wangxiner55	78c96277c6	Ini_Boom_FX ... Ini_Boom_FX	2024-11-08 10:38:33 +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

469 changed files with 1125 additions and 252 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakRGB_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakRGB_Sole.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTextureAndClamp_Sole.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTextureDissolve_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_BreakTexture_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Common_VFX_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Decal_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Default_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Default_Sole.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_DeriveHDRfromLDR.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_DeriveHDRfromLDR_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Dissolve02_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FX_ParticleColor_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FlowMap_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Fresnel.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FresnelFunction.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_FresnelFunction_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Fresnel_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Mask_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Mask_Sole.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_MaterialFunction_TexSV.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_MaterialFunction_TexSV_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refine.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Refraction_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_Shine_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_UVAnimation_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VectorToRadialValue.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VertexAnimation_LY_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Function/MF_VertexAnimation_Texture.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Effect_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Effect_002.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Smoke.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/Effect/Material/Effect/Master/M_Smoke_Inst.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/MSPresets/M_MS_Character_Material/Functions/MF_FX.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMaterialLiberal/MSPresets/M_MS_Character_Material/M_FX_Character.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Grid.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Ring_LXC_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Sphere.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/fx_Ring_double_lxc_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/fx_thorn_common_lxc_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Blueprints/BP_DemoDisplay.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Blueprints/BP_DemoRoom.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_Display_Blue.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_TileBlack.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/MI_Tile_Ceiling.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Display.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Emi_Only.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Glow.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Metal.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_Glossy.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_Tile_Grey.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/M_UELogo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Materials/Textures/T_GrungySurface_slnneipc_4K_MR.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Corner_B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Curve_B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_EdgeCurve_B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Main_B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Display_Side_B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Floor_Corner.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Floor_Edge.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Pipe.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_1MPanel.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_1MPanel2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/ShadowBox_RoundEdge.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Curve.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Wall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Splitter_Wall2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TagBar_Middle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TagBar_TitleCap.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MPillar.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MPillar_B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_10MWall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_Edge.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurveEdge.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurveEdge2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/Tile_InnerCurve_B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TrimFeature_MetalTrim_Bend.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/TrimFeature_MetalTrim_Straight.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Meshes/UELogo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/DT_Colourways.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/E_EnclosureLevel.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/E_RoomLighting.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/S_Colour.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/CommonScriptLiberal/DemoRoom/Misc/S_RoomSettings.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Flare/T_Glow_Tc_012.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Glow/T_Glow_Tc_008.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Ice/fx_a_ice_001_n.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Ice/fx_c_ice_002.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/LightBeam/fx_lightbeam_trig_center_fallof_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/LightBeam/fx_lightbeam_trig_center_fallof_002.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Line/FX_Mask_line_yyh_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Line/FX_changyong_mag_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Mask/FX_Mask_center_yyh_002.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Mask/FX_center_yyh_002.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Mask/fx_Mask_uside_lxc_001.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Mask/fx_b_atypical_008_ycl.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Mask/fx_c_line_004_ycl.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/CommonLiberal/Texture/EffectCommonTextureLib/Mask/fx_d_atypical_034_1.uasset (Stored with Git LFS)

View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More