diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index 6fca917..a08dc49 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -537,6 +537,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7791211404575533502} - {fileID: 5485012652387384987} m_Father: {fileID: 5913791720362352550} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} @@ -6639,6 +6640,76 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1ecd98174f84ffa4b93712c1d1b30a59, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &5904198735500205900 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2402234831336241486} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Player Position Marker + objectReference: {fileID: 0} + - target: {fileID: 6339790211674806269, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!4 &7791211404575533502 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 5904198735500205900} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6167885581044250701 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 287c2aa..c69d0af 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -11018,6 +11018,12 @@ PrefabInstance: value: objectReference: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2628711887938685344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -11767,6 +11773,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} +--- !u!114 &172614118 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1818292915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &172614119 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -25176,6 +25194,11 @@ MonoBehaviour: _AudioManager: {fileID: 1947493795} _PlayerMicrophone: {fileID: 431721603} _AudienceSilencer: {fileID: 344488391} + _HostPositionMarker: {fileID: 1334696253} + _PlayerPositionMarkers: + - {fileID: 4438766482650780792} + - {fileID: 172614118} + - {fileID: 937910640} _CameraController: {fileID: 1524477936} _TiebreakerData: url: https://witwics.actual.horse/static/TiebreakerData.json @@ -25308,6 +25331,68 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1001 &517321110 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2063457642} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.25000003 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Player Position Marker + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!4 &517321111 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 517321110} + m_PrefabAsset: {fileID: 0} +--- !u!114 &517321112 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 517321110} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068113076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &518072192 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4006318464411565335, guid: c37ec0a412d585049af93f09e1c82ec7, @@ -32576,6 +32661,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 666229122} m_PrefabAsset: {fileID: 0} +--- !u!114 &694468891 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 666229122} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 694468889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &696233295 GameObject: m_ObjectHideFlags: 0 @@ -39703,6 +39800,10 @@ MonoBehaviour: _AudioManager: {fileID: 1947493795} _PlayerMicrophone: {fileID: 51189182} _AudienceSilencer: {fileID: 344488391} + _HostPositionMarker: {fileID: 694468891} + _PlayerPositionMarkers: + - {fileID: 4881855407002070443} + - {fileID: 1248667630} _CameraController: {fileID: 1355919010} _ArrivalDisplay: {fileID: 2013644315} _LocationBoard: {fileID: 1748199014} @@ -39711,9 +39812,6 @@ MonoBehaviour: _PlayerConfettiCannons: - {fileID: 173137748} - {fileID: 905695708} - _PlayerPositionMarkers: - - {fileID: 4881855407002070443} - - {fileID: 1248667630} _JailPlayer: {fileID: 115578771} --- !u!1001 &867006604 PrefabInstance: @@ -41430,6 +41528,12 @@ PrefabInstance: value: objectReference: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2628711887938685344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -42184,6 +42288,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} +--- !u!114 &937910640 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1329986635} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &937910641 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -43796,6 +43912,9 @@ MonoBehaviour: _AudioManager: {fileID: 1947493795} _PlayerMicrophone: {fileID: 772205216} _AudienceSilencer: {fileID: 344488391} + _HostPositionMarker: {fileID: 2014347401} + _PlayerPositionMarkers: + - {fileID: 517321112} _CameraController: {fileID: 1691482842} _Maps: - {fileID: 886213381} @@ -55575,7 +55694,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1658730386} + m_TransformParent: {fileID: 2063457642} m_Modifications: - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} @@ -55592,45 +55711,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.84705 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} @@ -56091,22 +56175,22 @@ PrefabInstance: - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalRotation.w - value: -0.38268274 + value: 0.9914449 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalRotation.y - value: 0.9238798 + value: 0.13052616 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} @@ -56116,7 +56200,7 @@ PrefabInstance: - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 225 + value: 15 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} @@ -56395,8 +56479,8 @@ Transform: - {fileID: 1264786912} - {fileID: 1343307840} - {fileID: 1143449486} - - {fileID: 2063457642} - {fileID: 1658730386} + - {fileID: 2063457642} - {fileID: 579108364} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -58807,6 +58891,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1329986635 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2100549964862264379, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1 &1330471526 stripped GameObject: m_CorrespondingSourceObject: {fileID: 399228068808120113, guid: 126991d511ca61841a0ef899b6c038a6, @@ -59343,6 +59433,11 @@ PrefabInstance: propertyPath: m_Name value: Host Position Marker objectReference: {fileID: 0} + - target: {fileID: 6339790211674806269, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} propertyPath: serializationData.Prefab @@ -59366,6 +59461,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1334696249} m_PrefabAsset: {fileID: 0} +--- !u!114 &1334696253 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 1334696249} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334696251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1337513406 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2595320447929043918, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -69912,6 +70019,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 50383829} m_PrefabAsset: {fileID: 0} +--- !u!1 &1507112015 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2100549964862264379, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!1 &1509375540 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8805209586645447962, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -79515,7 +79628,7 @@ GameObject: m_Component: - component: {fileID: 1658730386} m_Layer: 0 - m_Name: Player Spawn Point + m_Name: Host Spawn Point m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -79529,14 +79642,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1658730385} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.3849616, z: -0, w: -0.9229327} + m_LocalRotation: {x: -0, y: -0.2596623, z: 0, w: -0.96569955} m_LocalPosition: {x: -27.281, y: 0, z: -0.942} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1242312398} + - {fileID: 2014347400} + - {fileID: 1800500103} m_Father: {fileID: 1276291775} - m_LocalEulerAnglesHint: {x: 0, y: -314.717, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -329.9, z: 0} --- !u!1 &1661734723 stripped GameObject: m_CorrespondingSourceObject: {fileID: 93778220037391676, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -82604,6 +82718,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2357104409142985571} m_PrefabAsset: {fileID: 0} +--- !u!1 &1735165259 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 2014347399} + m_PrefabAsset: {fileID: 0} --- !u!1 &1735519735 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5595091127962403785, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -84344,12 +84464,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 2063457642} + m_TransformParent: {fileID: 1658730386} m_Modifications: - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalScale.x - value: 0.84705 + value: 0.8470501 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} @@ -84359,42 +84479,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} propertyPath: m_LocalScale.z - value: 0.84705 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.68 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.681 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.500004 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.500004 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.49999607 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.49999607 + value: 0.84705013 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} @@ -84980,6 +85065,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1817081116} m_CullTransparentMesh: 1 +--- !u!1 &1818292915 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2100549964862264379, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!1 &1820919454 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5591101949846710254, guid: c37ec0a412d585049af93f09e1c82ec7, @@ -92173,7 +92264,7 @@ PrefabInstance: - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -92244,7 +92335,7 @@ PrefabInstance: - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 89.895 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -92254,7 +92345,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -93436,6 +93527,68 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f77acae58a8be34380b96b47188d4eb, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &2014347399 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1658730386} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Host Position Marker + objectReference: {fileID: 0} + - target: {fileID: 6339790211674806269, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!4 &2014347400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 2014347399} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2014347401 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 2014347399} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735165259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2014825485 GameObject: m_ObjectHideFlags: 0 @@ -96037,7 +96190,7 @@ GameObject: m_Component: - component: {fileID: 2063457642} m_Layer: 0 - m_Name: Host Spawn Point + m_Name: Player Spawn Point m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -96051,14 +96204,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063457641} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.9239798, z: -0, w: -0.38244125} - m_LocalPosition: {x: -26.72, y: 0, z: 0.96} + m_LocalRotation: {x: 0.00000015273689, y: -0.9237823, z: 0.00000042468304, w: 0.3829182} + m_LocalPosition: {x: -26.719797, y: 0, z: -0.0023725033} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1800500103} + - {fileID: 517321111} + - {fileID: 1242312398} m_Father: {fileID: 1276291775} - m_LocalEulerAnglesHint: {x: 0, y: -224.97, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -134.971, z: 0} --- !u!1 &2063804006 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1829400999671884876, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -96369,6 +96523,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2067059962} m_CullTransparentMesh: 1 +--- !u!1 &2068113076 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 517321110} + m_PrefabAsset: {fileID: 0} --- !u!1 &2068113426 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4476962291825252709, guid: aecb18996fccac6488cfcd38604796da, @@ -103239,6 +103399,12 @@ PrefabInstance: value: objectReference: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2628711887938685344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -103988,6 +104154,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} +--- !u!114 &4438766482650780792 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2597923872188987004, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507112015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4438766482650780793 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -107112,91 +107290,91 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} - - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} - - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} - - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} - - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} - - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} - - {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2} - - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} + - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} + - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} + - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} + - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} + - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} + - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2} + - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} + - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} + - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} + - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} + - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} + - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} @@ -112784,6 +112962,26 @@ MonoBehaviour: ID: 1337 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1507112015} + ID: 1338 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1818292915} + ID: 1339 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1329986635} + ID: 1340 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1735165259} + ID: 1341 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2068113076} + ID: 1342 + 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/CameraAnchor.cs b/Assets/UdonSharp/Cameras/CameraAnchor.cs index 5915548..cef264a 100644 --- a/Assets/UdonSharp/Cameras/CameraAnchor.cs +++ b/Assets/UdonSharp/Cameras/CameraAnchor.cs @@ -217,10 +217,10 @@ public class CameraAnchor : UdonSharpBehaviour { _AttachedCamera = NewCamera; _AttachedCamera.gameObject.SetActive(true); - _AttachedCamera.transform.parent = CameraRoot; _AttachedCamera.fieldOfView = FOV; _AttachedCamera.nearClipPlane = NearClippingPlane; _AttachedCamera.farClipPlane = FarClippingPlane; + _AttachedCamera.transform.parent = CameraRoot; _AttachedCamera.GetComponent().TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true); } } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs index 7b3d380..82a240d 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs @@ -46,16 +46,13 @@ public class CameraControllerRound3 : CameraControllerBase DisableAllSwitchers(); DisableAllTriggers(); - HostStartingCameraAnchor.AttachCamera(PlayerCamera); - PlayerStartingCameraAnchor.AttachCamera(HostCamera); + PlayerCameraAnchorSequence[0].AttachCamera(PlayerCamera); + HostCameraAnchorSequence[0].AttachCamera(HostCamera); OverheadCameraAnchor.AttachCamera(OverheadCamera); FrontCameraAnchor.AttachCamera(FrontCamera); NewspaperCameraAnchor.AttachCamera(PrimaryFocusCamera); VideoPlayerCameraAnchor.AttachCamera(VideoPlayerCamera); - HostCameraAnchorSequence[0].AttachCamera(HostCamera); - PlayerCameraAnchorSequence[0].AttachCamera(PlayerCamera); - ActivatePlayfieldSwitchTriggerGroup = false; PlayIFeelGood(false); diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 88293e9..8c28cd5 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -65,7 +65,7 @@ public class CaseManager : UdonSharpBehaviour [UdonSynced] private ContinentMap _FinalRoundContinent = ContinentMap.INDEX_MAX; - [UdonSynced] private string[] _CurrentWinningPlayers = new string[3]; + [UdonSynced] private string[] _CurrentWinningPlayers = new string[0]; private DataDictionary _CaseFileDictionary; diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.asset b/Assets/UdonSharp/Game Managers/GameManagerBase.asset index fa2448e..a2cd8c0 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: 9 + Data: 11 - Name: Entry: 7 Data: @@ -410,19 +410,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraController + Data: _HostPositionMarker - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraController + Data: _HostPositionMarker - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraControllerBase, Assembly-CSharp + Data: PositionMarker, Assembly-CSharp - Name: Entry: 8 Data: @@ -479,16 +479,151 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Initialised + Data: _PlayerPositionMarkers - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Initialised + Data: _PlayerPositionMarkers - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: PositionMarker[], 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: 2 + - Name: + Entry: 7 + Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 40|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: _Initialised + - Name: $v + Entry: 7 + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Initialised + - Name: k__BackingField + Entry: 7 + Data: 42|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -497,7 +632,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -512,7 +647,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -536,16 +671,16 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -560,7 +695,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|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 e069239..dc1357a 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -48,9 +48,10 @@ public class GameManagerBase : UdonSharpBehaviour [SerializeField] protected AudioManager _AudioManager; [SerializeField] protected Microphone _PlayerMicrophone; [SerializeField] protected Microphone _AudienceSilencer; - [Space] - + [SerializeField] private PositionMarker _HostPositionMarker; + [SerializeField] private PositionMarker[] _PlayerPositionMarkers; + [Space] [SerializeField] protected CameraControllerBase _CameraController; @@ -112,6 +113,22 @@ public class GameManagerBase : UdonSharpBehaviour SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), true); + _HostPositionMarker.SetPlayer(_CaseManager.GetHostOwner().displayName); + string[] WinningPlayers = _CaseManager.GetCurrentWinningPlayers(); + for (int i = 0; i < _PlayerPositionMarkers.Length; i++) + { + string PlayerName = ""; + if (i < WinningPlayers.Length) + { + PlayerName = WinningPlayers[i]; + } + else + { + PlayerName = _CaseManager.GetHostOwner().displayName; + } + _PlayerPositionMarkers[i].SetPlayer(PlayerName); + } + _Initialised = true; } @@ -119,6 +136,12 @@ public class GameManagerBase : UdonSharpBehaviour { SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), false); + _HostPositionMarker.ClearPlayer(); + for (int i = 0; i < _PlayerPositionMarkers.Length; i++) + { + _PlayerPositionMarkers[i].ClearPlayer(); + } + _Initialised = false; } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 5443ea4..61434b1 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: 35 + Data: 37 - Name: Entry: 7 Data: @@ -410,19 +410,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraController + Data: _HostPositionMarker - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraController + Data: _HostPositionMarker - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraControllerBase, Assembly-CSharp + Data: PositionMarker, Assembly-CSharp - Name: Entry: 8 Data: @@ -479,25 +479,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Initialised + Data: _PlayerPositionMarkers - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Initialised + Data: _PlayerPositionMarkers - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Boolean, mscorlib + Data: PositionMarker[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 32 + 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 @@ -509,13 +515,19 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -533,73 +545,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard - - Name: $v - Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AllowInteractionFromHostCard - - 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 - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 35|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: _TiebreakerData + Data: _CameraController - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TiebreakerData + Data: _CameraController - Name: k__BackingField Entry: 7 Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCUrl, VRCSDKBase + Data: CameraControllerBase, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 37 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -650,25 +614,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _GameHasBegun + Data: _Initialised - Name: $v Entry: 7 Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _GameHasBegun + Data: _Initialised - Name: k__BackingField - Entry: 9 - Data: 32 + Entry: 7 + Data: 42|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - 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: @@ -677,16 +647,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -704,31 +668,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionIndex + Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionIndex + Data: _AllowInteractionFromHostCard - Name: k__BackingField - Entry: 7 - Data: 45|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 45 + Data: 42 - 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: @@ -737,16 +695,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 46|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: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -764,40 +716,55 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionStage + Data: _TiebreakerData - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionStage + Data: _TiebreakerData - Name: k__BackingField - Entry: 9 - Data: 45 + Entry: 7 + Data: 47|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl, VRCSDKBase + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 45 + Data: 47 - 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: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 49|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 + Data: 2 - Name: Entry: 7 - Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 49|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -818,19 +785,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionSubstage + Data: _GameHasBegun - Name: $v Entry: 7 Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionSubstage + Data: _GameHasBegun - Name: k__BackingField Entry: 9 - Data: 45 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 45 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -872,19 +839,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionCorrectResponse + Data: _QuestionIndex - Name: $v Entry: 7 Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionCorrectResponse + Data: _QuestionIndex - Name: k__BackingField - Entry: 9 - Data: 45 + Entry: 7 + Data: 55|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 45 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -899,13 +872,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 57|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -926,25 +899,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentQuestionType + Data: _QuestionStage - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentQuestionType + Data: _QuestionStage - Name: k__BackingField - Entry: 7 - Data: 58|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: RoundSegmentType, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 45 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -986,16 +953,184 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionsList + Data: _QuestionSubstage - Name: $v Entry: 7 Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _QuestionSubstage + - Name: k__BackingField + Entry: 9 + Data: 55 + - Name: k__BackingField + Entry: 9 + Data: 55 + - 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: _QuestionCorrectResponse + - Name: $v + Entry: 7 + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _QuestionCorrectResponse + - Name: k__BackingField + Entry: 9 + Data: 55 + - Name: k__BackingField + Entry: 9 + Data: 55 + - 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: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 66|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: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CurrentQuestionType + - Name: k__BackingField + Entry: 7 + Data: 68|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: RoundSegmentType, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 55 + - 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: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 70|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: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionsList - Name: k__BackingField Entry: 7 - Data: 62|System.RuntimeType, mscorlib + Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataList, VRCSDK3 @@ -1004,7 +1139,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 62 + Data: 72 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1019,7 +1154,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1043,13 +1178,13 @@ MonoBehaviour: Data: _CurrentQuestion - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentQuestion - Name: k__BackingField Entry: 7 - Data: 65|System.RuntimeType, mscorlib + Data: 75|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1058,7 +1193,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 65 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1073,7 +1208,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1097,16 +1232,16 @@ MonoBehaviour: Data: _BuzzInAllowed - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzInAllowed - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1121,13 +1256,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|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: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1151,13 +1286,13 @@ MonoBehaviour: Data: _PlayerBuzzInAllowed - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerBuzzInAllowed - Name: k__BackingField Entry: 7 - Data: 71|System.RuntimeType, mscorlib + Data: 81|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean[], mscorlib @@ -1166,175 +1301,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 71 - - 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: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 73|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: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _BuzzedInPlayer - - Name: k__BackingField - Entry: 9 - Data: 45 - - Name: k__BackingField - Entry: 9 - Data: 45 - - 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: _FinalRoundPlayersSortedByScore - - Name: $v - Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _FinalRoundPlayersSortedByScore - - 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: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _TiebreakerPlayerNumbers - - Name: $v - Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _TiebreakerPlayerNumbers - - Name: k__BackingField - Entry: 9 - Data: 78 - - Name: k__BackingField - Entry: 9 - Data: 78 + Data: 81 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1376,16 +1343,184 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerPodiums + Data: _BuzzedInPlayer - Name: $v Entry: 7 Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _BuzzedInPlayer + - Name: k__BackingField + Entry: 9 + Data: 55 + - Name: k__BackingField + Entry: 9 + Data: 55 + - 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: 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: + - 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: _FinalRoundPlayersSortedByScore + - Name: $v + Entry: 7 + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FinalRoundPlayersSortedByScore + - Name: k__BackingField + Entry: 7 + Data: 88|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 88 + - 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: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 90|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: _TiebreakerPlayerNumbers + - Name: $v + Entry: 7 + Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TiebreakerPlayerNumbers + - 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: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 93|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: _PlayerPodiums + - Name: $v + Entry: 7 + Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 85|System.RuntimeType, mscorlib + Data: 95|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -1393,14 +1528,8 @@ MonoBehaviour: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 86|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 33 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1415,13 +1544,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 88|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1430,7 +1559,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1454,13 +1583,13 @@ MonoBehaviour: Data: _VideoPlayer - Name: $v Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayer - Name: k__BackingField Entry: 7 - Data: 91|System.RuntimeType, mscorlib + Data: 100|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaseVideoSyncPlayer, Assembly-CSharp @@ -1484,13 +1613,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 93|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 102|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1499,7 +1629,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 94|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 103|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Props @@ -1508,7 +1638,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 95|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1532,13 +1662,13 @@ MonoBehaviour: Data: _ACMECrimenetComputer - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ACMECrimenetComputer - Name: k__BackingField Entry: 7 - Data: 97|System.RuntimeType, mscorlib + Data: 106|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ACMECrimenetComputer, Assembly-CSharp @@ -1562,13 +1692,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 108|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1592,13 +1723,13 @@ MonoBehaviour: Data: _VideoMusicClueSkateboard - Name: $v Entry: 7 - Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoMusicClueSkateboard - Name: k__BackingField Entry: 7 - Data: 101|System.RuntimeType, mscorlib + Data: 110|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VideoMusicClueSkateboard, Assembly-CSharp @@ -1622,14 +1753,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 103|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 112|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1653,13 +1784,13 @@ MonoBehaviour: Data: _DetectiveNoirEffect - Name: $v Entry: 7 - Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _DetectiveNoirEffect - Name: k__BackingField Entry: 7 - Data: 105|System.RuntimeType, mscorlib + Data: 114|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DetectiveNoirEffect, Assembly-CSharp @@ -1683,14 +1814,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 107|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 116|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1714,13 +1845,13 @@ MonoBehaviour: Data: _FilingCabinet - Name: $v Entry: 7 - Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 117|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FilingCabinet - Name: k__BackingField Entry: 7 - Data: 109|System.RuntimeType, mscorlib + Data: 118|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FilingCabinet, Assembly-CSharp @@ -1744,14 +1875,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 110|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 119|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 111|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 120|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1775,13 +1906,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 113|System.RuntimeType, mscorlib + Data: 122|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -1805,14 +1936,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 123|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 115|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 124|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1836,13 +1967,13 @@ MonoBehaviour: Data: _ArrivalDisplay - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 125|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 - Data: 117|System.RuntimeType, mscorlib + Data: 126|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay, Assembly-CSharp @@ -1864,140 +1995,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 119|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: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _LightningRoundAnimator - - Name: k__BackingField - Entry: 7 - Data: 121|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 121 - - 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: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 3 - - Name: - Entry: 7 - Data: 123|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 124|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Effects - - Name: - Entry: 8 - Data: - - 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: _TheChaseAnimator - - Name: $v - Entry: 7 - Data: 126|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _TheChaseAnimator - - Name: k__BackingField - Entry: 9 - Data: 121 - - Name: k__BackingField - Entry: 9 - Data: 121 - - 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: 127|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], @@ -2028,16 +2025,150 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraControllerRound1 + Data: _LightningRoundAnimator - Name: $v Entry: 7 Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraControllerRound1 + Data: _LightningRoundAnimator - Name: k__BackingField Entry: 7 Data: 130|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 130 + - 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: 131|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: 132|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 133|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Effects + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 134|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: _TheChaseAnimator + - Name: $v + Entry: 7 + Data: 135|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TheChaseAnimator + - Name: k__BackingField + Entry: 9 + Data: 130 + - Name: k__BackingField + Entry: 9 + Data: 130 + - 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: 136|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 137|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: _CameraControllerRound1 + - Name: $v + Entry: 7 + Data: 138|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraControllerRound1 + - Name: k__BackingField + Entry: 7 + Data: 139|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound1, Assembly-CSharp @@ -2061,7 +2192,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 131|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 140|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2086,13 +2217,13 @@ MonoBehaviour: Data: _VideoPlayerTimer - Name: $v Entry: 7 - Data: 132|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 141|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayerTimer - Name: k__BackingField Entry: 7 - Data: 133|System.RuntimeType, mscorlib + Data: 142|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -2101,7 +2232,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 133 + Data: 142 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2116,7 +2247,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 134|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 143|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 dac1760..66072d5 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -92,8 +92,6 @@ public class GameManagerRound1 : GameManagerBase public override void InitialiseGameMode() { - base.InitialiseGameMode(); - _GameHasBegun = false; _QuestionIndex = 0; _QuestionStage = 0; @@ -116,6 +114,8 @@ public class GameManagerRound1 : GameManagerBase DisableInteraction(); + base.InitialiseGameMode(); + RequestSerialization(); } @@ -187,13 +187,19 @@ public class GameManagerRound1 : GameManagerBase return; } + string[] CurrentPlayers = new string[3] { + _PlayerPodiums[0].PlayerName, + _PlayerPodiums[1].PlayerName, + _PlayerPodiums[2].PlayerName + }; + _CaseManager.SetCurrentWinningPlayers(CurrentPlayers); + Interface.HeaderUI.text = _CaseManager.GetCaseTitle() + " has been loaded."; Interface.CommentUI.text = _CaseManager.GetCaseDescription(); _GameHasBegun = false; - _VideoPlayer.LoadLists(_CaseManager.GetMaps(), _CaseManager.GetVideos()); - _VideoPlayer.SetVideoIndex(_CaseManager.GetIntroVideo()); + _VideoPlayer.PrepareMapsAndVideos(_CaseManager); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 0bd554e..dfd9bdd 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: 29 + Data: 30 - Name: Entry: 7 Data: @@ -410,19 +410,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraController + Data: _HostPositionMarker - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraController + Data: _HostPositionMarker - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraControllerBase, Assembly-CSharp + Data: PositionMarker, Assembly-CSharp - Name: Entry: 8 Data: @@ -479,25 +479,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Initialised + Data: _PlayerPositionMarkers - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Initialised + Data: _PlayerPositionMarkers - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Boolean, mscorlib + Data: PositionMarker[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 9 - Data: 32 + 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 @@ -509,13 +515,19 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -533,67 +545,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard - - Name: $v - Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AllowInteractionFromHostCard - - 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 - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 35|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: _ArrivalDisplay + Data: _CameraController - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ArrivalDisplay + Data: _CameraController - Name: k__BackingField Entry: 7 Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ArrivalDisplay, Assembly-CSharp + Data: CameraControllerBase, Assembly-CSharp - Name: Entry: 8 Data: @@ -650,16 +614,187 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LocationBoard + Data: _Initialised - Name: $v Entry: 7 Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LocationBoard + Data: _Initialised - Name: k__BackingField Entry: 7 Data: 42|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 42 + - 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: 43|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: _AllowInteractionFromHostCard + - Name: $v + Entry: 7 + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AllowInteractionFromHostCard + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - 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: 45|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: _ArrivalDisplay + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ArrivalDisplay + - Name: k__BackingField + Entry: 7 + Data: 47|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: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 49|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 50|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: _LocationBoard + - Name: $v + Entry: 7 + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LocationBoard + - Name: k__BackingField + Entry: 7 + Data: 52|System.RuntimeType, mscorlib - Name: Entry: 1 Data: LocationBoard, Assembly-CSharp @@ -683,13 +818,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 43|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: 44|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -713,13 +848,13 @@ MonoBehaviour: Data: _JailChain - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailChain - Name: k__BackingField Entry: 7 - Data: 46|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailChain, Assembly-CSharp @@ -743,13 +878,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 47|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: 48|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -773,13 +908,13 @@ MonoBehaviour: Data: _JailPhone - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPhone - Name: k__BackingField Entry: 7 - Data: 50|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailPhone, Assembly-CSharp @@ -803,13 +938,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -833,13 +968,13 @@ MonoBehaviour: Data: _PlayerConfettiCannons - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerConfettiCannons - Name: k__BackingField Entry: 7 - Data: 54|System.RuntimeType, mscorlib + Data: 64|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.ParticleSystem[], UnityEngine.ParticleSystemModule @@ -848,7 +983,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 54 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -863,79 +998,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 55|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: 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: _PlayerPositionMarkers - - Name: $v - Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PlayerPositionMarkers - - Name: k__BackingField - Entry: 7 - Data: 58|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: PositionMarker[], Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 59|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: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -959,13 +1028,13 @@ MonoBehaviour: Data: _JailPlayer - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPlayer - Name: k__BackingField Entry: 7 - Data: 63|System.RuntimeType, mscorlib + Data: 68|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -989,13 +1058,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1017,84 +1086,18 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _Location - - Name: $v - Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Location - - Name: k__BackingField - Entry: 7 - Data: 67|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 67 - - 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: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 70|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: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Landmarks + Data: _Location - Name: k__BackingField Entry: 7 Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.String[], mscorlib + Data: System.String, mscorlib - Name: Entry: 8 Data: @@ -1118,13 +1121,79 @@ MonoBehaviour: Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 75|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: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Landmarks + - Name: k__BackingField + Entry: 7 + Data: 77|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1145,13 +1214,13 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 81|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1160,7 +1229,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 81 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1175,13 +1244,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1205,16 +1274,16 @@ MonoBehaviour: Data: _CurrentPlayerCounter - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 76 + Data: 81 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 81 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1229,13 +1298,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1259,16 +1328,16 @@ MonoBehaviour: Data: _Players - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Players - Name: k__BackingField Entry: 9 - Data: 72 + Data: 77 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 77 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1283,13 +1352,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 89|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1313,16 +1382,16 @@ MonoBehaviour: Data: _RoundIsOver - Name: $v Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RoundIsOver - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1337,13 +1406,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 87|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 92|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1367,13 +1436,13 @@ MonoBehaviour: Data: _CameraControllerRound2 - Name: $v Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound2 - Name: k__BackingField Entry: 7 - Data: 89|System.RuntimeType, mscorlib + Data: 94|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound2, Assembly-CSharp @@ -1397,7 +1466,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1421,118 +1490,16 @@ MonoBehaviour: Data: _PlayingJailCall - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayingJailCall - Name: k__BackingField Entry: 9 - Data: 32 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 32 - - 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: 92|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: _PanelToReveal_Cache - - Name: $v - Entry: 7 - Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PanelToReveal_Cache - - Name: k__BackingField - Entry: 9 - Data: 76 - - Name: k__BackingField - Entry: 9 - Data: 76 - - 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: 94|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: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_STANDARD - - Name: k__BackingField - Entry: 7 - Data: 96|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 96 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1568,19 +1535,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_RED + Data: _PanelToReveal_Cache - Name: $v Entry: 7 Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_RED + Data: _PanelToReveal_Cache - Name: k__BackingField Entry: 9 - Data: 96 + Data: 81 - Name: k__BackingField Entry: 9 - Data: 96 + Data: 81 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1616,19 +1583,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_YELLOW + Data: COLOR_STANDARD - Name: $v Entry: 7 Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_YELLOW + Data: COLOR_STANDARD - Name: k__BackingField - Entry: 9 - Data: 96 + Entry: 7 + Data: 101|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 96 + Data: 101 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1643,7 +1616,105 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 102|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_RED + - Name: $v + Entry: 7 + Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_RED + - Name: k__BackingField + Entry: 9 + Data: 101 + - Name: k__BackingField + Entry: 9 + Data: 101 + - 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: 104|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: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_YELLOW + - Name: k__BackingField + Entry: 9 + Data: 101 + - Name: k__BackingField + Entry: 9 + Data: 101 + - 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: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1668,16 +1739,16 @@ MonoBehaviour: Data: COLOR_GREEN - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_GREEN - Name: k__BackingField Entry: 9 - Data: 96 + Data: 101 - Name: k__BackingField Entry: 9 - Data: 96 + Data: 101 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1692,7 +1763,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index ae8e60d..4de3c6b 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -26,7 +26,6 @@ public class GameManagerRound2 : GameManagerBase [SerializeField] private JailChain _JailChain; [SerializeField] private JailPhone _JailPhone; [SerializeField] private ParticleSystem[] _PlayerConfettiCannons; - [SerializeField] private PositionMarker[] _PlayerPositionMarkers; [SerializeField] private RandomVideoPlayer _JailPlayer; @@ -62,8 +61,6 @@ public class GameManagerRound2 : GameManagerBase public override void InitialiseGameMode() { - base.InitialiseGameMode(); - _StageIndex = 0; _PlayingJailCall = false; @@ -72,12 +69,6 @@ public class GameManagerRound2 : GameManagerBase _JailChain.Initialise(); _JailPhone.Initialise(); - string[] WinningPlayers = _CaseManager.GetCurrentWinningPlayers(); - for (int i = 0; i < _PlayerPositionMarkers.Length && i < WinningPlayers.Length; i++) - { - _PlayerPositionMarkers[i].SetPlayer(WinningPlayers[i]); - } - SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); _CameraControllerRound2.InitialiseCameras(); @@ -87,6 +78,8 @@ public class GameManagerRound2 : GameManagerBase _CameraControllerRound2.PlayModemZoom(true); _CameraControllerRound2.WinningPlayerCamera_StopFollowingPlayers(); + base.InitialiseGameMode(); + RequestSerialization(); } @@ -97,11 +90,6 @@ public class GameManagerRound2 : GameManagerBase _JailPhone.Activate = false; _JailChain.Show = false; - for (int i = 0; i < _PlayerPositionMarkers.Length; i++) - { - _PlayerPositionMarkers[i].ClearPlayer(); - } - _CameraControllerRound2.DeinitialiseCameras(); _CameraControllerRound2.PlayModemZoom(false); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index a502e58..6b3cc7f 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: 31 - Name: Entry: 7 Data: @@ -410,19 +410,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraController + Data: _HostPositionMarker - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraController + Data: _HostPositionMarker - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraControllerBase, Assembly-CSharp + Data: PositionMarker, Assembly-CSharp - Name: Entry: 8 Data: @@ -479,127 +479,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Initialised + Data: _PlayerPositionMarkers - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Initialised + Data: _PlayerPositionMarkers - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 32 - - 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: 33|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: _AllowInteractionFromHostCard - - Name: $v - Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AllowInteractionFromHostCard - - 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 - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 35|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: _Maps - - Name: $v - Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Maps - - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: FloorMap[], Assembly-CSharp + Data: PositionMarker[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 7 - Data: 38|System.RuntimeType, mscorlib + Data: 33|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -620,22 +518,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 40|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -656,25 +545,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Markers + Data: _CameraController - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Markers + Data: _CameraController - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: FloorMapMarker[], Assembly-CSharp + Data: CameraControllerBase, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 38 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -689,13 +578,253 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 40|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: _Initialised + - Name: $v + Entry: 7 + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Initialised + - Name: k__BackingField + Entry: 7 + Data: 42|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 42 + - 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: 43|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: _AllowInteractionFromHostCard + - Name: $v + Entry: 7 + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AllowInteractionFromHostCard + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - 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: 45|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: _Maps + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Maps + - Name: k__BackingField + Entry: 7 + Data: 47|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: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 49|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 50|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: _Markers + - Name: $v + Entry: 7 + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Markers + - Name: k__BackingField + Entry: 7 + Data: 52|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: FloorMapMarker[], 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: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -719,13 +848,13 @@ MonoBehaviour: Data: _CaptureCarmenNewspaper - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaptureCarmenNewspaper - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaptureCarmenNewspaper, Assembly-CSharp @@ -749,13 +878,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|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: 49|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -779,13 +908,13 @@ MonoBehaviour: Data: _NewspaperPublicDisplay - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _NewspaperPublicDisplay - Name: k__BackingField Entry: 7 - Data: 51|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: NewspaperDisplay, Assembly-CSharp @@ -809,13 +938,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -839,13 +968,13 @@ MonoBehaviour: Data: _TimerPublicDisplay - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TimerPublicDisplay - Name: k__BackingField Entry: 7 - Data: 55|System.RuntimeType, mscorlib + Data: 64|System.RuntimeType, mscorlib - Name: Entry: 1 Data: TimerDisplay, Assembly-CSharp @@ -869,13 +998,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 56|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: 57|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -899,13 +1028,13 @@ MonoBehaviour: Data: _Scoreboard - Name: $v Entry: 7 - Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Scoreboard - Name: k__BackingField Entry: 7 - Data: 59|System.RuntimeType, mscorlib + Data: 68|System.RuntimeType, mscorlib - Name: Entry: 1 Data: SimpleEnable, Assembly-CSharp @@ -929,13 +1058,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -959,13 +1088,13 @@ MonoBehaviour: Data: _TimerCameraOverlays - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TimerCameraOverlays - Name: k__BackingField Entry: 7 - Data: 63|System.RuntimeType, mscorlib + Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraOverlay[], Assembly-CSharp @@ -974,7 +1103,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 38 + Data: 33 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -989,13 +1118,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1019,16 +1148,16 @@ MonoBehaviour: Data: _NewspaperCameraOverlays - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _NewspaperCameraOverlays - Name: k__BackingField Entry: 9 - Data: 63 + Data: 72 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 33 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1043,13 +1172,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 68|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 77|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1073,13 +1202,13 @@ MonoBehaviour: Data: _EndingPlayer - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EndingPlayer - Name: k__BackingField Entry: 7 - Data: 70|System.RuntimeType, mscorlib + Data: 79|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -1103,13 +1232,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 71|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: 72|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1133,13 +1262,13 @@ MonoBehaviour: Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentlyActiveMap - Name: k__BackingField Entry: 7 - Data: 74|System.RuntimeType, mscorlib + Data: 83|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -1148,7 +1277,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 75|System.RuntimeType, mscorlib + Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1169,19 +1298,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 76|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: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 78|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1205,16 +1334,16 @@ MonoBehaviour: Data: _ActiveMarker - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1229,19 +1358,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 82|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 91|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1265,16 +1394,16 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1289,13 +1418,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 85|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 94|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1319,13 +1448,13 @@ MonoBehaviour: Data: _ContinentData - Name: $v Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 87|System.RuntimeType, mscorlib + Data: 96|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1334,7 +1463,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 87 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1349,7 +1478,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1373,13 +1502,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 90|System.RuntimeType, mscorlib + Data: 99|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -1388,169 +1517,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 75 - - 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: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 92|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: _RunTimer - - Name: $v - Entry: 7 - Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _RunTimer - - 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 - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 95|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: _Timer - - Name: $v - Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Timer - - Name: k__BackingField - Entry: 9 - Data: 75 - - Name: k__BackingField - Entry: 9 - Data: 75 - - 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: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 98|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: _SuccessCounter - - Name: $v - Entry: 7 - Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _SuccessCounter - - Name: k__BackingField - Entry: 9 - Data: 75 - - Name: k__BackingField - Entry: 9 - Data: 75 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1569,19 +1536,13 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 Data: 101|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 102|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - Name: Entry: 13 Data: @@ -1599,19 +1560,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FailureCounter + Data: _RunTimer - Name: $v Entry: 7 - Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FailureCounter + Data: _RunTimer - Name: k__BackingField Entry: 9 - Data: 75 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 75 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1626,20 +1587,191 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 104|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: _Timer + - Name: $v + Entry: 7 + Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Timer + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 9 + Data: 84 + - 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: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 107|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: _SuccessCounter + - Name: $v + Entry: 7 + Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _SuccessCounter + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 9 + Data: 84 + - 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: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 105|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 110|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 106|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 111|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: _FailureCounter + - Name: $v + Entry: 7 + Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FailureCounter + - Name: k__BackingField + Entry: 9 + Data: 84 + - Name: k__BackingField + Entry: 9 + Data: 84 + - 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: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 114|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 115|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1663,13 +1795,13 @@ MonoBehaviour: Data: _CameraControllerRound3 - Name: $v Entry: 7 - Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound3 - Name: k__BackingField Entry: 7 - Data: 108|System.RuntimeType, mscorlib + Data: 117|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound3, Assembly-CSharp @@ -1693,7 +1825,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1718,13 +1850,13 @@ MonoBehaviour: Data: _VideoPlayerTimer - Name: $v Entry: 7 - Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayerTimer - Name: k__BackingField Entry: 7 - Data: 111|System.RuntimeType, mscorlib + Data: 120|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -1733,7 +1865,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 111 + Data: 120 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1748,7 +1880,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 121|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index e6bdc53..99d91f9 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -94,8 +94,6 @@ public class GameManagerRound3 : GameManagerBase public override void InitialiseGameMode() { - base.InitialiseGameMode(); - _GameStatus = GameStatus.Pregame; _StageIndex = 0; @@ -133,17 +131,30 @@ public class GameManagerRound3 : GameManagerBase DeinitialiseGameplayCameraFollowers(); DeinitialiseEndingCameraFollowers(); + base.InitialiseGameMode(); + RequestSerialization(); } public override void DeinitialiseGameMode() { + _RunTimer = false; _EndingPlayer.PlayVideo = false; _CameraControllerRound3.DeinitialiseCameras(); _NewspaperPublicDisplay.Activate(false); _TimerPublicDisplay.Activate(false); + foreach (CameraOverlay Overlay in _TimerCameraOverlays) + { + Overlay.EnableOverlayElements(false); + } + + foreach (CameraOverlay Overlay in _NewspaperCameraOverlays) + { + Overlay.EnableOverlayElements(false); + } + _VideoPlayerTimer = -1.0f; base.DeinitialiseGameMode(); @@ -186,7 +197,6 @@ public class GameManagerRound3 : GameManagerBase _Markers[i].SendCustomNetworkEvent(NetworkEventTarget.All, "Initialise"); } - ActiveMarker = 0; GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.All, "SetPickupable", true); } @@ -230,6 +240,8 @@ public class GameManagerRound3 : GameManagerBase private void DisplayBriefing() { + ActiveMarker = 0; + HostCardCaptureCarmenExplainerInterface CaptureCarmenExplainerInterface = (HostCardCaptureCarmenExplainerInterface)GetHostCardInterface(RoundSegmentType.CaptureCarmenExplainer); diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs index 8cfc02b..407f136 100644 --- a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs @@ -123,15 +123,19 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour base.OnDeserialization(Result); } - public void LoadLists(VRCUrl[] Maps, VRCUrl[] Videos) + public void PrepareMapsAndVideos(CaseManager Manager) + { + _LoadLists(Manager.GetMaps(), Manager.GetVideos()); + SetVideoIndex(Manager.GetIntroVideo()); + } + + private void _LoadLists(VRCUrl[] Maps, VRCUrl[] Videos) { _CaseMapsList = Maps; _ReloadMapList(); _CaseVideoList = Videos; _ReloadVideoList(); - - RequestSerialization(); } private void _ReloadMapList()