From b19044a8016863012240e6db3fa3c9338eec24df Mon Sep 17 00:00:00 2001 From: Chris Midkiff Date: Tue, 9 Oct 2018 03:07:31 -0400 Subject: [PATCH] Fixed the stupid fucking button --- Assets/Prefabs.meta | 8 + Assets/Prefabs/GVR.prefab | 346 ++++++++++++++++++++ Assets/Prefabs/GVR.prefab.meta | 8 + Assets/Scenes/Google.unity | 334 +------------------ Assets/Scenes/Home.unity | 379 ++++++++++++---------- ProjectSettings/EditorBuildSettings.asset | 5 +- 6 files changed, 591 insertions(+), 489 deletions(-) create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/GVR.prefab create mode 100644 Assets/Prefabs/GVR.prefab.meta diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..c2be020 --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05d65f37cb163e745848a4353465577f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GVR.prefab b/Assets/Prefabs/GVR.prefab new file mode 100644 index 0000000..c1bdbf8 --- /dev/null +++ b/Assets/Prefabs/GVR.prefab @@ -0,0 +1,346 @@ +%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_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1534288903135148} + m_IsPrefabAsset: 1 +--- !u!1 &1132347761416848 +GameObject: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4683914149962586} + - component: {fileID: 114855450908423216} + - component: {fileID: 23144344928207762} + m_Layer: 2 + m_Name: GvrReticlePointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1219259380339076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4247502131944788} + - component: {fileID: 114911861791547390} + - component: {fileID: 114501065152772058} + m_Layer: 0 + m_Name: GvrEventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1534288903135148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4172977793111564} + m_Layer: 0 + m_Name: GVR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1655486884145648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4444700130726422} + - component: {fileID: 20501644528040130} + - component: {fileID: 81493890010726444} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1847637236175556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4135333772386656} + - component: {fileID: 114055513287100450} + m_Layer: 0 + m_Name: GvrEditorEmulator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1983655756840764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4430838072756240} + - component: {fileID: 114525599419662748} + m_Layer: 0 + m_Name: GvrControllerMain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4135333772386656 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1847637236175556} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4172977793111564} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4172977793111564 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1534288903135148} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.484919, y: -7.587544, z: 0.7514019} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4444700130726422} + - {fileID: 4247502131944788} + - {fileID: 4430838072756240} + - {fileID: 4135333772386656} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4247502131944788 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1219259380339076} + 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: 4172977793111564} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4430838072756240 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1983655756840764} + 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: 4172977793111564} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4444700130726422 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1655486884145648} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 13.55, y: 9.23, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4683914149962586} + m_Father: {fileID: 4172977793111564} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4683914149962586 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1132347761416848} + 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: 4444700130726422} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &20501644528040130 +Camera: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1655486884145648} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + 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: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!23 &23144344928207762 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1132347761416848} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 4cb1460f617514a888f47071314ccdae, 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: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!81 &81493890010726444 +AudioListener: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1655486884145648} + m_Enabled: 1 +--- !u!114 &114055513287100450 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1847637236175556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41679d3338266415f88d226e6bf3d0be, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &114501065152772058 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1219259380339076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcd4baceb58cc40c98e500572bede6a6, type: 3} + m_Name: + m_EditorClassIdentifier: + vrModeOnly: 0 + scrollInput: + inertia: 1 + decelerationRate: 0.05 +--- !u!114 &114525599419662748 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1983655756840764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 41251d5f89d5546bb9d8ba907686b71f, type: 3} + m_Name: + m_EditorClassIdentifier: + emulatorConnectionMode: 1 +--- !u!114 &114855450908423216 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1132347761416848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7dcc90c2e60c4011896c7f21fc1f557, type: 3} + m_Name: + m_EditorClassIdentifier: + raycastMode: 0 + overridePointerCamera: {fileID: 0} + drawDebugRays: 1 + maxReticleDistance: 20 + reticleSegments: 20 + reticleGrowthSpeed: 8 + reticleSortingOrder: 32767 +--- !u!114 &114911861791547390 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1219259380339076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 20 diff --git a/Assets/Prefabs/GVR.prefab.meta b/Assets/Prefabs/GVR.prefab.meta new file mode 100644 index 0000000..5651b88 --- /dev/null +++ b/Assets/Prefabs/GVR.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3713ae6a80ceef4f9f728d03835786b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Google.unity b/Assets/Scenes/Google.unity index b253a2a..bf84f29 100644 --- a/Assets/Scenes/Google.unity +++ b/Assets/Scenes/Google.unity @@ -113,39 +113,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &93974318 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 93974319} - m_Layer: 0 - m_Name: Gvr - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &93974319 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 93974318} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.484919, y: -7.587544, z: 0.7514019} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 624858044} - - {fileID: 893507161} - - {fileID: 1746473950} - - {fileID: 864563732} - - {fileID: 1005528043} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170076733 GameObject: m_ObjectHideFlags: 0 @@ -212,84 +179,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &624858043 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 624858044} - - component: {fileID: 624858046} - - component: {fileID: 624858045} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &624858044 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 624858043} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 13.55, y: 9.23, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2012435306} - m_Father: {fileID: 93974319} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &624858045 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 624858043} - m_Enabled: 1 ---- !u!20 &624858046 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 624858043} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - 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: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &824984008 GameObject: m_ObjectHideFlags: 0 @@ -377,238 +266,49 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &864563731 +--- !u!1001 &1771504037 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 93974319} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -13.484919 objectReference: {fileID: 0} - - target: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -7.587544 objectReference: {fileID: 0} - - target: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 0.7514019 objectReference: {fileID: 0} - - target: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5ca80f4596fa44b87912a0592346d260, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &864563732 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 424718, guid: 5ca80f4596fa44b87912a0592346d260, - type: 2} - m_PrefabInternal: {fileID: 864563731} ---- !u!1001 &893507160 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 93974319} - m_Modifications: - - target: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, type: 2} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, type: 2} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, type: 2} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, type: 2} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 463285ecd6702471a909ba810832bf0e, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &893507161 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 766346198, guid: 463285ecd6702471a909ba810832bf0e, - type: 2} - m_PrefabInternal: {fileID: 893507160} ---- !u!1001 &1005528042 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 93974319} - m_Modifications: - - target: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - propertyPath: m_LocalPosition.z - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 970dd4b9371394fb4890965f608d46fd, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1005528043 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 498412, guid: 970dd4b9371394fb4890965f608d46fd, - type: 2} - m_PrefabInternal: {fileID: 1005528042} ---- !u!1001 &1746473949 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 93974319} - m_Modifications: - - target: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d638298e697ca4e9b91853efadd0e6da, type: 2} - m_IsPrefabAsset: 0 ---- !u!4 &1746473950 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4000010886689084, guid: d638298e697ca4e9b91853efadd0e6da, - type: 2} - m_PrefabInternal: {fileID: 1746473949} ---- !u!1001 &2012435305 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 624858044} - m_Modifications: - - target: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, type: 2} - propertyPath: m_RootOrder - value: 0 + - target: {fileID: 1534288903135148, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_Name + value: Gvr objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 60270cf52a5e94998a5a335989159738, type: 2} + m_SourcePrefab: {fileID: 100100000, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} m_IsPrefabAsset: 0 ---- !u!4 &2012435306 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 482300, guid: 60270cf52a5e94998a5a335989159738, - type: 2} - m_PrefabInternal: {fileID: 2012435305} diff --git a/Assets/Scenes/Home.unity b/Assets/Scenes/Home.unity index 2f10952..3c31e61 100644 --- a/Assets/Scenes/Home.unity +++ b/Assets/Scenes/Home.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -113,6 +113,48 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &91225814 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_LocalPosition.x + value: -13.484919 + objectReference: {fileID: 0} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_LocalPosition.y + value: -7.587544 + objectReference: {fileID: 0} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_LocalPosition.z + value: 0.7514019 + objectReference: {fileID: 0} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c3713ae6a80ceef4f9f728d03835786b, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &102099177 GameObject: m_ObjectHideFlags: 0 @@ -177,8 +219,63 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!4 &115120518 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4172977793111564, guid: c3713ae6a80ceef4f9f728d03835786b, + type: 2} + m_PrefabInternal: {fileID: 91225814} +--- !u!1001 &286643794 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 115120518} + m_Modifications: + - target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: m_LocalPosition.x + value: 25.01 + objectReference: {fileID: 0} + - target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: m_LocalPosition.y + value: 6.24 + objectReference: {fileID: 0} + - target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: m_LocalPosition.z + value: 8.07 + objectReference: {fileID: 0} + - target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 452846, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11499020, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: controllerMain + value: + objectReference: {fileID: 1288645121} + - target: {fileID: 11499020, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + propertyPath: reticlePointer + value: + objectReference: {fileID: 1487937394} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8524bbe5e592a42dc9251484a73c9c7f, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &340359233 GameObject: m_ObjectHideFlags: 0 @@ -265,6 +362,7 @@ GameObject: - component: {fileID: 378838060} - component: {fileID: 378838059} - component: {fileID: 378838058} + - component: {fileID: 378838061} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -329,7 +427,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 378838059} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 340359235} + m_MethodName: set_tag + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Clicked + m_BoolArgument: 0 + m_CallState: 1 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &378838059 @@ -366,6 +475,58 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 378838056} m_CullTransparentMesh: 0 +--- !u!114 &378838061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 378838056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca0157c63fb794df89c6735fc602eca2, type: 3} + m_Name: + m_EditorClassIdentifier: + OnPointerClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 340359235} + m_MethodName: set_text + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Clicked + m_BoolArgument: 0 + m_CallState: 1 + m_TypeName: GvrAllEventsTrigger+TriggerEvent, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnPointerDown: + m_PersistentCalls: + m_Calls: [] + m_TypeName: GvrAllEventsTrigger+TriggerEvent, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnPointerUp: + m_PersistentCalls: + m_Calls: [] + m_TypeName: GvrAllEventsTrigger+TriggerEvent, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnPointerEnter: + m_PersistentCalls: + m_Calls: [] + m_TypeName: GvrAllEventsTrigger+TriggerEvent, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnPointerExit: + m_PersistentCalls: + m_Calls: [] + m_TypeName: GvrAllEventsTrigger+TriggerEvent, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnScroll: + m_PersistentCalls: + m_Calls: [] + m_TypeName: GvrAllEventsTrigger+TriggerEvent, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &379068245 GameObject: m_ObjectHideFlags: 0 @@ -441,68 +602,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 379068245} m_CullTransparentMesh: 0 ---- !u!1 &749049123 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 749049126} - - component: {fileID: 749049125} - - component: {fileID: 749049124} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &749049124 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 749049123} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &749049125 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 749049123} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &749049126 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 749049123} - 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: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &795877348 GameObject: m_ObjectHideFlags: 0 @@ -578,30 +677,35 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 795877348} m_CullTransparentMesh: 0 ---- !u!1 &996792851 +--- !u!20 &974237413 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 20501644528040130, guid: c3713ae6a80ceef4f9f728d03835786b, + type: 2} + m_PrefabInternal: {fileID: 91225814} +--- !u!1 &1021574411 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 996792855} - - component: {fileID: 996792854} - - component: {fileID: 996792853} - - component: {fileID: 996792852} + - component: {fileID: 1021574415} + - component: {fileID: 1021574414} + - component: {fileID: 1021574413} + - component: {fileID: 1021574412} m_Layer: 0 - m_Name: Floor + m_Name: Plane m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!64 &996792852 +--- !u!64 &1021574412 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 996792851} + m_GameObject: {fileID: 1021574411} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -610,12 +714,12 @@ MeshCollider: m_CookingOptions: 14 m_SkinWidth: 0.01 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &996792853 +--- !u!23 &1021574413 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 996792851} + m_GameObject: {fileID: 1021574411} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -625,7 +729,7 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 m_Materials: - - {fileID: 15302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -645,25 +749,25 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &996792854 +--- !u!33 &1021574414 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 996792851} + m_GameObject: {fileID: 1021574411} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &996792855 +--- !u!4 &1021574415 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 996792851} + m_GameObject: {fileID: 1021574411} 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: 2} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1058515202 GameObject: @@ -675,9 +779,9 @@ GameObject: - component: {fileID: 1058515208} - component: {fileID: 1058515207} - component: {fileID: 1058515206} - - component: {fileID: 1058515205} - component: {fileID: 1058515204} - component: {fileID: 1058515203} + - component: {fileID: 1058515205} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -726,12 +830,12 @@ MonoBehaviour: m_GameObject: {fileID: 1058515202} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 739800cd36aba44e9b04ce977e5784bd, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: + ignoreReversedGraphics: 0 + blockingObjects: 3 + blockingMask: serializedVersion: 2 m_Bits: 4294967295 --- !u!114 &1058515206 @@ -763,8 +867,8 @@ Canvas: m_GameObject: {fileID: 1058515202} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 1080299557} + m_RenderMode: 2 + m_Camera: {fileID: 974237413} m_PlaneDistance: 1 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -782,94 +886,27 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1058515202} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 8.27} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_Children: - {fileID: 340359234} - {fileID: 378838057} - {fileID: 795877349} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1 &1080299555 + m_AnchoredPosition: {x: 0, y: 2.77} + m_SizeDelta: {x: 800, y: 414.7002} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1288645121 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1080299558} - - component: {fileID: 1080299557} - - component: {fileID: 1080299556} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1080299556 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1080299555} - m_Enabled: 1 ---- !u!20 &1080299557 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1080299555} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - 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: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1080299558 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1080299555} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - 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} + m_CorrespondingSourceObject: {fileID: 1983655756840764, guid: c3713ae6a80ceef4f9f728d03835786b, + type: 2} + m_PrefabInternal: {fileID: 91225814} +--- !u!1 &1487937394 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1132347761416848, guid: c3713ae6a80ceef4f9f728d03835786b, + type: 2} + m_PrefabInternal: {fileID: 91225814} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 39c9160..4c7cc4e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,7 +8,10 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/Oculus.unity guid: 99c9720ab356a0642a771bea13969a05 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/Google.unity guid: defe0a558a2303b47ace2b698618c9e4 + - enabled: 1 + path: Assets/Scenes/Home.unity + guid: d8ad458e052dbf347926cc4a4973c528 m_configObjects: {}