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

Compare commits

base: Effect:009bdce7069e9bf9a1f513c71a3f4ca8061a347d
Branches Tags
Effect:Dev
Effect:Dev_YYH
Effect:Dev_WX
Effect:Dev_LZY
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
..
compare: Effect:598d720da1453e9c8314385ea7c4fec4e8ec4a89
Branches Tags
Effect:Dev_YYH
Effect:Dev_WX
Effect:Dev_LZY
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

37 Commits
009bdce706 ... 598d720da1

Author SHA1 Message Date
YinHao
598d720da1 revert 6001b3467b 
revert cj进度2
 2024-10-29 19:31:37 +08:00
hcjwwww
6001b3467b cj进度2 2024-10-29 19:28:03 +08:00
YinHaoovo
0ee04a8a5c Merge branch 'master' of http://47.108.239.202:3001/Effect/c_101 2024-10-29 19:22:17 +08:00
xiner
c9105f6d8a lxc_Niagara系统变更 
1111
 2024-10-29 19:21:37 +08:00
hcjwwww
993f5ddac8 吸收进程2 2024-10-29 19:15:07 +08:00
hcjwwww
1d219eaf2f 吸收特效进度2 2024-10-29 19:08:32 +08:00
YinHaoovo
029fc044e3 1 2024-10-29 19:07:11 +08:00
YinHaoovo
d799a76a5a 蓄力第一阶段进度 2024-10-29 19:03:25 +08:00
YinHaoovo
ce4e83a7d9 1 2024-10-29 18:03:40 +08:00
YinHaoovo
94bea045cc 蓄力进度 2024-10-29 17:58:24 +08:00
XXXXCHUAN1
99b3023176 lxc 2024-10-29 16:29:57 +08:00
hcjwwww
69f7fa8172 截图改名 2024-10-29 15:56:25 +08:00
hcjwwww
2971be0b8d 截图 2024-10-29 15:42:55 +08:00
hcjwwww
1c93736fd2 Merge branch 'master' of http://47.108.239.202:3001/Effect/c_101 2024-10-29 15:40:21 +08:00
hcjwwww
495ffae853 吸收颜色分组 2024-10-29 15:39:56 +08:00
YinHaoovo
5a7305a676 Merge branch 'master' of http://47.108.239.202:3001/Effect/c_101 2024-10-29 15:04:52 +08:00
YinHaoovo
9e1fd17b97 更改删除部分文件 2024-10-29 14:38:55 +08:00
XXXXCHUAN1
6f45aaa1fc Merge branch 'master' of http://47.108.239.202:3001/Effect/c_101 2024-10-29 14:34:40 +08:00
XXXXCHUAN1
65f9e09940 lxc 2024-10-29 14:32:02 +08:00
YinHaoovo
650bfd5a00 更改图片名 2024-10-29 14:15:00 +08:00
YinHaoovo
2fdab8e64d 更改部分文件 2024-10-29 14:13:36 +08:00
YinHaoovo
6097a38249 Merge branch 'master' of http://47.108.239.202:3001/Effect/c_101 2024-10-29 14:09:50 +08:00
YinHaoovo
9556b0bdda 更改名字+蓄力部分进度 2024-10-29 14:09:44 +08:00
YinHao
74bedfdc08 Knight角色展示图片 2024-10-29 14:07:35 +08:00
YinHao
5531e8a483 Samurai 2024-10-29 14:00:36 +08:00
wangxiner55
d3e2055017 公用光照贴图 2024-10-29 12:56:26 +08:00
wangxiner55
729b40461f Warrior角色展示图片 2024-10-29 11:29:01 +08:00
YinHaoovo
303fe898bf Merge branch 'master' of http://47.108.239.202:3001/Effect/c_101 2024-10-29 11:02:56 +08:00
XXXXCHUAN1
56b32020af Merge branch 'master' of http://47.108.239.202:3001/Effect/c_101 2024-10-29 10:43:20 +08:00
XXXXCHUAN1
db986afb2f lxc 2024-10-28 22:04:56 +08:00
hcjwwww
91595f94fb Merge branch 'master' of http://47.108.239.202:3001/Effect/c_101 2024-10-28 22:01:02 +08:00
hcjwwww
423d581e9f 流程1 2024-10-28 22:00:47 +08:00
YinHaoovo
adff878a05 yyh蓄力进度 2024-10-28 20:38:06 +08:00
wangxiner55
d1bafca335 Update .gitignore 2024-10-28 19:19:06 +08:00
YinHaoovo
7835ea2855 edit material 2024-10-28 18:56:02 +08:00
YinHao
e22f36bb5c yyh (#1) 
Co-authored-by: YinHaoovo <94337980+YinHaoovo@users.noreply.github.com>
Reviewed-on: #1
 2024-10-28 18:37:51 +08:00
XXXXCHUAN1
251c1e5865 lxc 2024-10-28 18:33:55 +08:00
245 changed files with 402 additions and 319 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored
View File

@ -11,4 +11,5 @@ Saved
*.sln
*.suo
*.xcodeproj
*.xcworkspace
*.xcworkspace
Content/Custom

2
Config/DefaultEditor.ini
View File

@ -0,0 +1,2 @@
[/Script/AdvancedPreviewScene.SharedProfiles]

4
Config/DefaultEngine.ini
View File

@ -47,10 +47,6 @@ r.Shadow.Virtual.Enable=1
r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
r.DefaultFeature.LocalExposure.HighlightContrastScale=0.8
r.DefaultFeature.LocalExposure.ShadowContrastScale=0.8
r.DefaultFeature.MotionBlur=False
r.Mobile.AntiAliasing=3
r.DefaultFeature.AutoExposure=False
r.AntiAliasingMethod=1
[/Script/WorldPartitionEditor.WorldPartitionEditorSettings]
CommandletClass=Class'/Script/UnrealEd.WorldPartitionConvertCommandlet'

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Animation/253500_idle_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Material/253500_LB_MI.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Material/253500_LB_MI_ncl1_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Material/253500_LB_MI_ncl1_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Material/NPC_Elf_Female_Idlie_02_Inst.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Material/NPC_Elf_Female_Idlie_02_Inst1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/SkeletaMesh/2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/SkeletaMesh/253500.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/SkeletaMesh/AM_Knight.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/SkeletaMesh/AM_Knight_PhysicsAsset.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/SkeletaMesh/AM_Knight_Skeleton.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Texture/253500_B_A.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Texture/253500_B_D.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Texture/253500_B_D_拷贝.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Texture/253500_B_D_拷贝_2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Knight/Texture/253500_B_N.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Animation/03_0_NPC_30100200_idle_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Material/30100200_GB_MI.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Material/30100200_GB_MI_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Material/MI_Body.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Material/NPC_Elf_Female_Idlie_02.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/SkeletaMesh/03_0_NPC_30100200_idle.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/SkeletaMesh/03_0_NPC_30100200_idle_PhysicsAsset.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/SkeletaMesh/03_0_NPC_30100200_idle_Skeleton.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/SkeletaMesh/StaticMesh.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/SkeletaMesh/dun001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/SkeletaMesh/dun001_PhysicsAsset.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/SkeletaMesh/dun001_Skeleton.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Texture/30100200_B_A.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Texture/30100200_B_D.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Texture/30100200_B_D_拷贝_3.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonCharacterLiberal/Samurai/Texture/30100200_B_N.uasset (Stored with Git LFS) Normal file
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) 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_line_Plane_yyh_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/CommonLiberal/CommonMeshLiberal/BaseStaticMesh/FX_ring_yyh_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) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/CommonLiberal/Texture/EffectCommonTextureLib/Noise/190220rwrr8u00llui_thumb_拷贝.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/BloomFactor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/BreakRGB.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/BreakTexture.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/BreakTextureDissolve.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/ColorMap.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Common_VFX.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Decal.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Default.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/DeriveHDRfromLDR.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Dissolve02.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Dissolve03.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/FX_ParticleColor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/FlowMap.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Fresnel.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/FresnelFunction.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_BreakVector3.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_CameraOffset.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_GlobalColor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_RefineColor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_Shine.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MF_VertexAnimation_Texture.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Mask.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/MaterialFunction_TexSV.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/Refraction.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/UVAnimation.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/VectorToRadialValue.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/Functions/VertexAnimation.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Materials/MPC_Effect.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient_001_Y.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient_002_Y.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient_003_Y.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient_004_Y.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient_005_Y.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient_006_Y.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient_007_Y.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dandao/Textures/ColorGradient/ColorGradient_008_Y.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/NGR/BP_CamShake_08.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/xishou/Level/TempLevel.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/HCJ/xishou/Material/M_Effect_001_Inst5.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/FX/NS_AccumulateEnergy_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/Level/TempLevel.umap (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/Material/MI_AccumulateEnergy_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/Material/MI_AccumulateEnergy_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/Material/MI_AccumulateEnergy_003.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/Material/MI_AccumulateEnergy_004.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/Material/MI_AccumulateEnergy_005.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/Material/MI_Fresnel_001.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/PrivateCommonLiberal/C_001/LXC/AccumulateEnergy/Material/MI_Fresnel_002.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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