czbdw c8d1c21e11 Merge branch 'master' into master_mapDev ...

# Conflicts:
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/ChillOrganic_Medium SDF.asset
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
#	Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat

2024-10-27 17:17:52 +08:00

..

add_sprite.mat

updated

2024-10-27 16:01:07 +08:00

add_sprite.mat.meta

updated

2024-10-27 16:01:07 +08:00

BorderEffect 2.mat

init

2024-10-16 00:03:41 +08:00

BorderEffect 2.mat.meta

init

2024-10-16 00:03:41 +08:00

bossBodyTrailMaterial.mat

增加boss 出场cg

2024-10-26 01:38:30 +08:00

bossBodyTrailMaterial.mat.meta

增加boss 出场cg

2024-10-26 01:38:30 +08:00

bossDownEffect1.mat

增加boss 出场cg

2024-10-26 01:38:30 +08:00

bossDownEffect1.mat.meta

增加boss 出场cg

2024-10-26 01:38:30 +08:00

bossDownEffect2.mat

update core

2024-10-26 21:11:33 +08:00

bossDownEffect2.mat.meta

update core

2024-10-26 21:11:33 +08:00

bossDownEffect3.mat

update core

2024-10-26 21:11:33 +08:00

bossDownEffect3.mat.meta

update core

2024-10-26 21:11:33 +08:00

bossEyeMaterial.mat

update core

2024-10-26 21:11:33 +08:00

bossEyeMaterial.mat.meta

update core

2024-10-26 21:11:33 +08:00

bossTrailMaterial.mat

update core

2024-10-26 21:11:33 +08:00

bossTrailMaterial.mat.meta

增加boss 出场cg

2024-10-26 01:38:30 +08:00

enemyMaterial.mat

update core

2024-10-18 00:23:04 +08:00

enemyMaterial.mat.meta

update core

2024-10-18 00:23:04 +08:00

playerBody.mat

增加特效 ，优化道具外观

2024-10-27 17:06:07 +08:00

playerBody.mat.meta

增加特效 ，优化道具外观

2024-10-27 17:06:07 +08:00

PlayerLight.mat

update urp

2024-10-23 23:16:50 +08:00

PlayerLight.mat.meta

update urp

2024-10-23 23:16:50 +08:00

playerMaterial.mat

update core

2024-10-17 17:58:11 +08:00

playerMaterial.mat.meta

update core

2024-10-17 17:58:11 +08:00

propBorder2.mat

updat core

2024-10-23 18:46:37 +08:00

propBorder2.mat.meta

updat core

2024-10-23 18:46:37 +08:00

propBorder_big.mat

updat core

2024-10-23 18:46:37 +08:00

propBorder_big.mat.meta

updat core

2024-10-23 18:46:37 +08:00

propBorder.mat

updat core

2024-10-23 18:46:37 +08:00

propBorder.mat.meta

updat core

2024-10-23 18:46:37 +08:00

propEffect1.mat

updat core

2024-10-23 18:46:37 +08:00

propEffect1.mat.meta

updat core

2024-10-23 18:46:37 +08:00

scene_point.mat

update core

2024-10-24 00:08:57 +08:00

scene_point.mat.meta

update core

2024-10-24 00:08:57 +08:00

sceneProp2.mat

增加特效 ，优化道具外观

2024-10-27 17:06:07 +08:00

sceneProp2.mat.meta

增加特效 ，优化道具外观

2024-10-27 17:06:07 +08:00

sceneProp.mat

增加特效 ，优化道具外观

2024-10-27 17:06:07 +08:00

sceneProp.mat.meta

增加特效 ，优化道具外观

2024-10-27 17:06:07 +08:00

Shader Graphs_LoadEffect2.mat

init

2024-10-16 00:03:41 +08:00

Shader Graphs_LoadEffect2.mat.meta

init

2024-10-16 00:03:41 +08:00

Shader Graphs_LoadEffect.mat

init

2024-10-16 00:03:41 +08:00

Shader Graphs_LoadEffect.mat.meta

init

2024-10-16 00:03:41 +08:00

Shader Graphs_UIWashing.mat

update core

2024-10-25 15:35:39 +08:00

Shader Graphs_UIWashing.mat.meta

updat core

2024-10-21 22:29:53 +08:00

successEffect1.mat

updat core

2024-10-22 19:10:15 +08:00

successEffect1.mat.meta

updat core

2024-10-22 19:10:15 +08:00

successEffectBorder.mat

updat core

2024-10-22 19:10:15 +08:00

successEffectBorder.mat.meta

updat core

2024-10-22 19:10:15 +08:00

touch1 1.mat

updat core

2024-10-21 22:29:53 +08:00

touch1 1.mat.meta

updat core

2024-10-21 22:29:53 +08:00

touch1.mat

updat core

2024-10-21 22:29:53 +08:00

touch1.mat.meta

updat core

2024-10-21 22:29:53 +08:00