diff --git a/Assets/Audio/SFX/CrookJailCall.meta b/Assets/Audio/SFX/CrookJailCall.meta new file mode 100644 index 0000000..123d101 --- /dev/null +++ b/Assets/Audio/SFX/CrookJailCall.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14cb4a25c20a6094893d9637472bfee0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/CrookJailCall/Patty Larceny - Africa.wav b/Assets/Audio/SFX/CrookJailCall/Patty Larceny - Africa.wav new file mode 100644 index 0000000..f8dc91e Binary files /dev/null and b/Assets/Audio/SFX/CrookJailCall/Patty Larceny - Africa.wav differ diff --git a/Assets/Audio/SFX/CrookJailCall/Patty Larceny - Africa.wav.meta b/Assets/Audio/SFX/CrookJailCall/Patty Larceny - Africa.wav.meta new file mode 100644 index 0000000..9f5594b --- /dev/null +++ b/Assets/Audio/SFX/CrookJailCall/Patty Larceny - Africa.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: cb70bafd3899fa54b8041ac72cdfee7a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Round 1 - Correct.wav b/Assets/Audio/SFX/Round 1 - Correct.wav new file mode 100644 index 0000000..4960234 Binary files /dev/null and b/Assets/Audio/SFX/Round 1 - Correct.wav differ diff --git a/Assets/Audio/SFX/Round 1 - Correct.wav.meta b/Assets/Audio/SFX/Round 1 - Correct.wav.meta new file mode 100644 index 0000000..b785bf7 --- /dev/null +++ b/Assets/Audio/SFX/Round 1 - Correct.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 36c2d4712d593424ca7b554b6953d1a6 +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/ClueVideoScreen/M_ClueVideoScreen_Maps.mat b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat index 7a2a985..a10e07b 100644 --- a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat +++ b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat @@ -48,7 +48,7 @@ Material: - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 0.5, y: 0.33333334} - m_Offset: {x: 0, y: 0.6666667} + m_Offset: {x: 0.5, y: 0.33333334} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 8dc3836..441d49c 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -34698,6 +34698,8 @@ MonoBehaviour: _RockapellaIdent: {fileID: 8300000, guid: 3dd54f8dd36092b4d9664c76ccf9ab49, type: 3} _Ding: {fileID: 8300000, guid: c73e1e65b24947b479626ae419424e84, type: 3} _Buzzer: {fileID: 8300000, guid: bc5aa9668b30b7e48a492e3308a2a802, type: 3} + _Round1Correct: {fileID: 8300000, guid: 36c2d4712d593424ca7b554b6953d1a6, type: 3} + _Round1Incorrect: {fileID: 8300000, guid: 1494bab0c02f97843ba2bc2b6c1fa4ee, type: 3} _TheLoot: {fileID: 8300000, guid: 66a73bb07c1203843831c12df9c02c30, type: 3} _TheWarrant: {fileID: 8300000, guid: 54b6be0d7456ff84faff67734e63f713, type: 3} _InJail: {fileID: 8300000, guid: bde3bed97680134498790ef9bbc8e0a8, type: 3} @@ -42097,38 +42099,38 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - {fileID: 2100000, guid: 4877371455c14a9459593994036db53b, type: 2} - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} - - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - - {fileID: 2100000, guid: 79cb8dae66bc60241b5964b24ff1ac7e, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} - - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 4877371455c14a9459593994036db53b, type: 2} - - {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2} + - {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2} - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: cba30de4550b90f4f8ef7bc7d94faf95, type: 2} + - {fileID: 2100000, guid: 95dd396b63c6ad4429ad37eedc63f20c, type: 2} + - {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - {fileID: 2100000, guid: 341141e903fac3e4ca54a62259c6d01d, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/Textures/T_BlankTVPicture.png.meta b/Assets/Textures/T_BlankTVPicture.png.meta index 593f25b..204c1db 100644 --- a/Assets/Textures/T_BlankTVPicture.png.meta +++ b/Assets/Textures/T_BlankTVPicture.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 diff --git a/Assets/UdonSharp/AudioManager.asset b/Assets/UdonSharp/AudioManager.asset index 845227e..7ce7ec9 100644 --- a/Assets/UdonSharp/AudioManager.asset +++ b/Assets/UdonSharp/AudioManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 29 + Data: 31 - Name: Entry: 7 Data: @@ -782,13 +782,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheLoot + Data: _Round1Correct - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheLoot + Data: _Round1Correct - Name: k__BackingField Entry: 9 Data: 10 @@ -836,13 +836,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheWarrant + Data: _Round1Incorrect - Name: $v Entry: 7 Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheWarrant + Data: _Round1Incorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -890,13 +890,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _InJail + Data: _TheLoot - Name: $v Entry: 7 Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _InJail + Data: _TheLoot - Name: k__BackingField Entry: 9 Data: 10 @@ -944,13 +944,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapCorrect + Data: _TheWarrant - Name: $v Entry: 7 Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapCorrect + Data: _TheWarrant - Name: k__BackingField Entry: 9 Data: 10 @@ -998,13 +998,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapIncorrect + Data: _InJail - Name: $v Entry: 7 Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapIncorrect + Data: _InJail - Name: k__BackingField Entry: 9 Data: 10 @@ -1052,13 +1052,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenInJail + Data: _MapCorrect - Name: $v Entry: 7 Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenInJail + Data: _MapCorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1106,13 +1106,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Contessa + Data: _MapIncorrect - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Contessa + Data: _MapIncorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1134,126 +1134,126 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 65|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: _CarmenInJail + - Name: $v + Entry: 7 + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CarmenInJail + - Name: k__BackingField + Entry: 9 + Data: 10 + - Name: k__BackingField + Entry: 9 + Data: 10 + - 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: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 68|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: _CrookTheme_Contessa + - Name: $v + Entry: 7 + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_Contessa + - Name: k__BackingField + Entry: 9 + Data: 10 + - Name: k__BackingField + Entry: 9 + Data: 10 + - 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: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 65|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 71|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Crook Themes - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 66|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: _CrookTheme_DoubleTrouble - - Name: $v - Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CrookTheme_DoubleTrouble - - Name: k__BackingField - Entry: 9 - Data: 10 - - Name: k__BackingField - Entry: 9 - Data: 10 - - 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: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 69|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: _CrookTheme_EarthaBrute - - Name: $v - Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CrookTheme_EarthaBrute - - Name: k__BackingField - Entry: 9 - Data: 10 - - Name: k__BackingField - Entry: 9 - Data: 10 - - 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: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1277,13 +1277,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_DoubleTrouble - Name: $v Entry: 7 Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -1331,13 +1331,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_EarthaBrute - Name: $v Entry: 7 Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -1385,13 +1385,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_Kneemoi - Name: $v Entry: 7 Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -1439,13 +1439,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_PattyLarceny - Name: $v Entry: 7 Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -1493,13 +1493,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_Robocrook - Name: $v Entry: 7 Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -1547,13 +1547,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_SarahNade - Name: $v Entry: 7 Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -1601,13 +1601,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_TopGrunge - Name: $v Entry: 7 Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -1650,6 +1650,114 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CrookTheme_VicTheSlick + - Name: $v + Entry: 7 + Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_VicTheSlick + - Name: k__BackingField + Entry: 9 + Data: 10 + - Name: k__BackingField + Entry: 9 + Data: 10 + - 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: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 96|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: _CrookTheme_WonderRat + - Name: $v + Entry: 7 + Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_WonderRat + - Name: k__BackingField + Entry: 9 + Data: 10 + - Name: k__BackingField + Entry: 9 + Data: 10 + - 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: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/AudioManager.cs b/Assets/UdonSharp/AudioManager.cs index 83d7d07..4ac795a 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -30,6 +30,8 @@ public enum SFXEventType None, Ding, Buzzer, + Round1Correct, + Round1Incorrect, TheLoot, TheWarrant, @@ -65,6 +67,8 @@ public class AudioManager : UdonSharpBehaviour [Header("SFX")] [SerializeField] private AudioClip _Ding = null; [SerializeField] private AudioClip _Buzzer = null; + [SerializeField] private AudioClip _Round1Correct = null; + [SerializeField] private AudioClip _Round1Incorrect = null; [SerializeField] private AudioClip _TheLoot = null; [SerializeField] private AudioClip _TheWarrant = null; @@ -170,18 +174,20 @@ public class AudioManager : UdonSharpBehaviour switch (SFXEvent) { - case SFXEventType.Ding: _SFXPlayer.clip = _Ding; break; - case SFXEventType.Buzzer: _SFXPlayer.clip = _Buzzer; break; + case SFXEventType.Ding: _SFXPlayer.clip = _Ding; break; + case SFXEventType.Buzzer: _SFXPlayer.clip = _Buzzer; break; + case SFXEventType.Round1Correct: _SFXPlayer.clip = _Round1Correct; break; + case SFXEventType.Round1Incorrect: _SFXPlayer.clip = _Round1Incorrect; break; - case SFXEventType.TheLoot: _SFXPlayer.clip = _TheLoot; break; - case SFXEventType.TheWarrant: _SFXPlayer.clip = _TheWarrant; break; - case SFXEventType.InJail: _SFXPlayer.clip = _InJail; break; + case SFXEventType.TheLoot: _SFXPlayer.clip = _TheLoot; break; + case SFXEventType.TheWarrant: _SFXPlayer.clip = _TheWarrant; break; + case SFXEventType.InJail: _SFXPlayer.clip = _InJail; break; - case SFXEventType.MapCorrect: _SFXPlayer.clip = _MapCorrect; break; - case SFXEventType.MapIncorrect: _SFXPlayer.clip = _MapIncorrect; break; - case SFXEventType.CarmenInJail: _SFXPlayer.clip = _CarmenInJail; break; + case SFXEventType.MapCorrect: _SFXPlayer.clip = _MapCorrect; break; + case SFXEventType.MapIncorrect: _SFXPlayer.clip = _MapIncorrect; break; + case SFXEventType.CarmenInJail: _SFXPlayer.clip = _CarmenInJail; break; - default: _SFXPlayer.clip = null; break; + default: _SFXPlayer.clip = null; break; } _SFXPlayer.loop = Loop; diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.asset b/Assets/UdonSharp/CaseVideoSyncPlayer.asset index 7961fa4..8a367d0 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer.asset +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 12 + Data: 13 - Name: Entry: 7 Data: @@ -188,145 +188,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FlashCorrectAnswer + Data: _ShowScreen - Name: $v Entry: 7 Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FlashCorrectAnswer + Data: _ShowScreen - Name: k__BackingField Entry: 7 Data: 14|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Boolean, mscorlib + Data: ClueScreenType, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 14 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 16|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _VideoPlayer - - Name: $v - Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoPlayer - - Name: k__BackingField - Entry: 7 - Data: 18|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 18 - - 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: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 20|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: _VideoURL - - Name: $v - Entry: 7 - Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _VideoURL - - Name: k__BackingField - Entry: 7 - Data: 22|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDKBase.VRCUrl, VRCSDKBase - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 22 + Data: 9 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -341,19 +221,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 24|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 16|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 25|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 17|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -374,19 +254,139 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TimeAndOffset + Data: _FlashCorrectAnswer + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FlashCorrectAnswer + - Name: k__BackingField + Entry: 7 + Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 19 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 21|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _VideoPlayer + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoPlayer + - Name: k__BackingField + Entry: 7 + Data: 23|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 23 + - 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: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 25|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: _VideoURL - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TimeAndOffset + Data: _VideoURL - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Vector2, UnityEngine.CoreModule + Data: VRC.SDKBase.VRCUrl, VRCSDKBase - Name: Entry: 8 Data: @@ -440,19 +440,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: SyncFrequency + Data: _TimeAndOffset - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: SyncFrequency + Data: _TimeAndOffset - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Single, mscorlib + Data: UnityEngine.Vector2, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -462,6 +462,72 @@ MonoBehaviour: - 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: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 34|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 35|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: SyncFrequency + - Name: $v + Entry: 7 + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: SyncFrequency + - Name: k__BackingField + Entry: 7 + Data: 37|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 37 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: Entry: 6 Data: @@ -473,7 +539,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -497,13 +563,13 @@ MonoBehaviour: Data: _BlankScreenMesh - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BlankScreenMesh - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule @@ -512,7 +578,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 35 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -527,13 +593,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 37|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -557,16 +623,16 @@ MonoBehaviour: Data: _VideoScreenMesh - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoScreenMesh - Name: k__BackingField Entry: 9 - Data: 35 + Data: 40 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -581,13 +647,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -611,16 +677,16 @@ MonoBehaviour: Data: _MapScreenMesh - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapScreenMesh - Name: k__BackingField Entry: 9 - Data: 35 + Data: 40 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -635,13 +701,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 48|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -665,13 +731,13 @@ MonoBehaviour: Data: _MapDownloader - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MapDownloader - Name: k__BackingField Entry: 7 - Data: 45|System.RuntimeType, mscorlib + Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 @@ -680,7 +746,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 45 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -695,7 +761,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -719,16 +785,16 @@ MonoBehaviour: Data: _CurrentMapURL - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentMapURL - Name: k__BackingField Entry: 9 - Data: 22 + Data: 27 - Name: k__BackingField Entry: 9 - Data: 22 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -743,7 +809,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/CaseVideoSyncPlayer.cs index ae6be6b..2e44ebc 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.cs @@ -2,6 +2,7 @@ using UdonSharp; using UnityEngine; using VRC.SDK3.Image; +using VRC.SDK3.UdonNetworkCalling; using VRC.SDK3.Video.Components.Base; using VRC.SDKBase; using VRC.Udon.Common.Interfaces; @@ -31,6 +32,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour [SerializeField] private GameManagerRound1 _GameManager; [UdonSynced, FieldChangeCallback(nameof(SubMapIndex))] private SubMap _SubMapIndex = 0; + [UdonSynced, FieldChangeCallback(nameof(ShowScreen))] private ClueScreenType _ShowScreen = ClueScreenType.Blank; [FieldChangeCallback(nameof(FlashCorrectAnswer))] private bool _FlashCorrectAnswer = false; [SerializeField] private BaseVRCVideoPlayer _VideoPlayer; @@ -57,13 +59,15 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour } + [NetworkCallable] public void LoadMap(int MapIndex) { VRCUrl MapURL = _GameManager.GetMapURL(MapIndex); if (MapURL == _CurrentMapURL) return; _CurrentMapURL = MapURL; - ShowScreen(ClueScreenType.Blank); + SubMapIndex = 0; + ShowScreen = ClueScreenType.Blank; TextureInfo AdditionalTextureInfo = new TextureInfo(); AdditionalTextureInfo.WrapModeU = TextureWrapMode.Clamp; @@ -85,12 +89,6 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour base.OnImageLoadError(result); } - public void ShowSubMap(SubMap Index) - { - SubMapIndex = Index; - ShowScreen(ClueScreenType.Map); - } - public void NextCorrectAnswerFrame() { if (FlashCorrectAnswer) @@ -103,7 +101,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour { _VideoPlayer.Stop(); SubMapIndex = 0; - ShowScreen(ClueScreenType.Blank); + ShowScreen = ClueScreenType.Blank; } } @@ -118,6 +116,10 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour case SubMap.CorrectLit: _MapScreenMesh.sharedMaterial.SetVector("_MainTex_ST", new Vector4(0.5f, 0.33333333f, 0.0f, 0.0f)); break; case SubMap.OnlyCorrect: _MapScreenMesh.sharedMaterial.SetVector("_MainTex_ST", new Vector4(0.5f, 0.33333333f, 0.5f, 0.0f)); break; } + + ShowScreen = ClueScreenType.Map; + + RequestSerialization(); } @@ -131,7 +133,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour { Debug.LogError("Displaying video material..."); - ShowScreen(ClueScreenType.Video); + ShowScreen = ClueScreenType.Video; UpdateTimeAndOffset(); base.OnVideoStart(); @@ -163,13 +165,15 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour public void ClearScreen() { - ShowScreen(ClueScreenType.Blank); + ShowScreen = ClueScreenType.Blank; FlashCorrectAnswer = false; } - private void ShowScreen(ClueScreenType Screen) + private void SwapToScreen(ClueScreenType Screen) { + if (ShowScreen == Screen) return; + switch (Screen) { case ClueScreenType.Blank: @@ -194,6 +198,8 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour break; } } + + RequestSerialization(); } @@ -207,6 +213,16 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour get => _SubMapIndex; } + public ClueScreenType ShowScreen + { + set + { + SwapToScreen(value); + _ShowScreen = value; + } + get => _ShowScreen; + } + public bool FlashCorrectAnswer { set diff --git a/Assets/UdonSharp/Game Managers/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset index 7cb0ac6..bfd9bbf 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -433,8 +433,8 @@ MonoBehaviour: Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -446,7 +446,13 @@ MonoBehaviour: Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 29|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -467,7 +473,7 @@ MonoBehaviour: Data: _CaseFileLootImage - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileLootImage @@ -481,8 +487,8 @@ MonoBehaviour: Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -491,10 +497,16 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -515,13 +527,13 @@ MonoBehaviour: Data: _CaseFileMaps - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileMaps - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 34|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl[], VRCSDKBase @@ -530,61 +542,13 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 32 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _CaseFileVideos - - Name: $v - Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseFileVideos - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -596,7 +560,67 @@ MonoBehaviour: Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 36|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: _CaseFileVideos + - Name: $v + Entry: 7 + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileVideos + - Name: k__BackingField + Entry: 9 + Data: 34 + - Name: k__BackingField + Entry: 9 + Data: 34 + - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -617,13 +641,13 @@ MonoBehaviour: Data: _CaseFileDictionary - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileDictionary - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -632,7 +656,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 37 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -647,7 +671,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 738eb1a..91ffa35 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -37,10 +37,11 @@ public class CaseManager : UdonSharpBehaviour [SerializeField] private Texture[] CrookPortraits; - private VRCUrl _CaseFileCluesURL; - private VRCUrl _CaseFileLootImage; - private VRCUrl[] _CaseFileMaps; - private VRCUrl[] _CaseFileVideos; + [UdonSynced] private VRCUrl _CaseFileCluesURL; + [UdonSynced] private VRCUrl _CaseFileLootImage; + [UdonSynced] private VRCUrl[] _CaseFileMaps; + [UdonSynced] private VRCUrl[] _CaseFileVideos; + private DataDictionary _CaseFileDictionary; @@ -113,6 +114,8 @@ public class CaseManager : UdonSharpBehaviour { Debug.LogError("Malformed case file. " + ErrorString); } + + RequestSerialization(); } public string ContinueToRound1() diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index ebe8683..434c508 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -48,7 +48,6 @@ public class GameManagerRound1 : GameManagerBase _QuestionStage = 0; _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; - ResetBuzzers(); base.InitialiseGameMode(); } @@ -152,7 +151,8 @@ public class GameManagerRound1 : GameManagerBase DataList Maps = _CurrentQuestion["Maps"].DataList; for (int i = 0; i < Maps.Count; i++) { - _VideoPlayer.LoadMap((int)Maps[i].Number); + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_VideoPlayer, NetworkEventTarget.All, + "LoadMap", (int)Maps[i].Number); } } @@ -205,7 +205,7 @@ public class GameManagerRound1 : GameManagerBase private void MultipleChoiceRevealQuestion() { _QuestionSubstage = 0; - _VideoPlayer.ShowSubMap(SubMap.NoLabels); + _VideoPlayer.SubMapIndex = SubMap.NoLabels; HostCardMultipleChoiceInterface Interface = (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); @@ -240,7 +240,7 @@ public class GameManagerRound1 : GameManagerBase private void MultipleChoiceRevealChoice1() { - _VideoPlayer.ShowSubMap(SubMap.OneLabel); + _VideoPlayer.SubMapIndex = SubMap.OneLabel; HostCardMultipleChoiceInterface Interface = (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); @@ -254,7 +254,7 @@ public class GameManagerRound1 : GameManagerBase } private void MultipleChoiceRevealChoice2() { - _VideoPlayer.ShowSubMap(SubMap.TwoLabels); + _VideoPlayer.SubMapIndex = SubMap.TwoLabels; HostCardMultipleChoiceInterface Interface = (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); @@ -268,7 +268,7 @@ public class GameManagerRound1 : GameManagerBase } private void MultipleChoiceRevealChoice3() { - _VideoPlayer.ShowSubMap(SubMap.ThreeLabels); + _VideoPlayer.SubMapIndex = SubMap.ThreeLabels; HostCardMultipleChoiceInterface Interface = (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); @@ -342,12 +342,22 @@ public class GameManagerRound1 : GameManagerBase Interface.HeaderUI.text = "ANSWER REVEALED"; + bool IsSomeoneCorrect = false; for (int i = 0; i < _PlayerPodiums.Length; i++) { - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[i], - NetworkEventTarget.All, - "VerifyMultipleChoiceResponse", _QuestionCorrectResponse); + bool Correct = _PlayerPodiums[i].VerifyMultipleChoiceResponse(_QuestionCorrectResponse); + IsSomeoneCorrect = IsSomeoneCorrect ? true : Correct; + } + + if (IsSomeoneCorrect) + { + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + "PlaySFX", SFXEventType.Round1Correct); + } + else + { + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + "PlaySFX", SFXEventType.Round1Incorrect); } _VideoPlayer.FlashCorrectAnswer = true; @@ -416,10 +426,7 @@ public class GameManagerRound1 : GameManagerBase int PodiumIndex = _BuzzedInPlayer - 1; if (PodiumIndex >= 0 && PodiumIndex < _PlayerPodiums.Length) { - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[PodiumIndex], - NetworkEventTarget.All, - "AdjustScore", 5); + _PlayerPodiums[PodiumIndex].AdjustScore(5); } EndBuzzInPeriod(); @@ -518,10 +525,7 @@ public class GameManagerRound1 : GameManagerBase int PodiumIndex = _BuzzedInPlayer - 1; if (PodiumIndex >= 0 && PodiumIndex < _PlayerPodiums.Length) { - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[PodiumIndex], - NetworkEventTarget.All, - "AdjustScore", 5); + _PlayerPodiums[PodiumIndex].AdjustScore(5); } } @@ -570,7 +574,8 @@ public class GameManagerRound1 : GameManagerBase DataList Maps = _CurrentQuestion["Maps"].DataList; for (int i = 0; i < Maps.Count; i++) { - _VideoPlayer.LoadMap((int)Maps[i].Number); + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_VideoPlayer, NetworkEventTarget.All, + "LoadMap", (int)Maps[i].Number); } } @@ -579,7 +584,7 @@ public class GameManagerRound1 : GameManagerBase private void FinalRoundShowMapPreview() { - _VideoPlayer.ShowSubMap(SubMap.ThreeLabels); + _VideoPlayer.SubMapIndex = SubMap.ThreeLabels; EnableRiskCards(); @@ -638,7 +643,7 @@ public class GameManagerRound1 : GameManagerBase } private void FinalRoundRevealChoice1() { - _VideoPlayer.ShowSubMap(SubMap.OneLabel); + _VideoPlayer.SubMapIndex = SubMap.OneLabel; HostCardMultipleChoiceInterface Interface = (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.FinalRound); @@ -651,7 +656,7 @@ public class GameManagerRound1 : GameManagerBase } private void FinalRoundRevealChoice2() { - _VideoPlayer.ShowSubMap(SubMap.TwoLabels); + _VideoPlayer.SubMapIndex = SubMap.TwoLabels; HostCardMultipleChoiceInterface Interface = (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.FinalRound); @@ -664,7 +669,7 @@ public class GameManagerRound1 : GameManagerBase } private void FinalRoundRevealChoice3() { - _VideoPlayer.ShowSubMap(SubMap.ThreeLabels); + _VideoPlayer.SubMapIndex = SubMap.ThreeLabels; HostCardMultipleChoiceInterface Interface = (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.FinalRound); @@ -777,10 +782,7 @@ public class GameManagerRound1 : GameManagerBase int PlayerNumber = _FinalRoundPlayersSortedByScore[PlayerPlace - 1]; _PlayerPodiums[PlayerNumber - 1].EnableBuzzInEffect(false); - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_PlayerPodiums[PlayerNumber - 1], - NetworkEventTarget.All, - "VerifyFinalRoundResponse", _QuestionCorrectResponse); + _PlayerPodiums[PlayerNumber - 1].VerifyFinalRoundResponse(_QuestionCorrectResponse); // If we're assigning points to the first-place player, then we're // about to finish up, so just move on to determining winners. diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 9f9cabc..e06410e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -53,6 +53,9 @@ public class GameManagerRound3 : GameManagerBase public override void InitialiseGameMode() { + _StageIndex = 0; + + // We'll need to reset the markers and regenerate the map here, too. base.InitialiseGameMode(); } @@ -221,15 +224,22 @@ public class GameManagerRound3 : GameManagerBase NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "PlaySFXLoop", SFXEventType.CarmenInJail); + SendCustomEventDelayedSeconds(nameof(StopFinalRoundMusic), 1.0f); SendCustomEventDelayedSeconds(nameof(PlayWindDownMusic), 5.0f); + SendCustomEventDelayedSeconds(nameof(EndCarmenInJailSFX), 7.0f); } } + public void StopFinalRoundMusic() + { + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "StopMusic"); + } public void PlayWindDownMusic() { NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.CarmenSandiegoWindDown); - SendCustomEventDelayedSeconds(nameof(EndCarmenInJailSFX), 2.0f); + EnableInteraction("Do It, Rockapella!"); + } public void EndCarmenInJailSFX() { @@ -252,11 +262,37 @@ public class GameManagerRound3 : GameManagerBase (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); GameLossInterface.HeaderUI.text = "The player has lost. " + _SuccessCounter + " countries in " + TIMER_LENGTH + " seconds."; - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, - "StopMusic"); + StopFinalRoundMusic(); + SendCustomEventDelayedSeconds(nameof(PlayWindDownMusic), 2.5f); } } + + private void DoItRockapella() + { + HostCardBetweenRoundsInterface Interface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + Interface.HeaderUI.text = "Rockin' it acapella"; + + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + "PlayMusicLoop", MusicEventType.CarmenSandiegoTheme); + + EnableInteraction("End Game"); + } + + + private void EndGame() + { + HostCardBetweenRoundsInterface Interface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + Interface.HeaderUI.text = "Game is over. Load a new case file to start again."; + + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "StopMusic"); + + EnableInteraction("Game is over. Load a new case file to start again."); + } + + private void GameStatusUpdate(GameStatus NewStatus) { if ((int)_GameStatus <= (int)GameStatus.Begin) @@ -272,14 +308,12 @@ public class GameManagerRound3 : GameManagerBase { NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "PlaySFX", SFXEventType.MapCorrect); - //_AudioManager.PlaySFX(SFXEventType.MapCorrect); } public void PlayIncorrectSound() { NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "PlaySFX", SFXEventType.MapIncorrect); - //_AudioManager.PlaySFX(SFXEventType.MapIncorrect); } private void UpdateInterface() @@ -307,6 +341,8 @@ public class GameManagerRound3 : GameManagerBase { case 1: DisplayBriefing(); break; case 2: BeginRound(); break; + case 3: DoItRockapella(); break; + case 4: EndGame(); break; } } } diff --git a/Assets/UdonSharp/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs index 339a433..883f79d 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.cs +++ b/Assets/UdonSharp/Podium/PlayerPodium.cs @@ -5,7 +5,6 @@ using TMPro; using VRC.SDKBase; using VRC.SDK3.UdonNetworkCalling; using VRC.Udon.Common.Interfaces; -using VRC.Udon.Common; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -60,13 +59,10 @@ public class PlayerPodium : UdonSharpBehaviour [NetworkCallable] public void ResetOwner() { - Networking.SetOwner(Networking.InstanceOwner, gameObject); - Networking.SetOwner(Networking.InstanceOwner, _ChoiceCards.gameObject); - Networking.SetOwner(Networking.InstanceOwner, _RiskCards.gameObject); - Networking.SetOwner(Networking.InstanceOwner, _Buzzer.gameObject); - PlayerName = "Player " + PlayerNumber; _PlayerID = -1; + + RequestSerialization(); } public int GetPlayerID() { return _PlayerID; } @@ -94,22 +90,22 @@ public class PlayerPodium : UdonSharpBehaviour } - [NetworkCallable] public void DecreaseScoreBy5() { PlayerScore -= 5; + RequestSerialization(); } - [NetworkCallable] public void IncreaseScoreBy5() { PlayerScore += 5; + RequestSerialization(); } - [NetworkCallable] public void AdjustScore(int Adjustment) { PlayerScore += Adjustment; + RequestSerialization(); } @@ -140,13 +136,15 @@ public class PlayerPodium : UdonSharpBehaviour "MakeChoiceTextVisible"); } - [NetworkCallable] - public void VerifyMultipleChoiceResponse(int CorrectResponse) + public bool VerifyMultipleChoiceResponse(int CorrectResponse) { - if (_ChoiceCards.GetSelectedChoice() == CorrectResponse) + bool IsCorrectResponse = _ChoiceCards.GetSelectedChoice() == CorrectResponse; + if (IsCorrectResponse) { AdjustScore(10); } + + return IsCorrectResponse; } @@ -217,7 +215,6 @@ public class PlayerPodium : UdonSharpBehaviour { _PlayerScore = value; _ScorecardUI.text = PlayerScore.ToString(); - RequestSerialization(); } get => _PlayerScore; } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 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: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 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: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 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: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 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: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 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: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 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: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 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: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index ba6209e..d925021 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -10,8 +10,8 @@ AudioManager: Default Speaker Mode: 2 m_SampleRate: 48000 m_DSPBufferSize: 1024 - m_VirtualVoiceCount: 64 - m_RealVoiceCount: 32 + m_VirtualVoiceCount: 32 + m_RealVoiceCount: 24 m_EnableOutputSuspension: 1 m_SpatializerPlugin: OculusSpatializer m_AmbisonicDecoderPlugin: OculusSpatializer