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

Backup

parent 5e4da008
......@@ -156,7 +156,7 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<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 Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
......
......@@ -192,3 +192,5 @@
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: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:
m_PrefabInternal: {fileID: 0}
m_Name: Ghost
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_ShaderKeywords: _ALPHABLEND_ON _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
- first:
name: _BumpMap
second:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _BumpScale
second: 1
- first:
name: _Cutoff
second: 0.5
- first:
name: _DetailNormalMapScale
second: 1
- first:
name: _DstBlend
second: 10
- first:
name: _GlossMapScale
second: 1
- first:
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
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 1
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 2
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 5
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- first:
name: _Color
second: {r: 0.13235295, g: 0, b: 0, a: 0}
- first:
name: _EmissionColor
second: {r: 0.029411793, g: 0, b: 0, a: 1}
- _Color: {r: 0.809, g: 0, b: 0, a: 0.903}
- _EmissionColor: {r: 0.029411793, g: 0, b: 0, a: 1}
......@@ -10,31 +10,23 @@ Material:
m_Shader: {fileID: 4, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_EnableInstancingVariants: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
- first:
name: _BumpMap
second:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 6dd25b365bb9824458db5824d2578fe0, type: 3}
m_Scale: {x: 15, y: 2}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 5bdacf18a5ac56440a17703dda50bd2b, type: 3}
m_Scale: {x: 15, y: 2}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _Shininess
second: 0.078125
- _Shininess: 0.05
m_Colors:
- first:
name: _Color
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}
- _Color: {r: 0.83137256, g: 0.83137256, b: 0.83137256, a: 1}
- _SpecColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
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
LightmapSettings:
m_ObjectHideFlags: 0
......@@ -15366,7 +15366,6 @@ GameObject:
m_Component:
- component: {fileID: 481782168}
- component: {fileID: 481782171}
- component: {fileID: 481782170}
- component: {fileID: 481782169}
m_Layer: 0
m_Name: wall (8)
......@@ -15420,18 +15419,6 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 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
MeshFilter:
m_ObjectHideFlags: 0
......@@ -23854,6 +23841,10 @@ Prefab:
propertyPath: reset_mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1000010762658480, guid: d9dcf2a12e0c2094b96357dfd35811ba, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: d9dcf2a12e0c2094b96357dfd35811ba, type: 2}
m_IsPrefabParent: 0
......@@ -34127,7 +34118,7 @@ Transform:
m_GameObject: {fileID: 1174692386}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -297, y: 309.8, z: -1676}
m_LocalScale: {x: 649.4905, y: 633.44086, z: -15.830646}
m_LocalScale: {x: 649.4905, y: 633.44086, z: 16.6}
m_Children: []
m_Father: {fileID: 1554619529}
m_RootOrder: 96
......@@ -43346,7 +43337,7 @@ Transform:
m_GameObject: {fileID: 1505805047}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -467, y: 309.8, z: -1142}
m_LocalScale: {x: 1073.6677, y: 633.44086, z: -15.83073}
m_LocalScale: {x: 1073.6677, y: 633.44086, z: 10.9}
m_Children: []
m_Father: {fileID: 1554619529}
m_RootOrder: 97
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 1927
y: -98
width: 1906
height: 1036
m_ShowMode: 0
m_Title:
m_RootView: {fileID: 4}
m_MinSize: {x: 100, y: 122}
m_MaxSize: {x: 4000, y: 4022}
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
m_PrefabParentObject: {fileID: 0}
......@@ -36,63 +14,15 @@ MonoBehaviour:
m_PixelRect:
serializedVersion: 2
x: 0
y: 43
y: 40
width: 1920
height: 1007
height: 1010
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 5}
m_RootView: {fileID: 2}
m_MinSize: {x: 950, y: 300}