diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index e27d220..b1ba18b 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -237,6 +237,38 @@ 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, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.43709993, y: 1.031, z: -0.202} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 998730497871157579} + m_Father: {fileID: 5984335492357139332} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1829400999671884876 GameObject: m_ObjectHideFlags: 0 @@ -271,13 +303,13 @@ Transform: m_GameObject: {fileID: 1829400999671884876} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.4371, y: 1.031, z: -0.202} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025, y: 0.025, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7802392935245435383} - {fileID: 8720041269844188083} - m_Father: {fileID: 5984335492357139332} + m_Father: {fileID: 2523767775587334635} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2639439540520151315 MeshFilter: @@ -1459,7 +1491,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5617792120913924276} - - {fileID: 998730497871157579} + - {fileID: 2523767775587334635} - {fileID: 7716102101337073303} - {fileID: 7780879094676330011} - {fileID: 7566631391838123814} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index f164b61..a0606eb 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1451,12 +1451,17 @@ PrefabInstance: - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.x - value: 0.4371 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: spawnPos.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.z - value: -0.202 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} @@ -9054,12 +9059,17 @@ PrefabInstance: - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.x - value: 0.4371 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: spawnPos.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.z - value: -0.202 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} @@ -21811,12 +21821,17 @@ PrefabInstance: - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.x - value: 0.4371 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: spawnPos.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: spawnPos.z - value: -0.202 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7192157746005513772, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} diff --git a/Assets/UdonSharp/GameManager.cs b/Assets/UdonSharp/GameManager.cs index 44779bd..067aa94 100644 --- a/Assets/UdonSharp/GameManager.cs +++ b/Assets/UdonSharp/GameManager.cs @@ -652,6 +652,7 @@ public class GameManager : UdonSharpBehaviour private void AdvanceToNextQuestion() { DisableChoiceCards(); + DisableRiskCards(); DisableBuzzers(); _QuestionIndex++; diff --git a/Assets/UdonSharp/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs index 02346ed..661b8e8 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.cs +++ b/Assets/UdonSharp/Podium/PlayerPodium.cs @@ -188,6 +188,8 @@ public class PlayerPodium : UdonSharpBehaviour public void EnableBuzzer(bool Enable) { _Buzzer.gameObject.SetActive(Enable); + _Buzzer.transform.localPosition = Vector3.zero; + _Buzzer.transform.localEulerAngles = Vector3.zero; } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: