diff --git a/Assets/Images/Controls/HTC_Controls_Catalog.png.meta b/Assets/Images/Controls/HTC_Controls_Catalog.png.meta index 94614e3..295d241 100644 --- a/Assets/Images/Controls/HTC_Controls_Catalog.png.meta +++ b/Assets/Images/Controls/HTC_Controls_Catalog.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9df0243b6fb399244be95a5c72f686da +guid: 832e255abc5d1d94bad3a345e7f6264e TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -101,30 +101,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 @@ -137,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta b/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta index b8e9d6a..bb067f8 100644 --- a/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta +++ b/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e722dc1453341754dba8e5c24ad17fac +guid: f3adb458eb2a4504284313642076de69 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -101,30 +101,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 @@ -137,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Materials/NetworkBox-Plate.mat b/Assets/Materials/NetworkBox-Plate.mat new file mode 100644 index 0000000..00c242d --- /dev/null +++ b/Assets/Materials/NetworkBox-Plate.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NetworkBox-Plate + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/NetworkBox-Plate.mat.meta b/Assets/Materials/NetworkBox-Plate.mat.meta new file mode 100644 index 0000000..5ef546c --- /dev/null +++ b/Assets/Materials/NetworkBox-Plate.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06b5748c2f86a06d78022e87c287a02e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Blender/NetworkBox.mtl.meta b/Assets/Models/Blender/NetworkBox.mtl.meta index 657cbd7..f3f0f36 100644 --- a/Assets/Models/Blender/NetworkBox.mtl.meta +++ b/Assets/Models/Blender/NetworkBox.mtl.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2840181573e5a6541920b3b96c3a84dc +guid: 32918c2cbfca990779445ffc1ed71a2b DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Models/Blender/NetworkBox.obj.meta b/Assets/Models/Blender/NetworkBox.obj.meta index 6d59746..30e95aa 100644 --- a/Assets/Models/Blender/NetworkBox.obj.meta +++ b/Assets/Models/Blender/NetworkBox.obj.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1484c25639d152f408c39d85df2ebe87 +guid: 79b62203c17e16d8b9bd5d8e55df2215 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] diff --git a/Assets/Models/NetworkBox.prefab b/Assets/Models/NetworkBox.prefab index 4216c2c..3353318 100644 --- a/Assets/Models/NetworkBox.prefab +++ b/Assets/Models/NetworkBox.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7577333752425881301 +--- !u!1 &2838372129594135989 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7089730460097201263} - - component: {fileID: 6182338237463481290} - - component: {fileID: 8226076056436850432} + - component: {fileID: 3181859954724409103} m_Layer: 0 m_Name: NetworkBox m_TagString: Untagged @@ -18,36 +16,70 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7089730460097201263 +--- !u!4 &3181859954724409103 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7577333752425881301} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 5.312, y: 2.4525094, z: 2.831812} - m_LocalScale: {x: 0.255, y: 0.0024999995, z: 0.09232478} + m_GameObject: {fileID: 2838372129594135989} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 5.6182184, y: 3.8261597, z: 2.942} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2618853044308065879} m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &6552217979737648492 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2618853044308065879} + - component: {fileID: 904985668399957789} + - component: {fileID: 4443537201563673481} + m_Layer: 0 + m_Name: default + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2618853044308065879 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6552217979737648492} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3181859954724409103} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6182338237463481290 +--- !u!33 &904985668399957789 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7577333752425881301} - m_Mesh: {fileID: -855889283239656021, guid: 06a516c85ff4592d3931610c846b8363, type: 3} ---- !u!23 &8226076056436850432 + m_GameObject: {fileID: 6552217979737648492} + m_Mesh: {fileID: -2432090755550338912, guid: 79b62203c17e16d8b9bd5d8e55df2215, type: 3} +--- !u!23 &4443537201563673481 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7577333752425881301} + m_GameObject: {fileID: 6552217979737648492} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -61,9 +93,9 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 5296590585878813031, guid: 06a516c85ff4592d3931610c846b8363, type: 3} - - {fileID: 8556262120643298411, guid: 06a516c85ff4592d3931610c846b8363, type: 3} - - {fileID: -6518380632535569532, guid: 06a516c85ff4592d3931610c846b8363, type: 3} + - {fileID: 5296590585878813031, guid: 79b62203c17e16d8b9bd5d8e55df2215, type: 3} + - {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2} + - {fileID: 2100000, guid: 06b5748c2f86a06d78022e87c287a02e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Models/NetworkBox.prefab.meta b/Assets/Models/NetworkBox.prefab.meta index 7eaedf7..fda14e6 100644 --- a/Assets/Models/NetworkBox.prefab.meta +++ b/Assets/Models/NetworkBox.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6ebb33deb111cac8a963221c8ed3430 +guid: 45459df2bf234d23182a573a1308c331 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Texture/NetworkBox-Plate_displacement.png.meta b/Assets/Texture/NetworkBox-Plate_displacement.png.meta index 04f3bbc..d3d7276 100644 --- a/Assets/Texture/NetworkBox-Plate_displacement.png.meta +++ b/Assets/Texture/NetworkBox-Plate_displacement.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 45db3b75ae37b6045b589fca3acc0b10 +guid: 53a5f72716a04a0fdac19e6b0779760f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -101,30 +101,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 @@ -137,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Texture/NetworkBox-Plate_emit.png.meta b/Assets/Texture/NetworkBox-Plate_emit.png.meta index 80e0f05..1f7d77a 100644 --- a/Assets/Texture/NetworkBox-Plate_emit.png.meta +++ b/Assets/Texture/NetworkBox-Plate_emit.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d84cd8332be29504cbcfcfe74f833202 +guid: bb5d14870df2668a582449650b3848a9 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -101,30 +101,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: WebGL maxTextureSize: 2048 @@ -137,18 +113,6 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/XR/Settings/Open VR Settings.asset b/Assets/XR/Settings/Open VR Settings.asset index f9fd368..62af21b 100644 --- a/Assets/XR/Settings/Open VR Settings.asset +++ b/Assets/XR/Settings/Open VR Settings.asset @@ -18,6 +18,6 @@ MonoBehaviour: StereoRenderingMode: 1 InitializationType: 1 EditorAppKey: application.generated.unity.unity3dtemplate.exe - ActionManifestFileRelativeFilePath: StreamingAssets\SteamVR\actions.json + ActionManifestFileRelativeFilePath: StreamingAssets/SteamVR/actions.json MirrorView: 2 HasCopiedDefaults: 0