foldcc/taptap2024_GJ_chidouren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master_mapDev

Browse Source 
# 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
This commit is contained in:
czbdw
2024-10-27 17:17:52 +08:00
parent 1a2ece04c0 e6616c90d5
commit c8d1c21e11
42 changed files with 113162 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/GameRes/AutoSource/Part/Part1.prefab
View File

@@ -2795,7 +2795,7 @@ PrefabInstance:
- target: {fileID: 3442328184467762397, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
objectReference: {fileID: 2100000, guid: e5e7531331bbe8c4aae68561b1d62f5b, type: 2}
- target: {fileID: 8209694557750501125, guid: c13d9ff1ea3ccee468b549ef9b80b878, type: 3}
propertyPath: m_Name
value: completeProp