diff --git a/Viagg-io/Assets/Prefabs/Components/XR Interaction Hands Setup.prefab b/Viagg-io/Assets/Prefabs/Components/XR Interaction Hands Setup.prefab index e444f449..fa0ebffd 100644 --- a/Viagg-io/Assets/Prefabs/Components/XR Interaction Hands Setup.prefab +++ b/Viagg-io/Assets/Prefabs/Components/XR Interaction Hands Setup.prefab @@ -222,6 +222,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6178172132692152350} m_Modifications: + - target: {fileID: 6871537830725498, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 292634832433144490, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} propertyPath: m_Parameters.widthMultiplier value: 0.005 @@ -274,6 +278,14 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1096765080775214961, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + propertyPath: m_HandMeshRenderer + value: + objectReference: {fileID: 8911100134353005624} + - target: {fileID: 1643749915119030726, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1820897918385990095, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} propertyPath: m_RequestedTrackingOriginMode value: 2 @@ -338,10 +350,18 @@ PrefabInstance: propertyPath: m_RotationAction.m_Reference value: objectReference: {fileID: -3279446914071225446, guid: c348712bda248c246b8c49b3db54643f, type: 3} + - target: {fileID: 3707255535797615770, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + propertyPath: m_HandMeshRenderer + value: + objectReference: {fileID: 385592853764047220} - target: {fileID: 3910408762165081306, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4213253056565931907, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4605643766788160351, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} propertyPath: m_IsActive value: 1 @@ -350,13 +370,21 @@ PrefabInstance: propertyPath: m_Parameters.widthMultiplier value: 0.0035 objectReference: {fileID: 0} + - target: {fileID: 4743647466011135546, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8181680437625569136, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8414094292795595994, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} propertyPath: m_RotationAction.m_Reference value: objectReference: {fileID: 7384354444432909072, guid: c348712bda248c246b8c49b3db54643f, type: 3} - target: {fileID: 8775677614826887028, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: @@ -365,6 +393,12 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 657184242118504721, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} insertIndex: -1 addedObject: {fileID: 2365414758627251490} + - targetCorrespondingSourceObject: {fileID: 4399806423645351520, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + insertIndex: 2 + addedObject: {fileID: 4441435140452425308} + - targetCorrespondingSourceObject: {fileID: 2062385652673493497, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + insertIndex: 2 + addedObject: {fileID: 6490138172312632994} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 2218496723442559054, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} insertIndex: -1 @@ -379,6 +413,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 6213754849475325600} m_SourcePrefab: {fileID: 100100000, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} +--- !u!4 &620281564447367753 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2062385652673493497, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + m_PrefabInstance: {fileID: 1442486795734145968} + m_PrefabAsset: {fileID: 0} --- !u!4 &778297127070970877 stripped Transform: m_CorrespondingSourceObject: {fileID: 2218496723442559053, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} @@ -513,6 +552,82 @@ MonoBehaviour: m_EditorClassIdentifier: nonRigidbodyVelocity: 0 attenuationObject: {fileID: 0} +--- !u!4 &2957737648895047120 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4399806423645351520, guid: d6878e1999eb4b44a9f5a263af86c185, type: 3} + m_PrefabInstance: {fileID: 1442486795734145968} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5166222009684003290 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2957737648895047120} + m_Modifications: + - target: {fileID: 5336186960391751790, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8795879930519852935, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + propertyPath: m_Name + value: HandLeft + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} +--- !u!4 &4441435140452425308 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8795879930519852934, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + m_PrefabInstance: {fileID: 5166222009684003290} + m_PrefabAsset: {fileID: 0} +--- !u!137 &8911100134353005624 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 4330366967082837474, guid: 6abc76b40b133154a91d14528cc20ba5, type: 3} + m_PrefabInstance: {fileID: 5166222009684003290} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7436718944533201287 PrefabInstance: m_ObjectHideFlags: 0 @@ -587,3 +702,74 @@ Transform: m_CorrespondingSourceObject: {fileID: 5181158593811993765, guid: 760ca66a6888341999f27c6e23ec905e, type: 3} m_PrefabInstance: {fileID: 7436718944533201287} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8077919530696434750 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 620281564447367753} + m_Modifications: + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3029536390279617181, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_Name + value: HandRight + objectReference: {fileID: 0} + - target: {fileID: 5336186961340876117, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e664d688bb65af54a9146781a2b6f500, type: 3} +--- !u!137 &385592853764047220 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 8449720109929391434, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + m_PrefabInstance: {fileID: 8077919530696434750} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6490138172312632994 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3029536390279617180, guid: e664d688bb65af54a9146781a2b6f500, type: 3} + m_PrefabInstance: {fileID: 8077919530696434750} + m_PrefabAsset: {fileID: 0} diff --git a/Viagg-io/Assets/Resources/MetaXRAudioSettings.asset b/Viagg-io/Assets/Resources/MetaXRAudioSettings.asset deleted file mode 100644 index 8cf8c831..00000000 --- a/Viagg-io/Assets/Resources/MetaXRAudioSettings.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f3fe6e38ac2d4c22b04340d6eda2a47e, type: 3} - m_Name: MetaXRAudioSettings - m_EditorClassIdentifier: - voiceLimit: 64 diff --git a/Viagg-io/Assets/Resources/MetaXRAudioSettings.asset.meta b/Viagg-io/Assets/Resources/MetaXRAudioSettings.asset.meta deleted file mode 100644 index 87afb942..00000000 --- a/Viagg-io/Assets/Resources/MetaXRAudioSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ce2c5eea9bc89494d87e465b942bc9cb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset b/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset deleted file mode 100644 index 0ac2533d..00000000 --- a/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cd7bb81df5b74b34dadbf531f381a26b, type: 3} - m_Name: OVRPlatformToolSettings - m_EditorClassIdentifier: - riftRedistPackages: [] - languagePackDirectory: - assetConfigs: - - configList: [] - - configList: [] - - configList: [] - targetPlatform: 3 - runOvrLint: 1 diff --git a/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset.meta b/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset.meta deleted file mode 100644 index 4c80c3ff..00000000 --- a/Viagg-io/Assets/Resources/OVRPlatformToolSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b0e22bf1774ae4e31b7577198af36cfc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset b/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset index 72f41a44..bba149bc 100644 --- a/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset +++ b/Viagg-io/Assets/Resources/OculusRuntimeSettings.asset @@ -18,6 +18,6 @@ MonoBehaviour: hasSentConsentEvent: 0 hasSetTelemetryEnabled: 0 telemetryEnabled: 0 - telemetryProjectGuid: + telemetryProjectGuid: 09bc1f3d-c25f-44e8-8052-00ce34e76d09 bodyTrackingFidelity: 1 bodyTrackingJointSet: 0 diff --git a/Viagg-io/ProjectSettings/ProjectSettings.asset b/Viagg-io/ProjectSettings/ProjectSettings.asset index 05c125ed..bcafa55c 100644 --- a/Viagg-io/ProjectSettings/ProjectSettings.asset +++ b/Viagg-io/ProjectSettings/ProjectSettings.asset @@ -144,6 +144,8 @@ PlayerSettings: bundleVersion: 1.0 preloadedAssets: - {fileID: 0} + - {fileID: 0} + - {fileID: 11400000, guid: be340e3c48769439d8d18a5a2bccd498, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1