diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 29366a5..819e955 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -64,6 +64,7 @@ + diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 9adf465..5f5c790 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -998,6 +998,133 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &51189179 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 51189180} + - component: {fileID: 51189183} + - component: {fileID: 51189184} + - component: {fileID: 51189182} + - component: {fileID: 51189181} + m_Layer: 0 + m_Name: Microphone Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &51189180 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51189179} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.00000023841858, z: -0, w: 1} + m_LocalPosition: {x: -1.68, y: 0, z: 1.31} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1583513123} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &51189181 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51189179} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 2 + serializedProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1, + type: 2} + programSource: {fileID: 11400000, guid: 7874d8cac34e7544c960f6392673f399, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &51189182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51189179} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fa4104b3414f05428aa283f01b2ca53, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 51189181} + _MikedVoiceDistanceNear: 30 + _MikedVoiceDistanceFar: 60 +--- !u!135 &51189183 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51189179} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 2.35 + m_Center: {x: 0, y: 0, z: 0} +--- !u!135 &51189184 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51189179} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 3.4331448 + m_Center: {x: 0.46841148, y: 0, z: 7.2048817} --- !u!1 &56104913 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, @@ -8470,6 +8597,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5882532645313673403, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -16724,6 +16857,133 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &431721600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 431721601} + - component: {fileID: 431721604} + - component: {fileID: 431721605} + - component: {fileID: 431721603} + - component: {fileID: 431721602} + m_Layer: 0 + m_Name: Microphone Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &431721601 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 431721600} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: 10.370806, y: 0, z: -4.925557} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2110808113} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &431721602 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 431721600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 2 + serializedProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1, + type: 2} + programSource: {fileID: 11400000, guid: 7874d8cac34e7544c960f6392673f399, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &431721603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 431721600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fa4104b3414f05428aa283f01b2ca53, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 431721602} + _MikedVoiceDistanceNear: 30 + _MikedVoiceDistanceFar: 60 +--- !u!135 &431721604 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 431721600} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 2.28 + m_Center: {x: 0, y: 0, z: 0} +--- !u!135 &431721605 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 431721600} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1.4223654 + m_Center: {x: 0.94838387, y: 0, z: 5.08399} --- !u!1 &432147265 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1109820307783882289, guid: be33bc7f6c414e6409becfa348b9310d, @@ -19572,6 +19832,7 @@ MonoBehaviour: _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} + _Microphone: {fileID: 431721603} _VideoPlayer: {fileID: 2057791820} _TiebreakerData: url: https://witwics-dev.github.io/TiebreakerData.json @@ -26545,6 +26806,111 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &772205213 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 772205214} + - component: {fileID: 772205217} + - component: {fileID: 772205216} + - component: {fileID: 772205215} + m_Layer: 0 + m_Name: Microphone Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &772205214 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 772205213} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -21.24, y: 0, z: 0.48} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1276291775} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &772205215 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 772205213} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 2 + serializedProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1, + type: 2} + programSource: {fileID: 11400000, guid: 7874d8cac34e7544c960f6392673f399, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &772205216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 772205213} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fa4104b3414f05428aa283f01b2ca53, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 772205215} + _MikedVoiceDistanceNear: 30 + _MikedVoiceDistanceFar: 60 +--- !u!65 &772205217 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 772205213} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 12.217293, y: 5, z: 11} + m_Center: {x: 0, y: 2.5, z: 0} --- !u!1 &772889382 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4680653884435436470, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -28964,7 +29330,7 @@ Transform: m_GameObject: {fileID: 865296975} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.983, y: -1.127, z: -2.261} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -29021,6 +29387,7 @@ MonoBehaviour: _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} + _Microphone: {fileID: 51189182} _Modem: {fileID: 966631266} _ArrivalDisplay: {fileID: 2013644315} _LocationBoard: {fileID: 1748199014} @@ -29082,7 +29449,7 @@ Transform: m_GameObject: {fileID: 875814627} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.0600004, y: 0, z: 5.8} + m_LocalPosition: {x: -2.03, y: 0, z: 5.8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -30239,6 +30606,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5882532645313673403, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -31272,7 +31645,7 @@ Transform: m_GameObject: {fileID: 969831471} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.58, y: -1.127, z: -1.98} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -31329,6 +31702,7 @@ MonoBehaviour: _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _AudioManager: {fileID: 1947493795} + _Microphone: {fileID: 772205216} _Maps: - {fileID: 886213381} - {fileID: 1534889734} @@ -41687,6 +42061,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1757939442} + - {fileID: 772205214} - {fileID: 1762618933} - {fileID: 530310356} - {fileID: 731366888} @@ -56320,6 +56695,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 51189180} - {fileID: 7240854401870329234} - {fileID: 295257087} - {fileID: 1230983058} @@ -70343,6 +70719,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1074804292} + - {fileID: 431721601} - {fileID: 72003558} - {fileID: 167305400} - {fileID: 2136439120} @@ -72360,6 +72737,11 @@ PrefabInstance: value: objectReference: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} + - target: {fileID: 497488136702045868, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} propertyPath: _AudioManager @@ -75027,6 +75409,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5813006568754327842, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5882532645313673403, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -77174,35 +77562,35 @@ MonoBehaviour: DynamicPrefabs: [] DynamicMaterials: - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: 20b7b61cb65ead644a4959264fc90833, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -81749,6 +82137,18 @@ MonoBehaviour: - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 431721600} + ID: 1097 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 51189179} + ID: 1100 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 772205213} + ID: 1101 + 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/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 326e7c7..8471c05 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -203,7 +203,12 @@ public class CaseManager : UdonSharpBehaviour public string ContinueToRound1() { + _Round3Manager.DeinitialiseGameMode(); + _Round2Manager.DeinitialiseGameMode(); + _Round1Manager.DeinitialiseGameMode(); + _HostCard.SetGameManager(_Round1Manager); + _Round1Manager.InitialiseGameMode(); return ""; @@ -211,7 +216,12 @@ public class CaseManager : UdonSharpBehaviour public string ContinueToRound2() { + _Round3Manager.DeinitialiseGameMode(); + _Round2Manager.InitialiseGameMode(); + _Round1Manager.DeinitialiseGameMode(); + _HostCard.SetGameManager(_Round2Manager); + _Round2Manager.InitialiseGameMode(); return ""; @@ -219,7 +229,12 @@ public class CaseManager : UdonSharpBehaviour public string ContinueToRound3() { + _Round3Manager.DeinitialiseGameMode(); + _Round2Manager.DeinitialiseGameMode(); + _Round1Manager.DeinitialiseGameMode(); + _HostCard.SetGameManager(_Round3Manager); + _Round3Manager.InitialiseGameMode(); return ""; diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.asset b/Assets/UdonSharp/Game Managers/GameManagerBase.asset index aa2ef4a..0bbecd4 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.asset @@ -236,25 +236,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostOwner + Data: _Microphone - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostOwner + Data: _Microphone - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase + Data: Microphone, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -266,13 +266,19 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -293,13 +299,13 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 19|System.RuntimeType, mscorlib + Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -308,7 +314,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -323,7 +329,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|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 14bdad7..f6172ab 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -41,8 +41,7 @@ public class GameManagerBase : UdonSharpBehaviour [SerializeField] protected HostCardManager _HostCard = null; [SerializeField] protected CaseManager _CaseManager; [SerializeField] protected AudioManager _AudioManager; - - private VRCPlayerApi _HostOwner; + [SerializeField] protected Microphone _Microphone; private bool _AllowInteractionFromHostCard = false; @@ -52,15 +51,14 @@ public class GameManagerBase : UdonSharpBehaviour _AllowInteractionFromHostCard = true; _HostCard.SetNextInteractionText(NextInteraction); } - protected void DisableInteraction() + protected void DisableInteraction(string DisableReason = "") { _AllowInteractionFromHostCard = false; - _HostCard.SetNextInteractionText(""); + _HostCard.SetNextInteractionText(DisableReason); } public override void OnOwnershipTransferred(VRCPlayerApi Player) { - _HostOwner = Player; SetOwnershipOfObjects(Player); base.OnOwnershipTransferred(Player); } @@ -97,9 +95,25 @@ public class GameManagerBase : UdonSharpBehaviour public virtual void InitialiseGameMode() { _AllowInteractionFromHostCard = true; + + SetOwnershipOfObjects(_CaseManager.GetHostOwner()); + EnableMicrophone(true); } - public virtual void SetOwnershipOfObjects(VRCPlayerApi NewOwner) { } + public virtual void DeinitialiseGameMode() + { + EnableMicrophone(false); + } + + public void EnableMicrophone(bool Enable) + { + _Microphone.gameObject.SetActive(Enable); + } + + public virtual void SetOwnershipOfObjects(VRCPlayerApi NewOwner) + { + Networking.SetOwner(NewOwner, _Microphone.gameObject); + } public virtual void LoadQuestionData(DataToken Data) { } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index df4b0f6..83d8621 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -236,25 +236,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostOwner + Data: _Microphone - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostOwner + Data: _Microphone - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase + Data: Microphone, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -266,13 +266,19 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -293,13 +299,13 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 19|System.RuntimeType, mscorlib + Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -308,7 +314,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -323,7 +329,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -347,13 +353,13 @@ MonoBehaviour: Data: _VideoPlayer - Name: $v Entry: 7 - Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayer - Name: k__BackingField Entry: 7 - Data: 22|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaseVideoSyncPlayer, Assembly-CSharp @@ -377,13 +383,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 24|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -392,7 +398,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -416,13 +422,13 @@ MonoBehaviour: Data: _TiebreakerData - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerData - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl, VRCSDKBase @@ -431,7 +437,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 28 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -446,13 +452,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -476,16 +482,16 @@ MonoBehaviour: Data: _GameHasBegun - Name: $v Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameHasBegun - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -500,13 +506,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 33|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -530,13 +536,13 @@ MonoBehaviour: Data: _QuestionIndex - Name: $v Entry: 7 - Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionIndex - Name: k__BackingField Entry: 7 - Data: 34|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -545,7 +551,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -560,13 +566,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 37|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -590,16 +596,16 @@ MonoBehaviour: Data: _QuestionStage - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionStage - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -614,13 +620,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 40|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -644,16 +650,16 @@ MonoBehaviour: Data: _QuestionSubstage - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionSubstage - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -668,13 +674,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 42|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -698,16 +704,16 @@ MonoBehaviour: Data: _QuestionCorrectResponse - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionCorrectResponse - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -722,13 +728,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 44|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: 45|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 46|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -752,13 +758,13 @@ MonoBehaviour: Data: _CurrentQuestionType - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentQuestionType - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 48|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RoundSegmentType, Assembly-CSharp @@ -767,7 +773,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -782,13 +788,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -812,13 +818,13 @@ MonoBehaviour: Data: _QuestionsList - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionsList - Name: k__BackingField Entry: 7 - Data: 51|System.RuntimeType, mscorlib + Data: 52|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataList, VRCSDK3 @@ -827,7 +833,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 51 + Data: 52 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -842,7 +848,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -866,13 +872,13 @@ MonoBehaviour: Data: _CurrentQuestion - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentQuestion - Name: k__BackingField Entry: 7 - Data: 54|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -881,7 +887,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 54 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -896,7 +902,7 @@ 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: 0 @@ -920,16 +926,16 @@ MonoBehaviour: Data: _BuzzInAllowed - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzInAllowed - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -944,13 +950,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -974,13 +980,13 @@ MonoBehaviour: Data: _PlayerBuzzInAllowed - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerBuzzInAllowed - Name: k__BackingField Entry: 7 - Data: 60|System.RuntimeType, mscorlib + Data: 61|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean[], mscorlib @@ -989,7 +995,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 60 + Data: 61 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1004,13 +1010,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 63|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1034,16 +1040,16 @@ MonoBehaviour: Data: _BuzzedInPlayer - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzedInPlayer - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 9 - Data: 34 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1058,13 +1064,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 64|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: 65|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1088,13 +1094,13 @@ MonoBehaviour: Data: _FinalRoundPlayersSortedByScore - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FinalRoundPlayersSortedByScore - Name: k__BackingField Entry: 7 - Data: 67|System.RuntimeType, mscorlib + Data: 68|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32[], mscorlib @@ -1103,7 +1109,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 67 + Data: 68 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1118,13 +1124,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|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: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1148,16 +1154,16 @@ MonoBehaviour: Data: _TiebreakerPlayerNumbers - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerPlayerNumbers - Name: k__BackingField Entry: 9 - Data: 67 + Data: 68 - Name: k__BackingField Entry: 9 - Data: 67 + Data: 68 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1172,13 +1178,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 73|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1202,13 +1208,13 @@ MonoBehaviour: Data: _PlayerPodiums - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 74|System.RuntimeType, mscorlib + Data: 75|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -1217,7 +1223,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 75|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -1238,13 +1244,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 77|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1253,7 +1259,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1277,13 +1283,13 @@ MonoBehaviour: Data: _VideoMusicClueSkateboard - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoMusicClueSkateboard - Name: k__BackingField Entry: 7 - Data: 80|System.RuntimeType, mscorlib + Data: 81|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VideoMusicClueSkateboard, Assembly-CSharp @@ -1307,13 +1313,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 82|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 83|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1322,7 +1328,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 83|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 84|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Props @@ -1331,7 +1337,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 85|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1355,13 +1361,13 @@ MonoBehaviour: Data: _ACMECrimenetComputer - Name: $v Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ACMECrimenetComputer - Name: k__BackingField Entry: 7 - Data: 86|System.RuntimeType, mscorlib + Data: 87|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ACMECrimenetComputer, Assembly-CSharp @@ -1385,13 +1391,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 87|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: 88|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1415,13 +1421,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 90|System.RuntimeType, mscorlib + Data: 91|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -1445,13 +1451,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 92|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1475,13 +1481,13 @@ MonoBehaviour: Data: _ArrivalDisplay - Name: $v Entry: 7 - Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 - Data: 94|System.RuntimeType, mscorlib + Data: 95|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay, Assembly-CSharp @@ -1505,13 +1511,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 96|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1535,13 +1541,13 @@ MonoBehaviour: Data: _LightningRoundAnimator - Name: $v Entry: 7 - Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LightningRoundAnimator - Name: k__BackingField Entry: 7 - Data: 98|System.RuntimeType, mscorlib + Data: 99|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -1550,7 +1556,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 98 + Data: 99 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1565,13 +1571,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 100|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 101|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1580,7 +1587,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 101|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 102|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects @@ -1589,7 +1596,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 102|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 103|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index e0a055b..c5a9aba 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -58,15 +58,14 @@ public class GameManagerRound1 : GameManagerBase public override void InitialiseGameMode() { + base.InitialiseGameMode(); + _GameHasBegun = false; _QuestionIndex = 0; _QuestionStage = 0; _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; - VRCPlayerApi Owner = Networking.GetOwner(gameObject); - SetOwnershipOfObjects(Owner); - _Modem.Activate(false); _ArrivalDisplay.Activate(false); @@ -76,7 +75,16 @@ public class GameManagerRound1 : GameManagerBase DisableInteraction(); RequestSerialization(); - base.InitialiseGameMode(); + } + + public override void DeinitialiseGameMode() + { + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ResetPodium"); + } + + base.DeinitialiseGameMode(); } public override void SetOwnershipOfObjects(VRCPlayerApi NewOwner) @@ -1198,11 +1206,6 @@ public class GameManagerRound1 : GameManagerBase } public void _ContinueToRound2_Private() { - for (int i = 0; i < _PlayerPodiums.Length; i++) - { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ResetPodium"); - } - _CaseManager.ContinueToRound2(); EnableInteraction("Continue To Round 2"); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 3a52832..939aa4e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -236,25 +236,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostOwner + Data: _Microphone - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostOwner + Data: _Microphone - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase + Data: Microphone, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -266,13 +266,19 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -293,13 +299,13 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 19|System.RuntimeType, mscorlib + Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -308,7 +314,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -323,7 +329,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -347,13 +353,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 22|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -377,13 +383,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 24|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -392,7 +398,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -416,13 +422,13 @@ MonoBehaviour: Data: _ArrivalDisplay - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay, Assembly-CSharp @@ -446,13 +452,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -476,13 +482,13 @@ MonoBehaviour: Data: _LocationBoard - Name: $v Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LocationBoard - Name: k__BackingField Entry: 7 - Data: 31|System.RuntimeType, mscorlib + Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 Data: LocationBoard, Assembly-CSharp @@ -506,13 +512,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -536,13 +542,13 @@ MonoBehaviour: Data: _JailChain - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailChain - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 36|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailChain, Assembly-CSharp @@ -566,13 +572,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 37|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -596,13 +602,13 @@ MonoBehaviour: Data: _JailPhone - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPhone - Name: k__BackingField Entry: 7 - Data: 39|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailPhone, Assembly-CSharp @@ -626,13 +632,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -656,13 +662,13 @@ MonoBehaviour: Data: _JailPlayer - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPlayer - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -686,13 +692,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 44|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: 45|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -716,13 +722,13 @@ MonoBehaviour: Data: _Location - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Location - Name: k__BackingField Entry: 7 - Data: 47|System.RuntimeType, mscorlib + Data: 48|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -731,7 +737,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 47 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -746,19 +752,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 50|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 51|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -782,13 +788,13 @@ MonoBehaviour: Data: _Landmarks - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Landmarks - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 53|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -797,7 +803,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 52 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -812,13 +818,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 54|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 55|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -842,13 +848,13 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 7 - Data: 56|System.RuntimeType, mscorlib + Data: 57|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -857,7 +863,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 56 + Data: 57 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -872,13 +878,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -902,16 +908,16 @@ MonoBehaviour: Data: _CurrentPlayerCounter - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 56 + Data: 57 - Name: k__BackingField Entry: 9 - Data: 56 + Data: 57 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -926,13 +932,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 60|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: 61|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -956,16 +962,16 @@ MonoBehaviour: Data: _Players - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Players - Name: k__BackingField Entry: 9 - Data: 52 + Data: 53 - Name: k__BackingField Entry: 9 - Data: 52 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -980,13 +986,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 65|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1010,13 +1016,13 @@ MonoBehaviour: Data: COLOR_STANDARD - Name: $v Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_STANDARD - Name: k__BackingField Entry: 7 - Data: 66|System.RuntimeType, mscorlib + Data: 67|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Color, UnityEngine.CoreModule @@ -1025,7 +1031,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 66 + Data: 67 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1040,7 +1046,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1064,16 +1070,16 @@ MonoBehaviour: Data: COLOR_RED - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 66 + Data: 67 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 67 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1088,7 +1094,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1112,16 +1118,16 @@ MonoBehaviour: Data: COLOR_YELLOW - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_YELLOW - Name: k__BackingField Entry: 9 - Data: 66 + Data: 67 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 67 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1136,7 +1142,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1160,16 +1166,16 @@ MonoBehaviour: Data: COLOR_GREEN - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_GREEN - Name: k__BackingField Entry: 9 - Data: 66 + Data: 67 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 67 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1184,7 +1190,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 61a313b..cb8de8c 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -45,13 +45,12 @@ public class GameManagerRound2 : GameManagerBase public override void InitialiseGameMode() { + base.InitialiseGameMode(); + _StageIndex = 0; _CurrentPlayerCounter = 0; - VRCPlayerApi Owner = Networking.GetOwner(gameObject); - SetOwnershipOfObjects(Owner); - InitialiseLocationBoard(); _LocationBoard.SetLootImageURL(_CaseManager.GetLootImage()); @@ -61,7 +60,14 @@ public class GameManagerRound2 : GameManagerBase _JailPlayer.PlayVideo = false; RequestSerialization(); - base.InitialiseGameMode(); + } + + public override void DeinitialiseGameMode() + { + _JailPlayer.PlayVideo = false; + _JailPhone.Activate = false; + + base.DeinitialiseGameMode(); } private void InitialiseLocationBoard() @@ -300,9 +306,6 @@ public class GameManagerRound2 : GameManagerBase Interface.HeaderUI.text = "Round is over."; Interface.CommentUI.text = "Let's go to the map!"; - _JailPlayer.PlayVideo = false; - _JailPhone.Activate = false; - _CaseManager.ContinueToRound3(); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index be33031..bde6b0f 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset @@ -236,25 +236,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostOwner + Data: _Microphone - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostOwner + Data: _Microphone - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCPlayerApi, VRCSDKBase + Data: Microphone, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -266,13 +266,19 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -293,13 +299,13 @@ MonoBehaviour: Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AllowInteractionFromHostCard - Name: k__BackingField Entry: 7 - Data: 19|System.RuntimeType, mscorlib + Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -308,7 +314,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -323,7 +329,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -347,13 +353,13 @@ MonoBehaviour: Data: _Maps - Name: $v Entry: 7 - Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Maps - Name: k__BackingField Entry: 7 - Data: 22|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMap[], Assembly-CSharp @@ -362,7 +368,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 24|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -383,13 +389,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -398,7 +404,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -422,13 +428,13 @@ MonoBehaviour: Data: _Markers - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Markers - Name: k__BackingField Entry: 7 - Data: 28|System.RuntimeType, mscorlib + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMapMarker[], Assembly-CSharp @@ -437,7 +443,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -452,13 +458,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -482,13 +488,13 @@ MonoBehaviour: Data: _EndingPlayer - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EndingPlayer - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 33|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -512,13 +518,13 @@ MonoBehaviour: 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: 1 - Name: Entry: 7 - Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -542,13 +548,13 @@ MonoBehaviour: Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentlyActiveMap - Name: k__BackingField Entry: 7 - Data: 36|System.RuntimeType, mscorlib + Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -557,7 +563,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 38|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -578,19 +584,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 40|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 40|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 41|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -614,16 +620,16 @@ MonoBehaviour: Data: _ActiveMarker - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -638,19 +644,19 @@ 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: 2 - Name: Entry: 7 - Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 44|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 44|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 45|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -674,16 +680,16 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -698,13 +704,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -728,13 +734,13 @@ MonoBehaviour: Data: _ContinentData - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 49|System.RuntimeType, mscorlib + Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -743,7 +749,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 49 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -758,7 +764,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -782,13 +788,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 53|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -797,7 +803,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -812,13 +818,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 54|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 55|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -842,16 +848,16 @@ MonoBehaviour: Data: _RunTimer - Name: $v Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RunTimer - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 9 - Data: 19 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -866,13 +872,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 56|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: 57|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -896,16 +902,16 @@ MonoBehaviour: Data: _Timer - Name: $v Entry: 7 - Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Timer - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -920,13 +926,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 60|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 61|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -950,16 +956,16 @@ MonoBehaviour: Data: _SuccessCounter - Name: $v Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _SuccessCounter - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -974,19 +980,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 63|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 64|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 65|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1010,16 +1016,16 @@ MonoBehaviour: Data: _FailureCounter - Name: $v Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FailureCounter - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 37 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1034,19 +1040,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 68|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 69|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 0145983..9a21dd5 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -58,6 +58,8 @@ public class GameManagerRound3 : GameManagerBase public override void InitialiseGameMode() { + base.InitialiseGameMode(); + _StageIndex = 0; SuccessCounter = 0; @@ -70,7 +72,26 @@ public class GameManagerRound3 : GameManagerBase GetCurrentMap().RandomiseCountries(); RequestSerialization(); - base.InitialiseGameMode(); + } + + public override void DeinitialiseGameMode() + { + _EndingPlayer.PlayVideo = false; + + base.DeinitialiseGameMode(); + } + + public override void SetOwnershipOfObjects(VRCPlayerApi NewOwner) + { + for (int i = 0; i < _Maps.Length; i++) + Networking.SetOwner(NewOwner, _Maps[i].gameObject); + + for (int i = 0; i < _Markers.Length; i++) + Networking.SetOwner(NewOwner, _Markers[i].gameObject); + + Networking.SetOwner(NewOwner, _EndingPlayer.gameObject); + + base.SetOwnershipOfObjects(NewOwner); } private void InitialiseMarkers() @@ -352,9 +373,7 @@ public class GameManagerRound3 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic"); - _EndingPlayer.PlayVideo = false; - - EnableInteraction("Game Over"); + DisableInteraction("Game Over"); } diff --git a/Assets/UdonSharp/Microphone.asset b/Assets/UdonSharp/Microphone.asset new file mode 100644 index 0000000..68dbe54 --- /dev/null +++ b/Assets/UdonSharp/Microphone.asset @@ -0,0 +1,167 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: Microphone + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: e9311ad20f96a384bbc12e5d57e8acf1, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 0fa4104b3414f05428aa283f01b2ca53, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 2 + hasInteractEvent: 0 + scriptID: 1032960944844727064 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _MikedVoiceDistanceNear + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _MikedVoiceDistanceNear + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _MikedVoiceDistanceFar + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _MikedVoiceDistanceFar + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 8|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Microphone.asset.meta b/Assets/UdonSharp/Microphone.asset.meta new file mode 100644 index 0000000..4e22a79 --- /dev/null +++ b/Assets/UdonSharp/Microphone.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7874d8cac34e7544c960f6392673f399 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Microphone.cs b/Assets/UdonSharp/Microphone.cs new file mode 100644 index 0000000..2cbc9c1 --- /dev/null +++ b/Assets/UdonSharp/Microphone.cs @@ -0,0 +1,32 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)] +public class Microphone : UdonSharpBehaviour +{ + [SerializeField] private float _MikedVoiceDistanceNear = 30.0f; + [SerializeField] private float _MikedVoiceDistanceFar = 60.0f; + + private const float DEFAULT_VOICE_DISTANCE_NEAR = 0.0f; + private const float DEFAULT_VOICE_DISTANCE_FAR = 25.0f; + + + public override void OnPlayerTriggerEnter(VRCPlayerApi Player) + { + Player.SetVoiceDistanceNear(_MikedVoiceDistanceNear); + Player.SetVoiceDistanceFar(_MikedVoiceDistanceFar); + + base.OnPlayerTriggerEnter(Player); + } + + public override void OnPlayerTriggerExit(VRCPlayerApi Player) + { + Player.SetVoiceDistanceNear(DEFAULT_VOICE_DISTANCE_NEAR); + Player.SetVoiceDistanceFar(DEFAULT_VOICE_DISTANCE_FAR); + + base.OnPlayerTriggerExit(Player); + } +} diff --git a/Assets/UdonSharp/Microphone.cs.meta b/Assets/UdonSharp/Microphone.cs.meta new file mode 100644 index 0000000..10d1c91 --- /dev/null +++ b/Assets/UdonSharp/Microphone.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0fa4104b3414f05428aa283f01b2ca53 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: