Effect/c_101
17
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: Effect:Dev
Branches Tags
Effect:Dev
Effect:Dev_WX
Effect:Dev_LZY
Effect:Dev_YYH
Effect:Dev_LXY
Effect:Dev_LXL
Effect:Dev_ZYH
Effect:YINKAMISAMA
Effect:Dev_main
Effect:Dev_lw
Effect:Dev-Lsb
Effect:Dev_lxc
Effect:master
Effect:YYH_BF
Effect:Dev_BF
Effect:Main
...
pull from: Effect:Dev_LXY
Branches Tags
Effect:Dev_WX
Effect:Dev_LZY
Effect:Dev_YYH
Effect:Dev_LXY
Effect:Dev_LXL
Effect:Dev_ZYH
Effect:YINKAMISAMA
Effect:Dev_main
Effect:Dev_lw
Effect:Dev-Lsb
Effect:Dev_lxc
Effect:master
Effect:YYH_BF
Effect:Dev_BF
Effect:Dev
Effect:Main

31 Commits
Dev ... Dev_LXY

Author SHA1 Message Date
Lxy1210-end
99b8081387 xiniu 2024-11-15 17:57:09 +08:00
Lxy1210-end
c771dcdf1e xiniu 2024-11-15 17:56:41 +08:00
Lxy1210-end
15b57cd1e7 shui 2024-11-15 16:44:56 +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
668 changed files with 1477 additions and 391 deletions
Show Stats Expand all files Collapse all files

4
.gitignore vendored
View File

@ -12,4 +12,6 @@ Saved
*.suo
*.xcodeproj
*.xcworkspace
Content/Custom
Content/Custom
Content/PrivateCommonLiberal/C_001/LXY/heidong/Material/M_Effect_001_Inst17.uasset
Content/PrivateCommonLiberal/C_001/LXY/heidong/TEX/CausticF_0007.uasset

3
Config/DefaultEngine.ini
View File

@ -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'

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_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_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_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_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/CommonMeshLiberal/BaseStaticMesh/FX_Common_Plane_yyh_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Common_hemisphere_yyh_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Common_yyh_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Plane_YYH_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_Plane_YYH_003.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_line_Plane_yyh_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_ring_yyh_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/SM_Cylinder_NoCap.uasset (Stored with Git LFS)
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_Plane_LXC_001.uasset (Stored with Git LFS) Normal file
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_Ring_LXC_003.uasset (Stored with Git LFS) Normal file
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/Caustic/FX_CausticF_yyh_002.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_016.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_017.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_018.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_019.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/FX_CausticF_yyh_020.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/fx_CausticF_0058.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/fx_CausticF_yyh_006.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/fx_CausticF_yyh_007.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/fx_CausticF_yyh_008.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/fx_CausticF_yyh_009.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Caustic/fx_CausticF_yyh_013.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