diff --git a/Assets/Audio/SFX/LeverCartoon HB01_67_1.wav b/Assets/Audio/SFX/LeverCartoon HB01_67_1.wav new file mode 100644 index 0000000..2ba8246 Binary files /dev/null and b/Assets/Audio/SFX/LeverCartoon HB01_67_1.wav differ diff --git a/Assets/Audio/SFX/LeverCartoon HB01_67_1.wav.meta b/Assets/Audio/SFX/LeverCartoon HB01_67_1.wav.meta new file mode 100644 index 0000000..74c56d8 --- /dev/null +++ b/Assets/Audio/SFX/LeverCartoon HB01_67_1.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 42a7290f75e32364099536ce9cb2d75c +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/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat index e58bc80..0c5c084 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.5, 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 7ae9ce6..7f49c8f 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -61208,10 +61208,6 @@ MonoBehaviour: _Round1Correct: {fileID: 8300000, guid: 36c2d4712d593424ca7b554b6953d1a6, type: 3} _Round1Incorrect: {fileID: 8300000, guid: 1494bab0c02f97843ba2bc2b6c1fa4ee, type: 3} _VideoMusicClue: {fileID: 8300000, guid: 422c963da434b9542aaaaddeac6102db, type: 3} - _ComputerOpenCompartment: {fileID: 8300000, guid: 760080d45978ef54a9074ef55135cebd, - type: 3} - _ComputerRunTranslator: {fileID: 8300000, guid: 3d202995ebfe8e54ba5b655f501722ff, - type: 3} _ModemOperation: {fileID: 8300000, guid: 5edc86d0e2d307e498d89a513a1fe196, type: 3} _TheLoot: {fileID: 8300000, guid: 66a73bb07c1203843831c12df9c02c30, type: 3} _TheWarrant: {fileID: 8300000, guid: 54b6be0d7456ff84faff67734e63f713, type: 3} @@ -61219,6 +61215,9 @@ MonoBehaviour: _MapCorrect: {fileID: 8300000, guid: 680142b640a682d4a92c9935828c2311, type: 3} _MapIncorrect: {fileID: 8300000, guid: 1494bab0c02f97843ba2bc2b6c1fa4ee, type: 3} _CarmenInJail: {fileID: 8300000, guid: a3782a44fca9d2d439318892b75d3b93, type: 3} + _LeverCartoon: {fileID: 8300000, guid: 42a7290f75e32364099536ce9cb2d75c, type: 3} + _Boing: {fileID: 8300000, guid: 760080d45978ef54a9074ef55135cebd, type: 3} + _Printer: {fileID: 8300000, guid: 3d202995ebfe8e54ba5b655f501722ff, type: 3} _CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444, type: 3} _CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6, @@ -71463,37 +71462,37 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: 68c7d547c0d7542429e36f9a891362ec, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} + - {fileID: 2100000, guid: e3bf0e4e3864c2149b48a821a799c6f4, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: e3bf0e4e3864c2149b48a821a799c6f4, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: 2ef88cbea3ef7c84d8671b0c0b46f094, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/Textures/T_PolyHaven_DancingHall.png.meta b/Assets/Textures/T_PolyHaven_DancingHall.png.meta index 3222bf9..51e0389 100644 --- a/Assets/Textures/T_PolyHaven_DancingHall.png.meta +++ b/Assets/Textures/T_PolyHaven_DancingHall.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -69,12 +69,12 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 4096 + maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 - compressionQuality: 50 - crunchedCompression: 0 + compressionQuality: 0 + crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 ignorePlatformSupport: 0 diff --git a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs index e181836..08f7c7a 100644 --- a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs +++ b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs @@ -111,21 +111,21 @@ public class ACMECrimenetComputer : UdonSharpBehaviour [NetworkCallable] public void OpenCompartment() { - _AudioManager.PlaySFX(SFXEventType.ComputerOpenCompartment); + _AudioManager.PlaySFX(SFXEventType.LeverCartoon); _Animator.SetBool("Open Compartment", true); } [NetworkCallable] public void ThrowClueIntoTheAir() { - _AudioManager.PlaySFX(SFXEventType.ComputerOpenCompartment); + _AudioManager.PlaySFX(SFXEventType.Boing); _Animator.SetBool("Throw Clue Into The Air", true); } [NetworkCallable] public void RunTranslator() { - _AudioManager.PlaySFX(SFXEventType.ComputerRunTranslator); + _AudioManager.PlaySFX(SFXEventType.Printer); _UntranslatedCard.SetParent(_UntranslatedCardAnimator); _UntranslatedCard.localPosition = Vector3.zero; diff --git a/Assets/UdonSharp/AudioManager.asset b/Assets/UdonSharp/AudioManager.asset index fafc8ec..4a6f3d9 100644 --- a/Assets/UdonSharp/AudioManager.asset +++ b/Assets/UdonSharp/AudioManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 39 + Data: 40 - Name: Entry: 7 Data: @@ -1070,13 +1070,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ComputerOpenCompartment + Data: _ModemOperation - Name: $v Entry: 7 Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ComputerOpenCompartment + Data: _ModemOperation - Name: k__BackingField Entry: 9 Data: 10 @@ -1124,13 +1124,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ComputerRunTranslator + Data: _TheLoot - Name: $v Entry: 7 Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ComputerRunTranslator + Data: _TheLoot - Name: k__BackingField Entry: 9 Data: 10 @@ -1178,13 +1178,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ModemOperation + Data: _TheWarrant - Name: $v Entry: 7 Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ModemOperation + Data: _TheWarrant - Name: k__BackingField Entry: 9 Data: 10 @@ -1232,13 +1232,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheLoot + Data: _InJail - Name: $v Entry: 7 Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheLoot + Data: _InJail - Name: k__BackingField Entry: 9 Data: 10 @@ -1286,13 +1286,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheWarrant + Data: _MapCorrect - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheWarrant + Data: _MapCorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1340,13 +1340,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _InJail + Data: _MapIncorrect - Name: $v Entry: 7 Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _InJail + Data: _MapIncorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1394,13 +1394,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapCorrect + Data: _CarmenInJail - Name: $v Entry: 7 Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapCorrect + Data: _CarmenInJail - Name: k__BackingField Entry: 9 Data: 10 @@ -1448,13 +1448,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapIncorrect + Data: _LeverCartoon - Name: $v Entry: 7 Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapIncorrect + Data: _LeverCartoon - Name: k__BackingField Entry: 9 Data: 10 @@ -1502,13 +1502,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenInJail + Data: _Boing - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenInJail + Data: _Boing - Name: k__BackingField Entry: 9 Data: 10 @@ -1556,13 +1556,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Contessa + Data: _Printer - Name: $v Entry: 7 Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Contessa + Data: _Printer - Name: k__BackingField Entry: 9 Data: 10 @@ -1586,28 +1586,10 @@ MonoBehaviour: Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 91|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 92|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook Themes - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 91|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1628,13 +1610,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: $v Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -1655,10 +1637,28 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 94|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 95|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook Themes + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 96|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1682,13 +1682,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: $v Entry: 7 Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -1736,13 +1736,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: $v Entry: 7 Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -1791,13 +1791,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: $v Entry: 7 Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -1846,13 +1846,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: $v Entry: 7 Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -1901,13 +1901,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: $v Entry: 7 Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -1956,13 +1956,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: $v Entry: 7 Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2011,13 +2011,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: $v Entry: 7 Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2066,13 +2066,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: $v Entry: 7 Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -2121,13 +2121,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookTheme_WonderRat - Name: $v Entry: 7 Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookTheme_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -2150,12 +2150,67 @@ MonoBehaviour: Entry: 7 Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 123|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: _CrookJailCall_Patty_Africa + - Name: $v + Entry: 7 + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookJailCall_Patty_Africa + - 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: 125|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 123|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 126|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -2164,7 +2219,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 124|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 127|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Crook Jail Calls @@ -2173,7 +2228,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 125|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 128|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2197,13 +2252,13 @@ MonoBehaviour: Data: _FadeOutMusic - Name: $v Entry: 7 - Data: 126|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FadeOutMusic - Name: k__BackingField Entry: 7 - Data: 127|System.RuntimeType, mscorlib + Data: 130|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -2212,7 +2267,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 127 + Data: 130 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2227,7 +2282,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 128|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 131|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/AudioManager.cs b/Assets/UdonSharp/AudioManager.cs index fe1d788..897adf8 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -32,8 +32,6 @@ public enum SFXEventType Round1Correct, Round1Incorrect, VideoMusicClue, - ComputerOpenCompartment, - ComputerRunTranslator, ModemOperation, TheLoot, @@ -42,7 +40,11 @@ public enum SFXEventType MapCorrect, MapIncorrect, - CarmenInJail + CarmenInJail, + + LeverCartoon, + Boing, + Printer } @@ -75,8 +77,6 @@ public class AudioManager : UdonSharpBehaviour [SerializeField] private AudioClip _Round1Correct = null; [SerializeField] private AudioClip _Round1Incorrect = null; [SerializeField] private AudioClip _VideoMusicClue = null; - [SerializeField] private AudioClip _ComputerOpenCompartment = null; - [SerializeField] private AudioClip _ComputerRunTranslator = null; [SerializeField] private AudioClip _ModemOperation = null; [SerializeField] private AudioClip _TheLoot = null; @@ -87,6 +87,10 @@ public class AudioManager : UdonSharpBehaviour [SerializeField] private AudioClip _MapIncorrect = null; [SerializeField] private AudioClip _CarmenInJail = null; + [SerializeField] private AudioClip _LeverCartoon = null; + [SerializeField] private AudioClip _Boing = null; + [SerializeField] private AudioClip _Printer = null; + [Space][Header("Crook Themes")] [SerializeField] private AudioClip _CrookTheme_Contessa = null; [SerializeField] private AudioClip _CrookTheme_DoubleTrouble = null; @@ -215,24 +219,26 @@ public class AudioManager : UdonSharpBehaviour switch (SFXEvent) { - 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.VideoMusicClue: _SFXPlayer.clip = _VideoMusicClue; break; - case SFXEventType.ComputerOpenCompartment: _SFXPlayer.clip = _ComputerOpenCompartment; break; - case SFXEventType.ComputerRunTranslator: _SFXPlayer.clip = _ComputerRunTranslator; break; - case SFXEventType.ModemOperation: _SFXPlayer.clip = _ModemOperation; 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.VideoMusicClue: _SFXPlayer.clip = _VideoMusicClue; break; + case SFXEventType.ModemOperation: _SFXPlayer.clip = _ModemOperation; 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; + case SFXEventType.LeverCartoon: _SFXPlayer.clip = _LeverCartoon; break; + case SFXEventType.Boing: _SFXPlayer.clip = _Boing; break; + case SFXEventType.Printer: _SFXPlayer.clip = _Printer; break; + + default: _SFXPlayer.clip = null; break; } _SFXPlayer.loop = Loop; diff --git a/Credits And License Requirements.txt b/Credits And License Requirements.txt index 177e8fe..ea2f8b7 100644 --- a/Credits And License Requirements.txt +++ b/Credits And License Requirements.txt @@ -4,6 +4,7 @@ - ImagesWriter II Power-On Sound by jewettg -- https://freesound.org/s/662715/ -- License: Creative Commons 0 - Hannah Barbera Sound Effects Library - - Disc 1 - Boing Cartoon 14-15 +- - Disc 1 - Lever Cartoon 67-1 - - Disc 3 - Electronic 16-02 - Hollywood Edge Super Single Vol. 1 - - Fog Horn 1 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