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

6
Assets/GameRes/Scenes/InitScene.unity
View File

@@ -613,9 +613,9 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3744876990496415339, guid: 121fd30183d15fd41b7db01d2d435331, type: 3}
propertyPath: m_Mass
value: 0.19634955
- target: {fileID: 8247442098040652398, guid: 121fd30183d15fd41b7db01d2d435331, type: 3}
propertyPath: deadEffect
value: deadEffect
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []