From e410390075a9ee4db20a424ffbf1759349903c32 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Thu, 14 May 2026 03:33:26 -0400 Subject: [PATCH] Using buzzers to test a new method for manually synced pickups. Needs testing. --- Assembly-CSharp.csproj | 1 + Assets/Prefabs/Buzzer.prefab | 530 +++++------------- Assets/Prefabs/Player Podium.prefab | 128 +++-- Assets/Scenes/witwics.unity | 352 ++++++++---- .../Game Managers/GameManagerRound1.cs | 4 +- .../Interacts/PickupUseCallback.asset | 242 ++++++++ .../Interacts/PickupUseCallback.asset.meta | 8 + .../UdonSharp/Interacts/PickupUseCallback.cs | 35 ++ .../Interacts/PickupUseCallback.cs.meta | 11 + Assets/UdonSharp/Podiums/Buzzer.asset | 227 +++++++- Assets/UdonSharp/Podiums/Buzzer.cs | 53 +- Assets/UdonSharp/Podiums/PlayerPodium.cs | 5 +- 12 files changed, 1014 insertions(+), 582 deletions(-) create mode 100644 Assets/UdonSharp/Interacts/PickupUseCallback.asset create mode 100644 Assets/UdonSharp/Interacts/PickupUseCallback.asset.meta create mode 100644 Assets/UdonSharp/Interacts/PickupUseCallback.cs create mode 100644 Assets/UdonSharp/Interacts/PickupUseCallback.cs.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 776dabb..759e0d2 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -142,6 +142,7 @@ + diff --git a/Assets/Prefabs/Buzzer.prefab b/Assets/Prefabs/Buzzer.prefab index 7efaa6e..0b28534 100644 --- a/Assets/Prefabs/Buzzer.prefab +++ b/Assets/Prefabs/Buzzer.prefab @@ -1,276 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3917245638110528118 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1187428301334024669} - - component: {fileID: 1294374808979277058} - - component: {fileID: 6018588148279477987} - - component: {fileID: 2806153863051757668} - - component: {fileID: 3554513563528162472} - - component: {fileID: 207925927192373736} - - component: {fileID: 1554411512478086657} - m_Layer: 0 - m_Name: Cube_looper - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1187428301334024669 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3917245638110528118} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7252322564229829413} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1294374808979277058 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3917245638110528118} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bea5fa186e4e67342a4be5316722cfb4, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 6018588148279477987} - sync: {fileID: 772074554510416962} - data: {fileID: 5742052315775153552} ---- !u!114 &6018588148279477987 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3917245638110528118} - 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: 0 - serializedProgramAsset: {fileID: 11400000, guid: aa7dfdcc5dda8f846b435b9da336970a, - type: 2} - programSource: {fileID: 11400000, guid: f55d258c4edbbe146a41756b51674e63, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!114 &2806153863051757668 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3917245638110528118} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 033ca15a573c15f4abfff7cd4357218c, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 3554513563528162472} - sync: {fileID: 772074554510416962} - data: {fileID: 5742052315775153552} ---- !u!114 &3554513563528162472 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3917245638110528118} - 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: 0 - serializedProgramAsset: {fileID: 11400000, guid: 3246074af68639e4ca3785ac7744faf3, - type: 2} - programSource: {fileID: 11400000, guid: f46a04b3664ce2d4382238a1ede0f168, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!114 &207925927192373736 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3917245638110528118} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a082bb6c340547f4e9849389bcdc72c1, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 1554411512478086657} - sync: {fileID: 772074554510416962} - data: {fileID: 5742052315775153552} ---- !u!114 &1554411512478086657 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3917245638110528118} - 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: 0 - serializedProgramAsset: {fileID: 11400000, guid: 17a25010d3e727149bc8de32418caf1a, - type: 2} - programSource: {fileID: 11400000, guid: 6b246d48ea259674cb15ba990bf99ec0, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!1 &4939541570271450893 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 378007575530036121} - - component: {fileID: 5742052315775153552} - - component: {fileID: 1280868101320767309} - m_Layer: 0 - m_Name: Cube_dataUltra - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &378007575530036121 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4939541570271450893} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7252322564229829413} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5742052315775153552 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4939541570271450893} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d85dd2eca6a5b7b4396e13ced0f8e66e, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 1280868101320767309} - sync: {fileID: 772074554510416962} - lastDeserialization: 0 ---- !u!114 &1280868101320767309 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4939541570271450893} - 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: 0 - serializedProgramAsset: {fileID: 11400000, guid: e6297c9d4177fb247b0654c8e167c1eb, - type: 2} - programSource: {fileID: 11400000, guid: bc9cfe466e2297342b46ff2f42676890, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!1 &8077784749325837858 +--- !u!1 &7626757254930273968 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -278,48 +8,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7252322564229829413} - - component: {fileID: 6718418534385704391} - - component: {fileID: 4859622880028078731} - - component: {fileID: 6589743827023095659} - - component: {fileID: 5891963814413925265} - - component: {fileID: 772074554510416962} - - component: {fileID: 8919263690368439476} - - component: {fileID: 4592685598294006705} - - component: {fileID: 7394641692692904860} - - component: {fileID: 8911416915246965269} + - component: {fileID: 6821121937072461079} + - component: {fileID: 6389929414397029953} + - component: {fileID: 7006015499958653031} + - component: {fileID: 8738255610393754145} + - component: {fileID: 2158112163124995557} + - component: {fileID: 6427619281016639707} + - component: {fileID: 6357274281148082537} + - component: {fileID: 3532578325024344632} + - component: {fileID: 4343776730586001529} m_Layer: 13 - m_Name: Buzzer + m_Name: Buzzer Pickup m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7252322564229829413 + m_IsActive: 0 +--- !u!4 &6821121937072461079 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8077784749325837858} + m_GameObject: {fileID: 7626757254930273968} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 378007575530036121} - - {fileID: 1187428301334024669} - m_Father: {fileID: 0} + m_Children: [] + m_Father: {fileID: 7252322564229829413} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &6718418534385704391 +--- !u!95 &6389929414397029953 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8077784749325837858} + m_GameObject: {fileID: 7626757254930273968} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: a85913e16709ec5479f2c9c33e02c547, type: 2} @@ -333,13 +60,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!137 &4859622880028078731 +--- !u!137 &7006015499958653031 SkinnedMeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8077784749325837858} + m_GameObject: {fileID: 7626757254930273968} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -388,13 +115,13 @@ SkinnedMeshRenderer: m_Center: {x: -0.006477733, y: 0.0021548867, z: 0.015709737} m_Extent: {x: 0.030116383, y: 0.034379695, z: 0.061877094} m_DirtyAABB: 0 ---- !u!65 &6589743827023095659 +--- !u!65 &8738255610393754145 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8077784749325837858} + m_GameObject: {fileID: 7626757254930273968} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -409,13 +136,13 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.060232766, y: 0.06875939, z: 0.12375419} m_Center: {x: -0.006477733, y: 0.0021548867, z: 0.015709737} ---- !u!54 &5891963814413925265 +--- !u!54 &2158112163124995557 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8077784749325837858} + m_GameObject: {fileID: 7626757254930273968} serializedVersion: 4 m_Mass: 1 m_Drag: 0 @@ -436,109 +163,13 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!114 &772074554510416962 +--- !u!114 &6427619281016639707 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8077784749325837858} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 73412ff0ee736d748bcef5ca61afd71d, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 8919263690368439476} - networkDataOptimization: 0 - data: {fileID: 5742052315775153552} - looper: {fileID: 1294374808979277058} - fixedLooper: {fileID: 2806153863051757668} - lateLooper: {fileID: 207925927192373736} - rigid: {fileID: 5891963814413925265} - pickup: {fileID: 4592685598294006705} - respawnHeight: -10 - smoothingTime: -0.25 - allowTheftFromSelf: 1 - allowTheftWhenAttachedToPlayer: 1 - kinematicWhileHeld: 1 - syncIsKinematic: 1 - syncPickupable: 0 - sleepOnSpawn: 1 - runEveryFrameOnOwner: 0 - eventListeners: [] - _behaviourEventListeners: [] - _classEventListeners: [] - customStates: [] - enterFirstCustomStateOnStart: 0 - debugLogs: 0 - kinematicWhileAttachedToPlayer: 1 - useWorldSpaceTransforms: 0 - useWorldSpaceTransformsWhenHeldOrAttachedToPlayer: 0 - syncCollisions: 1 - syncParticleCollisions: 1 - allowOutOfOrderData: 0 - takeOwnershipOfOtherObjectsOnCollision: 1 - allowOthersToTakeOwnershipOnCollision: 1 - positionDesyncThreshold: 0.015 - rotationDesyncThreshold: 0.995 - minimumSleepFrames: 4 - spawnPos: {x: -0.358, y: 1.031, z: 0} - spawnRot: {x: -0, y: -0, z: -0, w: 1} - _state: -1 - localTransformFlag: 1 - leftHandFlag: 0 - kinematicFlag: 1 - pickupableFlag: 1 - bounceFlag: 0 - sleepFlag: 0 - autoSmoothingTime: 0 - lastKinematic: 1 - lastPickupable: 1 - _showInternalObjects: 0 - showInternalObjects: 0 - unparentInternalDataObject: 0 ---- !u!114 &8919263690368439476 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8077784749325837858} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: - interactTextPlacement: {fileID: 0} - interactText: Use - interactTextGO: {fileID: 0} - proximity: 2 - SynchronizePosition: 0 - AllowCollisionOwnershipTransfer: 0 - Reliable: 0 - _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: 011009d075591eb439541bd2b381210d, - type: 2} - programSource: {fileID: 11400000, guid: f2db2b81059e41b4fbce86f13207c26a, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!114 &4592685598294006705 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8077784749325837858} + m_GameObject: {fileID: 7626757254930273968} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1804438810, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} @@ -549,7 +180,7 @@ MonoBehaviour: ExactGun: {fileID: 0} ExactGrip: {fileID: 0} allowManipulationWhenEquipped: 0 - orientation: 1 + orientation: 2 AutoHold: 1 InteractionText: Pick Up UseText: Buzz In @@ -562,9 +193,108 @@ MonoBehaviour: ThrowVelocityBoostMinSpeed: 1 ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} - pickupable: 1 + pickupable: 0 proximity: 0.5 version: 0 +--- !u!114 &6357274281148082537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7626757254930273968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1783056023, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} + m_Name: + m_EditorClassIdentifier: + AllowCollisionOwnershipTransfer: 1 + ForceKinematicOnRemote: 0 +--- !u!114 &3532578325024344632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7626757254930273968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b02b023f226de14f9feb829806abc3c, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 4343776730586001529} + _CallbackObject: {fileID: 7394641692692904860} + _UseDownCallbackFunction: BuzzerUseDown + _UseUpCallbackFunction: BuzzerUseUp +--- !u!114 &4343776730586001529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7626757254930273968} + 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: 0 + serializedProgramAsset: {fileID: 11400000, guid: f4f5ffed807c4e54e9967bed703330e8, + type: 2} + programSource: {fileID: 11400000, guid: 8a529462baaa2674899ff9ce101c5aa9, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1 &8077784749325837858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7252322564229829413} + - component: {fileID: 7394641692692904860} + - component: {fileID: 8911416915246965269} + m_Layer: 13 + m_Name: Buzzer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7252322564229829413 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8077784749325837858} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6821121937072461079} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7394641692692904860 MonoBehaviour: m_ObjectHideFlags: 0 @@ -587,8 +317,10 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 8911416915246965269} + _GameManager: {fileID: 0} _Podium: {fileID: 0} - _Animator: {fileID: 6718418534385704391} + _Animator: {fileID: 6389929414397029953} + _Pickup: {fileID: 6427619281016639707} --- !u!114 &8911416915246965269 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index 623a377..49fe08f 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -540,38 +540,6 @@ Transform: - {fileID: 1776577114273627543} m_Father: {fileID: 9043478063159764907} m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0} ---- !u!1 &1279709097283225487 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2523767775587334635} - m_Layer: 0 - m_Name: Buzzer Home - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2523767775587334635 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1279709097283225487} - serializedVersion: 2 - m_LocalRotation: {x: 0.12054317, y: -0, z: -0, w: 0.99270815} - m_LocalPosition: {x: 0.313, y: 1.0254, z: -0.2642} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 998730497871157579} - m_Father: {fileID: 5984335492357139332} - m_LocalEulerAnglesHint: {x: 13.847, y: 0, z: 0} --- !u!1 &1413072422791182760 GameObject: m_ObjectHideFlags: 1 @@ -2847,7 +2815,7 @@ Transform: m_Children: - {fileID: 6009663483960469181} - {fileID: 5617792120913924276} - - {fileID: 2523767775587334635} + - {fileID: 998730497871157579} - {fileID: 2108874904556183587} - {fileID: 7566631391838123814} - {fileID: 9043478063159764907} @@ -2892,7 +2860,7 @@ MonoBehaviour: _NameplateUI: {fileID: 5247165531706728442} _ScorecardUI: {fileID: 3651303298073640538} _ScorecardBackground: {fileID: 4701622366132471396} - _SpawnPoint: {fileID: 0} + _SpawnPoint: {fileID: 7588669560077923621} --- !u!114 &2656281140157091124 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5436,6 +5404,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3118032101653186714} m_PrefabAsset: {fileID: 0} +--- !u!4 &7588669560077923621 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4761755538961612223, guid: e2e3f800a9ce1d8448604706840a4b42, + type: 3} + m_PrefabInstance: {fileID: 3118032101653186714} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5229641065418514540 PrefabInstance: m_ObjectHideFlags: 0 @@ -6587,7 +6561,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 2523767775587334635} + m_TransformParent: {fileID: 5984335492357139332} m_Modifications: - target: {fileID: 207925927192373736, guid: 71852ff940f9ef844844547571134465, type: 3} @@ -6601,48 +6575,101 @@ PrefabInstance: value: objectReference: {fileID: 772074554510416962, guid: 71852ff940f9ef844844547571134465, type: 3} + - target: {fileID: 1180937643406731906, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1294374808979277058, guid: 71852ff940f9ef844844547571134465, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 1294374808979277058, guid: 71852ff940f9ef844844547571134465, type: 3} + - target: {fileID: 1554411512478086657, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2092568562943909624, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2092568562943909624, guid: 71852ff940f9ef844844547571134465, + type: 3} + - target: {fileID: 2479380191056077112, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2806153863051757668, guid: 71852ff940f9ef844844547571134465, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 2806153863051757668, guid: 71852ff940f9ef844844547571134465, type: 3} + - target: {fileID: 3223644985338205478, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3223644985338205478, guid: 71852ff940f9ef844844547571134465, + type: 3} + - target: {fileID: 3332597482383058782, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3554513563528162472, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5310074946965369494, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5310074946965369494, guid: 71852ff940f9ef844844547571134465, + type: 3} - target: {fileID: 5742052315775153552, guid: 71852ff940f9ef844844547571134465, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 5742052315775153552, guid: 71852ff940f9ef844844547571134465, type: 3} + - target: {fileID: 6018588148279477987, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6317072443005024462, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 7252322564229829413, guid: 71852ff940f9ef844844547571134465, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 0.31299996 objectReference: {fileID: 0} - target: {fileID: 7252322564229829413, guid: 71852ff940f9ef844844547571134465, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 1.0254 objectReference: {fileID: 0} - target: {fileID: 7252322564229829413, guid: 71852ff940f9ef844844547571134465, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -0.2642 objectReference: {fileID: 0} - target: {fileID: 7252322564229829413, guid: 71852ff940f9ef844844547571134465, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.99270815 objectReference: {fileID: 0} - target: {fileID: 7252322564229829413, guid: 71852ff940f9ef844844547571134465, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0.12054317 objectReference: {fileID: 0} - target: {fileID: 7252322564229829413, guid: 71852ff940f9ef844844547571134465, type: 3} @@ -6685,13 +6712,24 @@ PrefabInstance: propertyPath: m_Name value: Buzzer objectReference: {fileID: 0} - - target: {fileID: 8077784749325837858, guid: 71852ff940f9ef844844547571134465, + - target: {fileID: 8083038535001056347, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8083038535001056347, guid: 71852ff940f9ef844844547571134465, + type: 3} + - target: {fileID: 8934377284678096742, guid: 71852ff940f9ef844844547571134465, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8934377284678096742, guid: 71852ff940f9ef844844547571134465, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 3917245638110528118, guid: 71852ff940f9ef844844547571134465, type: 3} + - {fileID: 4939541570271450893, guid: 71852ff940f9ef844844547571134465, type: 3} + - {fileID: 8652468303736091607, guid: 71852ff940f9ef844844547571134465, type: 3} + - {fileID: 77162331434176074, guid: 71852ff940f9ef844844547571134465, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71852ff940f9ef844844547571134465, type: 3} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 4741b19..560883d 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -132,12 +132,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} ---- !u!1 &1183107 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6856029826852800536, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1292659 PrefabInstance: m_ObjectHideFlags: 0 @@ -1457,6 +1451,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 23265755} m_CullTransparentMesh: 1 +--- !u!1 &23968219 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 49249026646547678, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 4438766482650780789} + m_PrefabAsset: {fileID: 0} --- !u!1 &24430893 stripped GameObject: m_CorrespondingSourceObject: {fileID: 757993922925456820, guid: be33bc7f6c414e6409becfa348b9310d, @@ -11370,7 +11370,7 @@ PrefabInstance: type: 3} propertyPath: _GameManager value: - objectReference: {fileID: 0} + objectReference: {fileID: 515404446} - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -11445,6 +11445,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1334209153257905416, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1334209153257905416, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1400312625613948465, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -11491,6 +11497,12 @@ PrefabInstance: value: objectReference: {fileID: -2954808662792032550, guid: d4fcd422e9a91d34f850ed36c966ddd2, type: 3} + - target: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -11528,6 +11540,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -11590,7 +11608,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2923916352994936242, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -11746,6 +11765,11 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 4527216041166942880, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4548437926921976074, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -11827,6 +11851,12 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 5027680620206104392, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5027680620206104392, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5075860057938831002, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -11839,6 +11869,11 @@ PrefabInstance: value: objectReference: {fileID: 5112518294606867914, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 5135963033616526640, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5140152395961132065, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Layer @@ -11901,6 +11936,11 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5409350709839932246, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5499959156619928037, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -11926,7 +11966,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5789483618356548401, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -12065,6 +12106,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 6376927400057339990, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6376927400057339990, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 6392869760152404035, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -12237,7 +12284,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 7869945768825948644, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -12290,6 +12338,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8391073549009704086, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8391073549009704086, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 8618934753563162471, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -12299,7 +12353,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -12310,6 +12365,11 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8726516397165289708, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8788051151229107463, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -14718,6 +14778,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &233589856 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 49249026646547678, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 172614115} + m_PrefabAsset: {fileID: 0} --- !u!1 &235126501 stripped GameObject: m_CorrespondingSourceObject: {fileID: 879550886261809809, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -35434,12 +35500,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} ---- !u!1 &723309294 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3311726862824349027, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} --- !u!1 &723351287 GameObject: m_ObjectHideFlags: 0 @@ -42908,6 +42968,12 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &933226257 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 49249026646547678, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + m_PrefabInstance: {fileID: 937910637} + m_PrefabAsset: {fileID: 0} --- !u!1001 &934922675 PrefabInstance: m_ObjectHideFlags: 0 @@ -43277,7 +43343,7 @@ PrefabInstance: type: 3} propertyPath: _GameManager value: - objectReference: {fileID: 0} + objectReference: {fileID: 515404446} - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -43352,6 +43418,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1334209153257905416, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1334209153257905416, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1400312625613948465, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -43398,6 +43470,12 @@ PrefabInstance: value: objectReference: {fileID: -2954808662792032550, guid: d400619248dfbfd4d801bcb9dd49eb0a, type: 3} + - target: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -43435,6 +43513,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -43497,7 +43581,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2923916352994936242, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -43653,6 +43738,11 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 4527216041166942880, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4548437926921976074, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -43734,6 +43824,12 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 5027680620206104392, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5027680620206104392, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5075860057938831002, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -43746,6 +43842,11 @@ PrefabInstance: value: objectReference: {fileID: 5112518294606867914, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 5135963033616526640, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5140152395961132065, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Layer @@ -43808,6 +43909,11 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5409350709839932246, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5493248653452659307, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_StaticEditorFlags @@ -43838,7 +43944,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5789483618356548401, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -43977,6 +44084,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 6376927400057339990, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6376927400057339990, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 6392869760152404035, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -44149,7 +44262,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 7869945768825948644, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -44202,6 +44316,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8391073549009704086, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8391073549009704086, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 8618934753563162471, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -44211,7 +44331,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -44222,6 +44343,11 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8726516397165289708, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8788051151229107463, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -56632,12 +56758,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} ---- !u!1 &1157307248 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3311726862824349027, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} --- !u!1 &1161237311 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, @@ -87690,12 +87810,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1914584491} m_PrefabAsset: {fileID: 0} ---- !u!1 &1740603770 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3311726862824349027, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} --- !u!1 &1741422931 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1605704066978842006, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -91593,7 +91707,7 @@ Transform: m_PrefabAsset: {fileID: 0} --- !u!1 &1855771785 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -91612,7 +91726,7 @@ GameObject: m_IsActive: 1 --- !u!114 &1855771786 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -91636,7 +91750,7 @@ MonoBehaviour: iOS: 1 --- !u!114 &1855771787 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -91659,7 +91773,7 @@ MonoBehaviour: NewBuildTarget: 19 --- !u!4 &1855771788 Transform: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -91674,7 +91788,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1855771789 MonoBehaviour: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99298,12 +99412,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: 1 m_LayoutPriority: 1 ---- !u!1 &2001855494 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6856029826852800536, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} --- !u!1 &2003081962 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5319767931864254799, guid: aecb18996fccac6488cfcd38604796da, @@ -103018,12 +103126,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} ---- !u!1 &2079845194 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6856029826852800536, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} --- !u!1 &2081186770 GameObject: m_ObjectHideFlags: 0 @@ -109648,7 +109750,7 @@ PrefabInstance: type: 3} propertyPath: _GameManager value: - objectReference: {fileID: 0} + objectReference: {fileID: 515404446} - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -109723,6 +109825,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1334209153257905416, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1334209153257905416, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1400312625613948465, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -109763,6 +109871,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1825611870821002805, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -109800,6 +109914,12 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2362267669519923448, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2379192055874455715, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -109862,7 +109982,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2798572389090279422, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2923916352994936242, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -110018,6 +110139,11 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 4527216041166942880, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 4548437926921976074, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -110099,6 +110225,12 @@ PrefabInstance: propertyPath: _syncMethod value: 3 objectReference: {fileID: 0} + - target: {fileID: 5027680620206104392, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5027680620206104392, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5075860057938831002, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -110111,6 +110243,11 @@ PrefabInstance: value: objectReference: {fileID: 5112518294606867914, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 5135963033616526640, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5140152395961132065, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: m_Layer @@ -110173,6 +110310,11 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 5409350709839932246, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5499959156619928037, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -110198,7 +110340,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 5730882168965022218, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 5789483618356548401, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -110337,6 +110480,12 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 6376927400057339990, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 6376927400057339990, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 6392869760152404035, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: sleepFlag @@ -110509,7 +110658,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 7754050038164661126, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 7869945768825948644, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -110556,6 +110706,12 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8391073549009704086, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8391073549009704086, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 8618934753563162471, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -110565,7 +110721,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8687395224804200300, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 8700908482286058787, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -110576,6 +110733,11 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8726516397165289708, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8788051151229107463, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -114939,22 +115101,6 @@ MonoBehaviour: ID: 124 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 2063804006} - ID: 125 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1740603770} - ID: 126 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 2001855494} - ID: 127 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1523413810} ID: 128 SerializedTypeNames: @@ -115133,22 +115279,6 @@ MonoBehaviour: ID: 162 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 163396259} - ID: 163 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1157307248} - ID: 164 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1183107} - ID: 165 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1419973031} ID: 166 SerializedTypeNames: @@ -115327,22 +115457,6 @@ MonoBehaviour: ID: 200 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 993568079} - ID: 201 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.SDK3.Components.VRCPickup - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 723309294} - ID: 202 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 2079845194} - ID: 203 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 2095450009} ID: 204 SerializedTypeNames: @@ -120095,6 +120209,36 @@ MonoBehaviour: ID: 1491 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 23968219} + ID: 1492 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 233589856} + ID: 1493 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 933226257} + ID: 1494 + SerializedTypeNames: + - VRC.SDK3.Components.VRCPickup + - VRC.SDK3.Components.VRCObjectSync + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2063804006} + ID: 125 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 163396259} + ID: 163 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 993568079} + ID: 201 + 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/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index a99bd01..6e7c7fa 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -1690,7 +1690,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzer", true); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "EnableBuzzer", true); } } @@ -1698,7 +1698,7 @@ public class GameManagerRound1 : GameManagerBase { for (int i = 0; i < _PlayerPodiums.Length; i++) { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "EnableBuzzer", false); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "EnableBuzzer", false); } } diff --git a/Assets/UdonSharp/Interacts/PickupUseCallback.asset b/Assets/UdonSharp/Interacts/PickupUseCallback.asset new file mode 100644 index 0000000..3cce84d --- /dev/null +++ b/Assets/UdonSharp/Interacts/PickupUseCallback.asset @@ -0,0 +1,242 @@ +%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: PickupUseCallback + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: f4f5ffed807c4e54e9967bed703330e8, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 2b02b023f226de14f9feb829806abc3c, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 2 + hasInteractEvent: 0 + scriptID: 219769535263690462 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CallbackObject + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CallbackObject + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UdonSharp.UdonSharpBehaviour, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _UseDownCallbackFunction + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _UseDownCallbackFunction + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _UseUpCallbackFunction + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _UseUpCallbackFunction + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Interacts/PickupUseCallback.asset.meta b/Assets/UdonSharp/Interacts/PickupUseCallback.asset.meta new file mode 100644 index 0000000..52bf646 --- /dev/null +++ b/Assets/UdonSharp/Interacts/PickupUseCallback.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a529462baaa2674899ff9ce101c5aa9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Interacts/PickupUseCallback.cs b/Assets/UdonSharp/Interacts/PickupUseCallback.cs new file mode 100644 index 0000000..88da55a --- /dev/null +++ b/Assets/UdonSharp/Interacts/PickupUseCallback.cs @@ -0,0 +1,35 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)] +public class PickupUseCallback : UdonSharpBehaviour +{ + [SerializeField] private UdonSharpBehaviour _CallbackObject; + [Space] + [SerializeField] private string _UseDownCallbackFunction; + [SerializeField] private string _UseUpCallbackFunction; + + + public override void OnPickupUseDown() + { + if (_UseDownCallbackFunction != "" && Utilities.IsValid(_CallbackObject)) + { + _CallbackObject.SendCustomEvent(_UseDownCallbackFunction); + } + + base.OnPickupUseDown(); + } + + public override void OnPickupUseUp() + { + if (_UseUpCallbackFunction != "" && Utilities.IsValid(_CallbackObject)) + { + _CallbackObject.SendCustomEvent(_UseUpCallbackFunction); + } + + base.OnPickupUseUp(); + } +} diff --git a/Assets/UdonSharp/Interacts/PickupUseCallback.cs.meta b/Assets/UdonSharp/Interacts/PickupUseCallback.cs.meta new file mode 100644 index 0000000..14b30a6 --- /dev/null +++ b/Assets/UdonSharp/Interacts/PickupUseCallback.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2b02b023f226de14f9feb829806abc3c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Podiums/Buzzer.asset b/Assets/UdonSharp/Podiums/Buzzer.asset index c3e751e..a8c5299 100644 --- a/Assets/UdonSharp/Podiums/Buzzer.asset +++ b/Assets/UdonSharp/Podiums/Buzzer.asset @@ -19,7 +19,7 @@ MonoBehaviour: sourceCsScript: {fileID: 11500000, guid: 86b4e06bba88ab84ab3aae396f32d70f, type: 3} scriptVersion: 2 compiledVersion: 2 - behaviourSyncMode: 0 + behaviourSyncMode: 4 hasInteractEvent: 0 scriptID: -2466850991558166796 serializationData: @@ -44,25 +44,25 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 3 + Data: 6 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: _Podium + Data: _GameManager - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Podium + Data: _GameManager - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: PlayerPodium, Assembly-CSharp + Data: GameManagerRound1, Assembly-CSharp - Name: Entry: 8 Data: @@ -116,25 +116,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Animator + Data: _Podium - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Animator + Data: _Podium - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule + Data: PlayerPodium, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 8 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -152,10 +152,19 @@ MonoBehaviour: Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -176,25 +185,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _GameManager + Data: _Animator - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _GameManager + Data: _Animator - Name: k__BackingField Entry: 7 - Data: 12|System.RuntimeType, mscorlib + Data: 13|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: GameManagerRound1, Assembly-CSharp + Data: UnityEngine.Animator, UnityEngine.AnimationModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -204,15 +213,195 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 15|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: _Pickup + - Name: $v + Entry: 7 + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Pickup + - Name: k__BackingField + Entry: 7 + Data: 17|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Components.VRCPickup, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 17 + - 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: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 19|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: _Enabled + - Name: $v + Entry: 7 + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Enabled + - Name: k__BackingField + Entry: 7 + Data: 21|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 21 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 5 Data: false - Name: _fieldAttributes Entry: 7 - Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 23|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _TriggerPulled + - Name: $v + Entry: 7 + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TriggerPulled + - Name: k__BackingField + Entry: 9 + Data: 21 + - Name: k__BackingField + Entry: 9 + Data: 21 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 26|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Podiums/Buzzer.cs b/Assets/UdonSharp/Podiums/Buzzer.cs index f4235a7..06ba5fa 100644 --- a/Assets/UdonSharp/Podiums/Buzzer.cs +++ b/Assets/UdonSharp/Podiums/Buzzer.cs @@ -1,25 +1,42 @@  using UdonSharp; using UnityEngine; -using VRC.SDK3.UdonNetworkCalling; using VRC.Udon.Common.Interfaces; using VRC.SDKBase; -using VRC.Udon; +using VRC.Udon.Common; +using VRC.SDK3.Components; + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class Buzzer : UdonSharpBehaviour { + [SerializeField] private GameManagerRound1 _GameManager; + [Space] [SerializeField] private PlayerPodium _Podium; [SerializeField] private Animator _Animator; + [SerializeField] private VRCPickup _Pickup; - private GameManagerRound1 _GameManager; + [UdonSynced] private bool _Enabled = false; + [UdonSynced] private bool _TriggerPulled = false; - public void SetGameManager(GameManagerRound1 Manager) + public override void OnDeserialization(DeserializationResult Result) { - _GameManager = Manager; + _Enable_Synced(); + _TriggerPulled_Synced(); + + base.OnDeserialization(Result); } - public override void OnPickupUseDown() + + public void Enable(bool EnableBuzzer) + { + _Enabled = EnableBuzzer; + _Enable_Synced(); + RequestSerialization(); + } + + public void BuzzerUseDown() { VRCPlayerApi LocalPlayer = Networking.LocalPlayer; if (_Podium.GetPlayerID() == LocalPlayer.playerId) @@ -28,15 +45,33 @@ public class Buzzer : UdonSharpBehaviour "PlayerBuzzedIn", _Podium.PlayerNumber); } - _Animator.SetBool("Trigger Pull", true); + _TriggerPulled = true; + _TriggerPulled_Synced(); + RequestSerialization(); base.OnPickupUseDown(); } - public override void OnPickupUseUp() + public void BuzzerUseUp() { - _Animator.SetBool("Trigger Pull", false); + _TriggerPulled = false; + _TriggerPulled_Synced(); + RequestSerialization(); base.OnPickupUseUp(); } + + + private void _Enable_Synced() + { + _Pickup.gameObject.SetActive(_Enabled); + _Pickup.transform.localPosition = Vector3.zero; + _Pickup.transform.localEulerAngles = Vector3.zero; + _Pickup.pickupable = Networking.IsOwner(gameObject); + } + + private void _TriggerPulled_Synced() + { + _Animator.SetBool("Trigger Pull", _TriggerPulled); + } } diff --git a/Assets/UdonSharp/Podiums/PlayerPodium.cs b/Assets/UdonSharp/Podiums/PlayerPodium.cs index 8405812..73f078f 100644 --- a/Assets/UdonSharp/Podiums/PlayerPodium.cs +++ b/Assets/UdonSharp/Podiums/PlayerPodium.cs @@ -62,7 +62,6 @@ public class PlayerPodium : UdonSharpBehaviour void Start() { ResetPodium(); - _Buzzer.SetGameManager(_GameManager); } public override void OnPlayerLeft(VRCPlayerApi Player) @@ -249,9 +248,7 @@ public class PlayerPodium : UdonSharpBehaviour [NetworkCallable] public void EnableBuzzer(bool Enable) { - _Buzzer.gameObject.SetActive(Enable); - _Buzzer.transform.localPosition = Vector3.zero; - _Buzzer.transform.localEulerAngles = Vector3.zero; + _Buzzer.Enable(Enable); } [NetworkCallable]