Commit a3f606e4 authored by Nathan De Castro's avatar Nathan De Castro

Backup

parent 43327fdb
...@@ -194,3 +194,8 @@ ...@@ -194,3 +194,8 @@
4/29/2017 10:25:24 PM | unknown stopped after: 495 seconds 4/29/2017 10:25:24 PM | unknown stopped after: 495 seconds
5/3/2017 3:29:10 PM | unknown stopped after: 6 seconds 5/3/2017 3:29:10 PM | unknown stopped after: 6 seconds
5/4/2017 10:04:18 AM | unknown stopped after: 12 seconds 5/4/2017 10:04:18 AM | unknown stopped after: 12 seconds
5/10/2017 11:52:47 AM | unknown stopped after: 14 seconds
5/10/2017 11:53:25 AM | unknown stopped after: 21 seconds
5/10/2017 11:54:43 AM | unknown stopped after: 21 seconds
5/10/2017 11:55:03 AM | unknown stopped after: 10 seconds
5/10/2017 11:56:12 AM | unknown stopped after: 22 seconds
...@@ -10,119 +10,67 @@ Material: ...@@ -10,119 +10,67 @@ Material:
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_CustomRenderQueue: 3000 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties: m_SavedProperties:
serializedVersion: 2 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- first: - _BumpMap:
name: _BumpMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailAlbedoMap:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailMask:
name: _DetailMask
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailNormalMap:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _EmissionMap:
name: _EmissionMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _MainTex:
name: _MainTex m_Texture: {fileID: 2800000, guid: 32de6f86ac1978b4a92707117cbf640c, type: 3}
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _MetallicGlossMap:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _OcclusionMap:
name: _OcclusionMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _ParallaxMap:
name: _ParallaxMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Floats: m_Floats:
- first: - _BumpScale: 1
name: _BumpScale - _Cutoff: 0.5
second: 1 - _DetailNormalMapScale: 1
- first: - _DstBlend: 10
name: _Cutoff - _GlossMapScale: 1
second: 0.5 - _Glossiness: 0.5
- first: - _GlossyReflections: 1
name: _DetailNormalMapScale - _Metallic: 0
second: 1 - _Mode: 3
- first: - _OcclusionStrength: 1
name: _DstBlend - _Parallax: 0.02
second: 10 - _SmoothnessTextureChannel: 0
- first: - _SpecularHighlights: 1
name: _GlossMapScale - _SrcBlend: 1
second: 1 - _UVSec: 0
- first: - _ZWrite: 0
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 3
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 1
- first:
name: _UVSec
second: 0
- first:
name: _ZWrite
second: 0
m_Colors: m_Colors:
- first: - _Color: {r: 1, g: 1, b: 1, a: 1}
name: _Color - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
second: {r: 0, g: 0, b: 0, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
...@@ -10,119 +10,67 @@ Material: ...@@ -10,119 +10,67 @@ Material:
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_CustomRenderQueue: 3000 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties: m_SavedProperties:
serializedVersion: 2 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- first: - _BumpMap:
name: _BumpMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailAlbedoMap:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailMask:
name: _DetailMask
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailNormalMap:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _EmissionMap:
name: _EmissionMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _MainTex:
name: _MainTex m_Texture: {fileID: 2800000, guid: 4c002e8635e114e4f928d7c08d9d4f29, type: 3}
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _MetallicGlossMap:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _OcclusionMap:
name: _OcclusionMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _ParallaxMap:
name: _ParallaxMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Floats: m_Floats:
- first: - _BumpScale: 1
name: _BumpScale - _Cutoff: 0.5
second: 1 - _DetailNormalMapScale: 1
- first: - _DstBlend: 10
name: _Cutoff - _GlossMapScale: 1
second: 0.5 - _Glossiness: 0.5
- first: - _GlossyReflections: 1
name: _DetailNormalMapScale - _Metallic: 0
second: 1 - _Mode: 3
- first: - _OcclusionStrength: 1
name: _DstBlend - _Parallax: 0.02
second: 10 - _SmoothnessTextureChannel: 0
- first: - _SpecularHighlights: 1
name: _GlossMapScale - _SrcBlend: 1
second: 1 - _UVSec: 0
- first: - _ZWrite: 0
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 3
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 1
- first:
name: _UVSec
second: 0
- first:
name: _ZWrite
second: 0
m_Colors: m_Colors:
- first: - _Color: {r: 1, g: 1, b: 1, a: 1}
name: _Color - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
second: {r: 0.17647058, g: 0.1435389, b: 0.057093423, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
...@@ -38,7 +38,7 @@ Material: ...@@ -38,7 +38,7 @@ Material:
m_Scale: {x: 61.1, y: 60} m_Scale: {x: 61.1, y: 60}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 2800000, guid: 06fe0dcfc64354249a7a5d7eb3bac4e8, type: 3} m_Texture: {fileID: 2800000, guid: 4c002e8635e114e4f928d7c08d9d4f29, type: 3}
m_Scale: {x: 61.1, y: 60} m_Scale: {x: 61.1, y: 60}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:
......
...@@ -22,7 +22,7 @@ Material: ...@@ -22,7 +22,7 @@ Material:
m_Scale: {x: 15, y: 2} m_Scale: {x: 15, y: 2}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 2800000, guid: 5bdacf18a5ac56440a17703dda50bd2b, type: 3} m_Texture: {fileID: 2800000, guid: 5e94c081d57991d4eb046be2deb57f6d, type: 3}
m_Scale: {x: 15, y: 2} m_Scale: {x: 15, y: 2}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Floats: m_Floats:
......
...@@ -10,119 +10,67 @@ Material: ...@@ -10,119 +10,67 @@ Material:
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _METALLICGLOSSMAP _NORMALMAP m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _METALLICGLOSSMAP _NORMALMAP
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_CustomRenderQueue: 3000 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties: m_SavedProperties:
serializedVersion: 2 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- first: - _BumpMap:
name: _BumpMap
second:
m_Texture: {fileID: 2800000, guid: bea9f84b8dc38a74ebe294c438ff4421, type: 3} m_Texture: {fileID: 2800000, guid: bea9f84b8dc38a74ebe294c438ff4421, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailAlbedoMap:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailMask:
name: _DetailMask
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _DetailNormalMap:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _EmissionMap:
name: _EmissionMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 3.59, y: 1} m_Scale: {x: 3.59, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _MainTex:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: efd0e50117a79b54ba7d04206ca9d4ff, type: 3} m_Texture: {fileID: 2800000, guid: efd0e50117a79b54ba7d04206ca9d4ff, type: 3}
m_Scale: {x: 3.59, y: 1} m_Scale: {x: 3.59, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _MetallicGlossMap:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 2800000, guid: 63f9005ddcb94d54c97d731561ed01f4, type: 3} m_Texture: {fileID: 2800000, guid: 63f9005ddcb94d54c97d731561ed01f4, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _OcclusionMap:
name: _OcclusionMap
second:
m_Texture: {fileID: 2800000, guid: ee278c74f14d4694289f7d06b317c4bc, type: 3} m_Texture: {fileID: 2800000, guid: ee278c74f14d4694289f7d06b317c4bc, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- first: - _ParallaxMap:
name: _ParallaxMap
second:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Floats: m_Floats:
- first: - _BumpScale: 1
name: _BumpScale - _Cutoff: 0.5
second: 1 - _DetailNormalMapScale: 1
- first: - _DstBlend: 10
name: _Cutoff - _GlossMapScale: 1
second: 0.5 - _Glossiness: 0.5
- first: - _GlossyReflections: 1
name: _DetailNormalMapScale - _Metallic: 0
second: 1 - _Mode: 3
- first: - _OcclusionStrength: 1
name: _DstBlend - _Parallax: 0.02
second: 10 - _SmoothnessTextureChannel: 0
- first: - _SpecularHighlights: 1
name: _GlossMapScale - _SrcBlend: 1
second: 1 - _UVSec: 0
- first: - _ZWrite: 0
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 3
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 1
- first:
name: _UVSec
second: 0
- first:
name: _ZWrite
second: 0
m_Colors: m_Colors:
- first: - _Color: {r: 0.5661765, g: 0.5661765, b: 0.5661765, a: 1}
name: _Color - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
second: {r: 0.14705884, g: 0.14705884, b: 0.038927343, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
...@@ -18,15 +18,15 @@ Material: ...@@ -18,15 +18,15 @@ Material:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- _BumpMap: - _BumpMap:
m_Texture: {fileID: 2800000, guid: a9374361214f7454b848efc626bcc3c7, type: 3} m_Texture: {fileID: 2800000, guid: 8caa437b19957a045866b84c6218a0db, type: 3}
m_Scale: {x: 30, y: 30} m_Scale: {x: 30, y: 30}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 2800000, guid: 41d62cf2ef102b94a90669d9e8b63414, type: 3} m_Texture: {fileID: 2800000, guid: dc0da410c9b230e43b900e2459959dc7, type: 3}
m_Scale: {x: 30, y: 30} m_Scale: {x: 30, y: 30}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}