diff --git a/Assets/Audio/SFX/ACME Crimenet Computer Idle.wav b/Assets/Audio/SFX/ACME Crimenet Computer Idle.wav new file mode 100644 index 0000000..1437921 Binary files /dev/null and b/Assets/Audio/SFX/ACME Crimenet Computer Idle.wav differ diff --git a/Assets/Audio/SFX/ACME Crimenet Computer Idle.wav.meta b/Assets/Audio/SFX/ACME Crimenet Computer Idle.wav.meta new file mode 100644 index 0000000..a9b260d --- /dev/null +++ b/Assets/Audio/SFX/ACME Crimenet Computer Idle.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 44b5ad3934747c64f92ddb8ab4c674ea +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/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 20c0407..b79e43a 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -72274,6 +72274,8 @@ MonoBehaviour: _Buzzer: {fileID: 8300000, guid: bc5aa9668b30b7e48a492e3308a2a802, type: 3} _Round1Correct: {fileID: 8300000, guid: 36c2d4712d593424ca7b554b6953d1a6, type: 3} _Round1Incorrect: {fileID: 8300000, guid: 1494bab0c02f97843ba2bc2b6c1fa4ee, type: 3} + _ACMECrimenetComputerIdle: {fileID: 8300000, guid: 44b5ad3934747c64f92ddb8ab4c674ea, + type: 3} _VideoMusicClue: {fileID: 8300000, guid: 422c963da434b9542aaaaddeac6102db, type: 3} _ModemOperation: {fileID: 8300000, guid: 5edc86d0e2d307e498d89a513a1fe196, type: 3} _TheLoot: {fileID: 8300000, guid: 66a73bb07c1203843831c12df9c02c30, type: 3} diff --git a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs index 56d6e37..a711283 100644 --- a/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs +++ b/Assets/UdonSharp/ACME Crimenet Computer/ACMECrimenetComputer.cs @@ -65,6 +65,8 @@ public class ACMECrimenetComputer : UdonSharpBehaviour _Animator.SetBool("Throw Clue Into The Air", false); _Animator.SetBool("Run Translator", false); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic"); + _ClueImageCard.transform.localPosition = Vector3.zero; _ClueImageCard.transform.localRotation = Quaternion.identity; @@ -94,6 +96,8 @@ public class ACMECrimenetComputer : UdonSharpBehaviour Interactable.SetActive(true); } + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.ACMECrimenetComputerIdle); + TextureInfo AdditionalTextureInfo = new TextureInfo(); AdditionalTextureInfo.WrapModeU = TextureWrapMode.Clamp; AdditionalTextureInfo.WrapModeV = TextureWrapMode.Clamp; diff --git a/Assets/UdonSharp/AudioManager.asset b/Assets/UdonSharp/AudioManager.asset index a2905cb..5f291e9 100644 --- a/Assets/UdonSharp/AudioManager.asset +++ b/Assets/UdonSharp/AudioManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 60 + Data: 61 - Name: Entry: 7 Data: @@ -1016,13 +1016,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _VideoMusicClue + Data: _ACMECrimenetComputerIdle - Name: $v Entry: 7 Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _VideoMusicClue + Data: _ACMECrimenetComputerIdle - Name: k__BackingField Entry: 9 Data: 10 @@ -1070,13 +1070,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ModemOperation + Data: _VideoMusicClue - Name: $v Entry: 7 Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ModemOperation + Data: _VideoMusicClue - Name: k__BackingField Entry: 9 Data: 10 @@ -1124,13 +1124,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheLoot + Data: _ModemOperation - Name: $v Entry: 7 Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheLoot + Data: _ModemOperation - Name: k__BackingField Entry: 9 Data: 10 @@ -1178,13 +1178,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheWarrant + Data: _TheLoot - Name: $v Entry: 7 Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheWarrant + Data: _TheLoot - Name: k__BackingField Entry: 9 Data: 10 @@ -1232,13 +1232,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapCorrect + Data: _TheWarrant - Name: $v Entry: 7 Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapCorrect + Data: _TheWarrant - Name: k__BackingField Entry: 9 Data: 10 @@ -1286,13 +1286,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapIncorrect + Data: _MapCorrect - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapIncorrect + Data: _MapCorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1340,13 +1340,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenInJail + Data: _MapIncorrect - Name: $v Entry: 7 Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenInJail + Data: _MapIncorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1394,13 +1394,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LeverCartoon + Data: _CarmenInJail - Name: $v Entry: 7 Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LeverCartoon + Data: _CarmenInJail - Name: k__BackingField Entry: 9 Data: 10 @@ -1448,13 +1448,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Boing + Data: _LeverCartoon - Name: $v Entry: 7 Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Boing + Data: _LeverCartoon - Name: k__BackingField Entry: 9 Data: 10 @@ -1502,13 +1502,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Printer + Data: _Boing - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Printer + Data: _Boing - Name: k__BackingField Entry: 9 Data: 10 @@ -1556,13 +1556,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Thunder + Data: _Printer - Name: $v Entry: 7 Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Thunder + Data: _Printer - Name: k__BackingField Entry: 9 Data: 10 @@ -1610,13 +1610,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FogHorn + Data: _Thunder - Name: $v Entry: 7 Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FogHorn + Data: _Thunder - Name: k__BackingField Entry: 9 Data: 10 @@ -1664,13 +1664,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailDoorSlam + Data: _FogHorn - Name: $v Entry: 7 Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailDoorSlam + Data: _FogHorn - Name: k__BackingField Entry: 9 Data: 10 @@ -1718,13 +1718,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PhoneRing + Data: _JailDoorSlam - Name: $v Entry: 7 Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PhoneRing + Data: _JailDoorSlam - Name: k__BackingField Entry: 9 Data: 10 @@ -1772,13 +1772,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TimerEnd + Data: _PhoneRing - Name: $v Entry: 7 Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TimerEnd + Data: _PhoneRing - Name: k__BackingField Entry: 9 Data: 10 @@ -1827,13 +1827,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenEscape + Data: _TimerEnd - Name: $v Entry: 7 Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenEscape + Data: _TimerEnd - Name: k__BackingField Entry: 9 Data: 10 @@ -1882,13 +1882,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Contessa + Data: _CarmenEscape - Name: $v Entry: 7 Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Contessa + Data: _CarmenEscape - Name: k__BackingField Entry: 9 Data: 10 @@ -1913,28 +1913,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 109|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 110|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook Themes - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 111|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 109|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1955,13 +1937,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: $v Entry: 7 - Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -1982,11 +1964,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 112|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 113|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook Themes + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 114|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2010,13 +2010,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: $v Entry: 7 Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2065,13 +2065,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: $v Entry: 7 Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -2120,13 +2120,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: $v Entry: 7 Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -2175,13 +2175,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: $v Entry: 7 Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -2230,13 +2230,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: $v Entry: 7 Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2285,13 +2285,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: $v Entry: 7 Data: 130|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2340,13 +2340,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: $v Entry: 7 Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2395,13 +2395,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: $v Entry: 7 Data: 136|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -2450,13 +2450,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_WonderRat - Name: $v Entry: 7 Data: 139|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -2481,28 +2481,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 141|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 142|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook In Jail - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 143|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 141|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2523,13 +2505,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_DoubleTrouble + Data: _CrookInJail_Contessa - Name: $v Entry: 7 - Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 142|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_DoubleTrouble + Data: _CrookInJail_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -2550,11 +2532,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 145|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 143|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 144|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 145|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook In Jail + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 146|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2578,13 +2578,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_EarthaBrute + Data: _CrookInJail_DoubleTrouble - Name: $v Entry: 7 Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_EarthaBrute + Data: _CrookInJail_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2633,13 +2633,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_EarthaBrute - Name: $v Entry: 7 Data: 150|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -2688,13 +2688,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_Kneemoi - Name: $v Entry: 7 Data: 153|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -2743,13 +2743,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_PattyLarceny - Name: $v Entry: 7 Data: 156|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -2798,13 +2798,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_Robocrook - Name: $v Entry: 7 Data: 159|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2853,13 +2853,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_SarahNade - Name: $v Entry: 7 Data: 162|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2908,13 +2908,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_TopGrunge - Name: $v Entry: 7 Data: 165|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2963,13 +2963,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_VicTheSlick - Name: $v Entry: 7 Data: 168|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -3018,13 +3018,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookInJail_WonderRat - Name: $v Entry: 7 Data: 171|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookInJail_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -3049,28 +3049,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 173|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 174|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook Jail Calls - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 175|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 173|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3091,13 +3073,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Asia + Data: _CrookJailCall_Patty_Africa - Name: $v Entry: 7 - Data: 176|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Asia + Data: _CrookJailCall_Patty_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -3118,11 +3100,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 177|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 175|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 176|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 177|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook Jail Calls + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 178|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -3146,13 +3146,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Europe + Data: _CrookJailCall_Patty_Asia - Name: $v Entry: 7 Data: 179|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Europe + Data: _CrookJailCall_Patty_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -3201,13 +3201,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_NorthAmerica + Data: _CrookJailCall_Patty_Europe - Name: $v Entry: 7 Data: 182|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_NorthAmerica + Data: _CrookJailCall_Patty_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -3256,13 +3256,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Oceania + Data: _CrookJailCall_Patty_NorthAmerica - Name: $v Entry: 7 Data: 185|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Oceania + Data: _CrookJailCall_Patty_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -3311,13 +3311,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_SouthAmerica + Data: _CrookJailCall_Patty_Oceania - Name: $v Entry: 7 Data: 188|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_SouthAmerica + Data: _CrookJailCall_Patty_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -3366,16 +3366,71 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FadeOutMusic + Data: _CrookJailCall_Patty_SouthAmerica - Name: $v Entry: 7 Data: 191|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookJailCall_Patty_SouthAmerica + - 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: 192|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 193|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: _FadeOutMusic + - Name: $v + Entry: 7 + Data: 194|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FadeOutMusic - Name: k__BackingField Entry: 7 - Data: 192|System.RuntimeType, mscorlib + Data: 195|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -3384,7 +3439,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 192 + Data: 195 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3399,7 +3454,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 193|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 196|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 de30b40..3faeb1e 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -12,6 +12,7 @@ public enum MusicEventType CarmenSandiegoWindDown, TheChase, + ACMECrimenetComputerIdle, // So that the computer can play other sounds ThinkAboutIt, CapitalLoop, @@ -82,6 +83,7 @@ public class AudioManager : UdonSharpBehaviour [SerializeField] private AudioClip _Buzzer = null; [SerializeField] private AudioClip _Round1Correct = null; [SerializeField] private AudioClip _Round1Incorrect = null; + [SerializeField] private AudioClip _ACMECrimenetComputerIdle = null; [SerializeField] private AudioClip _VideoMusicClue = null; [SerializeField] private AudioClip _ModemOperation = null; @@ -187,22 +189,24 @@ public class AudioManager : UdonSharpBehaviour switch (MusicEvent) { - case MusicEventType.OpeningLoop: _MusicPlayer.clip = _OpeningLoop; break; - case MusicEventType.CarmenSandiegoTheme: _MusicPlayer.clip = _CarmenSandiegoTheme; break; - case MusicEventType.CarmenSandiegoWindDown: _MusicPlayer.clip = _CarmenSandiegoWindDown; break; + case MusicEventType.OpeningLoop: _MusicPlayer.clip = _OpeningLoop; break; + case MusicEventType.CarmenSandiegoTheme: _MusicPlayer.clip = _CarmenSandiegoTheme; break; + case MusicEventType.CarmenSandiegoWindDown: _MusicPlayer.clip = _CarmenSandiegoWindDown; break; - case MusicEventType.TheChase: _MusicPlayer.clip = _TheChase; break; - case MusicEventType.ThinkAboutIt: _MusicPlayer.clip = _ThinkAboutIt; break; + case MusicEventType.ACMECrimenetComputerIdle: _MusicPlayer.clip = _ACMECrimenetComputerIdle; break; + case MusicEventType.TheChase: _MusicPlayer.clip = _TheChase; break; + case MusicEventType.ThinkAboutIt: _MusicPlayer.clip = _ThinkAboutIt; break; - case MusicEventType.CapitalLoop: _MusicPlayer.clip = _CapitalLoop; break; - case MusicEventType.RecoverTheLoot: _MusicPlayer.clip = _RecoverTheLoot; break; + case MusicEventType.CapitalLoop: _MusicPlayer.clip = _CapitalLoop; break; + case MusicEventType.RecoverTheLoot: _MusicPlayer.clip = _RecoverTheLoot; break; - case MusicEventType.IFeelGood: _MusicPlayer.clip = _IFeelGood; break; - case MusicEventType.CarmenChaseMusic: _MusicPlayer.clip = _CarmenChaseMusic; break; + case MusicEventType.IFeelGood: _MusicPlayer.clip = _IFeelGood; break; + case MusicEventType.CarmenChaseMusic: _MusicPlayer.clip = _CarmenChaseMusic; break; - case MusicEventType.WhereInTheWorld: _MusicPlayer.clip = _WhereInTheWorld; break; - case MusicEventType.RockapellaIdent: _MusicPlayer.clip = _RockapellaIdent; break; - default: _MusicPlayer.clip = null; break; + case MusicEventType.WhereInTheWorld: _MusicPlayer.clip = _WhereInTheWorld; break; + case MusicEventType.RockapellaIdent: _MusicPlayer.clip = _RockapellaIdent; break; + + default: _MusicPlayer.clip = null; break; } _MusicPlayer.loop = Loop; diff --git a/Raw Files/SFX/ACME Crimenet Computer Idle.aup3 b/Raw Files/SFX/ACME Crimenet Computer Idle.aup3 new file mode 100644 index 0000000..818cb1e Binary files /dev/null and b/Raw Files/SFX/ACME Crimenet Computer Idle.aup3 differ