diff --git a/Assets/Audio/SFX/Buzzer.wav b/Assets/Audio/SFX/Buzzer.wav new file mode 100644 index 0000000..2938eaa Binary files /dev/null and b/Assets/Audio/SFX/Buzzer.wav differ diff --git a/Assets/Audio/SFX/Buzzer.wav.meta b/Assets/Audio/SFX/Buzzer.wav.meta new file mode 100644 index 0000000..23aefd5 --- /dev/null +++ b/Assets/Audio/SFX/Buzzer.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bc5aa9668b30b7e48a492e3308a2a802 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/BuzzedInPodiumOutline.mat b/Assets/Materials/BuzzedInPodiumOutline.mat new file mode 100644 index 0000000..1135e05 --- /dev/null +++ b/Assets/Materials/BuzzedInPodiumOutline.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BuzzedInPodiumOutline + m_Shader: {fileID: 4800000, guid: aef6d6073aae31049ace0e1c376bc64e, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.5613208, g: 0.92223763, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/BuzzedInPodiumOutline.mat.meta b/Assets/Materials/BuzzedInPodiumOutline.mat.meta new file mode 100644 index 0000000..d6d7fc9 --- /dev/null +++ b/Assets/Materials/BuzzedInPodiumOutline.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d93ea6d5213349a4aa01b00d77edba61 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index d920876..dcdeb2d 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -161,139 +161,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &322243717286875986 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6301535196474161237} - - component: {fileID: 1151541039679712279} - - component: {fileID: 4448082471098413186} - - component: {fileID: 1304214879062622917} - m_Layer: 0 - m_Name: Plus Ten - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6301535196474161237 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 322243717286875986} - 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: 163063897525236711} - m_Father: {fileID: 2328365303480765288} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1151541039679712279 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 322243717286875986} - m_CullTransparentMesh: 1 ---- !u!114 &4448082471098413186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 322243717286875986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1304214879062622917 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 322243717286875986} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 4448082471098413186} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2656281140157091124} - m_TargetAssemblyTypeName: - m_MethodName: SendCustomEvent - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: IncreaseScoreBy10 - m_BoolArgument: 0 - m_CallState: 2 --- !u!1 &1829400999671884876 GameObject: m_ObjectHideFlags: 0 @@ -745,140 +612,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3063706549382872941 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 163063897525236711} - - component: {fileID: 4496130977294519419} - - component: {fileID: 9011874664861088140} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &163063897525236711 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3063706549382872941} - 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: 6301535196474161237} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4496130977294519419 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3063706549382872941} - m_CullTransparentMesh: 1 ---- !u!114 &9011874664861088140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3063706549382872941} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: +10 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 80 - m_fontSizeBase: 80 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3311726862824349027 GameObject: m_ObjectHideFlags: 1 @@ -962,407 +695,6 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!1 &3519329110776926385 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4798477012542561380} - - component: {fileID: 7709535282546448840} - - component: {fileID: 7279825901509778158} - - component: {fileID: 5944596893148642110} - m_Layer: 0 - m_Name: Plus Five - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4798477012542561380 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3519329110776926385} - 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: 3084380069333647160} - m_Father: {fileID: 2328365303480765288} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7709535282546448840 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3519329110776926385} - m_CullTransparentMesh: 1 ---- !u!114 &7279825901509778158 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3519329110776926385} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5944596893148642110 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3519329110776926385} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7279825901509778158} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2656281140157091124} - m_TargetAssemblyTypeName: - m_MethodName: SendCustomEvent - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: IncreaseScoreBy5 - m_BoolArgument: 0 - m_CallState: 2 ---- !u!1 &4161443819448990759 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3084380069333647160} - - component: {fileID: 7660357493870999207} - - component: {fileID: 3421741677068519877} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3084380069333647160 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4161443819448990759} - 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: 4798477012542561380} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7660357493870999207 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4161443819448990759} - m_CullTransparentMesh: 1 ---- !u!114 &3421741677068519877 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4161443819448990759} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: +5 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 80 - m_fontSizeBase: 80 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4396694227773413791 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2777998514448973914} - - component: {fileID: 3189455230122111380} - - component: {fileID: 8054495699504760088} - m_Layer: 0 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2777998514448973914 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4396694227773413791} - 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: 5256771729254536994} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3189455230122111380 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4396694227773413791} - m_CullTransparentMesh: 1 ---- !u!114 &8054495699504760088 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4396694227773413791} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: -5 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 80 - m_fontSizeBase: 80 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5278643753074928947 GameObject: m_ObjectHideFlags: 0 @@ -1524,6 +856,89 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &6181750060712598379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3938961789148287225} + - component: {fileID: 2896373937264359406} + - component: {fileID: 8474886526797794486} + m_Layer: 0 + m_Name: Podium Buzzed In Effect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &3938961789148287225 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6181750060712598379} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7716102101337073303} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2896373937264359406 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6181750060712598379} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8474886526797794486 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6181750060712598379} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d93ea6d5213349a4aa01b00d77edba61, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &6693907286767766257 GameObject: m_ObjectHideFlags: 0 @@ -1559,7 +974,6 @@ Transform: - {fileID: 7716102101337073303} - {fileID: 7780879094676330011} - {fileID: 7566631391838123814} - - {fileID: 2328365303480765288} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1226214083704227558 @@ -1586,9 +1000,9 @@ MonoBehaviour: _udonSharpBackingUdonBehaviour: {fileID: 2656281140157091124} PlayerNumber: 0 GameManager: {fileID: 0} - PlayerID: -1 - Nameplate: {fileID: 5247165531706728442} - Scorecard: {fileID: 3651303298073640538} + _BuzzedInEffect: {fileID: 6181750060712598379} + _Nameplate: {fileID: 5247165531706728442} + _Scorecard: {fileID: 3651303298073640538} --- !u!114 &2656281140157091124 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1802,284 +1216,6 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!1 &7070601902788454996 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2328365303480765288} - - component: {fileID: 6432364198603551454} - - component: {fileID: 3700670282991921803} - - component: {fileID: 857197579760812424} - - component: {fileID: 5991064594616739548} - - component: {fileID: 2039059453893040197} - m_Layer: 0 - m_Name: Debug Score Buttons - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2328365303480765288 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7070601902788454996} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.5001} - m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5256771729254536994} - - {fileID: 4798477012542561380} - - {fileID: 6301535196474161237} - m_Father: {fileID: 5984335492357139332} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.18} - m_SizeDelta: {x: 800, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &6432364198603551454 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7070601902788454996} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &3700670282991921803 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7070601902788454996} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &857197579760812424 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7070601902788454996} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &5991064594616739548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7070601902788454996} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1533785930, guid: 661092b4961be7145bfbe56e1e62337b, type: 3} - m_Name: - m_EditorClassIdentifier: - AllowFocusView: 1 ---- !u!114 &2039059453893040197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7070601902788454996} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!1 &7975226654317089644 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5256771729254536994} - - component: {fileID: 1793124390408860688} - - component: {fileID: 3545174111364055711} - - component: {fileID: 4626828056981927811} - m_Layer: 0 - m_Name: Minus Five - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5256771729254536994 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7975226654317089644} - 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: 2777998514448973914} - m_Father: {fileID: 2328365303480765288} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1793124390408860688 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7975226654317089644} - m_CullTransparentMesh: 1 ---- !u!114 &3545174111364055711 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7975226654317089644} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4626828056981927811 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7975226654317089644} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 3545174111364055711} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2656281140157091124} - m_TargetAssemblyTypeName: - m_MethodName: SendCustomEvent - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: DecreaseScoreBy5 - m_BoolArgument: 0 - m_CallState: 2 --- !u!1 &8532401947568035043 GameObject: m_ObjectHideFlags: 0 @@ -2111,7 +1247,8 @@ Transform: m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3938961789148287225} m_Father: {fileID: 5984335492357139332} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9183863380091036631 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 90d3e61..e900ba3 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -483,6 +483,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _GameManager + value: + objectReference: {fileID: 379391079} - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -1696,7 +1701,7 @@ MonoBehaviour: - {fileID: 4438766482650780795} - {fileID: 1993364535} - {fileID: 1589630268} - BuzzerSound: {fileID: 8300000, guid: 3dd54f8dd36092b4d9664c76ccf9ab49, type: 3} + BuzzerSound: {fileID: 8300000, guid: bc5aa9668b30b7e48a492e3308a2a802, type: 3} WhereInTheWorld: {fileID: 8300000, guid: e810feeb6c2063747bbb5f735a88bee9, type: 3} RockapellaIdent: {fileID: 8300000, guid: 3dd54f8dd36092b4d9664c76ccf9ab49, type: 3} MusicPlayer: {fileID: 379391083} @@ -3765,6 +3770,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _GameManager + value: + objectReference: {fileID: 379391079} - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -4299,6 +4309,140 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} +--- !u!1 &1157870779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1157870780} + - component: {fileID: 1157870782} + - component: {fileID: 1157870781} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1157870780 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157870779} + 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: 1416238136} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1157870781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157870779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Cancel Player Buzz In + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1157870782 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157870779} + m_CullTransparentMesh: 1 --- !u!1 &1193701799 GameObject: m_ObjectHideFlags: 0 @@ -4641,7 +4785,7 @@ GameObject: - component: {fileID: 1361882117} - component: {fileID: 1361882116} m_Layer: 0 - m_Name: Start Game + m_Name: Reset Buzzers m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4720,7 +4864,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: StartGame + m_StringArgument: Reset Buzzers m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1361882117 @@ -4859,6 +5003,7 @@ RectTransform: m_Children: - {fileID: 329379959} - {fileID: 797492447} + - {fileID: 1416238136} - {fileID: 1361882115} m_Father: {fileID: 379391076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4904,6 +5049,139 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: AllowFocusView: 1 +--- !u!1 &1416238135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1416238136} + - component: {fileID: 1416238139} + - component: {fileID: 1416238138} + - component: {fileID: 1416238137} + m_Layer: 0 + m_Name: Cancel Player Buzz In + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1416238136 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416238135} + 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: 1157870780} + m_Father: {fileID: 1378096749} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1416238137 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416238135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1416238138} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 379391078} + m_TargetAssemblyTypeName: + m_MethodName: SendCustomEvent + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: CancelPlayerBuzzIn + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1416238138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416238135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 35630e38b4e5ffb40b44ec5348b4333f, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1416238139 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416238135} + m_CullTransparentMesh: 1 --- !u!1 &1451971859 GameObject: m_ObjectHideFlags: 0 @@ -7532,6 +7810,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _GameManager + value: + objectReference: {fileID: 379391079} - target: {fileID: 1145695079806890482, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -7832,23 +8115,23 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} - - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - {fileID: 2100000, guid: 9ae5e187a5d8f4e4893d37b62cbf0959, type: 2} - {fileID: 2100000, guid: ff135f18e14d9a94287191652767f722, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} + - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} LightMapsNear: [] LightMapsFar: [] diff --git a/Assets/UdonSharp/Buzzer.cs b/Assets/UdonSharp/Buzzer.cs index 5f283dd..9c8713d 100644 --- a/Assets/UdonSharp/Buzzer.cs +++ b/Assets/UdonSharp/Buzzer.cs @@ -1,6 +1,8 @@  using UdonSharp; using UnityEngine; +using VRC.SDK3.UdonNetworkCalling; +using VRC.Udon.Common.Interfaces; using VRC.SDKBase; using VRC.Udon; @@ -11,9 +13,9 @@ public class Buzzer : UdonSharpBehaviour public override void OnPickupUseDown() { VRCPlayerApi LocalPlayer = Networking.LocalPlayer; - if (Podium.PlayerID == LocalPlayer.playerId) + if (Podium.GetPlayerID() == LocalPlayer.playerId) { - Podium.BuzzIn(); + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)Podium.GameManager, NetworkEventTarget.All, "PlayerBuzzedIn", Podium.PlayerNumber); } base.OnPickupUseDown(); diff --git a/Assets/UdonSharp/GameManager.asset b/Assets/UdonSharp/GameManager.asset index 3fee1c4..1c154e6 100644 --- a/Assets/UdonSharp/GameManager.asset +++ b/Assets/UdonSharp/GameManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 10 + Data: 9 - Name: Entry: 7 Data: @@ -155,7 +155,7 @@ 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.HeaderAttribute, UnityEngine.CoreModule @@ -165,6 +165,12 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -185,7 +191,7 @@ MonoBehaviour: Data: WhereInTheWorld - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: WhereInTheWorld @@ -209,10 +215,16 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -231,63 +243,69 @@ MonoBehaviour: - Name: $k Entry: 1 Data: RockapellaIdent - - Name: $v - Entry: 7 - Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: RockapellaIdent - - 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: MusicPlayer - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: RockapellaIdent + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: MusicPlayer + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: MusicPlayer - Name: k__BackingField Entry: 7 - Data: 16|System.RuntimeType, mscorlib + Data: 19|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.AudioSource, UnityEngine.AudioModule @@ -296,7 +314,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 19 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -311,79 +329,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _MusicEvent - - Name: $v - Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _MusicEvent - - Name: k__BackingField - Entry: 7 - Data: 19|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: MusicEventType, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 20|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: - - 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: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 23|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -407,16 +359,16 @@ MonoBehaviour: Data: SFXPlayer - Name: $v Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: SFXPlayer - Name: k__BackingField Entry: 9 - Data: 16 + Data: 19 - Name: k__BackingField Entry: 9 - Data: 16 + Data: 19 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -431,73 +383,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _SFXEvent - - Name: $v - Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _SFXEvent - - Name: k__BackingField - Entry: 7 - Data: 27|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: SFXEventType, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 20 - - 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: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 29|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 30|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -521,13 +413,13 @@ MonoBehaviour: Data: BuzzInAllowed - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: BuzzInAllowed - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -536,7 +428,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 32 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -551,13 +443,73 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 34|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 28|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: PlayerBuzzInAllowed + - Name: $v + Entry: 7 + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PlayerBuzzInAllowed + - Name: k__BackingField + Entry: 7 + Data: 30|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 30 + - 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: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -581,16 +533,22 @@ MonoBehaviour: Data: _BuzzedInPlayer - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzedInPlayer - Name: k__BackingField - Entry: 9 - Data: 20 + Entry: 7 + Data: 34|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 20 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -605,13 +563,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 37|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/GameManager.cs b/Assets/UdonSharp/GameManager.cs index 5bd151d..35ddaba 100644 --- a/Assets/UdonSharp/GameManager.cs +++ b/Assets/UdonSharp/GameManager.cs @@ -1,12 +1,13 @@  using UdonSharp; using UnityEngine; +using VRC.SDK3.UdonNetworkCalling; +using VRC.Udon.Common.Interfaces; using VRC.SDKBase; -using VRC.Udon; +using System.Linq; public enum MusicEventType { - INTERNAL = -1, None, WhereInTheWorld, RockapellaIdent @@ -14,7 +15,6 @@ public enum MusicEventType public enum SFXEventType { - INTERNAL = -1, None, Buzzer } @@ -26,112 +26,102 @@ public class GameManager : UdonSharpBehaviour public PlayerPodium[] PlayerPodiums; [Header("Audio")] - public AudioClip BuzzerSound = null; + [SerializeField] private AudioClip BuzzerSound = null; - public AudioClip WhereInTheWorld = null; - public AudioClip RockapellaIdent = null; + [SerializeField] private AudioClip WhereInTheWorld = null; + [SerializeField] private AudioClip RockapellaIdent = null; - public AudioSource MusicPlayer = null; - [UdonSynced, FieldChangeCallback(nameof(MusicEvent))] private MusicEventType _MusicEvent = MusicEventType.None; - - public AudioSource SFXPlayer = null; - [UdonSynced, FieldChangeCallback(nameof(SFXEvent))] private SFXEventType _SFXEvent = SFXEventType.None; + [SerializeField] private AudioSource MusicPlayer = null; + [SerializeField] private AudioSource SFXPlayer = null; [UdonSynced] private bool BuzzInAllowed = true; - [UdonSynced] private int _BuzzedInPlayer = 0; + [UdonSynced] private bool[] PlayerBuzzInAllowed; + [UdonSynced] private int _BuzzedInPlayer = -1; + + void Start() + { + PlayerBuzzInAllowed = new bool[PlayerPodiums.Length]; + } + [NetworkCallable] public void PlayerBuzzedIn(int PlayerNumber) { - if (!BuzzInAllowed) { return; } + int PlayerIndex = PlayerNumber - 1; + if (!BuzzInAllowed || !PlayerBuzzInAllowed[PlayerIndex]) { return; } + // Prevent new buzz-ins and store which player is currently buzzed in. BuzzInAllowed = false; + PlayerBuzzInAllowed[PlayerIndex] = false; _BuzzedInPlayer = PlayerNumber; - SFXEvent = SFXEventType.Buzzer; RequestSerialization(); - PlayerPodiums[PlayerNumber - 1].IncreaseScoreBy10(); - PlayerPodiums[PlayerNumber - 1].RequestSerialization(); + NetworkCalling.SendCustomNetworkEvent( + (IUdonEventReceiver)PlayerPodiums[PlayerIndex], + NetworkEventTarget.All, + "EnableBuzzInEffect", true); + + // Play the buzzer sound globally. + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlaySFX), SFXEventType.Buzzer); } - public void CancelBuzzIn() { + public void CancelPlayerBuzzIn() { BuzzInAllowed = true; - _BuzzedInPlayer = 0; + NetworkCalling.SendCustomNetworkEvent( + (IUdonEventReceiver)PlayerPodiums[_BuzzedInPlayer - 1], + NetworkEventTarget.All, + "EnableBuzzInEffect", false); + _BuzzedInPlayer = -1; RequestSerialization(); } - public void StartGame() + public void ResetBuzzers() { - for (int i = 0; i < PlayerPodiums.Length; i++) - { - Networking.SetOwner(Networking.InstanceOwner, PlayerPodiums[i].gameObject); - - } - - PlayerPodiums[0].IncreaseScoreBy10(); - PlayerPodiums[0].RequestSerialization(); - - PlayerPodiums[1].IncreaseScoreBy5(); - PlayerPodiums[1].RequestSerialization(); - - PlayerPodiums[2].DecreaseScoreBy5(); - PlayerPodiums[2].RequestSerialization(); + BuzzInAllowed = true; + for (int i = 0; i < PlayerPodiums.Length; i++) { PlayerBuzzInAllowed[i] = true; } + _BuzzedInPlayer = -1; } public void PlayWhereInTheWorld() { - MusicEvent = MusicEventType.WhereInTheWorld; + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayMusic), MusicEventType.WhereInTheWorld); } public void PlayRockapellaIdent() { - MusicEvent = MusicEventType.RockapellaIdent; + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayMusic), MusicEventType.RockapellaIdent); + } + + [NetworkCallable] + public void PlayMusic(MusicEventType MusicEvent) + { + MusicPlayer.Stop(); + + switch (MusicEvent) + { + case MusicEventType.WhereInTheWorld: MusicPlayer.clip = WhereInTheWorld; break; + case MusicEventType.RockapellaIdent: MusicPlayer.clip = RockapellaIdent; break; + default: MusicPlayer.clip = null; break; + } + + if (MusicPlayer.clip != null) + MusicPlayer.Play(); } - public MusicEventType MusicEvent + [NetworkCallable] + public void PlaySFX(SFXEventType SFXEvent) { - set + SFXPlayer.Stop(); + + switch (SFXEvent) { - _MusicEvent = value; - - MusicPlayer.Stop(); - - switch(_MusicEvent) - { - case MusicEventType.WhereInTheWorld: MusicPlayer.clip = WhereInTheWorld; break; - case MusicEventType.RockapellaIdent: MusicPlayer.clip = RockapellaIdent; break; - default: break; - } - - if (_MusicEvent != MusicEventType.None) - MusicPlayer.Play(); - - RequestSerialization(); + case SFXEventType.Buzzer: SFXPlayer.clip = BuzzerSound; break; + default: SFXPlayer.clip = null; break; } - get => _MusicEvent; - } - public SFXEventType SFXEvent - { - set - { - _SFXEvent = value; - - SFXPlayer.Stop(); - - switch (_SFXEvent) - { - case SFXEventType.Buzzer: SFXPlayer.clip = BuzzerSound; break; - default: break; - } - - if (_SFXEvent != SFXEventType.None) - SFXPlayer.Play(); - - RequestSerialization(); - } - get => _SFXEvent; + if (SFXPlayer.clip != null) + SFXPlayer.Play(); } } diff --git a/Assets/UdonSharp/PlayerPodium.asset b/Assets/UdonSharp/PlayerPodium.asset index 9f219b0..0a811c6 100644 --- a/Assets/UdonSharp/PlayerPodium.asset +++ b/Assets/UdonSharp/PlayerPodium.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 8 - Name: Entry: 7 Data: @@ -230,13 +230,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PlayerID + Data: _PlayerID - Name: $v Entry: 7 Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PlayerID + Data: _PlayerID - Name: k__BackingField Entry: 9 Data: 3 @@ -254,7 +254,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -344,19 +344,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Nameplate + Data: _BuzzedInEffect - Name: $v Entry: 7 Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Nameplate + Data: _BuzzedInEffect - Name: k__BackingField Entry: 7 Data: 22|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + Data: UnityEngine.GameObject, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -380,7 +380,22 @@ MonoBehaviour: Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 2 + - Name: + Entry: 7 + Data: 24|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Effects + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -398,19 +413,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Scorecard + Data: _Nameplate - Name: $v Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Scorecard + Data: _Nameplate - Name: k__BackingField - Entry: 9 - Data: 22 + Entry: 7 + Data: 27|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 22 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -425,10 +446,70 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 29|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: _Scorecard + - Name: $v + Entry: 7 + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Scorecard + - Name: k__BackingField + Entry: 9 + Data: 27 + - Name: k__BackingField + Entry: 9 + Data: 27 + - 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: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 32|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/PlayerPodium.cs b/Assets/UdonSharp/PlayerPodium.cs index 38eb5be..59a42e3 100644 --- a/Assets/UdonSharp/PlayerPodium.cs +++ b/Assets/UdonSharp/PlayerPodium.cs @@ -1,10 +1,9 @@  using UdonSharp; -using UnityEngine; using VRC.SDKBase; -using VRC.Udon; +using VRC.SDK3.UdonNetworkCalling; using TMPro; -using VRC.SDK3.Components; +using UnityEngine; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class PlayerPodium : UdonSharpBehaviour @@ -14,11 +13,14 @@ public class PlayerPodium : UdonSharpBehaviour public GameManager GameManager; [UdonSynced, FieldChangeCallback(nameof(PlayerName))] private string _PlayerName = "Player"; - [UdonSynced] public int PlayerID = -1; + [UdonSynced] private int _PlayerID = -1; [UdonSynced, FieldChangeCallback(nameof(PlayerScore))] private int _PlayerScore = 50; - public TextMeshProUGUI Nameplate; - public TextMeshProUGUI Scorecard; + [Header("Effects")] + [SerializeField] private GameObject _BuzzedInEffect; + + [SerializeField] private TextMeshProUGUI _Nameplate; + [SerializeField] private TextMeshProUGUI _Scorecard; void Start() { @@ -28,16 +30,15 @@ public class PlayerPodium : UdonSharpBehaviour public void SetPlayerName() { - if (PlayerID != -1) { return; } + if (_PlayerID != -1) { return; } Networking.SetOwner(Networking.LocalPlayer, gameObject); PlayerName = Networking.LocalPlayer.displayName; - PlayerID = Networking.LocalPlayer.playerId; + _PlayerID = Networking.LocalPlayer.playerId; + RequestSerialization(); } - public void BuzzIn() - { - GameManager.PlayerBuzzedIn(PlayerNumber); - } + public int GetPlayerID() { return _PlayerID; } + public void DecreaseScoreBy5() { @@ -49,20 +50,26 @@ public class PlayerPodium : UdonSharpBehaviour PlayerScore += 5; } + [NetworkCallable] public void IncreaseScoreBy10() { PlayerScore += 10; } + [NetworkCallable] + public void EnableBuzzInEffect(bool Enable) + { + _BuzzedInEffect.SetActive(Enable); + } + + public string PlayerName { set { _PlayerName = value; - Nameplate.text = value; - - RequestSerialization(); + _Nameplate.text = value; } get => _PlayerName; } @@ -72,7 +79,7 @@ public class PlayerPodium : UdonSharpBehaviour set { _PlayerScore = value; - Scorecard.text = PlayerScore.ToString(); + _Scorecard.text = PlayerScore.ToString(); RequestSerialization(); } get => _PlayerScore; diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json index 65a0a71..f65686f 100644 --- a/Packages/vpm-manifest.json +++ b/Packages/vpm-manifest.json @@ -6,12 +6,6 @@ "vrchat.jordo.easyquestswitch": { "version": "1.4.0" }, - "com.vrchat.base": { - "version": "3.8.0" - }, - "com.vrchat.worlds": { - "version": "3.8.0" - }, "dev.onevr.vrworldtoolkit": { "version": "3.2.1" }, @@ -19,7 +13,10 @@ "version": "1.5.0" }, "com.poiyomi.toon": { - "version": "9.2.40" + "version": "9.2.41" + }, + "com.vrchat.worlds": { + "version": "3.8.1" } }, "locked": { @@ -31,16 +28,6 @@ "version": "1.4.0", "dependencies": {} }, - "com.vrchat.base": { - "version": "3.8.0", - "dependencies": {} - }, - "com.vrchat.worlds": { - "version": "3.8.0", - "dependencies": { - "com.vrchat.base": "3.8.0" - } - }, "dev.onevr.vrworldtoolkit": { "version": "3.2.1", "dependencies": {} @@ -52,7 +39,17 @@ } }, "com.poiyomi.toon": { - "version": "9.2.40", + "version": "9.2.41", + "dependencies": {} + }, + "com.vrchat.worlds": { + "version": "3.8.1", + "dependencies": { + "com.vrchat.base": "3.8.1" + } + }, + "com.vrchat.base": { + "version": "3.8.1", "dependencies": {} } } diff --git a/Poi.Tools.csproj b/Poi.Tools.csproj index 6b2a38b..b6a9c14 100644 --- a/Poi.Tools.csproj +++ b/Poi.Tools.csproj @@ -1149,14 +1149,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/Thry/Config.json b/Thry/Config.json index af280b6..4318429 100644 --- a/Thry/Config.json +++ b/Thry/Config.json @@ -1,6 +1,6 @@ { "lastVersion": { - "_stringValue": "2.64.0" + "_stringValue": "2.64.1" }, "loggingLevel": 1, "default_texture_type": 0, diff --git a/Thry/presets_known_materials.txt b/Thry/presets_known_materials.txt index d4e6a7a..ed0a33c 100644 --- a/Thry/presets_known_materials.txt +++ b/Thry/presets_known_materials.txt @@ -353,3 +353,4 @@ a6c1d9564b56ecd47b82dfa7a8f11cbe d419d3432b8a0a24b986e614c57c2039 21221da753878694b9b9518a540dda85 70108d78e82c2ec488d6b504865508e0 +d93ea6d5213349a4aa01b00d77edba61 diff --git a/ThryAssemblyDefinition.csproj b/ThryAssemblyDefinition.csproj index 30de29b..043956c 100644 --- a/ThryAssemblyDefinition.csproj +++ b/ThryAssemblyDefinition.csproj @@ -1249,14 +1249,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index 835468e..ac6db56 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Lib.csproj b/UdonSharp.Lib.csproj index fdd42af..474574e 100644 --- a/UdonSharp.Lib.csproj +++ b/UdonSharp.Lib.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UdonSharp.Runtime.csproj b/UdonSharp.Runtime.csproj index 62564ab..ba74349 100644 --- a/UdonSharp.Runtime.csproj +++ b/UdonSharp.Runtime.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Addressables.csproj b/UniTask.Addressables.csproj index bae8e93..fb0f47b 100644 --- a/UniTask.Addressables.csproj +++ b/UniTask.Addressables.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.DOTween.csproj b/UniTask.DOTween.csproj index 478d57b..dabbbec 100644 --- a/UniTask.DOTween.csproj +++ b/UniTask.DOTween.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Editor.csproj b/UniTask.Editor.csproj index a39cffe..473d503 100644 --- a/UniTask.Editor.csproj +++ b/UniTask.Editor.csproj @@ -1128,14 +1128,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index d608348..fd7ad68 100644 --- a/UniTask.Linq.csproj +++ b/UniTask.Linq.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.TextMeshPro.csproj b/UniTask.TextMeshPro.csproj index 8de78ee..cc5e8cf 100644 --- a/UniTask.TextMeshPro.csproj +++ b/UniTask.TextMeshPro.csproj @@ -1123,14 +1123,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.csproj b/UniTask.csproj index ff2c404..c1c2d15 100644 --- a/UniTask.csproj +++ b/UniTask.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UnityEditorTests.csproj b/UnityEditorTests.csproj index fd56b97..f57b82f 100644 --- a/UnityEditorTests.csproj +++ b/UnityEditorTests.csproj @@ -990,14 +990,14 @@ Library\ScriptAssemblies\UnityEditor.TestRunner.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ClientSim.Editor.csproj b/VRC.ClientSim.Editor.csproj index 20834b5..2cc0fd2 100644 --- a/VRC.ClientSim.Editor.csproj +++ b/VRC.ClientSim.Editor.csproj @@ -1159,14 +1159,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index 6bf3faa..c4619f3 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -65,7 +65,6 @@ - @@ -138,6 +137,7 @@ + @@ -166,6 +166,7 @@ + @@ -1263,14 +1264,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ExampleCentral.Editor.csproj b/VRC.ExampleCentral.Editor.csproj index 73b783a..c33d7fd 100644 --- a/VRC.ExampleCentral.Editor.csproj +++ b/VRC.ExampleCentral.Editor.csproj @@ -1138,14 +1138,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index 088871a..e8c1069 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1181,14 +1181,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 66ee270..80863e5 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -1149,14 +1149,14 @@ Library\ScriptAssemblies\Cinemachine.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.BuildPipeline.csproj b/VRC.SDKBase.Editor.BuildPipeline.csproj index 29cfdf4..ed626b7 100644 --- a/VRC.SDKBase.Editor.BuildPipeline.csproj +++ b/VRC.SDKBase.Editor.BuildPipeline.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.ShaderStripping.csproj b/VRC.SDKBase.Editor.ShaderStripping.csproj index 208cd12..76e0eff 100644 --- a/VRC.SDKBase.Editor.ShaderStripping.csproj +++ b/VRC.SDKBase.Editor.ShaderStripping.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 281c2bc..221ccd3 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -84,6 +84,7 @@ + @@ -111,6 +112,7 @@ + @@ -123,6 +125,7 @@ + @@ -1255,14 +1258,14 @@ Library\ScriptAssemblies\Unity.XR.Oculus.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index 15e61ca..457487c 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -67,6 +67,7 @@ + @@ -83,21 +84,28 @@ + + + + + + + @@ -108,12 +116,14 @@ + + @@ -1175,14 +1185,14 @@ Library\ScriptAssemblies\Unity.Timeline.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.Editor.csproj b/VRC.Udon.Editor.csproj index 2a48698..a9bee13 100644 --- a/VRC.Udon.Editor.csproj +++ b/VRC.Udon.Editor.csproj @@ -1206,14 +1206,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.Udon.Serialization.OdinSerializer.csproj b/VRC.Udon.Serialization.OdinSerializer.csproj index dea0bb8..c19e98a 100644 --- a/VRC.Udon.Serialization.OdinSerializer.csproj +++ b/VRC.Udon.Serialization.OdinSerializer.csproj @@ -1305,14 +1305,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index 6252443..48b5212 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -1143,14 +1143,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRWorldToolkit.Editor.csproj b/VRWorldToolkit.Editor.csproj index 6586dc2..c8493d8 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1146,14 +1146,14 @@ Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/com.vrchat.core.vpm-resolver.Editor.csproj b/com.vrchat.core.vpm-resolver.Editor.csproj index ee65efd..7071a0e 100644 --- a/com.vrchat.core.vpm-resolver.Editor.csproj +++ b/com.vrchat.core.vpm-resolver.Editor.csproj @@ -1142,14 +1142,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.Editor.csproj b/vrchat.jordo.easyquestswitch.Editor.csproj index 436bfe1..efa55bb 100644 --- a/vrchat.jordo.easyquestswitch.Editor.csproj +++ b/vrchat.jordo.easyquestswitch.Editor.csproj @@ -1129,14 +1129,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.csproj b/vrchat.jordo.easyquestswitch.csproj index 8c0c6db..5925cbf 100644 --- a/vrchat.jordo.easyquestswitch.csproj +++ b/vrchat.jordo.easyquestswitch.csproj @@ -1151,14 +1151,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False +