This commit is contained in:
shengtao 2024-01-04 15:51:16 +08:00
parent 4994bc6c69
commit bb6abe3fac
9 changed files with 719 additions and 1011 deletions

View File

@ -2124,7 +2124,7 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -6779531890983085697, guid: 78424a213b5b9e44db863b48b96bf797, type: 3}
--- !u!64 &5127605429054352410
--- !u!64 &301025694900877602
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -2138,7 +2138,7 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -6779531890983085697, guid: 78424a213b5b9e44db863b48b96bf797, type: 3}
--- !u!64 &301025694900877602
--- !u!64 &5127605429054352410
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -3127,7 +3127,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 034137786182aab4c992cb89e1c19bf4, type: 2}
objectReference: {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
- target: {fileID: 4551957919080111034, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Materials.Array.size

View File

@ -2287,6 +2287,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2285a4046cc8b4f46a15a3377f1dd1c6, type: 2}
- target: {fileID: 2053206358061557084, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2285a4046cc8b4f46a15a3377f1dd1c6, type: 2}
- target: {fileID: 2477304976197797677, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Materials.Array.data[0]
@ -2296,7 +2301,7 @@ PrefabInstance:
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 034137786182aab4c992cb89e1c19bf4, type: 2}
objectReference: {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
- target: {fileID: 4551957919080111034, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Materials.Array.size
@ -2778,11 +2783,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2053206358061557084, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 7c8ed7524e95b674f8eeea2154cf3446, type: 2}
- target: {fileID: 2477304976197797677, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 84df3757e3fa6c8479785f933efbc2b3, type: 2}
- target: {fileID: 2981521572959673191, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
- target: {fileID: 4551957919080111034, guid: eda9250adb496d54fabb5e6d91300804,
type: 3}
propertyPath: m_Materials.Array.data[0]
@ -4403,6 +4418,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 5396646834166879364}
m_Modifications:
- target: {fileID: 1490872311394043884, guid: c931aab06f328c94bb889da4f8f8737f,
type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 7c8ed7524e95b674f8eeea2154cf3446, type: 2}
- target: {fileID: 5480771744667435056, guid: c931aab06f328c94bb889da4f8f8737f,
type: 3}
propertyPath: m_Materials.Array.data[0]
@ -4423,6 +4443,16 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 84df3757e3fa6c8479785f933efbc2b3, type: 2}
- target: {fileID: 7529875756957500442, guid: c931aab06f328c94bb889da4f8f8737f,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
- target: {fileID: 7686983338996617582, guid: c931aab06f328c94bb889da4f8f8737f,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
- target: {fileID: 7733491256133741716, guid: c931aab06f328c94bb889da4f8f8737f,
type: 3}
propertyPath: m_IsActive

View File

@ -158,7 +158,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 034137786182aab4c992cb89e1c19bf4, type: 2}
- {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -353,7 +353,7 @@ MeshRenderer:
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 2285a4046cc8b4f46a15a3377f1dd1c6, type: 2}
- {fileID: 2100000, guid: 78732657511abb74393ebf16155a4c9a, type: 2}
- {fileID: 2100000, guid: 2285a4046cc8b4f46a15a3377f1dd1c6, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -716,7 +716,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 034137786182aab4c992cb89e1c19bf4, type: 2}
- {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

View File

@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: KB3D_ConcreteMix_DiffuseLtBrown
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _NORMALMAP
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -55,6 +55,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
@ -75,3 +76,4 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: KB3D_MetalGalvanized_Rough
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _NORMALMAP
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -55,15 +55,16 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _Glossiness: 0.297
- _GlossyReflections: 1
- _Metallic: 0
- _Metallic: 0.317
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
@ -73,5 +74,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -1250,7 +1250,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 034137786182aab4c992cb89e1c19bf4, type: 2}
- {fileID: 2100000, guid: 8d5d327ab3cca784f874ace4eeb1f2c1, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -4663,7 +4663,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: e0b579ceafe38af4aba46fc0d90c5105, type: 2}
- {fileID: 2100000, guid: 7c8ed7524e95b674f8eeea2154cf3446, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

File diff suppressed because it is too large Load Diff