diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 0ab800a..1efc439 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -60,6 +60,7 @@ + diff --git a/Assets/Prefabs/Full Camera System.prefab b/Assets/Prefabs/Full Camera System.prefab index 1a1f255..09606d9 100644 --- a/Assets/Prefabs/Full Camera System.prefab +++ b/Assets/Prefabs/Full Camera System.prefab @@ -582,6 +582,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2291016102578546175} + - component: {fileID: 1997384404342608754} + - component: {fileID: 7315839628623432929} m_Layer: 0 m_Name: Full Camera System m_TagString: Untagged @@ -607,6 +609,57 @@ Transform: - {fileID: 6786745911998137291} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1997384404342608754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5101387917571020693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f5a2690c638357645b515b3dded3f78a, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 7315839628623432929} + _Console: {fileID: 41918366908441935} + _CameraSystem: {fileID: 8536427117196661484} + _Cameras: [] +--- !u!114 &7315839628623432929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5101387917571020693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: beebbd11cc7ab3a439fda4e6b55c6516, + type: 2} + programSource: {fileID: 11400000, guid: 75d3b5c56f0658940bc3720666e71020, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 --- !u!1 &6006940573095225623 GameObject: m_ObjectHideFlags: 0 @@ -1125,12 +1178,18 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 4452765576408117965} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 8536427117196661484} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &8536427117196661484 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5457269348523597857, guid: 118db197186aaf6489875f6ec0c46b3e, + type: 3} + m_PrefabInstance: {fileID: 4452765576408117965} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7678601836248966504 PrefabInstance: m_ObjectHideFlags: 0 @@ -1692,6 +1751,12 @@ PrefabInstance: addedObject: {fileID: 4397686769689672985} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d9c86bf2ae995824c8d5c5b8311de1a0, type: 3} +--- !u!1 &41918366908441935 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7645761038149500967, guid: d9c86bf2ae995824c8d5c5b8311de1a0, + type: 3} + m_PrefabInstance: {fileID: 7678601836248966504} + m_PrefabAsset: {fileID: 0} --- !u!114 &217540915919088471 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7605176658973183551, guid: d9c86bf2ae995824c8d5c5b8311de1a0, diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 4e344a9..12f961f 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1359,6 +1359,11 @@ PrefabInstance: propertyPath: m_Name value: Video Screen Camera objectReference: {fileID: 0} + - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: serializationData.Prefab @@ -1421,6 +1426,11 @@ PrefabInstance: value: objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} + - target: {fileID: 6629859500178188227, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: pickupable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: _syncMethod @@ -1455,7 +1465,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1492,6 +1502,16 @@ PrefabInstance: propertyPath: spawnRot.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: lastPickupable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: pickupableFlag + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: serializationData.Prefab @@ -3658,12 +3678,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 652699947} m_PrefabAsset: {fileID: 0} ---- !u!4 &109172017 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 495400204671463884, guid: 700c7675bc7fcf547a888725c3536e38, - type: 3} - m_PrefabInstance: {fileID: 1559839983} - m_PrefabAsset: {fileID: 0} --- !u!1 &110724031 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1961308820465788453, guid: be33bc7f6c414e6409becfa348b9310d, @@ -8765,6 +8779,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &171824892 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5101387917571020693, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + m_PrefabInstance: {fileID: 1559839983} + m_PrefabAsset: {fileID: 0} --- !u!1001 &172614115 PrefabInstance: m_ObjectHideFlags: 0 @@ -13944,7 +13964,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 109172017} + m_TransformParent: {fileID: 1090144570} m_Modifications: - target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -13971,6 +13991,11 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 1340351174269024408, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: volumeTrigger + value: + objectReference: {fileID: 0} - target: {fileID: 2014676780200193698, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Enabled @@ -14005,7 +14030,12 @@ PrefabInstance: - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Name - value: Camera Handheld 6 + value: Full Stage Camera + objectReference: {fileID: 0} + - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -14017,6 +14047,16 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: field of view + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: far clip plane + value: 15 + objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_TargetTexture @@ -14049,6 +14089,11 @@ PrefabInstance: value: objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} + - target: {fileID: 6629859500178188227, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: pickupable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: _syncMethod @@ -14083,52 +14128,52 @@ PrefabInstance: - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalPosition.x - value: 1.819 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalPosition.y - value: 0.731 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalPosition.z - value: 0.321 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalRotation.w - value: -0.68301237 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalRotation.x - value: 0.18301284 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalRotation.y - value: 0.683013 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalRotation.z - value: -0.18301265 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 180 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 57.61 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 180 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -14143,37 +14188,47 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.x - value: 1.819 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.y - value: 0.731 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.z - value: 0.321 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.w - value: -0.68301237 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.x - value: 0.18301284 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.y - value: 0.683013 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.z - value: -0.18301265 + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: lastPickupable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: pickupableFlag + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -15233,11 +15288,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -15674,11 +15724,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -19843,6 +19888,11 @@ PrefabInstance: propertyPath: m_Name value: Player 2 Camera objectReference: {fileID: 0} + - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: serializationData.Prefab @@ -19934,7 +19984,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -22587,11 +22637,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -23351,11 +23396,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -25295,11 +25335,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -26017,16 +26052,16 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1559839983} m_PrefabAsset: {fileID: 0} ---- !u!114 &674142364 stripped +--- !u!114 &674142366 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5423613212279373759, guid: 700c7675bc7fcf547a888725c3536e38, + m_CorrespondingSourceObject: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} m_PrefabInstance: {fileID: 1559839983} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 674142360} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Script: {fileID: 11500000, guid: a14cb14e50950304eab77b70f4649c38, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &678242348 stripped @@ -27354,11 +27389,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -30291,6 +30321,11 @@ PrefabInstance: propertyPath: m_Name value: Player 3 Camera objectReference: {fileID: 0} + - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: serializationData.Prefab @@ -30382,7 +30417,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -30795,7 +30830,7 @@ MonoBehaviour: - {fileID: 272672682} - {fileID: 379391084} _CameraEventListeners: - - {fileID: 674142364} + - {fileID: 904261778} --- !u!65 &824788963 BoxCollider: m_ObjectHideFlags: 0 @@ -31475,11 +31510,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -31984,6 +32014,11 @@ PrefabInstance: propertyPath: m_Name value: Player 1 Camera objectReference: {fileID: 0} + - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: serializationData.Prefab @@ -32075,7 +32110,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -32273,6 +32308,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1559839983} m_PrefabAsset: {fileID: 0} +--- !u!114 &904261778 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7315839628623432929, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + m_PrefabInstance: {fileID: 1559839983} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 171824892} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &905017120 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6252298826817455165, guid: be33bc7f6c414e6409becfa348b9310d, @@ -41313,6 +41360,38 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1090144569 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1090144570} + m_Layer: 22 + m_Name: Full Stage Camera Anchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1090144570 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1090144569} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.48183066, z: -0, w: 0.8762644} + m_LocalPosition: {x: 1.3630013, y: 1.55, z: -7.934} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 336011330} + m_Father: {fileID: 1115429855} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1091664444 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2192860597701305471, guid: be33bc7f6c414e6409becfa348b9310d, @@ -41763,6 +41842,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1090144570} - {fileID: 711521578} - {fileID: 1021328472} - {fileID: 1100478128} @@ -43465,11 +43545,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -43930,6 +44005,11 @@ PrefabInstance: propertyPath: m_Name value: Host Camera objectReference: {fileID: 0} + - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: serializationData.Prefab @@ -43982,6 +44062,11 @@ PrefabInstance: value: objectReference: {fileID: 6613426481501616359, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} + - target: {fileID: 6629859500178188227, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: pickupable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6924758242887616686, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: _syncMethod @@ -44016,7 +44101,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -44053,6 +44138,16 @@ PrefabInstance: propertyPath: spawnRot.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: lastPickupable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: pickupableFlag + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: serializationData.Prefab @@ -45867,11 +45962,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -51163,11 +51253,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -59107,6 +59192,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1607542514} m_Modifications: + - target: {fileID: 41918366908441935, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 276740985141412451, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: m_AnchorMax.y @@ -59269,6 +59359,52 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 0 objectReference: {fileID: 0} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: _CameraSystem + value: + objectReference: {fileID: 674142366} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: _Cameras.Array.size + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: _Cameras.Array.data[0] + value: + objectReference: {fileID: 1064115353} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: _Cameras.Array.data[1] + value: + objectReference: {fileID: 1205313864} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: _Cameras.Array.data[2] + value: + objectReference: {fileID: 2106990171} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: _Cameras.Array.data[3] + value: + objectReference: {fileID: 1840753605} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: _Cameras.Array.data[4] + value: + objectReference: {fileID: 1000884943} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: _Cameras.Array.data[5] + value: + objectReference: {fileID: 2043045203} + - target: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1997384404342608754, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} - target: {fileID: 2082709212681858895, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: m_AnchorMax.y @@ -59882,6 +60018,11 @@ PrefabInstance: propertyPath: cameraFOV.Array.data[4] value: 6.275 objectReference: {fileID: 0} + - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: cameraFOV.Array.data[5] + value: 30 + objectReference: {fileID: 0} - target: {fileID: 4677278074043053975, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: serializationData.Prefab @@ -60058,7 +60199,7 @@ PrefabInstance: - target: {fileID: 5101387917571020693, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5119323009821946632, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} @@ -60328,6 +60469,11 @@ PrefabInstance: propertyPath: m_Layer value: 13 objectReference: {fileID: 0} + - target: {fileID: 6844159686049746344, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6933419642831122147, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: m_AnchorMax.y @@ -60554,6 +60700,11 @@ PrefabInstance: propertyPath: m_Layer value: 22 objectReference: {fileID: 0} + - target: {fileID: 8536427117196661484, guid: 700c7675bc7fcf547a888725c3536e38, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8815777993069486951, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} propertyPath: m_AnchorMax.y @@ -60604,11 +60755,7 @@ PrefabInstance: - {fileID: 6223380121855048231, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} - {fileID: 8525479936919637482, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} - {fileID: 4385867836768625048, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 495400204671463884, guid: 700c7675bc7fcf547a888725c3536e38, - type: 3} - insertIndex: 0 - addedObject: {fileID: 336011330} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 700c7675bc7fcf547a888725c3536e38, type: 3} --- !u!1 &1560831838 stripped @@ -60984,11 +61131,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -69418,11 +69560,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -72141,11 +72278,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -75011,11 +75143,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, - type: 3} - propertyPath: m_ScaleInLightmap - value: 1 - objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 53cc95206e4008044ae5eb778c449c08, type: 3} propertyPath: m_Materials.Array.data[0] @@ -83662,17 +83789,47 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} @@ -83680,22 +83837,16 @@ MonoBehaviour: - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -88274,6 +88425,10 @@ MonoBehaviour: ID: 1109 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 171824892} + ID: 1110 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index ae15b56..ad7c7b4 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index d52da7a..ec25249 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/UdonSharp/FullCameraSystem.asset b/Assets/UdonSharp/FullCameraSystem.asset new file mode 100644 index 0000000..7c3d259 --- /dev/null +++ b/Assets/UdonSharp/FullCameraSystem.asset @@ -0,0 +1,239 @@ +%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: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: FullCameraSystem + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: beebbd11cc7ab3a439fda4e6b55c6516, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: f5a2690c638357645b515b3dded3f78a, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: -5666006791593757210 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Console + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Console + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CameraSystem + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraSystem + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraSystem.CameraSystem_Console, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Cameras + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Cameras + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/FullCameraSystem.asset.meta b/Assets/UdonSharp/FullCameraSystem.asset.meta new file mode 100644 index 0000000..894567a --- /dev/null +++ b/Assets/UdonSharp/FullCameraSystem.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75d3b5c56f0658940bc3720666e71020 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/FullCameraSystem.cs b/Assets/UdonSharp/FullCameraSystem.cs new file mode 100644 index 0000000..0c3c2f4 --- /dev/null +++ b/Assets/UdonSharp/FullCameraSystem.cs @@ -0,0 +1,38 @@ + +using UdonSharp; +using UnityEngine; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class FullCameraSystem : UdonSharpBehaviour +{ + [SerializeField] private GameObject _Console; + [SerializeField] private CameraSystem.CameraSystem_Console _CameraSystem; + [SerializeField] private GameObject[] _Cameras; + + public void CameraEnabled() + { + foreach (GameObject Camera in _Cameras) + { + Camera.SetActive(true); + } + + _Console.SetActive(true); + + _CameraSystem.gameObject.SetActive(true); + _CameraSystem.Authorize(); + } + + public void CameraDisabled() + { + foreach (GameObject Camera in _Cameras) + { + Camera.SetActive(false); + } + + _Console.SetActive(false); + + _CameraSystem.Deauthorize(); + _CameraSystem.gameObject.SetActive(false); + } +} diff --git a/Assets/UdonSharp/FullCameraSystem.cs.meta b/Assets/UdonSharp/FullCameraSystem.cs.meta new file mode 100644 index 0000000..65e9b0f --- /dev/null +++ b/Assets/UdonSharp/FullCameraSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f5a2690c638357645b515b3dded3f78a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/VRChatCameraSystem b/Assets/VRChatCameraSystem index 5f6feb1..e58de1e 160000 --- a/Assets/VRChatCameraSystem +++ b/Assets/VRChatCameraSystem @@ -1 +1 @@ -Subproject commit 5f6feb16f7af6ddcac787ab11a1de59b4b52ccea +Subproject commit e58de1e57854835a64edcfa4a0ff180a250d0845 diff --git a/witwics.sln b/witwics.sln index a61877a..5ce5cd5 100644 --- a/witwics.sln +++ b/witwics.sln @@ -5,6 +5,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.ClientSim", "VRC.Client EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vrchat.jordo.easyquestswitch", "vrchat.jordo.easyquestswitch.csproj", "{24AABBF3-C935-A9B5-2807-501AFC381210}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{7118B098-639E-4AE7-166D-ACE8F0BEB311}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.Udon.Serialization.OdinSerializer", "VRC.Udon.Serialization.OdinSerializer.csproj", "{C4865AD8-5708-4E51-79C2-E64911B4DB43}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UdonSharp.Editor", "UdonSharp.Editor.csproj", "{DFC90E0B-36B0-292E-7E42-CFA532E2309E}" @@ -25,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.ClientSim.Editor", "VRC EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.SDK3", "VRC.SDK3.csproj", "{08FEB8F6-AD22-0DF5-5232-7DE088616AF5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{7118B098-639E-4AE7-166D-ACE8F0BEB311}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.SDK3.Editor", "VRC.SDK3.Editor.csproj", "{5C71143D-D27E-C806-9E25-D4639A6DED1D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{195A71ED-9F29-D8F1-1F89-9EC9ABA5866C}" @@ -73,6 +73,10 @@ Global {24AABBF3-C935-A9B5-2807-501AFC381210}.Debug|Any CPU.Build.0 = Debug|Any CPU {24AABBF3-C935-A9B5-2807-501AFC381210}.Release|Any CPU.ActiveCfg = Release|Any CPU {24AABBF3-C935-A9B5-2807-501AFC381210}.Release|Any CPU.Build.0 = Release|Any CPU + {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Release|Any CPU.Build.0 = Release|Any CPU {C4865AD8-5708-4E51-79C2-E64911B4DB43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C4865AD8-5708-4E51-79C2-E64911B4DB43}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4865AD8-5708-4E51-79C2-E64911B4DB43}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,10 +117,6 @@ Global {08FEB8F6-AD22-0DF5-5232-7DE088616AF5}.Debug|Any CPU.Build.0 = Debug|Any CPU {08FEB8F6-AD22-0DF5-5232-7DE088616AF5}.Release|Any CPU.ActiveCfg = Release|Any CPU {08FEB8F6-AD22-0DF5-5232-7DE088616AF5}.Release|Any CPU.Build.0 = Release|Any CPU - {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Release|Any CPU.Build.0 = Release|Any CPU {5C71143D-D27E-C806-9E25-D4639A6DED1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5C71143D-D27E-C806-9E25-D4639A6DED1D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5C71143D-D27E-C806-9E25-D4639A6DED1D}.Release|Any CPU.ActiveCfg = Release|Any CPU