diff --git a/Assets/Materials/CloudMaterial.mat b/Assets/Materials/CloudMaterial.mat index ecd3fec..3a7a4c4 100644 --- a/Assets/Materials/CloudMaterial.mat +++ b/Assets/Materials/CloudMaterial.mat @@ -32,10 +32,10 @@ Material: - Vector1_C7F9BC69: 15 - Vector1_DFA4C9D3: 2 - Vector1_ED18166C: 1000 - - Vector1_F0BE3006: 2 + - Vector1_F0BE3006: 1.69 - Vector1_F3A863FF: 16 m_Colors: - - Color_4089CE7A: {r: 0.6431373, g: 0.82773715, b: 0.8509804, a: 0.27058825} + - Color_4089CE7A: {r: 0.6431373, g: 0.7553998, b: 0.8509804, a: 0.27058825} - Color_982234E: {r: 1, g: 1, b: 1, a: 0.80784315} - Vector4_B6649628: {r: 0, g: 1, b: -0.3, a: 2.7} - Vector4_F9BF86A4: {r: 1, g: 0, b: 0, a: 90} diff --git a/Assets/Materials/Textures/BFH-cpvrLab-Gelb.png b/Assets/Materials/Textures/BFH-cpvrLab-Gelb.png new file mode 100644 index 0000000..c64cf4c Binary files /dev/null and b/Assets/Materials/Textures/BFH-cpvrLab-Gelb.png differ diff --git a/Assets/Materials/Textures/BFH-cpvrLab-Gelb.png.meta b/Assets/Materials/Textures/BFH-cpvrLab-Gelb.png.meta new file mode 100644 index 0000000..2391a36 --- /dev/null +++ b/Assets/Materials/Textures/BFH-cpvrLab-Gelb.png.meta @@ -0,0 +1,115 @@ +fileFormatVersion: 2 +guid: 9ce1199133106e143983bbaed591e5fe +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + 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: Standalone + 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: Android + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/VirtualHandMaterial.mat b/Assets/Materials/VirtualHandMaterial.mat index 7e5cf47..ef17bcc 100644 --- a/Assets/Materials/VirtualHandMaterial.mat +++ b/Assets/Materials/VirtualHandMaterial.mat @@ -96,7 +96,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0.823 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -105,7 +105,7 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0, g: 0.7935257, b: 1, a: 0.6392157} + - _BaseColor: {r: 0, g: 0.7935257, b: 1, a: 0.53333336} - _Color: {r: 0, g: 0.9905014, b: 1, a: 0.62352943} - _EmissionColor: {r: 0, g: 0.28048778, b: 0.5, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} diff --git a/Assets/Perfabs/ControlPanel.prefab b/Assets/Perfabs/ControlPanel.prefab index a07f781..708c29c 100644 --- a/Assets/Perfabs/ControlPanel.prefab +++ b/Assets/Perfabs/ControlPanel.prefab @@ -123,6 +123,102 @@ MonoBehaviour: m_EditorClassIdentifier: panelSizeX: 1 panelSizeY: 0.5 +--- !u!82 &1666945224134663437 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1885538595227555898} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: c93f6ceb5ed391347adac1456e51d423, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &5638578489636297566 PrefabInstance: m_ObjectHideFlags: 0 @@ -273,7 +369,7 @@ PrefabInstance: - target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec, type: 3} propertyPath: m_LocalPosition.x - value: -0.25000003 + value: -0.25000006 objectReference: {fileID: 0} - target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec, type: 3} @@ -383,17 +479,17 @@ PrefabInstance: - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.x - value: 0.25 + value: 0.10593131 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.y - value: -0.000000052154064 + value: 0.23083338 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.z - value: -0.10000001 + value: 0.089412026 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -538,7 +634,7 @@ PrefabInstance: - target: {fileID: 8302446664294793078, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: haveToUpdateRelativeValues - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8302446664294793078, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -583,17 +679,17 @@ PrefabInstance: - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.x - value: -0.25 + value: -0.10593131 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.y - value: 0.0000000037252903 + value: -0.089412 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.z - value: -0.09999997 + value: -0.23083341 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -738,7 +834,7 @@ PrefabInstance: - target: {fileID: 8302446664294793078, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: haveToUpdateRelativeValues - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8302446664294793078, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -752,6 +848,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} +--- !u!1 &1885538595227555898 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5372255891520917641, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, + type: 3} + m_PrefabInstance: {fileID: 5810999328181405875} + m_PrefabAsset: {fileID: 0} --- !u!4 &8904590684627367087 stripped Transform: m_CorrespondingSourceObject: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, @@ -903,17 +1005,17 @@ PrefabInstance: - target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec, type: 3} propertyPath: m_LocalPosition.x - value: 0.25 + value: 0.40312663 objectReference: {fileID: 0} - target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec, type: 3} propertyPath: m_LocalPosition.y - value: 0.19999996 + value: 0.051525727 objectReference: {fileID: 0} - target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec, type: 3} propertyPath: m_LocalPosition.z - value: -0.009999886 + value: -0.12776354 objectReference: {fileID: 0} - target: {fileID: 8441670782551679430, guid: 053138291e8a12b4486d31e5b80b1eec, type: 3} diff --git a/Assets/Perfabs/ControlPanelLeft.prefab b/Assets/Perfabs/ControlPanelLeft.prefab index f8bb72b..8596659 100644 --- a/Assets/Perfabs/ControlPanelLeft.prefab +++ b/Assets/Perfabs/ControlPanelLeft.prefab @@ -26,6 +26,102 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: CONTROLPANEL_EXIT +--- !u!82 &8126911151857521287 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8431627214427334647} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: c93f6ceb5ed391347adac1456e51d423, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &8574654116891298413 GameObject: m_ObjectHideFlags: 0 @@ -705,12 +801,12 @@ PrefabInstance: - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.y - value: -0.053650394 + value: -0.053650435 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.z - value: -0.1 + value: -0.099999964 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -885,7 +981,7 @@ PrefabInstance: - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -952,20 +1048,45 @@ PrefabInstance: propertyPath: activeMaterial value: objectReference: {fileID: 2100000, guid: 5df18dd503330f044930b2c7a60fdc18, type: 2} + - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 8126911151857521287} + - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.x - value: -0.25000003 + value: -0.25000006 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.y - value: -0.05365039 + value: -0.053650398 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_LocalPosition.z - value: -0.1 + value: -0.099999994 objectReference: {fileID: 0} - target: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -1124,6 +1245,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} +--- !u!1 &8431627214427334647 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5372255891520917641, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, + type: 3} + m_PrefabInstance: {fileID: 4579384576479049598} + m_PrefabAsset: {fileID: 0} --- !u!4 &1493674551359408994 stripped Transform: m_CorrespondingSourceObject: {fileID: 3114141377214954524, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, diff --git a/Assets/Perfabs/HandManager.prefab b/Assets/Perfabs/HandManager.prefab index bc26206..ef04919 100644 --- a/Assets/Perfabs/HandManager.prefab +++ b/Assets/Perfabs/HandManager.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 6663558989223508451} - component: {fileID: 6663558989223508452} - component: {fileID: 6663558989223508450} + - component: {fileID: 7132427053785373801} m_Layer: 0 m_Name: HandManager m_TagString: Untagged @@ -44,12 +45,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f7f1924157efedc43b63c5f3086ec932, type: 3} m_Name: m_EditorClassIdentifier: - debug: {fileID: 0} CurrentLetterText: {fileID: 0} HandData: {fileID: 0} VirtualHand: {fileID: 0} - Validator: {fileID: 0} SecondsUnitlCorrect: 0.5 + TestMode: 0 --- !u!114 &6663558989223508450 MonoBehaviour: m_ObjectHideFlags: 0 @@ -62,8 +62,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ea824a2a0c744541bbd2d9373d9c648, type: 3} m_Name: m_EditorClassIdentifier: - debug: {fileID: 0} - CurrentUserHand: {fileID: 0} + DebugCanvas: {fileID: 0} + CurrentLeftHand: {fileID: 0} + CurrentRightHand: {fileID: 0} VirtualHand: {fileID: 0} MaxAngleDiff: 20 MaxTippDiff: 15 @@ -71,3 +72,99 @@ MonoBehaviour: FingerAngleWeight: 0.75 TipDistanceWeight: 1.25 WristOrientationWeight: 1 +--- !u!82 &7132427053785373801 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6663558989223508453} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 60ca1559693affd4fab5916492f6ea65, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Perfabs/SceneLoader.prefab b/Assets/Perfabs/SceneLoader.prefab index 299c561..7ce0601 100644 --- a/Assets/Perfabs/SceneLoader.prefab +++ b/Assets/Perfabs/SceneLoader.prefab @@ -10,6 +10,7 @@ GameObject: m_Component: - component: {fileID: 3197302426718737418} - component: {fileID: 3197302426718737417} + - component: {fileID: 204073498812343833} m_Layer: 0 m_Name: SceneLoader m_TagString: Untagged @@ -43,3 +44,99 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 04d1cdde25791fe4fba3df3bd0ac0c78, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!82 &204073498812343833 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3197302426718737416} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: c93f6ceb5ed391347adac1456e51d423, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset index cf5cd6c..ce0beca 100644 --- a/Assets/Resources/OVRBuildConfig.asset +++ b/Assets/Resources/OVRBuildConfig.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3} m_Name: OVRBuildConfig m_EditorClassIdentifier: - androidSDKPath: + androidSDKPath: C:\Program Files\Unity\Hub\Editor\2019.3.0f6\Editor\Data\PlaybackEngines\AndroidPlayer\SDK gradlePath: jdkPath: diff --git a/Assets/Scenes/InsightScene.unity b/Assets/Scenes/InsightScene.unity index ba04f1f..5afb0df 100644 --- a/Assets/Scenes/InsightScene.unity +++ b/Assets/Scenes/InsightScene.unity @@ -38,13 +38,13 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.017265823, g: 0.037191074, b: 0.035541035, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 11 - m_GIWorkflowMode: 1 + m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -98,7 +98,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -519,6 +519,16 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2376093626414727732, guid: 09148a20c61669b43b7ffa8b9da4cd90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2376136860151823482, guid: 09148a20c61669b43b7ffa8b9da4cd90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2386477697284580208, guid: 09148a20c61669b43b7ffa8b9da4cd90, type: 3} propertyPath: m_Name @@ -784,6 +794,11 @@ PrefabInstance: propertyPath: m_textInfo.pageCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 1666945224134663437, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_PlayOnAwake + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1861857355709511072, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_Name @@ -1147,7 +1162,7 @@ PrefabInstance: - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} @@ -1199,6 +1214,31 @@ PrefabInstance: propertyPath: useGestureController value: 0 objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1141973320} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8904590684627367087, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_LocalPosition.x @@ -1224,6 +1264,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.000000044703484 objectReference: {fileID: 0} + - target: {fileID: 8904590685819163908, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10000001 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} --- !u!4 &1141973313 stripped @@ -1289,6 +1334,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UIForHand: 0 +--- !u!82 &1141973320 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 1666945224134663437, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + m_PrefabInstance: {fileID: 1141973312} + m_PrefabAsset: {fileID: 0} --- !u!4 &1540625565 stripped Transform: m_CorrespondingSourceObject: {fileID: 2386477696160214385, guid: 09148a20c61669b43b7ffa8b9da4cd90, @@ -2364,7 +2415,7 @@ PrefabInstance: - target: {fileID: 911630948448039916, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: vruiPositionerChangedTransform - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 911630948448039916, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} @@ -2416,11 +2467,41 @@ PrefabInstance: propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 158098510} + - target: {fileID: 1656997643726510081, guid: 8c47f18dc2164da4b9e6b1441c79f65a, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1656997643726510081, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 6663558988274345240} + - target: {fileID: 1656997643726510081, guid: 8c47f18dc2164da4b9e6b1441c79f65a, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1656997643726510081, guid: 8c47f18dc2164da4b9e6b1441c79f65a, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1656997643726510081, guid: 8c47f18dc2164da4b9e6b1441c79f65a, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 8134991111426470559} + - target: {fileID: 1656997643726510081, guid: 8c47f18dc2164da4b9e6b1441c79f65a, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 1656997643726510081, guid: 8c47f18dc2164da4b9e6b1441c79f65a, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 2598671428398079244, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: vruiPositionerChangedTransform @@ -2429,7 +2510,7 @@ PrefabInstance: - target: {fileID: 2598671428398079244, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: anchorPosition.x - value: -0.97198534 + value: -1.5819852 objectReference: {fileID: 0} - target: {fileID: 2598671428398079244, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} @@ -2444,7 +2525,7 @@ PrefabInstance: - target: {fileID: 3865736211733624563, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: anchorPosition.x - value: -0.5482601 + value: -1.1582601 objectReference: {fileID: 0} - target: {fileID: 3865736211733624563, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} @@ -2459,27 +2540,27 @@ PrefabInstance: - target: {fileID: 5527334299104373155, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: vruiPositionerChangedTransform - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5527334299104373155, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: lastParentRotationValue.y - value: 0.49592406 + value: -0.49592403 objectReference: {fileID: 0} - target: {fileID: 5527334299104373155, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: lastParentRotationValue.z - value: 0.20541848 + value: 0.20541844 objectReference: {fileID: 0} - target: {fileID: 5527334299104373155, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: lastParentRotationValue.w - value: -0.77949524 + value: 0.77949524 objectReference: {fileID: 0} - target: {fileID: 5527334299104373155, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: anchorPosition.x - value: -0.70000005 + value: -1.21 objectReference: {fileID: 0} - target: {fileID: 5527334299104373155, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} @@ -2509,22 +2590,22 @@ PrefabInstance: - target: {fileID: 5527334300045101064, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: vruiPositionerChangedTransform - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5527334300045101064, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: lastParentRotationValue.y - value: 0.49592406 + value: -0.49592403 objectReference: {fileID: 0} - target: {fileID: 5527334300045101064, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: lastParentRotationValue.z - value: 0.20541848 + value: 0.20541844 objectReference: {fileID: 0} - target: {fileID: 5527334300045101064, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: lastParentRotationValue.w - value: -0.77949524 + value: 0.77949524 objectReference: {fileID: 0} - target: {fileID: 5527334300045101064, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} @@ -2549,7 +2630,7 @@ PrefabInstance: - target: {fileID: 5527334300045101064, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} propertyPath: anchorPosition.x - value: -0.70000005 + value: -1.21 objectReference: {fileID: 0} - target: {fileID: 5527334300045101064, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} @@ -2643,3 +2724,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8c47f18dc2164da4b9e6b1441c79f65a, type: 3} +--- !u!82 &8134991111426470559 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 8126911151857521287, guid: 8c47f18dc2164da4b9e6b1441c79f65a, + type: 3} + m_PrefabInstance: {fileID: 8134991111426470558} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/LearnScene.unity b/Assets/Scenes/LearnScene.unity index caaca9a..932c5c9 100644 --- a/Assets/Scenes/LearnScene.unity +++ b/Assets/Scenes/LearnScene.unity @@ -1043,11 +1043,21 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dc5ad5a24f50f514782349338cc7caa9, type: 2} + - target: {fileID: 2376093626414727732, guid: 09148a20c61669b43b7ffa8b9da4cd90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2376136860151823482, guid: 09148a20c61669b43b7ffa8b9da4cd90, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: dc5ad5a24f50f514782349338cc7caa9, type: 2} + - target: {fileID: 2376136860151823482, guid: 09148a20c61669b43b7ffa8b9da4cd90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2386477697284580208, guid: 09148a20c61669b43b7ffa8b9da4cd90, type: 3} propertyPath: m_Name @@ -2068,7 +2078,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6, type: 3} propertyPath: m_LocalPosition.y - value: -15 + value: -14 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6, type: 3} @@ -2127,6 +2137,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a6c256b56bcdd449babd3ad63692ea6, type: 3} +--- !u!1 &1951520390 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 9a6c256b56bcdd449babd3ad63692ea6, + type: 3} + m_PrefabInstance: {fileID: 1951520389} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1951520391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1951520390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d8ce2b1e4a7a24469373f9ce574b274, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 0.6431373, g: 0.8509804, b: 0.7254902, a: 0} --- !u!1001 &1958347475 PrefabInstance: m_ObjectHideFlags: 0 @@ -2731,6 +2760,11 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 0} + - target: {fileID: 1666945224134663437, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_PlayOnAwake + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1861857355709511072, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_Name @@ -2994,7 +3028,7 @@ PrefabInstance: - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} @@ -3046,6 +3080,31 @@ PrefabInstance: propertyPath: useGestureController value: 0 objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 5810999327177106950} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8904590684627367087, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_LocalPosition.x @@ -3071,6 +3130,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.000000044703484 objectReference: {fileID: 0} + - target: {fileID: 8904590685819163908, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10000001 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} --- !u!4 &5810999327177106943 stripped @@ -3136,3 +3200,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UIForHand: 0 +--- !u!82 &5810999327177106950 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 1666945224134663437, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + m_PrefabInstance: {fileID: 5810999327177106942} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/StartScene.unity b/Assets/Scenes/StartScene.unity index d647659..88281e1 100644 --- a/Assets/Scenes/StartScene.unity +++ b/Assets/Scenes/StartScene.unity @@ -44,7 +44,7 @@ RenderSettings: LightmapSettings: m_ObjectHideFlags: 0 serializedVersion: 11 - m_GIWorkflowMode: 1 + m_GIWorkflowMode: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -1717,7 +1717,7 @@ PrefabInstance: - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.size - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -2650,6 +2650,146 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 504470636} m_CullTransparentMesh: 0 +--- !u!1 &506909300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 506909303} + - component: {fileID: 506909302} + - component: {fileID: 506909301} + m_Layer: 0 + m_Name: BackgroundMusic + m_TagString: Music + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &506909301 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506909300} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 9158ab63e5af8b148a4e1d882db4b099, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.5 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 2.0827663 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &506909302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506909300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3c47bf1435370a248880428e1115e61d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &506909303 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506909300} + 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: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &560536508 GameObject: m_ObjectHideFlags: 0 @@ -3390,6 +3530,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2376093626414727732, guid: 09148a20c61669b43b7ffa8b9da4cd90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2376136860151823482, guid: 09148a20c61669b43b7ffa8b9da4cd90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2386477696161798015, guid: 09148a20c61669b43b7ffa8b9da4cd90, type: 3} propertyPath: m_AllowMSAA @@ -5786,7 +5936,7 @@ PrefabInstance: - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.size - value: 4 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2986986689778806655, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, type: 3} @@ -6348,7 +6498,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6, type: 3} propertyPath: m_LocalPosition.y - value: -15 + value: -14 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 9a6c256b56bcdd449babd3ad63692ea6, type: 3} @@ -6407,6 +6557,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a6c256b56bcdd449babd3ad63692ea6, type: 3} +--- !u!1 &1666075336 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 9a6c256b56bcdd449babd3ad63692ea6, + type: 3} + m_PrefabInstance: {fileID: 1666075335} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1666075337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1666075336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d8ce2b1e4a7a24469373f9ce574b274, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 0.6431373, g: 0.75686276, b: 0.8509804, a: 0} --- !u!1 &1669163575 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5372255891520917641, guid: fcd29aa0eaa57764c9cf1ceaddfacaa2, @@ -8573,6 +8742,7 @@ GameObject: - component: {fileID: 2131060615} - component: {fileID: 2131060614} - component: {fileID: 2131060616} + - component: {fileID: 2131060617} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -8649,7 +8819,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131060613} m_LocalRotation: {x: 0.560215, y: -0.2505174, z: 0.0650262, w: 0.7868748} - m_LocalPosition: {x: 0, y: 7.26, z: 0} + m_LocalPosition: {x: 0, y: 1.223, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -8681,6 +8851,102 @@ MonoBehaviour: - {fileID: 8026345484134852389} - {fileID: 14350242} ToggleButton: {fileID: 1669163578} +--- !u!82 &2131060617 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2131060613} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: c93f6ceb5ed391347adac1456e51d423, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.8 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1.5693638 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &2135845854 GameObject: m_ObjectHideFlags: 0 @@ -9005,7 +9271,7 @@ PrefabInstance: - target: {fileID: 3197302426718737418, guid: 12d14503f8cdb424d8be693bbe58fc9c, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.981 objectReference: {fileID: 0} - target: {fileID: 3197302426718737418, guid: 12d14503f8cdb424d8be693bbe58fc9c, type: 3} diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 7d6d73e..68e8b05 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -622,6 +622,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a6c256b56bcdd449babd3ad63692ea6, type: 3} +--- !u!1 &490881805 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 9a6c256b56bcdd449babd3ad63692ea6, + type: 3} + m_PrefabInstance: {fileID: 490881804} + m_PrefabAsset: {fileID: 0} +--- !u!114 &490881806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 490881805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d8ce2b1e4a7a24469373f9ce574b274, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 0.8235294, g: 0.6431373, b: 0.8509804, a: 0} --- !u!1001 &497677986 PrefabInstance: m_ObjectHideFlags: 0 @@ -852,6 +871,102 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 497677986} m_PrefabAsset: {fileID: 0} +--- !u!82 &497677991 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 497677988} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 60ca1559693affd4fab5916492f6ea65, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 9.375706 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1001 &511728707 PrefabInstance: m_ObjectHideFlags: 0 @@ -859,6 +974,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1038714177} m_Modifications: + - target: {fileID: 2376093626414727732, guid: 09148a20c61669b43b7ffa8b9da4cd90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2376136860151823482, guid: 09148a20c61669b43b7ffa8b9da4cd90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2386477697284580208, guid: 09148a20c61669b43b7ffa8b9da4cd90, type: 3} propertyPath: m_Name @@ -1139,6 +1264,11 @@ PrefabInstance: propertyPath: m_textInfo.pageCount value: 0 objectReference: {fileID: 0} + - target: {fileID: 1666945224134663437, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_PlayOnAwake + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1861857355709511072, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_Name @@ -1407,7 +1537,7 @@ PrefabInstance: - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} @@ -1464,6 +1594,31 @@ PrefabInstance: propertyPath: useGestureController value: 0 objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 953383628} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 8779549256124770252, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_onVRUIButtonDown.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8904590684627367087, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} propertyPath: m_LocalPosition.x @@ -1489,6 +1644,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.000000044703484 objectReference: {fileID: 0} + - target: {fileID: 8904590685819163908, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.10000001 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42ca5fe4ef53abb4e95831bbf9315591, type: 3} --- !u!4 &953383621 stripped @@ -1554,6 +1714,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UIForHand: 0 +--- !u!82 &953383628 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 1666945224134663437, guid: 42ca5fe4ef53abb4e95831bbf9315591, + type: 3} + m_PrefabInstance: {fileID: 953383620} + m_PrefabAsset: {fileID: 0} --- !u!1 &1038714176 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BackgroundMusicManager.cs b/Assets/Scripts/BackgroundMusicManager.cs new file mode 100644 index 0000000..1ab9157 --- /dev/null +++ b/Assets/Scripts/BackgroundMusicManager.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(AudioSource))] +public class BackgroundMusicManager : MonoBehaviour +{ + void Awake() + { + GameObject[] objs = GameObject.FindGameObjectsWithTag("Music"); + + if (objs.Length > 1) + { + Destroy(this.gameObject); + } + + DontDestroyOnLoad(this.gameObject); + } + +} diff --git a/Assets/Scripts/BackgroundMusicManager.cs.meta b/Assets/Scripts/BackgroundMusicManager.cs.meta new file mode 100644 index 0000000..48261e2 --- /dev/null +++ b/Assets/Scripts/BackgroundMusicManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3c47bf1435370a248880428e1115e61d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/CloudColorManager.cs b/Assets/Scripts/CloudColorManager.cs new file mode 100644 index 0000000..06c66cc --- /dev/null +++ b/Assets/Scripts/CloudColorManager.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CloudColorManager : MonoBehaviour +{ + public Color color; + // Start is called before the first frame update + void Start() + { + Renderer rend = GetComponent(); + + Debug.Log(rend); + Debug.Log(rend.material.GetColor("Color_4089CE7A")); + + rend.material.SetColor("Color_4089CE7A", color); + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/CloudColorManager.cs.meta b/Assets/Scripts/CloudColorManager.cs.meta new file mode 100644 index 0000000..b62e785 --- /dev/null +++ b/Assets/Scripts/CloudColorManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4d8ce2b1e4a7a24469373f9ce574b274 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DisclamerManager.cs b/Assets/Scripts/DisclamerManager.cs index 3748b57..8b18db2 100644 --- a/Assets/Scripts/DisclamerManager.cs +++ b/Assets/Scripts/DisclamerManager.cs @@ -15,6 +15,8 @@ public class DisclamerManager : MonoBehaviour public GameObject[] HandednessGameObjects; public VRUIToggleBehaviour ToggleButton; + + private AudioSource clickAudio; // Start is called before the first frame update void Awake() { @@ -38,7 +40,10 @@ void Awake() // if language is saved, set it to LanguageManager.language = (Language)PlayerPrefs.GetInt("Language", 0); } - + + clickAudio = GetComponent(); + + } public void ShowDisclamer() @@ -58,6 +63,8 @@ public void ShowDisclamer() public void ShowHandedness() { + clickAudio.Play(0); + // hide Disclamer foreach (GameObject disclamer in DisclamerGameObjects) disclamer.SetActive(false); @@ -86,12 +93,16 @@ public void SetLanguage(int languageId) LearnManger.IsInitalized = false; + clickAudio.Play(0); + } public void SetHandedness(int handednessId) { PlayerPrefs.SetInt("Handedness", handednessId); HandednessManager.SetHandedness(handednessId); + + clickAudio.Play(0); } diff --git a/Assets/Scripts/HandManager.cs b/Assets/Scripts/HandManager.cs index e6ceb37..f566675 100644 --- a/Assets/Scripts/HandManager.cs +++ b/Assets/Scripts/HandManager.cs @@ -30,12 +30,15 @@ public class HandManager : MonoBehaviour private HandForm _ObjectiveHandForm; private HandFormValidator _Validator; - + private AudioSource audioBlop; #endregion #region UnityFunctions private void Start() { + + audioBlop = GetComponent(); + _HandFormsLoaded = false; // _CurrentLetter = GetRandomAlphabetLetter(); _Validator = GetComponent(); @@ -67,6 +70,7 @@ void Update() // When the HandForm was right for the SecondsUnitlCorrect if(_CurrentTime - _PreviousFalseTime > SecondsUnitlCorrect) { + audioBlop.Play(0); LearnManger.IncreaseLetterScore(_ObjectiveHandForm.AlphabeticCharacter, TestMode); LoadNewHand(); _PreviousFalseTime = _CurrentTime; diff --git a/Assets/Scripts/SceneManager.cs b/Assets/Scripts/SceneManager.cs index f653189..be6f175 100644 --- a/Assets/Scripts/SceneManager.cs +++ b/Assets/Scripts/SceneManager.cs @@ -10,12 +10,21 @@ /// public class SceneManager : MonoBehaviour { + + AudioSource audioData; + + private void Start() + { + audioData = GetComponent(); + } + /// /// Loads a new Scene /// /// name of the Scene public void OnButtonDownLoadScene(string SceneName) { + audioData.Play(0); UnityEngine.SceneManagement.SceneManager.LoadScene(SceneName, LoadSceneMode.Single); } diff --git a/Assets/Shaders/Clouds.shadergraph b/Assets/Shaders/Clouds.shadergraph index f26fca2..8854d67 100644 --- a/Assets/Shaders/Clouds.shadergraph +++ b/Assets/Shaders/Clouds.shadergraph @@ -40,7 +40,7 @@ "typeInfo": { "fullName": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty" }, - "JSONnodeData": "{\n \"m_Guid\": {\n \"m_GuidSerialized\": \"7ebdaaa4-7345-4b4b-af73-d0365eb44ab0\"\n },\n \"m_Name\": \"Color Valley\",\n \"m_DefaultReferenceName\": \"Color_4089CE7A\",\n \"m_OverrideReferenceName\": \"\",\n \"m_GeneratePropertyBlock\": true,\n \"m_Precision\": 0,\n \"m_GPUInstanced\": false,\n \"m_Hidden\": false,\n \"m_Value\": {\n \"r\": 0.0,\n \"g\": 0.0,\n \"b\": 0.0,\n \"a\": 0.0\n },\n \"m_ColorMode\": 0\n}" + "JSONnodeData": "{\n \"m_Guid\": {\n \"m_GuidSerialized\": \"7ebdaaa4-7345-4b4b-af73-d0365eb44ab0\"\n },\n \"m_Name\": \"ColorValley\",\n \"m_DefaultReferenceName\": \"Color_4089CE7A\",\n \"m_OverrideReferenceName\": \"\",\n \"m_GeneratePropertyBlock\": true,\n \"m_Precision\": 0,\n \"m_GPUInstanced\": false,\n \"m_Hidden\": false,\n \"m_Value\": {\n \"r\": 0.0,\n \"g\": 0.0,\n \"b\": 0.0,\n \"a\": 0.0\n },\n \"m_ColorMode\": 0\n}" }, { "typeInfo": { @@ -181,7 +181,7 @@ "typeInfo": { "fullName": "UnityEditor.ShaderGraph.PropertyNode" }, - "JSONnodeData": "{\n \"m_GuidSerialized\": \"63a7d313-dc5f-490d-ba12-af5c7493964a\",\n \"m_GroupGuidSerialized\": \"a1f9cee6-e75a-4cb4-88ab-0959bdd28977\",\n \"m_Name\": \"Property\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 1977.9998779296875,\n \"y\": 681.0,\n \"width\": 143.0,\n \"height\": 33.999996185302737\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector4MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"Color Valley\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_PropertyGuidSerialized\": \"7ebdaaa4-7345-4b4b-af73-d0365eb44ab0\"\n}" + "JSONnodeData": "{\n \"m_GuidSerialized\": \"63a7d313-dc5f-490d-ba12-af5c7493964a\",\n \"m_GroupGuidSerialized\": \"a1f9cee6-e75a-4cb4-88ab-0959bdd28977\",\n \"m_Name\": \"Property\",\n \"m_NodeVersion\": 0,\n \"m_DrawState\": {\n \"m_Expanded\": true,\n \"m_Position\": {\n \"serializedVersion\": \"2\",\n \"x\": 1977.9998779296875,\n \"y\": 681.0,\n \"width\": 143.0,\n \"height\": 33.999996185302737\n }\n },\n \"m_SerializableSlots\": [\n {\n \"typeInfo\": {\n \"fullName\": \"UnityEditor.ShaderGraph.Vector4MaterialSlot\"\n },\n \"JSONnodeData\": \"{\\n \\\"m_Id\\\": 0,\\n \\\"m_DisplayName\\\": \\\"ColorValley\\\",\\n \\\"m_SlotType\\\": 1,\\n \\\"m_Priority\\\": 2147483647,\\n \\\"m_Hidden\\\": false,\\n \\\"m_ShaderOutputName\\\": \\\"Out\\\",\\n \\\"m_StageCapability\\\": 3,\\n \\\"m_Value\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n },\\n \\\"m_DefaultValue\\\": {\\n \\\"x\\\": 0.0,\\n \\\"y\\\": 0.0,\\n \\\"z\\\": 0.0,\\n \\\"w\\\": 0.0\\n }\\n}\"\n }\n ],\n \"m_Precision\": 0,\n \"m_PreviewExpanded\": true,\n \"m_CustomColors\": {\n \"m_SerializableColors\": []\n },\n \"m_PropertyGuidSerialized\": \"7ebdaaa4-7345-4b4b-af73-d0365eb44ab0\"\n}" }, { "typeInfo": { diff --git a/Assets/Scenes/StartScene.meta b/Assets/Sounds.meta similarity index 77% rename from Assets/Scenes/StartScene.meta rename to Assets/Sounds.meta index 10759b1..a64403e 100644 --- a/Assets/Scenes/StartScene.meta +++ b/Assets/Sounds.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5e3fc26feb33bdf47890b9ba6ce6aec6 +guid: a8db4adfb3963cb4bb7c0c1f4b1782d4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Sounds/0150.wav b/Assets/Sounds/0150.wav new file mode 100644 index 0000000..a88f966 Binary files /dev/null and b/Assets/Sounds/0150.wav differ diff --git a/Assets/Sounds/0150.wav.meta b/Assets/Sounds/0150.wav.meta new file mode 100644 index 0000000..65d55ad --- /dev/null +++ b/Assets/Sounds/0150.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3bfe414526689cf48a8b33797d4be94c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/1074.wav b/Assets/Sounds/1074.wav new file mode 100644 index 0000000..dc8e0e1 Binary files /dev/null and b/Assets/Sounds/1074.wav differ diff --git a/Assets/Sounds/1074.wav.meta b/Assets/Sounds/1074.wav.meta new file mode 100644 index 0000000..d65c3e1 --- /dev/null +++ b/Assets/Sounds/1074.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 342a90c5f504d1b47bf8d2af56df4361 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Blop1.wav b/Assets/Sounds/Blop1.wav new file mode 100644 index 0000000..9a90704 Binary files /dev/null and b/Assets/Sounds/Blop1.wav differ diff --git a/Assets/Sounds/Blop1.wav.meta b/Assets/Sounds/Blop1.wav.meta new file mode 100644 index 0000000..0cc5d16 --- /dev/null +++ b/Assets/Sounds/Blop1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 60ca1559693affd4fab5916492f6ea65 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/BlopClick.wav b/Assets/Sounds/BlopClick.wav new file mode 100644 index 0000000..408e8b7 Binary files /dev/null and b/Assets/Sounds/BlopClick.wav differ diff --git a/Assets/Sounds/BlopClick.wav.meta b/Assets/Sounds/BlopClick.wav.meta new file mode 100644 index 0000000..a58713c --- /dev/null +++ b/Assets/Sounds/BlopClick.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c93f6ceb5ed391347adac1456e51d423 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds/Monumental_Journey.mp3 b/Assets/Sounds/Monumental_Journey.mp3 new file mode 100644 index 0000000..41efe64 Binary files /dev/null and b/Assets/Sounds/Monumental_Journey.mp3 differ diff --git a/Assets/Sounds/Monumental_Journey.mp3.meta b/Assets/Sounds/Monumental_Journey.mp3.meta new file mode 100644 index 0000000..abc5af0 --- /dev/null +++ b/Assets/Sounds/Monumental_Journey.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9158ab63e5af8b148a4e1d882db4b099 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 59f08f3..9981e60 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: cpvrLab - productName: VR-Trainingsapplikation-FingeralphabetDev + productName: VR-Trainingsapplikation-Fingeralphabet defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -40,7 +40,8 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_VirtualRealitySplashScreen: {fileID: 0} + m_VirtualRealitySplashScreen: {fileID: 2800000, guid: 9ce1199133106e143983bbaed591e5fe, + type: 3} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 @@ -103,7 +104,6 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 - xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -120,9 +120,7 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.2 - preloadedAssets: - - {fileID: 7049848938761041164, guid: e93f7db9d983e434bb6d6543ee309659, type: 2} - - {fileID: 11400000, guid: d5c277ba591765c4194f1923b4d9b265, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -165,7 +163,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: ch.cpvrLab.VRTrainingsapplikationFingeralphabetDev + Android: ch.cpvrLab.VRTrainingsapplikationFingeralphabet Standalone: com.cpvrLab.VR-Trainingsapplikation-FingeralphabetDev buildNumber: {} AndroidBundleVersionCode: 1 @@ -277,7 +275,14 @@ PlayerSettings: androidGamepadSupportLevel: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 0cb87be8e5a6d8e4f932a0e35f228a8f, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e51db95..798259b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.5f1 -m_EditorVersionWithRevision: 2019.3.5f1 (d691e07d38ef) +m_EditorVersion: 2019.3.0f6 +m_EditorVersionWithRevision: 2019.3.0f6 (27ab2135bccf) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..d813235 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,9 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - FakeHand + - Music layers: - Default - TransparentFX diff --git a/README.md b/README.md index a259249..6beb1fd 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,8 @@ The Unity Project uses folowing plugins: | ui_ux_in_vr_2019_2 | https://github.com/soma1294/ui_ux_in_vr_2019_2 | | Oculus Integration | https://assetstore.unity.com/packages/tools/integration/oculus-integration-82022 | | JSON .NET For Unity | https://assetstore.unity.com/packages/tools/input-management/json-net-for-unity-11347#description | +| Monumental Journey | https://www.youtube.com/audiolibrary/music?nv=1 | +| All Sound Effects | https://bigsoundbank.com/ | ## Handform validation @@ -79,19 +81,10 @@ In the insight scene is a save button. When pressed it creates a Handformstruct:\ ![structimage](https://github.com/cpvrlab/vrTrainingFingerAlphabet/blob/master/Assets/Documents/DocumentImages/HandformStruct.png) -This Handformstruct will then be saved in the handdata.txt file. -Note: I wanted to save it in a json file but I had insufficent time.\ -The Textfile is as followed formated: +This Handformstruct will then be saved in the handdata.json file. -| Char | Description | -| ------ | ------ | -| \ | Split the Attributs of the handstruct | -| {} | Segment the OVRBone Objects | -| : | Segment the OVRBone Attributs | -| () | Segment the Transform values | -| , | Segment the float values | -The Textfile gets then splited and converts the values back to a handformstruct... +The Jsonfile will be converted to the values of a handformstruct... ## Domainmodel ![structimage](https://github.com/cpvrlab/vrTrainingFingerAlphabet/blob/master/Assets/Documents/DocumentImages/KlassendiagrammRealisierung2.png)