Commit 43327fdb authored by Nathan De Castro's avatar Nathan De Castro

Backup

parent 5e4da008
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" /> <None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" /> <None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="Assembly-UnityScript"> <Reference Include="Assembly-UnityScript">
<HintPath>C:/Users/natha/Desktop/Listen/Listen/Library/ScriptAssemblies/Assembly-UnityScript.dll</HintPath> <HintPath>C:/Users/yuki/Documents/Work/Listen/Library/ScriptAssemblies/Assembly-UnityScript.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEditor.Advertisements"> <Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath> <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
......
...@@ -192,3 +192,5 @@ ...@@ -192,3 +192,5 @@
4/29/2017 10:11:09 PM | unknown lost after: 264 seconds 4/29/2017 10:11:09 PM | unknown lost after: 264 seconds
4/29/2017 10:12:00 PM | unknown stopped after: 314 seconds 4/29/2017 10:12:00 PM | unknown stopped after: 314 seconds
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/4/2017 10:04:18 AM | unknown stopped after: 12 seconds
...@@ -8,121 +8,69 @@ Material: ...@@ -8,121 +8,69 @@ Material:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_Name: Ghost m_Name: Ghost
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION m_ShaderKeywords: _ALPHABLEND_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
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: - _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: 1
- first: - _GlossyReflections: 1
name: _DetailNormalMapScale - _Metallic: 0
second: 1 - _Mode: 2
- first: - _OcclusionStrength: 1
name: _DstBlend - _Parallax: 0.02
second: 10 - _SmoothnessTextureChannel: 0
- first: - _SpecularHighlights: 1
name: _GlossMapScale - _SrcBlend: 5
second: 1 - _UVSec: 0
- first: - _ZWrite: 0
name: _Glossiness
second: 1
- 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.809, g: 0, b: 0, a: 0.903}
name: _Color - _EmissionColor: {r: 0.029411793, g: 0, b: 0, a: 1}
second: {r: 0.13235295, g: 0, b: 0, a: 0}
- first:
name: _EmissionColor
second: {r: 0.029411793, g: 0, b: 0, a: 1}
...@@ -10,31 +10,23 @@ Material: ...@@ -10,31 +10,23 @@ Material:
m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ShaderKeywords:
m_LightmapFlags: 5 m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties: m_SavedProperties:
serializedVersion: 2 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
- first: - _BumpMap:
name: _BumpMap
second:
m_Texture: {fileID: 2800000, guid: 6dd25b365bb9824458db5824d2578fe0, type: 3} m_Texture: {fileID: 2800000, guid: 6dd25b365bb9824458db5824d2578fe0, 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}
- first: - _MainTex:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: 5bdacf18a5ac56440a17703dda50bd2b, type: 3} m_Texture: {fileID: 2800000, guid: 5bdacf18a5ac56440a17703dda50bd2b, 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:
- first: - _Shininess: 0.05
name: _Shininess
second: 0.078125
m_Colors: m_Colors:
- first: - _Color: {r: 0.83137256, g: 0.83137256, b: 0.83137256, a: 1}
name: _Color - _SpecColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
second: {r: 0.83137256, g: 0.83137256, b: 0.83137256, a: 1}
- first:
name: _SpecColor
second: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 1549895649} m_Sun: {fileID: 1549895649}
m_IndirectSpecularColor: {r: 0.007369941, g: 0.010651721, b: 0.01558495, a: 1} m_IndirectSpecularColor: {r: 0.007387018, g: 0.010637774, b: 0.015593598, a: 1}
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -15366,7 +15366,6 @@ GameObject: ...@@ -15366,7 +15366,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 481782168} - component: {fileID: 481782168}
- component: {fileID: 481782171} - component: {fileID: 481782171}
- component: {fileID: 481782170}
- component: {fileID: 481782169} - component: {fileID: 481782169}
m_Layer: 0 m_Layer: 0
m_Name: wall (8) m_Name: wall (8)
...@@ -15420,18 +15419,6 @@ MeshRenderer: ...@@ -15420,18 +15419,6 @@ MeshRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
--- !u!65 &481782170
BoxCollider:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 481782167}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &481782171 --- !u!33 &481782171
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -23854,6 +23841,10 @@ Prefab: ...@@ -23854,6 +23841,10 @@ Prefab:
propertyPath: reset_mode propertyPath: reset_mode
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1000010762658480, guid: d9dcf2a12e0c2094b96357dfd35811ba, type: 2}
propertyPath: m_IsActive
value: 1