Commit 864bebb6 authored by Nathan De Castro's avatar Nathan De Castro
Browse files

backup

parent d6a30555
......@@ -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/yuki/Documents/Work/Listen/Library/ScriptAssemblies/Assembly-UnityScript.dll</HintPath>
<HintPath>H:/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>
......
......@@ -76,6 +76,7 @@
<Compile Include="Assets\Scripts\UI\SessionRecorder.cs" />
<Compile Include="Assets\Scripts\UI\Visibility.cs" />
<Compile Include="Assets\Scripts\VR\InteractableItem.cs" />
<Compile Include="Assets\Scripts\VR\PickedUpObject.cs" />
<Compile Include="Assets\Scripts\VR\Tutorial.cs" />
<Compile Include="Assets\Scripts\VR\VRMove.cs" />
<Compile Include="Assets\Scripts\VR\WandButtons.cs" />
......
......@@ -11,3 +11,87 @@
4/20/2017 11:59:31 PM | Player stopped after: 26 seconds
4/21/2017 12:02:02 AM | Player stopped after: 88 seconds
4/21/2017 12:05:40 AM | Player stopped after: 16 seconds
4/21/2017 11:36:27 AM | Player stopped after: 14 seconds
4/21/2017 11:36:30 AM | Player stopped after: 0 seconds
4/21/2017 11:36:54 AM | Player stopped after: 14 seconds
4/21/2017 11:38:44 AM | Player stopped after: 99 seconds
4/21/2017 11:40:08 AM | Player stopped after: 27 seconds
4/21/2017 11:42:43 AM | Player stopped after: 25 seconds
4/21/2017 11:45:35 AM | Player stopped after: 18 seconds
4/21/2017 11:46:07 AM | Player stopped after: 3 seconds
4/21/2017 11:47:13 AM | Player stopped after: 1 seconds
4/21/2017 11:52:31 AM | Player stopped after: 4 seconds
4/21/2017 11:53:01 AM | Player stopped after: 8 seconds
4/21/2017 12:01:23 PM | Player stopped after: 36 seconds
4/21/2017 12:02:28 PM | Player stopped after: 7 seconds
4/21/2017 12:04:22 PM | Player stopped after: 11 seconds
4/21/2017 12:07:43 PM | Player stopped after: 6 seconds
4/21/2017 12:08:12 PM | Player stopped after: 12 seconds
4/21/2017 12:26:04 PM | Player stopped after: 3 seconds
4/21/2017 12:29:26 PM | Player stopped after: 13 seconds
4/21/2017 12:32:54 PM | Player stopped after: 8 seconds
4/21/2017 12:36:48 PM | Player stopped after: 20 seconds
4/21/2017 12:37:22 PM | Player stopped after: 14 seconds
4/21/2017 12:37:49 PM | Player stopped after: 20 seconds
4/21/2017 12:40:45 PM | Player stopped after: 31 seconds
4/21/2017 1:29:03 PM | Player stopped after: 4 seconds
4/21/2017 1:39:05 PM | Player stopped after: 85 seconds
4/21/2017 1:40:17 PM | Player stopped after: 63 seconds
4/21/2017 1:44:37 PM | Player stopped after: 8 seconds
4/21/2017 1:45:12 PM | Player stopped after: 10 seconds
4/21/2017 1:47:24 PM | Player stopped after: 16 seconds
4/21/2017 2:18:20 PM | Player stopped after: 230 seconds
4/21/2017 2:22:45 PM | Player stopped after: 8 seconds
4/21/2017 2:28:00 PM | Player stopped after: 15 seconds
4/21/2017 2:29:38 PM | Player stopped after: 12 seconds
4/21/2017 2:31:13 PM | Player stopped after: 6 seconds
4/21/2017 2:34:48 PM | Player stopped after: 25 seconds
4/21/2017 2:35:36 PM | Player stopped after: 44 seconds
4/21/2017 2:36:30 PM | Player stopped after: 11 seconds
4/21/2017 2:36:54 PM | Player stopped after: 8 seconds
4/21/2017 2:37:06 PM | Player stopped after: 8 seconds
4/21/2017 2:40:33 PM | Player stopped after: 56 seconds
4/21/2017 2:41:45 PM | Player stopped after: 19 seconds
4/21/2017 2:44:21 PM | Player stopped after: 91 seconds
4/21/2017 2:48:43 PM | Player stopped after: 34 seconds
4/22/2017 4:43:18 PM | Player stopped after: 1 seconds
4/22/2017 6:32:29 PM | Player stopped after: 2 seconds
4/22/2017 9:16:35 PM | Player stopped after: 167 seconds
4/22/2017 9:18:17 PM | Player stopped after: 30 seconds
4/22/2017 9:19:52 PM | Player stopped after: 25 seconds
4/22/2017 9:34:08 PM | Player stopped after: 780 seconds
4/22/2017 9:54:44 PM | Player stopped after: 34 seconds
4/22/2017 9:57:30 PM | Player stopped after: 31 seconds
4/22/2017 10:08:57 PM | Player stopped after: 14 seconds
4/22/2017 11:16:31 PM | Player stopped after: 32 seconds
4/24/2017 9:08:43 AM | Player stopped after: 120 seconds
4/24/2017 9:12:54 AM | Player stopped after: 81 seconds
4/24/2017 9:14:12 AM | unknown stopped after: 70 seconds
4/24/2017 9:18:36 AM | unknown stopped after: 84 seconds
4/24/2017 9:18:54 AM | unknown stopped after: 13 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:19:39 AM | unknown won after: 34 seconds
4/24/2017 9:20:16 AM | unknown stopped after: 71 seconds
4/24/2017 9:31:10 AM | unknown stopped after: 14 seconds
4/24/2017 9:33:35 AM | unknown stopped after: 124 seconds
4/24/2017 9:33:53 AM | unknown stopped after: 9 seconds
4/24/2017 9:34:30 AM | unknown lost after: 17 seconds
4/24/2017 9:34:32 AM | unknown stopped after: 19 seconds
4/24/2017 9:35:01 AM | unknown lost after: 18 seconds
4/24/2017 9:35:06 AM | unknown stopped after: 22 seconds
4/24/2017 9:37:01 AM | unknown stopped after: 53 seconds
4/24/2017 9:37:35 AM | unknown lost after: 7 seconds
4/24/2017 9:38:28 AM | unknown stopped after: 60 seconds
4/24/2017 9:45:27 AM | unknown lost after: 15 seconds
4/24/2017 9:45:43 AM | unknown lost after: 31 seconds
4/24/2017 9:45:49 AM | unknown stopped after: 36 seconds
4/24/2017 9:53:19 AM | unknown stopped after: 403 seconds
4/24/2017 10:57:15 AM | unknown stopped after: 21 seconds
4/25/2017 9:48:06 AM | unknown lost after: 62 seconds
4/25/2017 9:48:26 AM | unknown stopped after: 82 seconds
4/25/2017 9:49:05 AM | unknown stopped after: 28 seconds
4/25/2017 9:50:10 AM | unknown stopped after: 60 seconds
4/25/2017 9:56:08 AM | unknown stopped after: 190 seconds
......@@ -10,128 +10,72 @@ Material:
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_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:
m_Texture: {fileID: 2800000, guid: e7d6f7ad9bbd63d45b2f36bd0a17bed5, type: 3}
- _MainTex:
m_Texture: {fileID: 2800000, guid: facb8f96350c0514bbd803725030c967, type: 3}
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}
- first:
name: _ToonShade
second:
- _ToonShade:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: PixelSnap
second: 0
- 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: 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
- PixelSnap: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- first:
name: _Color
second: {r: 0.1102941, g: 0.1102941, b: 0.1102941, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: facb8f96350c0514bbd803725030c967
timeCreated: 1493020619
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
......@@ -10,118 +10,66 @@ Material:
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP
m_LightmapFlags: 1
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: 29adb014df293964a990527992ab9577, type: 3}
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_Scale: {x: 17.18, y: 28.17}
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: 17.81, y: 6.08}
m_Scale: {x: 61.1, y: 60}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 06fe0dcfc64354249a7a5d7eb3bac4e8, type: 3}
m_Scale: {x: 17.81, y: 6.08}
m_Scale: {x: 61.1, y: 60}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: a6a6badc28a3cf74e88a4317508f2b11, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: 032a65f5ac455d241a60d2e27b80fb17, type: 3}
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: 0
- first:
name: _GlossMapScale
second: 1
- first:
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 0
- 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: 1
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, 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: a9374361214f7454b848efc626bcc3c7, type: 3}
m_Scale: {x: 30, y: 30}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 41d62cf2ef102b94a90669d9e8b63414, type: 3}
m_Scale: {x: 30, y: 30}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _Shininess
second: 0.078125
- _Shininess: 0.03
m_Colors:
- first:
name: _Color
second: {r: 0.2647059, g: 0.2647059, b: 0.2647059, a: 1}
- first:
name: _SpecColor
second: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
- _Color: {r: 0.2647059, g: 0.2647059, b: 0.2647059, a: 1}
- _SpecColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
......@@ -155,8 +155,8 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000010762658480}
m_LocalRotation: {x: -0, y: 0.6908623, z: -0, w: -0.7229864}
m_LocalPosition: {x: 8.14, y: 4.005, z: 9.12}
m_LocalScale: {x: 1.3441427, y: 0.79516745, z: 1.0782981}
m_LocalPosition: {x: 8, y: 5.1933, z: 9}
m_LocalScale: {x: 1.3441427, y: 1.6924092, z: 1.0782981}
m_Children:
- {fileID: 4000012182433452}
- {fileID: 4069329736314968}
......@@ -262,6 +262,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23001106548211338
MeshRenderer:
......@@ -293,6 +294,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23356757139525694
MeshRenderer:
......@@ -324,6 +326,7 @@ MeshRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33000010399098632
MeshFilter:
......@@ -641,7 +644,7 @@ Light:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1000013041560516}
m_Enabled: 1
serializedVersion: 7
serializedVersion: 8
m_Type: 0
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_Intensity: 8
......@@ -666,6 +669,8 @@ Light:
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 0
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!108 &108270653439417304
......@@ -675,7 +680,7 @@ Light:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1886355899794438}
m_Enabled: 1
serializedVersion: 7
serializedVersion: 8
m_Type: 0
m_Color: {r: 1, g: 0, b: 0, a: 1}