diff --git a/Assets/GameAssets/Model/Materials/Mat3d66-10162104-11-25574.mat b/Assets/GameAssets/Model/Materials/Mat3d66-10162104-11-25574.mat index af5e7b3..8982ff2 100644 --- a/Assets/GameAssets/Model/Materials/Mat3d66-10162104-11-25574.mat +++ b/Assets/GameAssets/Model/Materials/Mat3d66-10162104-11-25574.mat @@ -9,10 +9,9 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Mat3d66-10162104-11-25574 m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _EMISSION + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -68,9 +67,9 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.259 + - _Glossiness: 0.07 - _GlossyReflections: 1 - - _Metallic: 0.481 + - _Metallic: 0.352 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 diff --git a/Assets/GameAssets/Model/Materials/b_glass.mat b/Assets/GameAssets/Model/Materials/b_glass.mat index d84d779..1b3e046 100644 --- a/Assets/GameAssets/Model/Materials/b_glass.mat +++ b/Assets/GameAssets/Model/Materials/b_glass.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: b_glass - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - _EMISSION @@ -70,9 +70,9 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 10 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.896 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.615 - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -82,6 +82,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.077922076, g: 0.077922076, b: 0.077922076, a: 0.25324672} + - _Color: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 0.25324672} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/b_glass2.mat b/Assets/GameAssets/Model/Materials/b_glass2.mat index 8b8be0d..72185c0 100644 --- a/Assets/GameAssets/Model/Materials/b_glass2.mat +++ b/Assets/GameAssets/Model/Materials/b_glass2.mat @@ -8,11 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: b_glass2 - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _EMISSION + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -68,7 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 1 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -80,6 +79,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.4528, g: 0.4528, b: 0.4528, a: 0.7987013} + - _Color: {r: 0.01886791, g: 0.01886791, b: 0.01886791, a: 0.7987013} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/black_matt.mat b/Assets/GameAssets/Model/Materials/black_matt.mat index 2f966a4..87bf621 100644 --- a/Assets/GameAssets/Model/Materials/black_matt.mat +++ b/Assets/GameAssets/Model/Materials/black_matt.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: black_matt - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] @@ -80,6 +80,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.047058824, g: 0.047058824, b: 0.047058824, a: 1} + - _Color: {r: 0.72327036, g: 0.72327036, b: 0.72327036, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/blue.mat b/Assets/GameAssets/Model/Materials/blue.mat index 7297453..1f67a30 100644 --- a/Assets/GameAssets/Model/Materials/blue.mat +++ b/Assets/GameAssets/Model/Materials/blue.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: blue - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] diff --git a/Assets/GameAssets/Model/Materials/body.mat b/Assets/GameAssets/Model/Materials/body.mat index 1232126..d1d22fc 100644 --- a/Assets/GameAssets/Model/Materials/body.mat +++ b/Assets/GameAssets/Model/Materials/body.mat @@ -8,11 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: body - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _EMISSION + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -68,9 +67,9 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.424 - _GlossyReflections: 1 - - _Metallic: 0.208 + - _Metallic: 0.41 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -80,6 +79,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.46226418, g: 0.45572272, b: 0.45572272, a: 1} + - _Color: {r: 0.6981132, g: 0.6981132, b: 0.6981132, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/chrome.mat b/Assets/GameAssets/Model/Materials/chrome.mat index 54d4df3..602f199 100644 --- a/Assets/GameAssets/Model/Materials/chrome.mat +++ b/Assets/GameAssets/Model/Materials/chrome.mat @@ -8,11 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: chrome - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _EMISSION + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -68,9 +67,9 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.6 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -80,6 +79,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.5882, g: 0.5882, b: 0.5882, a: 1} + - _Color: {r: 0.63529414, g: 0.63529414, b: 0.64705884, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/d_glass.mat b/Assets/GameAssets/Model/Materials/d_glass.mat index afc9b23..9522628 100644 --- a/Assets/GameAssets/Model/Materials/d_glass.mat +++ b/Assets/GameAssets/Model/Materials/d_glass.mat @@ -8,12 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: d_glass - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -70,7 +69,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 10 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.9 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 3 diff --git a/Assets/GameAssets/Model/Materials/interior.mat b/Assets/GameAssets/Model/Materials/interior.mat index 1e4de5e..e7f2f02 100644 --- a/Assets/GameAssets/Model/Materials/interior.mat +++ b/Assets/GameAssets/Model/Materials/interior.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: interior - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] @@ -80,6 +80,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.098039225, g: 0.098039225, b: 0.098039225, a: 1} + - _Color: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/interior2.mat b/Assets/GameAssets/Model/Materials/interior2.mat index 92ba4ad..bed7ae8 100644 --- a/Assets/GameAssets/Model/Materials/interior2.mat +++ b/Assets/GameAssets/Model/Materials/interior2.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: interior2 - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] diff --git a/Assets/GameAssets/Model/Materials/red.mat b/Assets/GameAssets/Model/Materials/red.mat index fb57fa5..e654598 100644 --- a/Assets/GameAssets/Model/Materials/red.mat +++ b/Assets/GameAssets/Model/Materials/red.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: red - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] @@ -68,7 +68,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.397 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -80,6 +80,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.651, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/GameAssets/Model/Materials/silver.mat b/Assets/GameAssets/Model/Materials/silver.mat index f13b513..74108f8 100644 --- a/Assets/GameAssets/Model/Materials/silver.mat +++ b/Assets/GameAssets/Model/Materials/silver.mat @@ -8,11 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: silver - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: - - _EMISSION + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -68,9 +67,9 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.6 - _GlossyReflections: 1 - - _Metallic: 0.604 + - _Metallic: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 diff --git a/Assets/Scenes/SampleScene_Profiles/GameObject Profile.asset b/Assets/Scenes/SampleScene_Profiles/GameObject Profile.asset index e405ab0..88d166d 100644 --- a/Assets/Scenes/SampleScene_Profiles/GameObject Profile.asset +++ b/Assets/Scenes/SampleScene_Profiles/GameObject Profile.asset @@ -12,4 +12,52 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3} m_Name: GameObject Profile m_EditorClassIdentifier: - settings: [] + settings: + - {fileID: 6053070533099916870} +--- !u!114 &6053070533099916870 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + intensity: + overrideState: 1 + value: 3.53 + threshold: + overrideState: 1 + value: 1 + softKnee: + overrideState: 1 + value: 0.5 + clamp: + overrideState: 1 + value: 65472 + diffusion: + overrideState: 1 + value: 7 + anamorphicRatio: + overrideState: 1 + value: 0 + color: + overrideState: 1 + value: {r: 1, g: 1, b: 1, a: 1} + fastMode: + overrideState: 1 + value: 0 + dirtTexture: + overrideState: 1 + value: {fileID: 0} + defaultState: 1 + dirtIntensity: + overrideState: 1 + value: 0