diff --git a/Assets/D5VR/TestResource/S1_3.mp4 b/Assets/D5VR/TestResource/S1_3.mp4 index 54efa469..4d563960 100644 Binary files a/Assets/D5VR/TestResource/S1_3.mp4 and b/Assets/D5VR/TestResource/S1_3.mp4 differ diff --git a/Assets/D5VR/TestResource/S2_3.mp4 b/Assets/D5VR/TestResource/S2_3.mp4 index 6623e08b..3c643150 100644 Binary files a/Assets/D5VR/TestResource/S2_3.mp4 and b/Assets/D5VR/TestResource/S2_3.mp4 differ diff --git a/Assets/D5VR/TestResource/S3_3.mp4 b/Assets/D5VR/TestResource/S3_3.mp4 index c0f9d5fa..58552e83 100644 Binary files a/Assets/D5VR/TestResource/S3_3.mp4 and b/Assets/D5VR/TestResource/S3_3.mp4 differ diff --git a/Assets/D5VR/TestResource/S4_4.mp4 b/Assets/D5VR/TestResource/S4_4.mp4 index 42f97d6e..21b0eba0 100644 Binary files a/Assets/D5VR/TestResource/S4_4.mp4 and b/Assets/D5VR/TestResource/S4_4.mp4 differ diff --git a/Assets/D5VR/TestResource/TechVideo.mp4 b/Assets/D5VR/TestResource/TechVideo.mp4 index 5f78ecf3..3de6cce2 100644 Binary files a/Assets/D5VR/TestResource/TechVideo.mp4 and b/Assets/D5VR/TestResource/TechVideo.mp4 differ diff --git a/Assets/Scenes/Old/Launcher.unity b/Assets/Scenes/Old/Launcher.unity index cf6e27f4..d9d58fd7 100644 --- a/Assets/Scenes/Old/Launcher.unity +++ b/Assets/Scenes/Old/Launcher.unity @@ -4490,7 +4490,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _isOffline: 1 - NextSceneId: 10002 + NextSceneId: 10000 --- !u!4 &1249925296 stripped Transform: m_CorrespondingSourceObject: {fileID: 1433784918516034456, guid: ce9599ce44e0e24458ea019ad346716d, @@ -7208,7 +7208,7 @@ PrefabInstance: - target: {fileID: 3774916886869996527, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4134069240938312508, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, type: 3} @@ -7273,7 +7273,7 @@ PrefabInstance: - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, type: 3} propertyPath: handPoseEnd.m_PersistentCalls.m_Calls.Array.size - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6421715568953444632, guid: 099df9ba55a6b934a8fcdc4f2d9d69c2, type: 3} diff --git a/Assets/Scenes/Scene_04.unity b/Assets/Scenes/Scene_04.unity index 3327f9c0..98f87765 100644 --- a/Assets/Scenes/Scene_04.unity +++ b/Assets/Scenes/Scene_04.unity @@ -132,6 +132,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 148837295} m_Modifications: + - target: {fileID: 612037333160837191, guid: 24a91d9a67655f144b82e0add7998d26, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2635415312085463213, guid: 24a91d9a67655f144b82e0add7998d26, type: 3} propertyPath: m_LocalPosition.x @@ -237,7 +242,11 @@ PrefabInstance: propertyPath: m_Name value: Dynamic objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 612037333160837191, guid: 24a91d9a67655f144b82e0add7998d26, type: 3} + - {fileID: 890044696922746972, guid: 24a91d9a67655f144b82e0add7998d26, type: 3} + - {fileID: 6816215352345957595, guid: 24a91d9a67655f144b82e0add7998d26, type: 3} + - {fileID: 9158741363894109255, guid: 24a91d9a67655f144b82e0add7998d26, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 22709ee6..2e750cc7 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -14,25 +14,25 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Old/Loading.unity guid: 3cfa99d38790d7d41b7c96b45739c19d - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Scene_00.unity guid: 19c6213d43d0a514380c61578667dc1b - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Scene_01.unity guid: ee715637c0f182e4e999c9738f391545 - enabled: 1 path: Assets/Scenes/Scene_02.unity guid: 8eaab09c0bef06b44ab38fbc9851bc95 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Scene_03.unity guid: 9420365d551014747bb1aef28ff7b718 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Scene_04.unity guid: ad379b1b85275984793e924b36290ea2 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Scene_05.unity guid: cbbc9f554f205bc48b38a1049fdc0cbf - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Scene_06.unity guid: 15dffa1af456bc64d89b160385f36b7a m_configObjects: