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

upload to Kiwi

parent a5ee5efb
......@@ -156,6 +156,9 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\SteamVR\InteractionSystem\Readme_InteractionSystem.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
</Reference>
......@@ -198,6 +201,9 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
</Reference>
......
......@@ -154,6 +154,9 @@
<Reference Include="Assembly-UnityScript">
<HintPath>C:/Users/yuki/Documents/Work/Listen/Library/ScriptAssemblies/Assembly-UnityScript.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
</Reference>
......@@ -196,6 +199,9 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
</Reference>
......
......@@ -219,6 +219,9 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\SteamVR\InteractionSystem\Readme_InteractionSystem.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
......@@ -234,6 +237,9 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath>
</Reference>
......
......@@ -55,6 +55,7 @@
<Compile Include="Assets\Scripts\Effects\MediumEnabler.cs" />
<Compile Include="Assets\Scripts\Effects\Rotator.cs" />
<Compile Include="Assets\Scripts\Effects\SmallEnabler.cs" />
<Compile Include="Assets\Scripts\Effects\SwitchStart.cs" />
<Compile Include="Assets\Scripts\Effects\SwitchState.cs" />
<Compile Include="Assets\Scripts\Tools\AM.cs" />
<Compile Include="Assets\Scripts\Tools\FPS_Camera.cs" />
......@@ -63,6 +64,7 @@
<Compile Include="Assets\Scripts\Tools\GhostSound.cs" />
<Compile Include="Assets\Scripts\Tools\LightScript.cs" />
<Compile Include="Assets\Scripts\Tools\Pickup.cs" />
<Compile Include="Assets\Scripts\Tools\Pitcher.cs" />
<Compile Include="Assets\Scripts\Tools\PlayerSound.cs" />
<Compile Include="Assets\Scripts\Tools\RippleEffect.cs" />
<Compile Include="Assets\Scripts\UI\Info.cs" />
......@@ -268,6 +270,9 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\SteamVR\InteractionSystem\Readme_InteractionSystem.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
......@@ -283,6 +288,9 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath>
</Reference>
......
......@@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Switch
m_Name: Switch green
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
......@@ -121,7 +121,7 @@ Material:
m_Colors:
- first:
name: _Color
second: {r: 0.9191176, g: 0.03379107, b: 0.03379107, a: 1}
second: {r: 0, g: 1, b: 0.048275948, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Switch red
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
serializedVersion: 2
m_TexEnvs:
- first:
name: _BumpMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
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
m_Colors:
- first:
name: _Color
second: {r: 1, g: 0, b: 0, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
fileFormatVersion: 2
guid: 7d8b31fa0a59ec540a87a4efbc946523
timeCreated: 1480955992
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
......@@ -8,8 +8,8 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: 04. - Default
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
......@@ -121,7 +121,7 @@ Material:
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
second: {r: 0.21323532, g: 0.21323532, b: 0.21323532, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
......@@ -8,8 +8,8 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: 1 (30)
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
......@@ -121,7 +121,7 @@ Material:
m_Colors:
- first:
name: _Color
second: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1}
second: {r: 0.45588237, g: 0.45588237, b: 0.45588237, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
......@@ -19,13 +19,13 @@ Material:
name: _BumpMap
second:
m_Texture: {fileID: 2800000, guid: 6dd25b365bb9824458db5824d2578fe0, type: 3}
m_Scale: {x: 3, y: 3}
m_Scale: {x: 15, y: 2}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: 5bdacf18a5ac56440a17703dda50bd2b, type: 3}
m_Scale: {x: 3, y: 3}
m_Scale: {x: 15, y: 2}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
......
......@@ -25,7 +25,7 @@ Material:
name: _DetailAlbedoMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 10, y: 7.06}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
......@@ -43,13 +43,13 @@ Material:
name: _EmissionMap
second:
m_Texture: {fileID: 0}
m_Scale: {x: 10, y: 54.79}
m_Scale: {x: 3.59, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: efd0e50117a79b54ba7d04206ca9d4ff, type: 3}
m_Scale: {x: 10, y: 54.79}
m_Scale: {x: 3.59, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
......@@ -121,7 +121,7 @@ Material:
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, 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}
......@@ -58,8 +58,8 @@ GameObject:
- component: {fileID: 54215288056070620}
- component: {fileID: 82012098038847686}
- component: {fileID: 82269793099157692}
- component: {fileID: 114863510807630850}
- component: {fileID: 114890217478736866}
- component: {fileID: 114429798445900574}
m_Layer: 0
m_Name: Player
m_TagString: Player
......@@ -429,6 +429,18 @@ Light:
m_BounceIntensity: 1.57
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!114 &114429798445900574
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1474138143022610}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 502dc647dd3b62745b69ffe781c937ed, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 0}
--- !u!114 &114758404455892460
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -458,19 +470,6 @@ MonoBehaviour:
dx11BokehTexture: {fileID: 0}
dx11BokehScale: 1.2
dx11BokehIntensity: 2.5
--- !u!114 &114863510807630850
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1474138143022610}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5ae009a233e5930428d03c07d819d7c8, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 1474138143022610}
walking: 0
--- !u!114 &114890217478736866
MonoBehaviour:
m_ObjectHideFlags: 1
......
This diff is collapsed.
fileFormatVersion: 2
guid: d39efae341225fe4bb19bf752c847ff4
timeCreated: 1490183063
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
......@@ -11,22 +11,6 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1876634338105552}
m_IsPrefabParent: 1
--- !u!1 &1331159844058258
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4575044873899302}
- component: {fileID: 108319925751109520}
m_Layer: 0
m_Name: Point light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1481948352735598
GameObject:
m_ObjectHideFlags: 0
......@@ -123,19 +107,6 @@ Transform:
m_Father: {fileID: 4890147420870624}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4575044873899302
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1331159844058258}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.66, y: 0.164, z: 0.213}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4890147420870624}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4848804580108880
Transform:
m_ObjectHideFlags: 1
......@@ -155,14 +126,13 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1876634338105552}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -15.51, y: 4.512, z: -12.905}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -25.989, y: 1.17, z: -12.905}
m_LocalScale: {x: 0.5392623, y: 0.5392622, z: 0.21570486}
m_Children:
- {fileID: 4244690630902324}
- {fileID: 4169507316784948}
- {fileID: 4848804580108880}
- {fileID: 4575044873899302}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -179,7 +149,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: f23f26c6f94bcd045a53e2c6228362dc, type: 2}
- {fileID: 2100000, guid: 7d8b31fa0a59ec540a87a4efbc946523, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......@@ -241,7 +211,7 @@ MeshRenderer:
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: f23f26c6f94bcd045a53e2c6228362dc, type: 2}
- {fileID: 2100000, guid: 7d8b31fa0a59ec540a87a4efbc946523, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
......@@ -316,40 +286,6 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!108 &108319925751109520
Light:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1331159844058258}
m_Enabled: 1
serializedVersion: 7
m_Type: 2
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_Intensity: 4.22
m_Range: 0.59
m_SpotAngle: 30
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_Lightmapping: 4
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!114 &114849189908832936
MonoBehaviour:
m_ObjectHideFlags: 1
......
......@@ -10,7 +10,7 @@ public class BigEnabler : MonoBehaviour {
}
// Update is called once per frame
void Update () {
if (AM.i.GetPitch ()[2] > 0.5f) {
if (AM.i.GetRMS () > 10.0f) {
Activated = true;
} else {
Activated = false;
......
......@@ -10,7 +10,7 @@ public class MediumEnabler : MonoBehaviour {
}
// Update is called once per frame
void Update () {
if (AM.i.GetPitch ()[1] < 0.5f) {
if (AM.i.GetRMS () > 6.0f) {
Activated = true;
} else {
Activated = false;
......
......@@ -10,7 +10,7 @@ public class SmallEnabler : MonoBehaviour {
}
// Update is called once per frame
void Update () {
if (AM.i.GetPitch ()[0] < 0.5f) {
if (AM.i.GetRMS () > 2.0f) {
Activated = true;