From 3b2103cdf2e9fd89d3fa65090ae678d374560c88 Mon Sep 17 00:00:00 2001 From: BerniceChua Date: Mon, 30 Jan 2017 17:32:50 -0800 Subject: [PATCH 1/3] Add .gitignore. --- .gitignore | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cabab6c --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +# =============== # +# Unity generated # +# =============== # +Temp/ +Obj/ +UnityGenerated/ +Library/ +Assets/AssetStoreTools* + +# ===================================== # +# Visual Studio / MonoDevelop generated # +# ===================================== # +ExportedObj/ +*.svd +*.userprefs +*.csproj +*.pidb +*.suo +*.sln +*.user +*.unityproj +*.booproj + +# =============================== # +# Large Build Files Stored In AWS # +# =============================== # +Builds/ +*.pdb From 7829cfdf259fadcc964424b6f1561e0ef0cd1fbf Mon Sep 17 00:00:00 2001 From: BerniceChua Date: Mon, 30 Jan 2017 18:23:15 -0800 Subject: [PATCH 2/3] Add code to detect if game is 2D or 3D, and code to disable/enable components as needed. --- Unity Project/Assets/Materials/Cave.mat | 252 ++++++++-------- Unity Project/Assets/Materials/Walls.mat | 252 ++++++++-------- .../Assets/Prefabs/Detecting2DOr3D.prefab | 57 ++++ .../Prefabs/Detecting2DOr3D.prefab.meta | 8 + .../Assets/Prefabs/PlayerGeneric.prefab | 183 ++++++++++++ .../Assets/Prefabs/PlayerGeneric.prefab.meta | 8 + Unity Project/Assets/Scenes/Scene 2D.unity | 277 +++++++++++++---- Unity Project/Assets/Scenes/Scene 3D.unity | 281 ++++++++++++++---- .../Assets/Scripts/CameraMouseLook.cs | 33 ++ .../Assets/Scripts/CameraMouseLook.cs.meta | 12 + Unity Project/Assets/Scripts/Detect2DOr3D.cs | 37 +++ .../Assets/Scripts/Detect2DOr3D.cs.meta | 12 + .../ProjectSettings/ClusterInputManager.asset | 6 + .../ProjectSettings/EditorSettings.asset | 5 +- .../ProjectSettings/ProjectVersion.txt | 3 +- .../UnityConnectSettings.asset | 29 ++ 16 files changed, 1055 insertions(+), 400 deletions(-) create mode 100644 Unity Project/Assets/Prefabs/Detecting2DOr3D.prefab create mode 100644 Unity Project/Assets/Prefabs/Detecting2DOr3D.prefab.meta create mode 100644 Unity Project/Assets/Prefabs/PlayerGeneric.prefab create mode 100644 Unity Project/Assets/Prefabs/PlayerGeneric.prefab.meta create mode 100644 Unity Project/Assets/Scripts/CameraMouseLook.cs create mode 100644 Unity Project/Assets/Scripts/CameraMouseLook.cs.meta create mode 100644 Unity Project/Assets/Scripts/Detect2DOr3D.cs create mode 100644 Unity Project/Assets/Scripts/Detect2DOr3D.cs.meta create mode 100644 Unity Project/ProjectSettings/ClusterInputManager.asset create mode 100644 Unity Project/ProjectSettings/UnityConnectSettings.asset diff --git a/Unity Project/Assets/Materials/Cave.mat b/Unity Project/Assets/Materials/Cave.mat index d79f707..272f4cb 100644 --- a/Unity Project/Assets/Materials/Cave.mat +++ b/Unity Project/Assets/Materials/Cave.mat @@ -8,143 +8,129 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: Cave m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _LIGHTMAPPING_REALTIME - m_LightmapFlags: 5 + m_ShaderKeywords: _EMISSION _LIGHTMAPPING_REALTIME + m_LightmapFlags: 1 m_CustomRenderQueue: -1 stringTagMap: {} m_SavedProperties: serializedVersion: 2 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: acf9f8d362a80495a91a739e95ea4edb, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailNormalMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ParallaxMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _OcclusionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _EmissionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailMask - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailAlbedoMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _MetallicGlossMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - 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: 2800000, guid: acf9f8d362a80495a91a739e95ea4edb, type: 3} + 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: - data: - first: - name: _SrcBlend - second: 1 - data: - first: - name: _DstBlend - second: 0 - data: - first: - name: _Cutoff - second: .5 - data: - first: - name: _Parallax - second: .0199999996 - data: - first: - name: _ZWrite - second: 1 - data: - first: - name: _Glossiness - second: 0 - data: - first: - name: _BumpScale - second: 1 - data: - first: - name: _OcclusionStrength - second: 1 - data: - first: - name: _DetailNormalMapScale - second: 1 - data: - first: - name: _UVSec - second: 0 - data: - first: - name: _Mode - second: 0 - data: - first: - name: _Metallic - second: 0 - data: - first: - name: _Lightmapping - second: 1 - data: - first: - name: _EmissionScaleUI - second: 0 + - first: + name: _BumpScale + second: 1 + - first: + name: _Cutoff + second: 0.5 + - first: + name: _DetailNormalMapScale + second: 1 + - first: + name: _DstBlend + second: 0 + - first: + name: _EmissionScaleUI + second: 0 + - first: + name: _GlossMapScale + second: 1 + - first: + name: _Glossiness + second: 0 + - first: + name: _GlossyReflections + second: 1 + - first: + name: _Lightmapping + 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: - data: - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 0} - data: - first: - name: _Color - second: {r: .0220588446, g: .0220588446, b: .0220588446, a: 1} - data: - first: - name: _EmissionColorUI - second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _Color + second: {r: 0.022058845, g: 0.022058845, b: 0.022058845, a: 1} + - first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 0} + - first: + name: _EmissionColorUI + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity Project/Assets/Materials/Walls.mat b/Unity Project/Assets/Materials/Walls.mat index 0e12dbf..2b06310 100644 --- a/Unity Project/Assets/Materials/Walls.mat +++ b/Unity Project/Assets/Materials/Walls.mat @@ -8,143 +8,129 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: Walls m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _LIGHTMAPPING_REALTIME - m_LightmapFlags: 5 + m_ShaderKeywords: _EMISSION _LIGHTMAPPING_REALTIME + m_LightmapFlags: 1 m_CustomRenderQueue: -1 stringTagMap: {} m_SavedProperties: serializedVersion: 2 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailNormalMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ParallaxMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _OcclusionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _EmissionMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailMask - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _DetailAlbedoMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _MetallicGlossMap - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - 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: - data: - first: - name: _SrcBlend - second: 1 - data: - first: - name: _DstBlend - second: 0 - data: - first: - name: _Cutoff - second: .5 - data: - first: - name: _Parallax - second: .0199999996 - data: - first: - name: _ZWrite - second: 1 - data: - first: - name: _Glossiness - second: 0 - data: - first: - name: _BumpScale - second: 1 - data: - first: - name: _OcclusionStrength - second: 1 - data: - first: - name: _DetailNormalMapScale - second: 1 - data: - first: - name: _UVSec - second: 0 - data: - first: - name: _Mode - second: 0 - data: - first: - name: _Metallic - second: 0 - data: - first: - name: _Lightmapping - second: 1 - data: - first: - name: _EmissionScaleUI - second: 0 + - first: + name: _BumpScale + second: 1 + - first: + name: _Cutoff + second: 0.5 + - first: + name: _DetailNormalMapScale + second: 1 + - first: + name: _DstBlend + second: 0 + - first: + name: _EmissionScaleUI + second: 0 + - first: + name: _GlossMapScale + second: 1 + - first: + name: _Glossiness + second: 0 + - first: + name: _GlossyReflections + second: 1 + - first: + name: _Lightmapping + 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: - data: - first: - name: _EmissionColor - second: {r: 0, g: 0, b: 0, a: 0} - data: - first: - name: _Color - second: {r: .176470578, g: .176470578, b: .176470578, a: 1} - data: - first: - name: _EmissionColorUI - second: {r: 1, g: 1, b: 1, a: 1} + - first: + name: _Color + second: {r: 0.17647058, g: 0.17647058, b: 0.17647058, a: 1} + - first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 0} + - first: + name: _EmissionColorUI + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Unity Project/Assets/Prefabs/Detecting2DOr3D.prefab b/Unity Project/Assets/Prefabs/Detecting2DOr3D.prefab new file mode 100644 index 0000000..e2f0217 --- /dev/null +++ b/Unity Project/Assets/Prefabs/Detecting2DOr3D.prefab @@ -0,0 +1,57 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1443536702469874} + m_IsPrefabParent: 1 +--- !u!1 &1443536702469874 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4516120883944542} + - component: {fileID: 114309222257655590} + m_Layer: 0 + m_Name: Detecting2DOr3D + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4516120883944542 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1443536702469874} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114309222257655590 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1443536702469874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95d5b5af753c0c342869a8ab357947f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_caveMesh: {fileID: 0} + m_mainCamera: {fileID: 0} + m_fpsCamera: {fileID: 0} + m_playerController: {fileID: 0} diff --git a/Unity Project/Assets/Prefabs/Detecting2DOr3D.prefab.meta b/Unity Project/Assets/Prefabs/Detecting2DOr3D.prefab.meta new file mode 100644 index 0000000..d0d91c2 --- /dev/null +++ b/Unity Project/Assets/Prefabs/Detecting2DOr3D.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c740e6de8e6da2246b142026da69c857 +timeCreated: 1485783657 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity Project/Assets/Prefabs/PlayerGeneric.prefab b/Unity Project/Assets/Prefabs/PlayerGeneric.prefab new file mode 100644 index 0000000..826ff84 --- /dev/null +++ b/Unity Project/Assets/Prefabs/PlayerGeneric.prefab @@ -0,0 +1,183 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 1661829543071932} + m_IsPrefabParent: 1 +--- !u!1 &1524981150451310 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4556067650031066} + - component: {fileID: 20528591220857472} + - component: {fileID: 124489825098355990} + - component: {fileID: 92553295054363888} + - component: {fileID: 81965659184403788} + - component: {fileID: 114844769386658460} + m_Layer: 0 + m_Name: FirstPersonCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1661829543071932 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4150836613793996} + - component: {fileID: 33054885607323940} + - component: {fileID: 23453400678940686} + m_Layer: 0 + m_Name: PlayerGeneric + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4150836613793996 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1661829543071932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4556067650031066} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4556067650031066 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524981150451310} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4150836613793996} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &20528591220857472 +Camera: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524981150451310} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!23 &23453400678940686 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1661829543071932} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 2e3f6779d4a604a999fe5c48187c4ebf, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!33 &33054885607323940 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1661829543071932} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!81 &81965659184403788 +AudioListener: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524981150451310} + m_Enabled: 1 +--- !u!92 &92553295054363888 +Behaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524981150451310} + m_Enabled: 1 +--- !u!114 &114844769386658460 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524981150451310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 617680c7e445d2e4481eaca0d24acfdf, type: 3} + m_Name: + m_EditorClassIdentifier: + m_sensitivity: 5 + m_smoothing: 2 +--- !u!124 &124489825098355990 +Behaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1524981150451310} + m_Enabled: 1 diff --git a/Unity Project/Assets/Prefabs/PlayerGeneric.prefab.meta b/Unity Project/Assets/Prefabs/PlayerGeneric.prefab.meta new file mode 100644 index 0000000..04bca2e --- /dev/null +++ b/Unity Project/Assets/Prefabs/PlayerGeneric.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba03d01a80a22ec408915700a9fdfd27 +timeCreated: 1485783657 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity Project/Assets/Scenes/Scene 2D.unity b/Unity Project/Assets/Scenes/Scene 2D.unity index 3a5194b..29e33d8 100644 --- a/Unity Project/Assets/Scenes/Scene 2D.unity +++ b/Unity Project/Assets/Scenes/Scene 2D.unity @@ -1,32 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 - smallestHole: .25 + smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 7 m_Fog: 0 - m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 - m_FogDensity: .00999999978 + m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} - m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} - m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: .5 + m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} @@ -37,15 +37,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} ---- !u!127 &3 -LevelGameManager: - m_ObjectHideFlags: 0 + m_IndirectSpecularColor: {r: 0.39198107, g: 0.40182015, b: 0.38272092, a: 1} --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 7 m_GIWorkflowMode: 0 - m_LightmapsMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -56,19 +53,25 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 3 + serializedVersion: 4 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 m_TextureHeight: 1024 + m_AO: 0 m_AOMaxDistance: 1 - m_Padding: 2 m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_Padding: 2 m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 m_TextureCompression: 1 + m_DirectLightInLightProbes: 1 m_FinalGather: 0 + m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 1024 - m_LightmapSnapshot: {fileID: 0} + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &5 NavMeshSettings: @@ -76,29 +79,30 @@ NavMeshSettings: m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 - agentRadius: .5 + agentTypeID: 0 + agentRadius: 0.5 agentHeight: 2 agentSlope: 45 - agentClimb: .400000006 + agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: .166666672 manualCellSize: 0 + cellSize: 0.16666667 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1 &6949650 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 6949655} - - 20: {fileID: 6949654} - - 92: {fileID: 6949653} - - 124: {fileID: 6949652} - - 81: {fileID: 6949651} + - component: {fileID: 6949655} + - component: {fileID: 6949654} + - component: {fileID: 6949653} + - component: {fileID: 6949652} + - component: {fileID: 6949651} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -136,14 +140,14 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: .25, g: .25, b: .25, a: .0196078438} + m_BackGroundColor: {r: 0.25, g: 0.25, b: 0.25, a: 0.019607844} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 - near clip plane: .300000012 + near clip plane: 0.3 far clip plane: 1000 field of view: 60 orthographic: 1 @@ -155,10 +159,11 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 + m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 + m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 --- !u!4 &6949655 Transform: @@ -172,16 +177,17 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &509230441 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 509230443} - - 114: {fileID: 509230442} - - 114: {fileID: 509230444} + - component: {fileID: 509230443} + - component: {fileID: 509230442} + - component: {fileID: 509230444} m_Layer: 0 m_Name: Map Generator m_TagString: Untagged @@ -220,6 +226,7 @@ Transform: - {fileID: 663968339} m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &509230444 MonoBehaviour: m_ObjectHideFlags: 0 @@ -239,12 +246,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 631091596} - - 33: {fileID: 631091599} - - 64: {fileID: 631091598} - - 23: {fileID: 631091597} + - component: {fileID: 631091596} + - component: {fileID: 631091599} + - component: {fileID: 631091598} + - component: {fileID: 631091597} m_Layer: 0 m_Name: Ground m_TagString: Untagged @@ -258,12 +265,13 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 631091595} - m_LocalRotation: {x: .70710659, y: 0, z: 0, w: -.707106948} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} m_LocalPosition: {x: 0, y: 0, z: 10} - m_LocalScale: {x: 15.0249996, y: 1, z: 7.875} + m_LocalScale: {x: 15.025, y: 1, z: 7.875} m_Children: [] m_Father: {fileID: 509230443} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} --- !u!23 &631091597 MeshRenderer: m_ObjectHideFlags: 0 @@ -273,17 +281,24 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 @@ -299,6 +314,8 @@ MeshCollider: m_Enabled: 1 serializedVersion: 2 m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &631091599 MeshFilter: @@ -312,11 +329,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 663968339} - - 33: {fileID: 663968341} - - 23: {fileID: 663968340} + - component: {fileID: 663968339} + - component: {fileID: 663968341} + - component: {fileID: 663968340} m_Layer: 0 m_Name: Cave Mesh m_TagString: Untagged @@ -330,12 +347,13 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 663968338} - m_LocalRotation: {x: .70710659, y: 0, z: 0, w: -.707106948} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: -0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 509230443} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 270, y: 0, z: 0} --- !u!23 &663968340 MeshRenderer: m_ObjectHideFlags: 0 @@ -345,17 +363,24 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 05fed37fcab6b40febc2e9f8b3aeb6c2, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 @@ -372,11 +397,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 777526923} - - 33: {fileID: 777526922} - - 23: {fileID: 777526924} + - component: {fileID: 777526923} + - component: {fileID: 777526922} + - component: {fileID: 777526924} m_Layer: 0 m_Name: Walls m_TagString: Untagged @@ -403,6 +428,7 @@ Transform: m_Children: [] m_Father: {fileID: 509230443} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &777526924 MeshRenderer: m_ObjectHideFlags: 0 @@ -412,18 +438,139 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 27714a88ffab24286add2e6b615090bc, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 +--- !u!1 &1236642304 stripped +GameObject: + m_PrefabParentObject: {fileID: 1661829543071932, guid: ba03d01a80a22ec408915700a9fdfd27, + type: 2} + m_PrefabInternal: {fileID: 1479197895} +--- !u!1001 &1479197895 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1649068494 stripped +GameObject: + m_PrefabParentObject: {fileID: 1524981150451310, guid: ba03d01a80a22ec408915700a9fdfd27, + type: 2} + m_PrefabInternal: {fileID: 1479197895} +--- !u!1001 &1818857957 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114309222257655590, guid: c740e6de8e6da2246b142026da69c857, + type: 2} + propertyPath: m_caveMesh + value: + objectReference: {fileID: 663968338} + - target: {fileID: 114309222257655590, guid: c740e6de8e6da2246b142026da69c857, + type: 2} + propertyPath: m_mainCamera + value: + objectReference: {fileID: 6949650} + - target: {fileID: 114309222257655590, guid: c740e6de8e6da2246b142026da69c857, + type: 2} + propertyPath: m_fpsCamera + value: + objectReference: {fileID: 1649068494} + - target: {fileID: 114309222257655590, guid: c740e6de8e6da2246b142026da69c857, + type: 2} + propertyPath: m_playerController + value: + objectReference: {fileID: 1236642304} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c740e6de8e6da2246b142026da69c857, type: 2} + m_IsPrefabParent: 0 diff --git a/Unity Project/Assets/Scenes/Scene 3D.unity b/Unity Project/Assets/Scenes/Scene 3D.unity index ff196ec..01c660a 100644 --- a/Unity Project/Assets/Scenes/Scene 3D.unity +++ b/Unity Project/Assets/Scenes/Scene 3D.unity @@ -1,32 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 - smallestHole: .25 + smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 7 m_Fog: 0 - m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 - m_FogDensity: .00999999978 + m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} - m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} - m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: .5 + m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} @@ -37,15 +37,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} ---- !u!127 &3 -LevelGameManager: - m_ObjectHideFlags: 0 + m_IndirectSpecularColor: {r: 0.39198107, g: 0.40182015, b: 0.38272092, a: 1} --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 7 m_GIWorkflowMode: 0 - m_LightmapsMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -56,19 +53,25 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 3 + serializedVersion: 4 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 m_TextureHeight: 1024 + m_AO: 0 m_AOMaxDistance: 1 - m_Padding: 2 m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_Padding: 2 m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 m_TextureCompression: 1 + m_DirectLightInLightProbes: 1 m_FinalGather: 0 + m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 1024 - m_LightmapSnapshot: {fileID: 0} + m_ReflectionCompression: 2 + m_LightingDataAsset: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &5 NavMeshSettings: @@ -76,29 +79,30 @@ NavMeshSettings: m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 - agentRadius: .5 + agentTypeID: 0 + agentRadius: 0.5 agentHeight: 2 agentSlope: 45 - agentClimb: .400000006 + agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: .166666672 manualCellSize: 0 + cellSize: 0.16666667 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1 &6949650 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 6949655} - - 20: {fileID: 6949654} - - 92: {fileID: 6949653} - - 124: {fileID: 6949652} - - 81: {fileID: 6949651} + - component: {fileID: 6949655} + - component: {fileID: 6949654} + - component: {fileID: 6949653} + - component: {fileID: 6949652} + - component: {fileID: 6949651} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -136,14 +140,14 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: .25, g: .25, b: .25, a: .0196078438} + m_BackGroundColor: {r: 0.25, g: 0.25, b: 0.25, a: 0.019607844} m_NormalizedViewPortRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 - near clip plane: .300000012 + near clip plane: 0.3 far clip plane: 1000 field of view: 60 orthographic: 0 @@ -155,10 +159,11 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 + m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 + m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 --- !u!4 &6949655 Transform: @@ -166,22 +171,85 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 6949650} - m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} - m_LocalPosition: {x: 0, y: 62.9000015, z: 0} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} + m_LocalPosition: {x: 0, y: 62.9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &493215684 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4516120883944542, guid: c740e6de8e6da2246b142026da69c857, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114309222257655590, guid: c740e6de8e6da2246b142026da69c857, + type: 2} + propertyPath: m_caveMesh + value: + objectReference: {fileID: 663968338} + - target: {fileID: 114309222257655590, guid: c740e6de8e6da2246b142026da69c857, + type: 2} + propertyPath: m_mainCamera + value: + objectReference: {fileID: 6949650} + - target: {fileID: 114309222257655590, guid: c740e6de8e6da2246b142026da69c857, + type: 2} + propertyPath: m_fpsCamera + value: + objectReference: {fileID: 1612346128} + - target: {fileID: 114309222257655590, guid: c740e6de8e6da2246b142026da69c857, + type: 2} + propertyPath: m_playerController + value: + objectReference: {fileID: 1612346129} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: c740e6de8e6da2246b142026da69c857, type: 2} + m_IsPrefabParent: 0 --- !u!1 &509230441 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 509230443} - - 114: {fileID: 509230442} - - 114: {fileID: 509230444} + - component: {fileID: 509230443} + - component: {fileID: 509230442} + - component: {fileID: 509230444} m_Layer: 0 m_Name: Map Generator m_TagString: Untagged @@ -220,6 +288,7 @@ Transform: - {fileID: 663968339} m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &509230444 MonoBehaviour: m_ObjectHideFlags: 0 @@ -239,12 +308,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 631091596} - - 33: {fileID: 631091599} - - 64: {fileID: 631091598} - - 23: {fileID: 631091597} + - component: {fileID: 631091596} + - component: {fileID: 631091599} + - component: {fileID: 631091598} + - component: {fileID: 631091597} m_Layer: 0 m_Name: Ground m_TagString: Untagged @@ -260,10 +329,11 @@ Transform: m_GameObject: {fileID: 631091595} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -4, z: 0} - m_LocalScale: {x: 15.0249996, y: 1, z: 7.875} + m_LocalScale: {x: 15.025, y: 1, z: 7.875} m_Children: [] m_Father: {fileID: 509230443} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &631091597 MeshRenderer: m_ObjectHideFlags: 0 @@ -273,17 +343,24 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 @@ -299,6 +376,8 @@ MeshCollider: m_Enabled: 1 serializedVersion: 2 m_Convex: 0 + m_InflateMesh: 0 + m_SkinWidth: 0.01 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &631091599 MeshFilter: @@ -312,11 +391,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 663968339} - - 33: {fileID: 663968341} - - 23: {fileID: 663968340} + - component: {fileID: 663968339} + - component: {fileID: 663968341} + - component: {fileID: 663968340} m_Layer: 0 m_Name: Cave Mesh m_TagString: Untagged @@ -336,6 +415,7 @@ Transform: m_Children: [] m_Father: {fileID: 509230443} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &663968340 MeshRenderer: m_ObjectHideFlags: 0 @@ -345,17 +425,24 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 05fed37fcab6b40febc2e9f8b3aeb6c2, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 @@ -372,11 +459,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 777526923} - - 33: {fileID: 777526922} - - 23: {fileID: 777526924} + - component: {fileID: 777526923} + - component: {fileID: 777526922} + - component: {fileID: 777526924} m_Layer: 0 m_Name: Walls m_TagString: Untagged @@ -403,6 +490,7 @@ Transform: m_Children: [] m_Father: {fileID: 509230443} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &777526924 MeshRenderer: m_ObjectHideFlags: 0 @@ -412,18 +500,81 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - {fileID: 2100000, guid: 27714a88ffab24286add2e6b615090bc, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 +--- !u!1001 &1612346127 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalPosition.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4150836613793996, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1524981150451310, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: ba03d01a80a22ec408915700a9fdfd27, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1612346128 stripped +GameObject: + m_PrefabParentObject: {fileID: 1524981150451310, guid: ba03d01a80a22ec408915700a9fdfd27, + type: 2} + m_PrefabInternal: {fileID: 1612346127} +--- !u!1 &1612346129 stripped +GameObject: + m_PrefabParentObject: {fileID: 1661829543071932, guid: ba03d01a80a22ec408915700a9fdfd27, + type: 2} + m_PrefabInternal: {fileID: 1612346127} diff --git a/Unity Project/Assets/Scripts/CameraMouseLook.cs b/Unity Project/Assets/Scripts/CameraMouseLook.cs new file mode 100644 index 0000000..ffefa79 --- /dev/null +++ b/Unity Project/Assets/Scripts/CameraMouseLook.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CameraMouseLook : MonoBehaviour { + public float m_sensitivity = 5.0f; + public float m_smoothing = 2.0f; + + Vector2 m_mouseLook; + Vector2 m_smoothVector; + + GameObject m_playerCharacter; + + // Use this for initialization + void Start () { + m_playerCharacter = this.transform.parent.gameObject; + } + + // Update is called once per frame + void Update () { + Vector2 mouseDelta = new Vector2(Input.GetAxisRaw("Mouse X"), Input.GetAxisRaw("Mouse Y")); + + mouseDelta = Vector2.Scale(mouseDelta, new Vector2(m_sensitivity * m_smoothing, m_sensitivity * m_smoothing)); + m_smoothVector.x = Mathf.Lerp(m_smoothVector.x, mouseDelta.x, 1.0f / m_smoothing); + m_smoothVector.y = Mathf.Lerp(m_smoothVector.y, mouseDelta.y, 1.0f / m_smoothing); + m_mouseLook += m_smoothVector; + + m_mouseLook.y = Mathf.Clamp(m_mouseLook.y, -90.0f, 90.0f); + + transform.localRotation = Quaternion.AngleAxis(-m_mouseLook.y, Vector3.right); + m_playerCharacter.transform.localRotation = Quaternion.AngleAxis(m_mouseLook.x, m_playerCharacter.transform.up); + } +} diff --git a/Unity Project/Assets/Scripts/CameraMouseLook.cs.meta b/Unity Project/Assets/Scripts/CameraMouseLook.cs.meta new file mode 100644 index 0000000..8a5fa2a --- /dev/null +++ b/Unity Project/Assets/Scripts/CameraMouseLook.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 617680c7e445d2e4481eaca0d24acfdf +timeCreated: 1485784240 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity Project/Assets/Scripts/Detect2DOr3D.cs b/Unity Project/Assets/Scripts/Detect2DOr3D.cs new file mode 100644 index 0000000..16d9b08 --- /dev/null +++ b/Unity Project/Assets/Scripts/Detect2DOr3D.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class Detect2DOr3D : MonoBehaviour { + public GameObject m_caveMesh; + public GameObject m_mainCamera; + public GameObject m_fpsCamera; + + public GameObject m_playerController; + + // Use this for initialization + void Start () { + DetectOrientation(); + } + + void DetectOrientation () { + if (m_caveMesh.transform.rotation.eulerAngles.x == 270 || m_caveMesh.transform.rotation.eulerAngles.x == -90) { + m_fpsCamera.SetActive(false); + m_mainCamera.SetActive(true); + + m_playerController.AddComponent(); + m_playerController.AddComponent(); + m_playerController.GetComponent().gravityScale = 0; // This prevents the player character from sliding down, since the map is tilted 270 degrees or -90 degrees. + m_playerController.AddComponent(); + } else if (m_caveMesh.transform.rotation.eulerAngles.x == 0) { + m_fpsCamera.SetActive(true); + m_mainCamera.SetActive(false); + + m_playerController.AddComponent(); + m_playerController.AddComponent(); + m_playerController.GetComponent().constraints = RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationZ; + m_playerController.AddComponent(); + } + } +} diff --git a/Unity Project/Assets/Scripts/Detect2DOr3D.cs.meta b/Unity Project/Assets/Scripts/Detect2DOr3D.cs.meta new file mode 100644 index 0000000..0b48685 --- /dev/null +++ b/Unity Project/Assets/Scripts/Detect2DOr3D.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 95d5b5af753c0c342869a8ab357947f0 +timeCreated: 1485783406 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity Project/ProjectSettings/ClusterInputManager.asset b/Unity Project/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000..e7886b2 --- /dev/null +++ b/Unity Project/ProjectSettings/ClusterInputManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!236 &1 +ClusterInputManager: + m_ObjectHideFlags: 0 + m_Inputs: [] diff --git a/Unity Project/ProjectSettings/EditorSettings.asset b/Unity Project/ProjectSettings/EditorSettings.asset index cf22d13..7dff13c 100644 --- a/Unity Project/ProjectSettings/EditorSettings.asset +++ b/Unity Project/ProjectSettings/EditorSettings.asset @@ -6,8 +6,9 @@ EditorSettings: serializedVersion: 3 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 - m_WebSecurityEmulationEnabled: 0 - m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d m_DefaultBehaviorMode: 0 m_SpritePackerMode: 2 m_SpritePackerPaddingPower: 1 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationRootNamespace: + m_UserGeneratedProjectSuffix: diff --git a/Unity Project/ProjectSettings/ProjectVersion.txt b/Unity Project/ProjectSettings/ProjectVersion.txt index 78b2941..66e05aa 100644 --- a/Unity Project/ProjectSettings/ProjectVersion.txt +++ b/Unity Project/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.1.1f1 -m_StandardAssetsVersion: 0 +m_EditorVersion: 5.5.0f3 diff --git a/Unity Project/ProjectSettings/UnityConnectSettings.asset b/Unity Project/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 0000000..2943e44 --- /dev/null +++ b/Unity Project/ProjectSettings/UnityConnectSettings.asset @@ -0,0 +1,29 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!310 &1 +UnityConnectSettings: + m_ObjectHideFlags: 0 + m_Enabled: 0 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_Enabled: 0 + m_CaptureEditorExceptions: 1 + UnityPurchasingSettings: + m_Enabled: 0 + m_TestMode: 0 + UnityAnalyticsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_EnabledPlatforms: 4294967295 + m_IosGameId: + m_AndroidGameId: From fd9a5cbc35ca9c8495e024b27d86eb7b8bda8966 Mon Sep 17 00:00:00 2001 From: BerniceChua Date: Mon, 30 Jan 2017 19:35:43 -0800 Subject: [PATCH 3/3] Refactor and improve if statement. --- Unity Project/Assets/Scripts/Detect2DOr3D.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Unity Project/Assets/Scripts/Detect2DOr3D.cs b/Unity Project/Assets/Scripts/Detect2DOr3D.cs index 16d9b08..0f57a2d 100644 --- a/Unity Project/Assets/Scripts/Detect2DOr3D.cs +++ b/Unity Project/Assets/Scripts/Detect2DOr3D.cs @@ -16,7 +16,7 @@ void Start () { } void DetectOrientation () { - if (m_caveMesh.transform.rotation.eulerAngles.x == 270 || m_caveMesh.transform.rotation.eulerAngles.x == -90) { + if (m_caveMesh.GetComponent().is2D == true) { m_fpsCamera.SetActive(false); m_mainCamera.SetActive(true);