diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 0a691fd..1891f95 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -65,6 +65,7 @@ + @@ -129,6 +130,7 @@ + diff --git a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat index f1a1526..0c5c084 100644 --- a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat +++ b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat @@ -42,13 +42,13 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 2800000, guid: 44aab33f67dfa2949a8bd0a7e20d40e7, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 0.5, y: 0.33333334} m_Offset: {x: 0, y: 0.6666667} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 0.5, y: 0.33333334} - m_Offset: {x: 0, y: 0.6666667} + m_Offset: {x: 0.5, y: 0.33333334} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Materials/M_LocationBoard_Crook.mat b/Assets/Materials/M_LocationBoard_Crook.mat index fa57a8e..1558d18 100644 --- a/Assets/Materials/M_LocationBoard_Crook.mat +++ b/Assets/Materials/M_LocationBoard_Crook.mat @@ -46,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 60b125c1d7b06dd439bacc9a3af6b3e0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 78b7d39..3086c6b 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -20599,6 +20599,112 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &452417155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 452417156} + - component: {fileID: 452417159} + - component: {fileID: 452417158} + - component: {fileID: 452417157} + m_Layer: 0 + m_Name: Plane (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &452417156 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452417155} + serializedVersion: 2 + m_LocalRotation: {x: -0.4490837, y: 0.54619074, z: -0.54618895, w: -0.44908482} + m_LocalPosition: {x: -1.074, y: 1.74, z: 2.822} + m_LocalScale: {x: 0.44999993, y: 0.028125, z: 0.25312498} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1451322102} + m_LocalEulerAnglesHint: {x: -270, y: 0, z: -258.855} +--- !u!64 &452417157 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452417155} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &452417158 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452417155} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &452417159 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 452417155} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &453121268 GameObject: m_ObjectHideFlags: 0 @@ -31256,20 +31362,6 @@ MonoBehaviour: _AudioManager: {fileID: 1947493795} _PlayerMicrophone: {fileID: 431721603} _AudienceSilencer: {fileID: 344488391} - _Cameras: - - {fileID: 364742168} - - {fileID: 1832440713} - - {fileID: 1390751086} - - {fileID: 1983062415} - - {fileID: 2043045206} - - {fileID: 1064115356} - _CameraAnchors: - - {fileID: 1564239176} - - {fileID: 1858619632} - - {fileID: 306921569} - - {fileID: 1519421599} - - {fileID: 5806135540292049291} - - {fileID: 1914584493} _CameraController: {fileID: 1524477936} _TiebreakerData: url: https://witwics.actual.horse/static/TiebreakerData.json @@ -36326,11 +36418,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1655937598} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &647022021 stripped @@ -44190,7 +44278,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1355919012} m_Father: {fileID: 841163055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &865296977 @@ -44247,21 +44336,7 @@ MonoBehaviour: _AudioManager: {fileID: 1947493795} _PlayerMicrophone: {fileID: 51189182} _AudienceSilencer: {fileID: 344488391} - _Cameras: - - {fileID: 364742168} - - {fileID: 1832440713} - - {fileID: 1390751086} - - {fileID: 1983062415} - - {fileID: 2043045206} - - {fileID: 1064115356} - _CameraAnchors: - - {fileID: 783795840} - - {fileID: 739684421} - - {fileID: 1117826905} - - {fileID: 1922829039} - - {fileID: 1358503113} - - {fileID: 593766641} - _CameraController: {fileID: 0} + _CameraController: {fileID: 1355919010} _Modem: {fileID: 966631266} _ArrivalDisplay: {fileID: 2013644315} _LocationBoard: {fileID: 1748199014} @@ -47655,7 +47730,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1691482840} m_Father: {fileID: 841163055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &969831473 @@ -47712,53 +47788,7 @@ MonoBehaviour: _AudioManager: {fileID: 1947493795} _PlayerMicrophone: {fileID: 772205216} _AudienceSilencer: {fileID: 344488391} - _Cameras: - - {fileID: 364742168} - - {fileID: 1832440713} - - {fileID: 1390751086} - - {fileID: 1983062415} - - {fileID: 2043045206} - - {fileID: 1064115356} - _CameraAnchors: - - {fileID: 1329816342} - - {fileID: 1353942936} - - {fileID: 50383831} - - {fileID: 169430329} - - {fileID: 635617285} - - {fileID: 1925386528} - _CameraController: {fileID: 0} - _HostPlayerTimerToggle: {fileID: 1459858125} - _CameraTriggersGroup: {fileID: 380717942} - _HostCamera: {fileID: 1832440713} - _HostCameraAnchors: - - {fileID: 1353942936} - - {fileID: 1997117238} - - {fileID: 948859406} - - {fileID: 432846118} - - {fileID: 555086328} - - {fileID: 1118377132} - - {fileID: 1172111656} - - {fileID: 662054030} - - {fileID: 670913074} - - {fileID: 1860219231} - - {fileID: 1930024567} - - {fileID: 896965138} - - {fileID: 1842506231} - _PlayerCamera: {fileID: 364742168} - _PlayerCameraAnchors: - - {fileID: 1329816342} - - {fileID: 975673927} - - {fileID: 1577400826} - - {fileID: 782702584} - - {fileID: 768358872} - - {fileID: 1979533057} - - {fileID: 1374373552} - - {fileID: 995107661} - - {fileID: 986169468} - - {fileID: 544245849} - - {fileID: 1717397973} - - {fileID: 1345198644} - - {fileID: 2040355457} + _CameraController: {fileID: 1691482842} _Maps: - {fileID: 886213381} - {fileID: 1534889734} @@ -62768,6 +62798,99 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &1355919009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1355919012} + - component: {fileID: 1355919010} + - component: {fileID: 1355919011} + m_Layer: 0 + m_Name: Camera Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1355919010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355919009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9d25ed85adab20439cb9b1bd415d023, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1355919011} + _CameraConsole: {fileID: 674142366} + Player1Camera: {fileID: 364742168} + Player2Camera: {fileID: 1832440713} + HostAndWinnerCamera: {fileID: 1390751086} + LocationBoardCamera: {fileID: 1983062415} + PrimaryFocusCamera: {fileID: 2043045206} + VideoPlayerCamera: {fileID: 1064115356} + Player1CameraAnchor: {fileID: 783795840} + Player2CameraAnchor: {fileID: 739684421} + HostAndWinnerCameraAnchor: {fileID: 1117826905} + LocationBoardCameraAnchor: {fileID: 1922829039} + VideoPlayerCameraAnchor: {fileID: 593766641} +--- !u!114 &1355919011 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355919009} + 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: d791370166427de4b90d36f6bd746068, + type: 2} + programSource: {fileID: 11400000, guid: ba004ec09c23f3c4ebfc8ff25b1961e3, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!4 &1355919012 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355919009} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 865296976} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1356247071 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6133542484281842419, guid: be33bc7f6c414e6409becfa348b9310d, @@ -62854,18 +62977,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1358503111} m_PrefabAsset: {fileID: 0} ---- !u!114 &1358503113 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - m_PrefabInstance: {fileID: 1358503111} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1539984432} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1360827957 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1564876747245225317, guid: 40955da061a841841a91c845049f1e11, @@ -65154,6 +65265,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 452417156} - {fileID: 944796117} - {fileID: 1331320733} - {fileID: 1967712740} @@ -71340,7 +71452,12 @@ MonoBehaviour: HostCameraTrigger: {fileID: 1968710950} HostAndAllPlayersTimerToggle: {fileID: 552861273} HostAndIndividualPlayersTimerToggle: {fileID: 458165862} + Player1CameraAnchor: {fileID: 1564239176} + Player2CameraAnchor: {fileID: 1858619632} + Player3CameraAnchor: {fileID: 306921569} + HostCameraAnchor: {fileID: 1519421599} DefaultWideShotCameraAnchor: {fileID: 5806135540292049291} + VideoPlayerCameraAnchor: {fileID: 1914584493} AllPlayersViewCameraAnchor: {fileID: 1808255084} VideoMusicClueCameraAnchor: {fileID: 1144354959} ACMECrimenetComputerCameraAnchor: {fileID: 1743190486} @@ -77609,7 +77726,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2b5f22e139915474a9f2e20c3fd5f092, type: 3} insertIndex: -1 - addedObject: {fileID: 1617502302} + addedObject: {fileID: 1617502305} m_SourcePrefab: {fileID: 100100000, guid: 2b5f22e139915474a9f2e20c3fd5f092, type: 3} --- !u!4 &1617502300 stripped Transform: @@ -77623,7 +77740,7 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1617502299} m_PrefabAsset: {fileID: 0} ---- !u!65 &1617502302 +--- !u!65 &1617502305 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -77642,8 +77759,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 5.800005, y: 5, z: 0.0063507603} - m_Center: {x: -2.9000027, y: 2.5, z: -0.0031782412} + m_Size: {x: 5.8000026, y: 5, z: 0.11430121} + m_Center: {x: 2.900002, y: 2.5, z: 0.057150614} --- !u!1 &1617569524 stripped GameObject: m_CorrespondingSourceObject: {fileID: 433477094081345794, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -78199,7 +78316,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 0e3e4782d1740d046b6dcc14b34885d3, type: 3} insertIndex: -1 - addedObject: {fileID: 1629735787} + addedObject: {fileID: 1629735790} m_SourcePrefab: {fileID: 100100000, guid: 0e3e4782d1740d046b6dcc14b34885d3, type: 3} --- !u!4 &1629735785 stripped Transform: @@ -78213,7 +78330,7 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1629735784} m_PrefabAsset: {fileID: 0} ---- !u!65 &1629735787 +--- !u!65 &1629735790 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -78232,8 +78349,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 9.000001, y: 5, z: 0.006350001} - m_Center: {x: -4.5000005, y: 2.5, z: -0.0031750004} + m_Size: {x: 9, y: 5, z: 0.11430116} + m_Center: {x: 4.500001, y: 2.5, z: 0.05714725} --- !u!1 &1630269092 GameObject: m_ObjectHideFlags: 0 @@ -78739,98 +78856,12 @@ Transform: - {fileID: 1607542514} m_Father: {fileID: 1027471609} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1655937597 +--- !u!1 &1656897274 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + m_PrefabInstance: {fileID: 1976503209} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1655937598} - - component: {fileID: 1655937600} - - component: {fileID: 1655937599} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1655937598 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1655937597} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 647022021} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &1655937599 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1655937597} - m_Enabled: 1 ---- !u!20 &1655937600 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1655937597} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 30 - field of view: 13 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &1657587666 GameObject: m_ObjectHideFlags: 0 @@ -80296,6 +80327,128 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} +--- !u!1 &1691482839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1691482840} + - component: {fileID: 1691482842} + - component: {fileID: 1691482841} + m_Layer: 0 + m_Name: Camera Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1691482840 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691482839} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 969831472} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1691482841 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691482839} + 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: 4cd36dc75fae7c94dba00f777dc35e7a, + type: 2} + programSource: {fileID: 11400000, guid: 9d7b6eb1d965f824385664197395c601, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1691482842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691482839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8418cb07492d474c9fac332a5ada029, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1691482841} + _CameraConsole: {fileID: 674142366} + PlayerCamera: {fileID: 364742168} + HostCamera: {fileID: 1832440713} + OverheadCamera: {fileID: 1390751086} + FrontCamera: {fileID: 1983062415} + PrimaryFocusCamera: {fileID: 2043045206} + VideoPlayerCamera: {fileID: 1064115356} + HostStartingCameraAnchor: {fileID: 1353942936} + PlayerStartingCameraAnchor: {fileID: 1329816342} + OverheadCameraAnchor: {fileID: 50383831} + FrontCameraAnchor: {fileID: 169430329} + NewspaperCameraAnchor: {fileID: 635617285} + VideoPlayerCameraAnchor: {fileID: 1925386528} + HostCameraAnchorSequence: + - {fileID: 1353942936} + - {fileID: 1997117238} + - {fileID: 948859406} + - {fileID: 432846118} + - {fileID: 555086328} + - {fileID: 1118377132} + - {fileID: 1172111656} + - {fileID: 662054030} + - {fileID: 670913074} + - {fileID: 1860219231} + - {fileID: 1930024567} + - {fileID: 896965138} + - {fileID: 1842506231} + PlayerCameraAnchorSequence: + - {fileID: 1329816342} + - {fileID: 975673927} + - {fileID: 1577400826} + - {fileID: 782702584} + - {fileID: 768358872} + - {fileID: 1979533057} + - {fileID: 1374373552} + - {fileID: 995107661} + - {fileID: 986169468} + - {fileID: 544245849} + - {fileID: 1717397973} + - {fileID: 1345198644} + - {fileID: 2040355457} --- !u!1 &1692074135 stripped GameObject: m_CorrespondingSourceObject: {fileID: 639431482882524217, guid: 126991d511ca61841a0ef899b6c038a6, @@ -90203,7 +90356,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 7f60bf193aca11b40bedd54a396f38fe, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1976503213} m_SourcePrefab: {fileID: 100100000, guid: 7f60bf193aca11b40bedd54a396f38fe, type: 3} --- !u!4 &1976503210 stripped Transform: @@ -90211,6 +90368,27 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1976503209} m_PrefabAsset: {fileID: 0} +--- !u!65 &1976503213 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1656897274} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 15.999998, y: 5, z: 0.114301145} + m_Center: {x: -7.999997, y: 2.5, z: -0.057146765} --- !u!1 &1976758149 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6922462490522219438, guid: be33bc7f6c414e6409becfa348b9310d, @@ -95289,7 +95467,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5d7291fcde881de4aa65a8ad07e28f4b, type: 3} insertIndex: -1 - addedObject: {fileID: 2119386632} + addedObject: {fileID: 2119386635} m_SourcePrefab: {fileID: 100100000, guid: 5d7291fcde881de4aa65a8ad07e28f4b, type: 3} --- !u!4 &2119386630 stripped Transform: @@ -95303,7 +95481,7 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2119386629} m_PrefabAsset: {fileID: 0} ---- !u!65 &2119386632 +--- !u!65 &2119386635 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -95322,8 +95500,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 7.000001, y: 5, z: 0.006350001} - m_Center: {x: -3.5000005, y: 2.5, z: -0.0031748216} + m_Size: {x: 7.000001, y: 5, z: 0.114301175} + m_Center: {x: 3.5000005, y: 2.5, z: 0.057148986} --- !u!1 &2121141721 GameObject: m_ObjectHideFlags: 0 @@ -95549,7 +95727,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} insertIndex: -1 - addedObject: {fileID: 2128415474} + addedObject: {fileID: 2128415477} m_SourcePrefab: {fileID: 100100000, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} --- !u!4 &2128415472 stripped Transform: @@ -95563,7 +95741,7 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2128415471} m_PrefabAsset: {fileID: 0} ---- !u!65 &2128415474 +--- !u!65 &2128415477 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -95582,8 +95760,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 4.0000014, y: 5, z: 0.0063500023} - m_Center: {x: -2.0000033, y: 2.5, z: -0.0031759548} + m_Size: {x: 4.0000014, y: 5, z: 0.1143012} + m_Center: {x: 2.0000024, y: 2.5, z: 0.05714989} --- !u!1 &2128547808 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3454836681217535362, guid: f02831e826ef4484899eeac5b18c77ef, @@ -109363,6 +109541,14 @@ MonoBehaviour: ID: 1273 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1355919009} + ID: 1274 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1691482839} + ID: 1275 + 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/UdonSharp/Cameras/CameraControllerBase.cs b/Assets/UdonSharp/Cameras/CameraControllerBase.cs index f782be2..417919e 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerBase.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerBase.cs @@ -12,6 +12,12 @@ public class CameraControllerBase : UdonSharpBehaviour [SerializeField] private CameraSystem_Console _CameraConsole; + public virtual void InitialiseCameras() + { + Debug.LogError("[CameraControllerBase] This function has not been reimplemented, or is called from a child class."); + } + + public void SwitchToLiveCamera(Camera SwitchTo) { for (int i = 0; i < _CameraConsole.camerasObjects.Length; i++) diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset index 9a207b7..8e2c620 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 16 + Data: 21 - Name: Entry: 7 Data: @@ -647,13 +647,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: DefaultWideShotCameraAnchor + Data: Player1CameraAnchor - Name: $v Entry: 7 Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: DefaultWideShotCameraAnchor + Data: Player1CameraAnchor - Name: k__BackingField Entry: 7 Data: 41|System.RuntimeType, mscorlib @@ -716,13 +716,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: AllPlayersViewCameraAnchor + Data: Player2CameraAnchor - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: AllPlayersViewCameraAnchor + Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 Data: 41 @@ -770,13 +770,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoMusicClueCameraAnchor + Data: Player3CameraAnchor - Name: $v Entry: 7 Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoMusicClueCameraAnchor + Data: Player3CameraAnchor - Name: k__BackingField Entry: 9 Data: 41 @@ -824,13 +824,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ACMECrimenetComputerCameraAnchor + Data: HostCameraAnchor - Name: $v Entry: 7 Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ACMECrimenetComputerCameraAnchor + Data: HostCameraAnchor - Name: k__BackingField Entry: 9 Data: 41 @@ -878,13 +878,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: FilingCabinetCameraAnchor + Data: DefaultWideShotCameraAnchor - Name: $v Entry: 7 Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FilingCabinetCameraAnchor + Data: DefaultWideShotCameraAnchor - Name: k__BackingField Entry: 9 Data: 41 @@ -932,13 +932,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ModemCameraAnchor + Data: VideoPlayerCameraAnchor - Name: $v Entry: 7 Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ModemCameraAnchor + Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 Data: 41 @@ -981,6 +981,276 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: AllPlayersViewCameraAnchor + - Name: $v + Entry: 7 + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: AllPlayersViewCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 62|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: VideoMusicClueCameraAnchor + - Name: $v + Entry: 7 + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoMusicClueCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 65|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: ACMECrimenetComputerCameraAnchor + - Name: $v + Entry: 7 + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ACMECrimenetComputerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 68|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: FilingCabinetCameraAnchor + - Name: $v + Entry: 7 + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: FilingCabinetCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 71|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: ModemCameraAnchor + - Name: $v + Entry: 7 + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ModemCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 74|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: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs index 92f1eb6..626d9b4 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs @@ -22,7 +22,13 @@ public class CameraControllerRound1 : CameraControllerBase [SerializeField] public CameraTimedSwitcher HostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle; [Space] + [SerializeField] public CameraAnchor Player1CameraAnchor; + [SerializeField] public CameraAnchor Player2CameraAnchor; + [SerializeField] public CameraAnchor Player3CameraAnchor; + [SerializeField] public CameraAnchor HostCameraAnchor; [SerializeField] public CameraAnchor DefaultWideShotCameraAnchor; + [SerializeField] public CameraAnchor VideoPlayerCameraAnchor; + [SerializeField] public CameraAnchor AllPlayersViewCameraAnchor; [SerializeField] public CameraAnchor VideoMusicClueCameraAnchor; [SerializeField] public CameraAnchor ACMECrimenetComputerCameraAnchor; @@ -30,8 +36,21 @@ public class CameraControllerRound1 : CameraControllerBase [SerializeField] public CameraAnchor ModemCameraAnchor; + public override void InitialiseCameras() + { + Player1CameraAnchor.AttachCamera(Player1Camera); + Player2CameraAnchor.AttachCamera(Player2Camera); + Player3CameraAnchor.AttachCamera(Player3Camera); + HostCameraAnchor.AttachCamera(HostCamera); + DefaultWideShotCameraAnchor.AttachCamera(PrimaryFocusCamera); + VideoPlayerCameraAnchor.AttachCamera(VideoPlayerCamera); + } + public override void OnOwnershipTransferred(VRCPlayerApi Player) { + Networking.SetOwner(Player, Player1Camera.gameObject); + Networking.SetOwner(Player, Player2Camera.gameObject); + Networking.SetOwner(Player, Player3Camera.gameObject); Networking.SetOwner(Player, HostCamera.gameObject); Networking.SetOwner(Player, PrimaryFocusCamera.gameObject); Networking.SetOwner(Player, VideoPlayerCamera.gameObject); @@ -41,7 +60,13 @@ public class CameraControllerRound1 : CameraControllerBase Networking.SetOwner(Player, HostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, HostAndIndividualPlayersTimerToggle.gameObject); + Networking.SetOwner(Player, Player1CameraAnchor.gameObject); + Networking.SetOwner(Player, Player2CameraAnchor.gameObject); + Networking.SetOwner(Player, Player3CameraAnchor.gameObject); + Networking.SetOwner(Player, HostCameraAnchor.gameObject); Networking.SetOwner(Player, DefaultWideShotCameraAnchor.gameObject); + Networking.SetOwner(Player, VideoPlayerCameraAnchor.gameObject); + Networking.SetOwner(Player, AllPlayersViewCameraAnchor.gameObject); Networking.SetOwner(Player, VideoMusicClueCameraAnchor.gameObject); Networking.SetOwner(Player, ACMECrimenetComputerCameraAnchor.gameObject); diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset new file mode 100644 index 0000000..b4bb554 --- /dev/null +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset @@ -0,0 +1,761 @@ +%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: CameraControllerRound2 + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: d791370166427de4b90d36f6bd746068, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: b9d25ed85adab20439cb9b1bd415d023, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 4359593269362045359 + 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: 12 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CameraConsole + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraConsole + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraSystem.CameraSystem_Console, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: Player1Camera + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player1Camera + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Camera, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 2 + - Name: + Entry: 7 + Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 11|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: Player2Camera + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player2Camera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 7 + Data: + - Name: $k + Entry: 1 + Data: HostAndWinnerCamera + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostAndWinnerCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|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: LocationBoardCamera + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: LocationBoardCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 20|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: PrimaryFocusCamera + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PrimaryFocusCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 23|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: VideoPlayerCamera + - Name: $v + Entry: 7 + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 26|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: Player1CameraAnchor + - Name: $v + Entry: 7 + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player1CameraAnchor + - Name: k__BackingField + Entry: 7 + Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraAnchor, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: 30|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 31|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 32|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 33|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: Player2CameraAnchor + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player2CameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 36|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: HostAndWinnerCameraAnchor + - Name: $v + Entry: 7 + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostAndWinnerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 39|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: LocationBoardCameraAnchor + - Name: $v + Entry: 7 + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: LocationBoardCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 42|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: VideoPlayerCameraAnchor + - Name: $v + Entry: 7 + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 45|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/Cameras/CameraControllerRound2.asset.meta b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset.meta new file mode 100644 index 0000000..1105074 --- /dev/null +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba004ec09c23f3c4ebfc8ff25b1961e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs new file mode 100644 index 0000000..52d289c --- /dev/null +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -0,0 +1,125 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class CameraControllerRound2 : CameraControllerBase +{ + [Space] + + [SerializeField] public Camera Player1Camera; + [SerializeField] public Camera Player2Camera; + [SerializeField] public Camera HostAndWinnerCamera; + [SerializeField] public Camera LocationBoardCamera; + [SerializeField] public Camera PrimaryFocusCamera; + [SerializeField] public Camera VideoPlayerCamera; + [Space] + //[SerializeField] public CameraTimerSwitchTrigger HostCameraTrigger; + [Space] + //[SerializeField] public CameraTimedSwitcher HostAndAllPlayersTimerToggle; + //[SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle; + [Space] + [SerializeField] public CameraAnchor Player1CameraAnchor; + [SerializeField] public CameraAnchor Player2CameraAnchor; + [SerializeField] public CameraAnchor HostAndWinnerCameraAnchor; + [SerializeField] public CameraAnchor LocationBoardCameraAnchor; + [SerializeField] public CameraAnchor VideoPlayerCameraAnchor; + + + public override void InitialiseCameras() + { + Player1CameraAnchor.AttachCamera(Player1Camera); + Player2CameraAnchor.AttachCamera(Player2Camera); + HostAndWinnerCameraAnchor.AttachCamera(HostAndWinnerCamera); + LocationBoardCameraAnchor.AttachCamera(LocationBoardCamera); + VideoPlayerCameraAnchor.AttachCamera(VideoPlayerCamera); + } + + public override void OnOwnershipTransferred(VRCPlayerApi Player) + { + Networking.SetOwner(Player, Player1Camera.gameObject); + Networking.SetOwner(Player, Player2Camera.gameObject); + Networking.SetOwner(Player, HostAndWinnerCamera.gameObject); + Networking.SetOwner(Player, LocationBoardCamera.gameObject); + Networking.SetOwner(Player, PrimaryFocusCamera.gameObject); + Networking.SetOwner(Player, VideoPlayerCamera.gameObject); + + Networking.SetOwner(Player, Player1CameraAnchor.gameObject); + Networking.SetOwner(Player, Player2CameraAnchor.gameObject); + Networking.SetOwner(Player, HostAndWinnerCameraAnchor.gameObject); + Networking.SetOwner(Player, LocationBoardCameraAnchor.gameObject); + Networking.SetOwner(Player, VideoPlayerCameraAnchor.gameObject); + + base.OnOwnershipTransferred(Player); + } + + + public void SwitchToPlayer1Camera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(Player1Camera); + } + + public void SwitchToPlayer2Camera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(Player2Camera); + } + + public void SwitchToHostAndWinnerCamera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(HostAndWinnerCamera); + } + + public void SwitchToVideoPlayerCamera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(VideoPlayerCamera); + } + + + public void ActivateWideShotCamera() + { + //DefaultWideShotCameraAnchor.AttachCamera(PrimaryFocusCamera); + } + public void SwitchToWideShotCamera() + { + //DisableAllSwitchers(); + //ActivateWideShotCamera(); + //SwitchToLiveCamera(PrimaryFocusCamera); + } + + + public void ActivateHostAllPlayersCameraSwitcher() + { + //ActivateAllPlayersCamera(); + //HostAndIndividualPlayersTimerToggle.Activate = false; + //HostAndAllPlayersTimerToggle.Activate = true; + } + + + public void ActivateHostCameraTrigger() + { + //HostCameraTrigger.gameObject.SetActive(true); + } + public void DeactivateHostCameraTrigger() + { + //HostCameraTrigger.gameObject.SetActive(false); + } + + + public override void DisableAllTriggers() + { + //HostCameraTrigger.gameObject.SetActive(false); + } + + public override void DisableAllSwitchers() + { + //HostAndAllPlayersTimerToggle.Activate = false; + //HostAndIndividualPlayersTimerToggle.Activate = false; + } +} diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs.meta b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs.meta new file mode 100644 index 0000000..a7271dc --- /dev/null +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b9d25ed85adab20439cb9b1bd415d023 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.asset b/Assets/UdonSharp/Cameras/CameraControllerRound3.asset new file mode 100644 index 0000000..071886f --- /dev/null +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.asset @@ -0,0 +1,944 @@ +%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: CameraControllerRound3 + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 4cd36dc75fae7c94dba00f777dc35e7a, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: a8418cb07492d474c9fac332a5ada029, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: -8877321544674342264 + 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: 15 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CameraConsole + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraConsole + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraSystem.CameraSystem_Console, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: PlayerCamera + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PlayerCamera + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Camera, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 2 + - Name: + Entry: 7 + Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 11|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: HostCamera + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 7 + Data: + - Name: $k + Entry: 1 + Data: OverheadCamera + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: OverheadCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|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: FrontCamera + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: FrontCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 20|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: PrimaryFocusCamera + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PrimaryFocusCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 23|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: VideoPlayerCamera + - Name: $v + Entry: 7 + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCamera + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 26|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: HostStartingCameraAnchor + - Name: $v + Entry: 7 + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostStartingCameraAnchor + - Name: k__BackingField + Entry: 7 + Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraAnchor, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: 30|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 31|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 32|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 33|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: PlayerStartingCameraAnchor + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PlayerStartingCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 36|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: OverheadCameraAnchor + - Name: $v + Entry: 7 + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: OverheadCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 39|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: FrontCameraAnchor + - Name: $v + Entry: 7 + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: FrontCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 42|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: NewspaperCameraAnchor + - Name: $v + Entry: 7 + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: NewspaperCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 45|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: VideoPlayerCameraAnchor + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 48|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: HostCameraAnchorSequence + - Name: $v + Entry: 7 + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostCameraAnchorSequence + - Name: k__BackingField + Entry: 7 + Data: 50|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraAnchor[], Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 51|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - 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: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 53|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 54|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: PlayerCameraAnchorSequence + - Name: $v + Entry: 7 + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PlayerCameraAnchorSequence + - Name: k__BackingField + Entry: 9 + Data: 50 + - Name: k__BackingField + Entry: 9 + Data: 51 + - 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: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 57|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/Cameras/CameraControllerRound3.asset.meta b/Assets/UdonSharp/Cameras/CameraControllerRound3.asset.meta new file mode 100644 index 0000000..16c59f9 --- /dev/null +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d7b6eb1d965f824385664197395c601 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs new file mode 100644 index 0000000..9aad7be --- /dev/null +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs @@ -0,0 +1,137 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class CameraControllerRound3 : CameraControllerBase +{ + [Space] + + [SerializeField] public Camera PlayerCamera; + [SerializeField] public Camera HostCamera; + [SerializeField] public Camera OverheadCamera; + [SerializeField] public Camera FrontCamera; + [SerializeField] public Camera PrimaryFocusCamera; + [SerializeField] public Camera VideoPlayerCamera; + [Space] + //[SerializeField] public CameraTimerSwitchTrigger HostCameraTrigger; + [Space] + //[SerializeField] public CameraTimedSwitcher HostAndAllPlayersTimerToggle; + //[SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle; + [Space] + [SerializeField] public CameraAnchor HostStartingCameraAnchor; + [SerializeField] public CameraAnchor PlayerStartingCameraAnchor; + [SerializeField] public CameraAnchor OverheadCameraAnchor; + [SerializeField] public CameraAnchor FrontCameraAnchor; + [SerializeField] public CameraAnchor NewspaperCameraAnchor; + [SerializeField] public CameraAnchor VideoPlayerCameraAnchor; + [Space] + [SerializeField] public CameraAnchor[] HostCameraAnchorSequence; + [SerializeField] public CameraAnchor[] PlayerCameraAnchorSequence; + + + public override void InitialiseCameras() + { + HostStartingCameraAnchor.AttachCamera(PlayerCamera); + PlayerStartingCameraAnchor.AttachCamera(HostCamera); + OverheadCameraAnchor.AttachCamera(OverheadCamera); + FrontCameraAnchor.AttachCamera(FrontCamera); + NewspaperCameraAnchor.AttachCamera(PrimaryFocusCamera); + VideoPlayerCameraAnchor.AttachCamera(VideoPlayerCamera); + } + + public override void OnOwnershipTransferred(VRCPlayerApi Player) + { + Networking.SetOwner(Player, PlayerCamera.gameObject); + Networking.SetOwner(Player, HostCamera.gameObject); + Networking.SetOwner(Player, OverheadCamera.gameObject); + Networking.SetOwner(Player, FrontCamera.gameObject); + Networking.SetOwner(Player, PrimaryFocusCamera.gameObject); + Networking.SetOwner(Player, VideoPlayerCamera.gameObject); + + Networking.SetOwner(Player, HostStartingCameraAnchor.gameObject); + Networking.SetOwner(Player, PlayerStartingCameraAnchor.gameObject); + Networking.SetOwner(Player, OverheadCameraAnchor.gameObject); + Networking.SetOwner(Player, FrontCameraAnchor.gameObject); + Networking.SetOwner(Player, NewspaperCameraAnchor.gameObject); + Networking.SetOwner(Player, VideoPlayerCameraAnchor.gameObject); + + base.OnOwnershipTransferred(Player); + } + + + public void SwitchToPlayerCamera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(PlayerCamera); + } + + public void SwitchToHostCamera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(HostCamera); + } + + public void SwitchToOverheadCamera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(OverheadCamera); + } + + public void SwitchToFrontCamera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(FrontCamera); + } + + public void SwitchToVideoPlayerCamera() + { + DisableAllSwitchers(); + SwitchToLiveCamera(VideoPlayerCamera); + } + + + public void ActivateWideShotCamera() + { + //DefaultWideShotCameraAnchor.AttachCamera(PrimaryFocusCamera); + } + public void SwitchToWideShotCamera() + { + //DisableAllSwitchers(); + //ActivateWideShotCamera(); + //SwitchToLiveCamera(PrimaryFocusCamera); + } + + + public void ActivateHostAllPlayersCameraSwitcher() + { + //ActivateAllPlayersCamera(); + //HostAndIndividualPlayersTimerToggle.Activate = false; + //HostAndAllPlayersTimerToggle.Activate = true; + } + + + public void ActivateHostCameraTrigger() + { + //HostCameraTrigger.gameObject.SetActive(true); + } + public void DeactivateHostCameraTrigger() + { + //HostCameraTrigger.gameObject.SetActive(false); + } + + + public override void DisableAllTriggers() + { + //HostCameraTrigger.gameObject.SetActive(false); + } + + public override void DisableAllSwitchers() + { + //HostAndAllPlayersTimerToggle.Activate = false; + //HostAndIndividualPlayersTimerToggle.Activate = false; + } +} diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs.meta b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs.meta new file mode 100644 index 0000000..8b88754 --- /dev/null +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a8418cb07492d474c9fac332a5ada029 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset index 39b03e6..6894309 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset +++ b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 27 + Data: 24 - Name: Entry: 7 Data: @@ -1422,150 +1422,6 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _VideoLoadAttemptCounter - - Name: $v - Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoLoadAttemptCounter - - Name: k__BackingField - Entry: 9 - Data: 33 - - Name: k__BackingField - Entry: 9 - Data: 33 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - 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: _UseFallback - - Name: $v - Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _UseFallback - - Name: k__BackingField - Entry: 9 - Data: 43 - - Name: k__BackingField - Entry: 9 - Data: 43 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - 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: _FirstDeserialisationComplete - - Name: $v - Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _FirstDeserialisationComplete - - Name: k__BackingField - Entry: 9 - Data: 43 - - Name: k__BackingField - Entry: 9 - Data: 43 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs index 4b9c8a1..06de149 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/CaseVideoSyncPlayer/CaseVideoSyncPlayer.cs @@ -59,10 +59,8 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour private int _MapDownloadIndex = 0; private bool _MapDownloadsInProgress = false; - private int _VideoLoadAttemptCounter = 0; - private bool _UseFallback = false; - - private bool _FirstDeserialisationComplete = false; + //private int _VideoLoadAttemptCounter = 0; + //private bool _UseFallback = false; private const int IMAGES_PER_MAP_ATLAS = 6; private const int MAX_VIDEO_LOAD_ATTEMPTS = 5; @@ -296,9 +294,9 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour private void _LoadNewVideoIndex() { _OldVideoIndex = _VideoIndex; - _VideoLoadAttemptCounter = 0; + //_VideoLoadAttemptCounter = 0; - _UseFallback = false; + //_UseFallback = false; _LoadVideo_Private(); } @@ -323,7 +321,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour private void _StopVideo_Private() { _VideoPlayer.Stop(); - _UseFallback = false; + //_UseFallback = false; _VideoIndex = -1; SetVideoLoadStatus(IndicationStatus.Idle); @@ -377,11 +375,11 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour base.OnVideoError(VideoError); } - public void TryLoadFallbackURL() - { - _UseFallback = true; - TryLoadURL(); - } + //public void TryLoadFallbackURL() + //{ + // _UseFallback = true; + // TryLoadURL(); + //} private void SetPlaybackStatus(bool Value) { diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.asset b/Assets/UdonSharp/Game Managers/GameManagerBase.asset index 3ac8855..c466f50 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 10 + Data: 8 - Name: Entry: 7 Data: @@ -410,25 +410,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Cameras + Data: _CameraController - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Cameras + Data: _CameraController - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera[], UnityEngine.CoreModule + Data: CameraControllerBase, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -479,142 +479,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraAnchors + Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraAnchors + Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraAnchor[], Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 33|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - 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: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 35|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: _CameraController - - Name: $v - Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraController - - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraControllerBase, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 39|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: _AllowInteractionFromHostCard - - Name: $v - Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AllowInteractionFromHostCard - - Name: k__BackingField - Entry: 7 - Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -623,7 +497,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 41 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -638,7 +512,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 62a4a46..090726b 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -50,8 +50,6 @@ public class GameManagerBase : UdonSharpBehaviour [Space] - [SerializeField] protected Camera[] _Cameras; - [SerializeField] protected CameraAnchor[] _CameraAnchors; [SerializeField] protected CameraControllerBase _CameraController; @@ -109,11 +107,6 @@ public class GameManagerBase : UdonSharpBehaviour { SetOwnershipOfObjects(_CaseManager.GetHostOwner()); - for(int i = 0; i < _Cameras.Length && i < _CameraAnchors.Length; i++) - { - _CameraAnchors[i].AttachCamera(_Cameras[i]); - } - _AllowInteractionFromHostCard = true; SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), true); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index c3ec9b3..4d83b06 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 34 + Data: 32 - Name: Entry: 7 Data: @@ -410,25 +410,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Cameras + Data: _CameraController - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Cameras + Data: _CameraController - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera[], UnityEngine.CoreModule + Data: CameraControllerBase, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -479,142 +479,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraAnchors + Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraAnchors + Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraAnchor[], Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 33|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - 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: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 35|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: _CameraController - - Name: $v - Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraController - - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraControllerBase, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 39|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: _AllowInteractionFromHostCard - - Name: $v - Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AllowInteractionFromHostCard - - Name: k__BackingField - Entry: 7 - Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -623,7 +497,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 41 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -638,7 +512,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -662,13 +536,13 @@ MonoBehaviour: Data: _TiebreakerData - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerData - Name: k__BackingField Entry: 7 - Data: 44|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl, VRCSDKBase @@ -677,7 +551,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 44 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -692,13 +566,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 46|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 37|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -707,7 +581,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -731,16 +605,16 @@ MonoBehaviour: Data: _GameHasBegun - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameHasBegun - Name: k__BackingField Entry: 9 - Data: 41 + Data: 32 - Name: k__BackingField Entry: 9 - Data: 41 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -755,13 +629,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 41|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -785,13 +659,13 @@ MonoBehaviour: Data: _QuestionIndex - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionIndex - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -800,7 +674,169 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 52 + Data: 43 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 45|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _QuestionStage + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _QuestionStage + - Name: k__BackingField + Entry: 9 + Data: 43 + - Name: k__BackingField + Entry: 9 + Data: 43 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _QuestionSubstage + - Name: $v + Entry: 7 + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _QuestionSubstage + - Name: k__BackingField + Entry: 9 + Data: 43 + - Name: k__BackingField + Entry: 9 + Data: 43 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 51|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _QuestionCorrectResponse + - Name: $v + Entry: 7 + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _QuestionCorrectResponse + - Name: k__BackingField + Entry: 9 + Data: 43 + - Name: k__BackingField + Entry: 9 + Data: 43 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -842,178 +878,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionStage + Data: _CurrentQuestionType - Name: $v Entry: 7 Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _QuestionStage - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 57|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: _QuestionSubstage - - Name: $v - Entry: 7 - Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _QuestionSubstage - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 60|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: _QuestionCorrectResponse - - Name: $v - Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _QuestionCorrectResponse - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 63|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: _CurrentQuestionType - - Name: $v - Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentQuestionType - Name: k__BackingField Entry: 7 - Data: 65|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RoundSegmentType, Assembly-CSharp @@ -1022,7 +896,169 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 52 + Data: 43 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _QuestionsList + - Name: $v + Entry: 7 + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _QuestionsList + - Name: k__BackingField + Entry: 7 + Data: 60|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataList, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 60 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _CurrentQuestion + - Name: $v + Entry: 7 + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CurrentQuestion + - Name: k__BackingField + Entry: 7 + Data: 63|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 63 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: _BuzzInAllowed + - Name: $v + Entry: 7 + Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _BuzzInAllowed + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1064,19 +1100,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionsList + Data: _PlayerBuzzInAllowed - Name: $v Entry: 7 Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionsList + Data: _PlayerBuzzInAllowed - Name: k__BackingField Entry: 7 Data: 69|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataList, VRCSDK3 + Data: System.Boolean[], mscorlib - Name: Entry: 8 Data: @@ -1087,8 +1123,8 @@ MonoBehaviour: Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -1100,7 +1136,13 @@ MonoBehaviour: Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1118,31 +1160,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentQuestion + Data: _BuzzedInPlayer - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentQuestion + Data: _BuzzedInPlayer - Name: k__BackingField - Entry: 7 - Data: 72|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 43 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 43 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -1152,174 +1188,12 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - 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: _BuzzInAllowed - - Name: $v - Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _BuzzInAllowed - - Name: k__BackingField - Entry: 9 - Data: 41 - - Name: k__BackingField - Entry: 9 - Data: 41 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: _PlayerBuzzInAllowed - - Name: $v - Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PlayerBuzzInAllowed - - Name: k__BackingField - Entry: 7 - Data: 78|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean[], mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 78 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: _BuzzedInPlayer - - Name: $v - Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _BuzzedInPlayer - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1343,13 +1217,13 @@ MonoBehaviour: Data: _FinalRoundPlayersSortedByScore - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FinalRoundPlayersSortedByScore - Name: k__BackingField Entry: 7 - Data: 85|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32[], mscorlib @@ -1358,7 +1232,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 85 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1373,13 +1247,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 87|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1403,16 +1277,16 @@ MonoBehaviour: Data: _TiebreakerPlayerNumbers - Name: $v Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerPlayerNumbers - Name: k__BackingField Entry: 9 - Data: 85 + Data: 76 - Name: k__BackingField Entry: 9 - Data: 85 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1427,13 +1301,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1457,13 +1331,13 @@ MonoBehaviour: Data: _PlayerPodiums - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 92|System.RuntimeType, mscorlib + Data: 83|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -1471,8 +1345,14 @@ MonoBehaviour: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 33 + Entry: 7 + Data: 84|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1487,13 +1367,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 94|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 86|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1502,7 +1382,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 95|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 87|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1526,13 +1406,13 @@ MonoBehaviour: Data: _VideoPlayer - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayer - Name: k__BackingField Entry: 7 - Data: 97|System.RuntimeType, mscorlib + Data: 89|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaseVideoSyncPlayer, Assembly-CSharp @@ -1556,13 +1436,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 99|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 91|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1571,7 +1451,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 100|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 92|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Props @@ -1580,7 +1460,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1604,13 +1484,13 @@ MonoBehaviour: Data: _ACMECrimenetComputer - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ACMECrimenetComputer - Name: k__BackingField Entry: 7 - Data: 103|System.RuntimeType, mscorlib + Data: 95|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ACMECrimenetComputer, Assembly-CSharp @@ -1632,6 +1512,127 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 97|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: _VideoMusicClueSkateboard + - Name: $v + Entry: 7 + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoMusicClueSkateboard + - Name: k__BackingField + Entry: 7 + Data: 99|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VideoMusicClueSkateboard, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 101|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: _DetectiveNoirEffect + - Name: $v + Entry: 7 + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _DetectiveNoirEffect + - Name: k__BackingField + Entry: 7 + Data: 103|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: DetectiveNoirEffect, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], @@ -1662,19 +1663,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _VideoMusicClueSkateboard + Data: _FilingCabinet - Name: $v Entry: 7 Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _VideoMusicClueSkateboard + Data: _FilingCabinet - Name: k__BackingField Entry: 7 Data: 107|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VideoMusicClueSkateboard, Assembly-CSharp + Data: FilingCabinet, Assembly-CSharp - Name: Entry: 8 Data: @@ -1723,19 +1724,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _DetectiveNoirEffect + Data: _Modem - Name: $v Entry: 7 Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _DetectiveNoirEffect + Data: _Modem - Name: k__BackingField Entry: 7 Data: 111|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: DetectiveNoirEffect, Assembly-CSharp + Data: Modem, Assembly-CSharp - Name: Entry: 8 Data: @@ -1784,19 +1785,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FilingCabinet + Data: _ArrivalDisplay - Name: $v Entry: 7 Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FilingCabinet + Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 Data: 115|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: FilingCabinet, Assembly-CSharp + Data: ArrivalDisplay, Assembly-CSharp - Name: Entry: 8 Data: @@ -1845,25 +1846,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Modem + Data: _LightningRoundAnimator - Name: $v Entry: 7 Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Modem + Data: _LightningRoundAnimator - Name: k__BackingField Entry: 7 Data: 119|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Modem, Assembly-CSharp + Data: UnityEngine.Animator, UnityEngine.AnimationModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 119 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1880,134 +1881,12 @@ MonoBehaviour: Entry: 7 Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 121|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: _ArrivalDisplay - - Name: $v - Entry: 7 - Data: 122|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _ArrivalDisplay - - Name: k__BackingField - Entry: 7 - Data: 123|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: ArrivalDisplay, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: 124|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 125|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: _LightningRoundAnimator - - Name: $v - Entry: 7 - Data: 126|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _LightningRoundAnimator - - Name: k__BackingField - Entry: 7 - Data: 127|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 127 - - 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: 128|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 129|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 121|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -2016,7 +1895,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 130|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 122|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects @@ -2025,7 +1904,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 131|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 123|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2049,13 +1928,13 @@ MonoBehaviour: Data: _CameraControllerRound1 - Name: $v Entry: 7 - Data: 132|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound1 - Name: k__BackingField Entry: 7 - Data: 133|System.RuntimeType, mscorlib + Data: 125|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound1, Assembly-CSharp @@ -2079,7 +1958,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 134|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 126|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index c7f7f6d..5a87434 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -6,7 +6,6 @@ using VRC.SDK3.UdonNetworkCalling; using VRC.Udon.Common.Interfaces; using VRC.SDKBase; using VRC.SDK3.StringLoading; -using CameraSystem; public enum PresentationMedium @@ -90,6 +89,7 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.WhereInTheWorld); SendCustomEventDelayedSeconds(nameof(PlaySecondPartOfThemeMusic), 3.6666666666f); + _CameraControllerRound1.InitialiseCameras(); _CameraControllerRound1.ActivateHostCameraTrigger(); DisableInteraction(); @@ -118,6 +118,7 @@ public class GameManagerRound1 : GameManagerBase Networking.SetOwner(NewOwner, _ArrivalDisplay.gameObject); Networking.SetOwner(NewOwner, _CameraController.gameObject); + Networking.SetOwner(NewOwner, _CameraControllerRound1.gameObject); base.SetOwnershipOfObjects(NewOwner); } @@ -558,6 +559,7 @@ public class GameManagerRound1 : GameManagerBase EnableInteraction("Reveal Choice 2"); } + private void MultipleChoiceRevealChoice2() { _VideoPlayer.SubMapIndex = 2; @@ -574,6 +576,7 @@ public class GameManagerRound1 : GameManagerBase EnableInteraction("Reveal Choice 3"); } + private void MultipleChoiceRevealChoice3() { _VideoPlayer.SubMapIndex = 3; @@ -645,6 +648,45 @@ public class GameManagerRound1 : GameManagerBase } } + EnableInteraction("Focus On Player 1"); + } + + private void MultipleChoiceFocusOnPlayer1() + { + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].HighlightPodium(false); + } + _PlayerPodiums[0].HighlightPodium(true); + + _CameraControllerRound1.SwitchToPlayer1Camera(); + + EnableInteraction("Focus On Player 2"); + } + + private void MultipleChoiceFocusOnPlayer2() + { + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].HighlightPodium(false); + } + _PlayerPodiums[1].HighlightPodium(true); + + _CameraControllerRound1.SwitchToPlayer2Camera(); + + EnableInteraction("Focus On Player 3"); + } + + private void MultipleChoiceFocusOnPlayer3() + { + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].HighlightPodium(false); + } + _PlayerPodiums[2].HighlightPodium(true); + + _CameraControllerRound1.SwitchToPlayer3Camera(); + EnableInteraction("Reveal Answers And Assign Points"); } @@ -652,6 +694,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { + _PlayerPodiums[i].HighlightPodium(false); _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "ShowAuxiliaryMapScreen", true); } @@ -682,7 +725,6 @@ public class GameManagerRound1 : GameManagerBase _CameraControllerRound1.SwitchToVideoPlayerCamera(); - EnableInteraction("Next Question"); } @@ -1722,13 +1764,16 @@ public class GameManagerRound1 : GameManagerBase { switch (_QuestionStage) { - case 1: InitialiseCluePresentation(); break; - case 2: MultipleChoiceRevealChoice1(); break; - case 3: MultipleChoiceRevealChoice2(); break; - case 4: MultipleChoiceRevealChoice3(); break; - case 5: MultipleChoiceLockAnswers(); break; - case 6: MultipleChoiceRevealAnswersAndAssignPoints(); break; - case 7: AdvanceToNextQuestion(); break; + case 1: InitialiseCluePresentation(); break; + case 2: MultipleChoiceRevealChoice1(); break; + case 3: MultipleChoiceRevealChoice2(); break; + case 4: MultipleChoiceRevealChoice3(); break; + case 5: MultipleChoiceLockAnswers(); break; + case 6: MultipleChoiceFocusOnPlayer1(); break; + case 7: MultipleChoiceFocusOnPlayer2(); break; + case 8: MultipleChoiceFocusOnPlayer3(); break; + case 9: MultipleChoiceRevealAnswersAndAssignPoints(); break; + case 10: AdvanceToNextQuestion(); break; default: break; } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 4c3d838..35b6bfe 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 25 + Data: 24 - Name: Entry: 7 Data: @@ -410,25 +410,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Cameras + Data: _CameraController - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Cameras + Data: _CameraController - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera[], UnityEngine.CoreModule + Data: CameraControllerBase, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -479,142 +479,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraAnchors + Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraAnchors + Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraAnchor[], Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 33|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - 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: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 35|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: _CameraController - - Name: $v - Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraController - - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraControllerBase, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 39|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: _AllowInteractionFromHostCard - - Name: $v - Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AllowInteractionFromHostCard - - Name: k__BackingField - Entry: 7 - Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -623,7 +497,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 41 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -638,7 +512,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -662,13 +536,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 44|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -692,13 +566,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 46|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 37|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -707,7 +581,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -731,13 +605,13 @@ MonoBehaviour: Data: _ArrivalDisplay - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 - Data: 49|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay, Assembly-CSharp @@ -761,13 +635,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -791,13 +665,13 @@ MonoBehaviour: Data: _LocationBoard - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LocationBoard - Name: k__BackingField Entry: 7 - Data: 53|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: LocationBoard, Assembly-CSharp @@ -821,13 +695,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -851,13 +725,13 @@ MonoBehaviour: Data: _JailChain - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailChain - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 48|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailChain, Assembly-CSharp @@ -881,13 +755,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -911,13 +785,13 @@ MonoBehaviour: Data: _JailPhone - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPhone - Name: k__BackingField Entry: 7 - Data: 61|System.RuntimeType, mscorlib + Data: 52|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailPhone, Assembly-CSharp @@ -941,13 +815,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -971,13 +845,13 @@ MonoBehaviour: Data: _JailPlayer - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPlayer - Name: k__BackingField Entry: 7 - Data: 65|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -1001,13 +875,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1031,19 +905,145 @@ MonoBehaviour: Data: _Location - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Location - Name: k__BackingField Entry: 7 - Data: 69|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib - Name: Entry: 8 Data: + - Name: k__BackingField + Entry: 9 + Data: 60 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 63|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _Landmarks + - Name: $v + Entry: 7 + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Landmarks + - Name: k__BackingField + Entry: 7 + Data: 65|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 65 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _StageIndex + - Name: $v + Entry: 7 + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 7 + Data: 69|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 69 @@ -1064,139 +1064,13 @@ MonoBehaviour: Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 72|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - 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: _Landmarks - - Name: $v - Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Landmarks - - Name: k__BackingField - Entry: 7 - Data: 74|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String[], mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 74 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: _StageIndex - - Name: $v - Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _StageIndex - - Name: k__BackingField - Entry: 7 - Data: 78|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 78 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - Name: Entry: 13 Data: @@ -1215,24 +1089,192 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _CurrentPlayerCounter + - Name: $v + Entry: 7 + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CurrentPlayerCounter + - Name: k__BackingField + Entry: 9 + Data: 69 + - Name: k__BackingField + Entry: 9 + Data: 69 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _Players + - Name: $v + Entry: 7 + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Players + - Name: k__BackingField + Entry: 9 + Data: 65 + - Name: k__BackingField + Entry: 9 + Data: 65 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _CameraControllerRound2 + - Name: $v + Entry: 7 + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraControllerRound2 + - Name: k__BackingField + Entry: 7 + Data: 79|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraControllerRound2, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: COLOR_STANDARD - Name: $v Entry: 7 Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentPlayerCounter + Data: COLOR_STANDARD - Name: k__BackingField - Entry: 9 - Data: 78 + Entry: 7 + Data: 82|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 78 + Data: 82 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1241,16 +1283,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1268,25 +1304,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Players + Data: COLOR_RED - Name: $v Entry: 7 Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Players + Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 74 + Data: 82 - Name: k__BackingField Entry: 9 - Data: 74 + Data: 82 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1298,13 +1334,7 @@ MonoBehaviour: Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1322,25 +1352,67 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_STANDARD + Data: COLOR_YELLOW - Name: $v Entry: 7 - Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_STANDARD + Data: COLOR_YELLOW - Name: k__BackingField + Entry: 9 + Data: 82 + - Name: k__BackingField + Entry: 9 + Data: 82 + - Name: k__BackingField Entry: 7 - Data: 88|System.RuntimeType, mscorlib + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule + Entry: 6 + Data: - Name: Entry: 8 Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: COLOR_GREEN + - Name: $v + Entry: 7 + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_GREEN + - Name: k__BackingField + Entry: 9 + Data: 82 - Name: k__BackingField Entry: 9 - Data: 88 + Data: 82 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1371,150 +1443,6 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: COLOR_RED - - Name: $v - Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_RED - - Name: k__BackingField - Entry: 9 - Data: 88 - - Name: k__BackingField - Entry: 9 - Data: 88 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - 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: COLOR_YELLOW - - Name: $v - Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_YELLOW - - Name: k__BackingField - Entry: 9 - Data: 88 - - Name: k__BackingField - Entry: 9 - Data: 88 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - 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: COLOR_GREEN - - Name: $v - Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_GREEN - - Name: k__BackingField - Entry: 9 - Data: 88 - - Name: k__BackingField - Entry: 9 - Data: 88 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 0caf928..57ce072 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -36,12 +36,24 @@ public class GameManagerRound2 : GameManagerBase [UdonSynced] private int _CurrentPlayerCounter = 0; [UdonSynced] private string[] _Players = new string[2]; + private CameraControllerRound2 _CameraControllerRound2 = null; + private readonly Color COLOR_STANDARD = new Color(0.78431f, 0.78431f, 0.78431f); private readonly Color COLOR_RED = new Color(0.78431f, 0.0f, 0.0f); private readonly Color COLOR_YELLOW = new Color(0.78431f, 0.78431f, 0.0f); private readonly Color COLOR_GREEN = new Color(0.0f, 0.78431f, 0.0f); + void Start() + { + _CameraControllerRound2 = (CameraControllerRound2)_CameraController; + if (_CameraControllerRound2 == null) + { + Debug.LogError("Camera controller is the wrong type. This will cause a crash for sure."); + } + } + + public override void InitialiseGameMode() { base.InitialiseGameMode(); @@ -58,6 +70,8 @@ public class GameManagerRound2 : GameManagerBase SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); + _CameraControllerRound2.InitialiseCameras(); + RequestSerialization(); } @@ -86,6 +100,9 @@ public class GameManagerRound2 : GameManagerBase Networking.SetOwner(NewOwner, _JailPlayer.gameObject); Networking.SetOwner(NewOwner, _JailPhone.gameObject); + Networking.SetOwner(NewOwner, _CameraController.gameObject); + Networking.SetOwner(NewOwner, _CameraControllerRound2.gameObject); + base.SetOwnershipOfObjects(NewOwner); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index 58c001a..c5618fe 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 29 + Data: 22 - Name: Entry: 7 Data: @@ -410,25 +410,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Cameras + Data: _CameraController - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Cameras + Data: _CameraController - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera[], UnityEngine.CoreModule + Data: CameraControllerBase, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -479,142 +479,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraAnchors + Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraAnchors + Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraAnchor[], Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 33|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - 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: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 35|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: _CameraController - - Name: $v - Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraController - - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraControllerBase, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 39|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: _AllowInteractionFromHostCard - - Name: $v - Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AllowInteractionFromHostCard - - Name: k__BackingField - Entry: 7 - Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -623,7 +497,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 41 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -638,7 +512,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -659,25 +533,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostPlayerTimerToggle + Data: _Maps - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostPlayerTimerToggle + Data: _Maps - Name: k__BackingField Entry: 7 - Data: 44|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraTimedSwitcher, Assembly-CSharp + Data: FloorMap[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 4 + Entry: 7 + Data: 36|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -692,13 +572,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 3 + Data: 4 - Name: Entry: 7 - Data: 46|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 38|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -707,7 +587,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 47|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 39|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Camera Controls @@ -716,349 +596,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 48|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: _CameraTriggersGroup - - Name: $v - Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraTriggersGroup - - Name: k__BackingField - Entry: 7 - Data: 50|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.GameObject, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 50 - - 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: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 52|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: _HostCamera - - Name: $v - Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _HostCamera - - Name: k__BackingField - Entry: 7 - Data: 54|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Camera, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 54 - - 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: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 56|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: _HostCameraAnchors - - Name: $v - Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _HostCameraAnchors - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 9 - Data: 33 - - 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: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 59|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: _PlayerCamera - - Name: $v - Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PlayerCamera - - Name: k__BackingField - Entry: 9 - Data: 54 - - Name: k__BackingField - Entry: 9 - Data: 54 - - 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: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 62|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: _PlayerCameraAnchors - - Name: $v - Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PlayerCameraAnchors - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 9 - Data: 33 - - 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: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 65|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: _Maps - - Name: $v - Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Maps - - Name: k__BackingField - Entry: 7 - Data: 67|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: FloorMap[], Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 33 - - 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: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 69|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 40|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1067,7 +605,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1091,13 +629,13 @@ MonoBehaviour: Data: _Markers - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Markers - Name: k__BackingField Entry: 7 - Data: 72|System.RuntimeType, mscorlib + Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMapMarker[], Assembly-CSharp @@ -1106,7 +644,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 33 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1121,13 +659,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1151,13 +689,13 @@ MonoBehaviour: Data: _CaptureCarmenNewspaper - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaptureCarmenNewspaper - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 47|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaptureCarmenNewspaper, Assembly-CSharp @@ -1181,13 +719,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1211,13 +749,13 @@ MonoBehaviour: Data: _EndingPlayer - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EndingPlayer - Name: k__BackingField Entry: 7 - Data: 80|System.RuntimeType, mscorlib + Data: 51|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -1241,13 +779,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1271,13 +809,13 @@ MonoBehaviour: Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentlyActiveMap - Name: k__BackingField Entry: 7 - Data: 84|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -1286,7 +824,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 85|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1307,19 +845,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 87|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 88|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 59|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1343,16 +881,16 @@ MonoBehaviour: Data: _ActiveMarker - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1367,19 +905,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 91|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 92|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 63|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1403,16 +941,16 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1427,13 +965,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 95|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1457,13 +995,13 @@ MonoBehaviour: Data: _ContinentData - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 97|System.RuntimeType, mscorlib + Data: 68|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1472,7 +1010,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 97 + Data: 68 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1487,7 +1025,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1511,13 +1049,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 100|System.RuntimeType, mscorlib + Data: 71|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -1526,7 +1064,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1541,14 +1079,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 102|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 73|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1572,16 +1109,16 @@ MonoBehaviour: Data: _RunTimer - Name: $v Entry: 7 - Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RunTimer - Name: k__BackingField Entry: 9 - Data: 41 + Data: 32 - Name: k__BackingField Entry: 9 - Data: 41 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1596,14 +1133,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib + Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 105|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1627,16 +1163,16 @@ MonoBehaviour: Data: _Timer - Name: $v Entry: 7 - Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Timer - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1651,14 +1187,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 108|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1682,16 +1217,16 @@ MonoBehaviour: Data: _SuccessCounter - Name: $v Entry: 7 - Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _SuccessCounter - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1706,20 +1241,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 110|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 111|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 112|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 83|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1743,16 +1277,16 @@ MonoBehaviour: Data: _FailureCounter - Name: $v Entry: 7 - Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FailureCounter - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 9 - Data: 85 + Data: 56 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1767,20 +1301,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 115|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 116|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1796,6 +1329,60 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CameraControllerRound3 + - Name: $v + Entry: 7 + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraControllerRound3 + - Name: k__BackingField + Entry: 7 + Data: 89|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraControllerRound3, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index ce39b99..b304041 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -33,12 +33,12 @@ public enum GameStatus public class GameManagerRound3 : GameManagerBase { [Space, Header("Camera Controls")] - [SerializeField] private CameraTimedSwitcher _HostPlayerTimerToggle; - [SerializeField] private GameObject _CameraTriggersGroup; - [SerializeField] private Camera _HostCamera; - [SerializeField] private CameraAnchor[] _HostCameraAnchors; - [SerializeField] private Camera _PlayerCamera; - [SerializeField] private CameraAnchor[] _PlayerCameraAnchors; + //[SerializeField] private CameraTimedSwitcher _HostPlayerTimerToggle; + //[SerializeField] private GameObject _CameraTriggersGroup; + //[SerializeField] private Camera _HostCamera; + //[SerializeField] private CameraAnchor[] _HostCameraAnchors; + //[SerializeField] private Camera _PlayerCamera; + //[SerializeField] private CameraAnchor[] _PlayerCameraAnchors; [Space] @@ -64,6 +64,18 @@ public class GameManagerRound3 : GameManagerBase private const int MAX_SUCCESS_COUNT = 8; private const int MAX_FAILURE_COUNT = 2; + private CameraControllerRound3 _CameraControllerRound3 = null; + + + void Start() + { + _CameraControllerRound3 = (CameraControllerRound3)_CameraController; + if (_CameraControllerRound3 == null) + { + Debug.LogError("Camera controller is the wrong type. This will cause a crash for sure."); + } + } + public override void InitialiseGameMode() { @@ -85,12 +97,14 @@ public class GameManagerRound3 : GameManagerBase SendCustomNetworkEvent(NetworkEventTarget.All, nameof(ActivateCameraSwitchers), false); SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false); + _CameraControllerRound3.InitialiseCameras(); + RequestSerialization(); } [NetworkCallable] public void ActivateCameraSwitchers(bool Activate) { - _CameraTriggersGroup.SetActive(Activate); + //_CameraTriggersGroup.SetActive(Activate); } public override void DeinitialiseGameMode() @@ -108,10 +122,13 @@ public class GameManagerRound3 : GameManagerBase for (int i = 0; i < _Markers.Length; i++) Networking.SetOwner(NewOwner, _Markers[i].gameObject); - Networking.SetOwner(NewOwner, _HostPlayerTimerToggle.gameObject); - Networking.SetOwner(NewOwner, _CameraTriggersGroup); - Networking.SetOwner(NewOwner, _CaptureCarmenNewspaper.gameObject); - Networking.SetOwner(NewOwner, _EndingPlayer.gameObject); + //Networking.SetOwner(NewOwner, _HostPlayerTimerToggle.gameObject); + //Networking.SetOwner(NewOwner, _CameraTriggersGroup); + //Networking.SetOwner(NewOwner, _CaptureCarmenNewspaper.gameObject); + //Networking.SetOwner(NewOwner, _EndingPlayer.gameObject); + + Networking.SetOwner(NewOwner, _CameraController.gameObject); + Networking.SetOwner(NewOwner, _CameraControllerRound3.gameObject); base.SetOwnershipOfObjects(NewOwner); } @@ -175,7 +192,7 @@ public class GameManagerRound3 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic"); - _HostPlayerTimerToggle.Activate = true; + //_HostPlayerTimerToggle.Activate = true; EnableInteraction("Begin"); } @@ -186,7 +203,7 @@ public class GameManagerRound3 : GameManagerBase _GameStatus = GameStatus.Begin; UpdateInterface(); - _HostPlayerTimerToggle.Activate = false; + //_HostPlayerTimerToggle.Activate = false; SendCustomNetworkEvent(NetworkEventTarget.All, nameof(ActivateCameraSwitchers), true); GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true); @@ -319,8 +336,8 @@ public class GameManagerRound3 : GameManagerBase GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true); } - _HostCameraAnchors[ActiveMarker].AttachCamera(_HostCamera); - _PlayerCameraAnchors[ActiveMarker].AttachCamera(_PlayerCamera); + //_HostCameraAnchors[ActiveMarker].AttachCamera(_HostCamera); + //_PlayerCameraAnchors[ActiveMarker].AttachCamera(_PlayerCamera); } [NetworkCallable] diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index 3ce1418..96c8e41 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Lib.csproj b/UdonSharp.Lib.csproj index 8def6c3..de30fa2 100644 --- a/UdonSharp.Lib.csproj +++ b/UdonSharp.Lib.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UdonSharp.Runtime.csproj b/UdonSharp.Runtime.csproj index 95b4222..404efcf 100644 --- a/UdonSharp.Runtime.csproj +++ b/UdonSharp.Runtime.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Addressables.csproj b/UniTask.Addressables.csproj index 9aa8103..ea8c8d3 100644 --- a/UniTask.Addressables.csproj +++ b/UniTask.Addressables.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.DOTween.csproj b/UniTask.DOTween.csproj index d48f31c..7a59b69 100644 --- a/UniTask.DOTween.csproj +++ b/UniTask.DOTween.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Editor.csproj b/UniTask.Editor.csproj index 71a3f7f..d3bccb9 100644 --- a/UniTask.Editor.csproj +++ b/UniTask.Editor.csproj @@ -1128,14 +1128,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index 70a2010..2d5a27b 100644 --- a/UniTask.Linq.csproj +++ b/UniTask.Linq.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.TextMeshPro.csproj b/UniTask.TextMeshPro.csproj index 51bed4e..b8ba197 100644 --- a/UniTask.TextMeshPro.csproj +++ b/UniTask.TextMeshPro.csproj @@ -1123,14 +1123,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.csproj b/UniTask.csproj index 21f0a84..1bdff38 100644 --- a/UniTask.csproj +++ b/UniTask.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UnityEditorTests.csproj b/UnityEditorTests.csproj index b9085b2..7b09a12 100644 --- a/UnityEditorTests.csproj +++ b/UnityEditorTests.csproj @@ -990,14 +990,14 @@ Library\ScriptAssemblies\UnityEditor.TestRunner.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ClientSim.Editor.csproj b/VRC.ClientSim.Editor.csproj index 2577234..322f28d 100644 --- a/VRC.ClientSim.Editor.csproj +++ b/VRC.ClientSim.Editor.csproj @@ -1159,14 +1159,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index 949c893..c20c4be 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -1266,14 +1266,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ExampleCentral.Editor.csproj b/VRC.ExampleCentral.Editor.csproj index b01e5a7..cee0d79 100644 --- a/VRC.ExampleCentral.Editor.csproj +++ b/VRC.ExampleCentral.Editor.csproj @@ -1138,14 +1138,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index 8908370..73b3dff 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1184,14 +1184,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 36b455c..83e2836 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -1149,14 +1149,14 @@ Library\ScriptAssemblies\Cinemachine.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.BuildPipeline.csproj b/VRC.SDKBase.Editor.BuildPipeline.csproj index d0cafb5..60ab3fc 100644 --- a/VRC.SDKBase.Editor.BuildPipeline.csproj +++ b/VRC.SDKBase.Editor.BuildPipeline.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.ShaderStripping.csproj b/VRC.SDKBase.Editor.ShaderStripping.csproj index 13677d0..7e57a23 100644 --- a/VRC.SDKBase.Editor.ShaderStripping.csproj +++ b/VRC.SDKBase.Editor.ShaderStripping.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 5d4c581..63027b6 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -1267,14 +1267,14 @@ Library\ScriptAssemblies\Unity.XR.Oculus.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index 2539812..48720b4 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -1186,14 +1186,14 @@ Library\ScriptAssemblies\Unity.Timeline.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.Editor.csproj b/VRC.Udon.Editor.csproj index 7ca0cd2..af6c3b2 100644 --- a/VRC.Udon.Editor.csproj +++ b/VRC.Udon.Editor.csproj @@ -1206,14 +1206,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.Udon.Serialization.OdinSerializer.csproj b/VRC.Udon.Serialization.OdinSerializer.csproj index 597e186..67bf9ec 100644 --- a/VRC.Udon.Serialization.OdinSerializer.csproj +++ b/VRC.Udon.Serialization.OdinSerializer.csproj @@ -1305,14 +1305,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index a0cc0e6..343c1a1 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -1144,14 +1144,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRWorldToolkit.Editor.csproj b/VRWorldToolkit.Editor.csproj index 4a839ae..f3bc28c 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1147,14 +1147,14 @@ Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/com.vrchat.core.vpm-resolver.Editor.csproj b/com.vrchat.core.vpm-resolver.Editor.csproj index 0ee0bd0..d33831e 100644 --- a/com.vrchat.core.vpm-resolver.Editor.csproj +++ b/com.vrchat.core.vpm-resolver.Editor.csproj @@ -1142,14 +1142,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.Editor.csproj b/vrchat.jordo.easyquestswitch.Editor.csproj index b3680ec..f92ad30 100644 --- a/vrchat.jordo.easyquestswitch.Editor.csproj +++ b/vrchat.jordo.easyquestswitch.Editor.csproj @@ -1129,14 +1129,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.csproj b/vrchat.jordo.easyquestswitch.csproj index 6175adb..e7c0214 100644 --- a/vrchat.jordo.easyquestswitch.csproj +++ b/vrchat.jordo.easyquestswitch.csproj @@ -1151,14 +1151,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False +