taosuqi
/
CultivationOfBrewing-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突

This commit is contained in:
taosuqi 2025-05-19 18:04:49 +08:00
parent 2b2a4c82e7 ca51b2b3d0
commit 77119de7bb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Models/Materials/fa.mat
View File

@ -82,7 +82,11 @@ Material:
- _EmissionEnabled: 0 - _EmissionEnabled: 0
- _FlipbookMode: 0 - _FlipbookMode: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
<<<<<<< HEAD
- _Glossiness: 0.267 - _Glossiness: 0.267
=======
- _Glossiness: 0.026
>>>>>>> ca51b2b3d02d5199d54e36a1db68520359753a99
- _GlossyReflections: 1 - _GlossyReflections: 1
- _LightingEnabled: 1 - _LightingEnabled: 1
- _Metallic: 0 - _Metallic: 0
@ -99,7 +103,11 @@ Material:
- _ZWrite: 0 - _ZWrite: 0
m_Colors: m_Colors:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
<<<<<<< HEAD
- _Color: {r: 1, g: 1, b: 1, a: 0.94509804} - _Color: {r: 1, g: 1, b: 1, a: 0.94509804}
=======
- _Color: {r: 1, g: 1, b: 1, a: 1}
>>>>>>> ca51b2b3d02d5199d54e36a1db68520359753a99
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: [] m_BuildTextureStacks: []