diff --git a/Assets/Prefabs/Betacam Handheld.prefab b/Assets/Prefabs/Betacam Handheld.prefab index 4c6d0ae..54cf2bf 100644 --- a/Assets/Prefabs/Betacam Handheld.prefab +++ b/Assets/Prefabs/Betacam Handheld.prefab @@ -213,7 +213,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2585420374601623244} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 7656cce..de16b29 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -9386,6 +9386,11 @@ PrefabInstance: value: objectReference: {fileID: 539074216792060133, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 556611239679267698, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 604159123653676994, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -9614,6 +9619,11 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 1741425850859796663, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1766502199382857038, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Mesh @@ -9868,6 +9878,11 @@ PrefabInstance: value: objectReference: {fileID: 3233966837507127488, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3262278141231255214, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3271671727687491860, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_StaticEditorFlags @@ -9916,6 +9931,11 @@ PrefabInstance: value: objectReference: {fileID: 3382224589555245396, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3385151794465962188, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3490838331118478181, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -9965,6 +9985,11 @@ PrefabInstance: value: objectReference: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3773647731252727289, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3780772836946022467, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -20998,11 +21023,11 @@ Transform: m_GameObject: {fileID: 516818819} serializedVersion: 2 m_LocalRotation: {x: 0.70710677, y: 0.000000059604645, z: -0.00000020861626, w: 0.7071068} - m_LocalPosition: {x: 17.333, y: 4.16, z: 9.615} + m_LocalPosition: {x: 4.702998, y: 4.16, z: 6.6949987} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1652837901} + m_Father: {fileID: 1428133776} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!108 &516818821 Light: @@ -27636,11 +27661,11 @@ Transform: m_GameObject: {fileID: 705413779} serializedVersion: 2 m_LocalRotation: {x: 0.5000002, y: -0.49999967, z: 0.49999973, w: 0.5000005} - m_LocalPosition: {x: 19.285, y: 4.16, z: 5.493} + m_LocalPosition: {x: 6.654998, y: 4.16, z: 2.572999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1652837901} + m_Father: {fileID: 1428133776} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} --- !u!108 &705413781 Light: @@ -32501,6 +32526,12 @@ MonoBehaviour: m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!23 &858587245 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + m_PrefabInstance: {fileID: 364742166} + m_PrefabAsset: {fileID: 0} --- !u!1001 &859579629 PrefabInstance: m_ObjectHideFlags: 0 @@ -34588,6 +34619,11 @@ PrefabInstance: value: objectReference: {fileID: 539074216792060133, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 556611239679267698, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 604159123653676994, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -34816,6 +34852,11 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 1741425850859796663, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1766502199382857038, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Mesh @@ -35070,6 +35111,11 @@ PrefabInstance: value: objectReference: {fileID: 3233966837507127488, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3262278141231255214, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3271671727687491860, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_StaticEditorFlags @@ -35118,6 +35164,11 @@ PrefabInstance: value: objectReference: {fileID: 3382224589555245396, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3385151794465962188, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3490838331118478181, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -35167,6 +35218,11 @@ PrefabInstance: value: objectReference: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3773647731252727289, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3780772836946022467, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -39001,6 +39057,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1652837901} + - {fileID: 1607542514} - {fileID: 2110808113} - {fileID: 1451322102} m_Father: {fileID: 0} @@ -43319,6 +43376,12 @@ Camera: type: 3} m_PrefabInstance: {fileID: 336011328} m_PrefabAsset: {fileID: 0} +--- !u!23 &1064115360 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + m_PrefabInstance: {fileID: 336011328} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1068087227 PrefabInstance: m_ObjectHideFlags: 0 @@ -49866,11 +49929,11 @@ Transform: m_GameObject: {fileID: 1286212625} serializedVersion: 2 m_LocalRotation: {x: 0.70710677, y: 0.000000059604645, z: -0.00000020861626, w: 0.7071068} - m_LocalPosition: {x: 17.333, y: 4.16, z: 4.332} + m_LocalPosition: {x: 4.703, y: 4.16, z: 1.4119997} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1652837901} + m_Father: {fileID: 1428133776} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!108 &1286212627 Light: @@ -51642,11 +51705,11 @@ Transform: m_GameObject: {fileID: 1328275533} serializedVersion: 2 m_LocalRotation: {x: 0.5000002, y: -0.49999967, z: 0.49999973, w: 0.5000005} - m_LocalPosition: {x: 19.285, y: 4.16, z: 7.978} + m_LocalPosition: {x: 6.6549997, y: 4.16, z: 5.0579996} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1652837901} + m_Father: {fileID: 1428133776} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90} --- !u!108 &1328275535 Light: @@ -54075,6 +54138,12 @@ MonoBehaviour: m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!23 &1390751093 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + m_PrefabInstance: {fileID: 1390751084} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1392345919 PrefabInstance: m_ObjectHideFlags: 0 @@ -55066,6 +55135,10 @@ Transform: - {fileID: 1630269093} - {fileID: 2032289631} - {fileID: 948628692} + - {fileID: 516818820} + - {fileID: 1328275534} + - {fileID: 1286212626} + - {fileID: 705413780} m_Father: {fileID: 1652837901} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1428433212 stripped @@ -65387,6 +65460,11 @@ PrefabInstance: propertyPath: cameraFOV.Array.data[5] value: 30 objectReference: {fileID: 0} + - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: camerasMeshes.Array.size + value: 6 + objectReference: {fileID: 0} - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: potatoButtons.Array.size @@ -65398,6 +65476,36 @@ PrefabInstance: value: objectReference: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} + - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: camerasMeshes.Array.data[0] + value: + objectReference: {fileID: 858587245} + - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: camerasMeshes.Array.data[1] + value: + objectReference: {fileID: 1832440720} + - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: camerasMeshes.Array.data[2] + value: + objectReference: {fileID: 1390751093} + - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: camerasMeshes.Array.data[3] + value: + objectReference: {fileID: 1983062422} + - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: camerasMeshes.Array.data[4] + value: + objectReference: {fileID: 2043045210} + - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: camerasMeshes.Array.data[5] + value: + objectReference: {fileID: 1064115360} - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: potatoButtons.Array.data[0] @@ -67823,8 +67931,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1607542513} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.0000008791684, z: -0, w: 1} - m_LocalPosition: {x: 17.08, y: 0, z: 4.58} + m_LocalRotation: {x: -0, y: 0.00000086426735, z: -0, w: 1} + m_LocalPosition: {x: 17.08, y: 0, z: 4.579999} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -67841,7 +67949,7 @@ Transform: - {fileID: 1293105582} - {fileID: 504807930} - {fileID: 904261777} - m_Father: {fileID: 1652837901} + m_Father: {fileID: 1027471609} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1608119158 stripped GameObject: @@ -69097,12 +69205,7 @@ Transform: - {fileID: 1865628721} - {fileID: 793580776} - {fileID: 1428133776} - - {fileID: 516818820} - - {fileID: 1328275534} - - {fileID: 1286212626} - - {fileID: 705413780} - {fileID: 439419218} - - {fileID: 1607542514} m_Father: {fileID: 1027471609} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1656897274 stripped @@ -75481,6 +75584,12 @@ MonoBehaviour: m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!23 &1832440720 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + m_PrefabInstance: {fileID: 1832440711} + m_PrefabAsset: {fileID: 0} --- !u!1 &1832458546 GameObject: m_ObjectHideFlags: 0 @@ -81447,6 +81556,12 @@ MonoBehaviour: m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!23 &1983062422 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + m_PrefabInstance: {fileID: 1983062413} + m_PrefabAsset: {fileID: 0} --- !u!1 &1983328789 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7147581531654102366, guid: e9914385266bca24db809c39e395f03c, @@ -83702,6 +83817,12 @@ Camera: type: 3} m_PrefabInstance: {fileID: 70805493} m_PrefabAsset: {fileID: 0} +--- !u!23 &2043045210 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + m_PrefabInstance: {fileID: 70805493} + m_PrefabAsset: {fileID: 0} --- !u!1 &2043738216 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8639549418172619285, guid: 126991d511ca61841a0ef899b6c038a6, @@ -88953,6 +89074,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 865296977} + - target: {fileID: 5833724708328403155, guid: f6465f2b41241f04a9645838d2b9d511, + type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5892701930973556973, guid: f6465f2b41241f04a9645838d2b9d511, type: 3} propertyPath: _CaseManager @@ -93013,6 +93139,11 @@ PrefabInstance: value: objectReference: {fileID: 539074216792060133, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 556611239679267698, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 604159123653676994, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Navigation.m_Mode @@ -93241,6 +93372,11 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 1741425850859796663, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1794858485046500128, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -93489,6 +93625,11 @@ PrefabInstance: value: objectReference: {fileID: 3233966837507127488, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3262278141231255214, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3271671727687491860, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_StaticEditorFlags @@ -93537,6 +93678,11 @@ PrefabInstance: value: objectReference: {fileID: 3382224589555245396, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3385151794465962188, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3490838331118478181, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -93586,6 +93732,11 @@ PrefabInstance: value: objectReference: {fileID: 3713683975532754211, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 3773647731252727289, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3780772836946022467, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod diff --git a/Assets/VRChatCameraSystem b/Assets/VRChatCameraSystem index 5df0f2a..941280e 160000 --- a/Assets/VRChatCameraSystem +++ b/Assets/VRChatCameraSystem @@ -1 +1 @@ -Subproject commit 5df0f2a92b738ac1d8ad2927313ba7f346676c12 +Subproject commit 941280e537e10997eb4a6811fafdc443064affb7