diff --git a/Assets/Audio/SFX/449829__tryl__zanussi-z930-drier-last-minutes-of-drying-with-buzzer.wav b/Assets/Audio/SFX/449829__tryl__zanussi-z930-drier-last-minutes-of-drying-with-buzzer.wav new file mode 100644 index 0000000..e9df7c0 Binary files /dev/null and b/Assets/Audio/SFX/449829__tryl__zanussi-z930-drier-last-minutes-of-drying-with-buzzer.wav differ diff --git a/Assets/Audio/SFX/449829__tryl__zanussi-z930-drier-last-minutes-of-drying-with-buzzer.wav.meta b/Assets/Audio/SFX/449829__tryl__zanussi-z930-drier-last-minutes-of-drying-with-buzzer.wav.meta new file mode 100644 index 0000000..6776dc9 --- /dev/null +++ b/Assets/Audio/SFX/449829__tryl__zanussi-z930-drier-last-minutes-of-drying-with-buzzer.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 9c9e0cef11278c843b24b1eecdc17f05 +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/SciFi HB03_83_02.wav b/Assets/Audio/SFX/SciFi HB03_83_02.wav new file mode 100644 index 0000000..7a7eb0c Binary files /dev/null and b/Assets/Audio/SFX/SciFi HB03_83_02.wav differ diff --git a/Assets/Audio/SFX/SciFi HB03_83_02.wav.meta b/Assets/Audio/SFX/SciFi HB03_83_02.wav.meta new file mode 100644 index 0000000..27749dc --- /dev/null +++ b/Assets/Audio/SFX/SciFi HB03_83_02.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: d608d8310e3f92546acd07ff6240d29b +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 47f6a1a..20c0407 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -72288,7 +72288,8 @@ MonoBehaviour: _FogHorn: {fileID: 8300000, guid: e85401543a2dade4690ef51e3e8734ad, type: 3} _JailDoorSlam: {fileID: 8300000, guid: a77878811d4fadc42930a9ca5be5ea93, type: 3} _PhoneRing: {fileID: 8300000, guid: e204469f7d81f814faa906180db7f455, type: 3} - _CarmenEscape: {fileID: 8300000, guid: c73e1e65b24947b479626ae419424e84, type: 3} + _TimerEnd: {fileID: 8300000, guid: 9c9e0cef11278c843b24b1eecdc17f05, type: 3} + _CarmenEscape: {fileID: 8300000, guid: d608d8310e3f92546acd07ff6240d29b, type: 3} _CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444, type: 3} _CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6, diff --git a/Assets/UdonSharp/AudioManager.asset b/Assets/UdonSharp/AudioManager.asset index 10116a5..a2905cb 100644 --- a/Assets/UdonSharp/AudioManager.asset +++ b/Assets/UdonSharp/AudioManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 59 + Data: 60 - Name: Entry: 7 Data: @@ -1772,13 +1772,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenEscape + Data: _TimerEnd - Name: $v Entry: 7 Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenEscape + Data: _TimerEnd - Name: k__BackingField Entry: 9 Data: 10 @@ -1827,13 +1827,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Contessa + Data: _CarmenEscape - Name: $v Entry: 7 Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Contessa + Data: _CarmenEscape - Name: k__BackingField Entry: 9 Data: 10 @@ -1858,28 +1858,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 106|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 107|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook Themes - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 108|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 106|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1900,13 +1882,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: $v Entry: 7 - Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -1927,11 +1909,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 110|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - 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 @@ -1955,13 +1955,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: $v Entry: 7 Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2010,13 +2010,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: $v Entry: 7 Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -2065,13 +2065,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: $v Entry: 7 Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -2120,13 +2120,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: $v Entry: 7 Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -2175,13 +2175,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: $v Entry: 7 Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2230,13 +2230,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: $v Entry: 7 Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2285,13 +2285,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: $v Entry: 7 Data: 130|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2340,13 +2340,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: $v Entry: 7 Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -2395,13 +2395,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_WonderRat - Name: $v Entry: 7 Data: 136|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -2426,28 +2426,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 138|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 139|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook In Jail - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 140|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 138|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2468,13 +2450,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_DoubleTrouble + Data: _CrookInJail_Contessa - Name: $v Entry: 7 - Data: 141|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 139|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_DoubleTrouble + Data: _CrookInJail_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -2495,11 +2477,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 142|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 140|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - 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 @@ -2523,13 +2523,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_EarthaBrute + Data: _CrookInJail_DoubleTrouble - Name: $v Entry: 7 Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_EarthaBrute + Data: _CrookInJail_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2578,13 +2578,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_EarthaBrute - Name: $v Entry: 7 Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -2633,13 +2633,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_Kneemoi - Name: $v Entry: 7 Data: 150|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -2688,13 +2688,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_PattyLarceny - Name: $v Entry: 7 Data: 153|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -2743,13 +2743,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_Robocrook - Name: $v Entry: 7 Data: 156|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2798,13 +2798,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_SarahNade - Name: $v Entry: 7 Data: 159|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2853,13 +2853,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_TopGrunge - Name: $v Entry: 7 Data: 162|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2908,13 +2908,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_VicTheSlick - Name: $v Entry: 7 Data: 165|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -2963,13 +2963,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookInJail_WonderRat - Name: $v Entry: 7 Data: 168|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookInJail_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -2994,28 +2994,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 170|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 171|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook Jail Calls - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 172|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 170|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3036,13 +3018,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Asia + Data: _CrookJailCall_Patty_Africa - Name: $v Entry: 7 - Data: 173|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 171|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 @@ -3063,11 +3045,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 174|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 172|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - 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 @@ -3091,13 +3091,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Europe + Data: _CrookJailCall_Patty_Asia - Name: $v Entry: 7 Data: 176|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 @@ -3146,13 +3146,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_NorthAmerica + Data: _CrookJailCall_Patty_Europe - Name: $v Entry: 7 Data: 179|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 @@ -3201,13 +3201,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Oceania + Data: _CrookJailCall_Patty_NorthAmerica - Name: $v Entry: 7 Data: 182|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 @@ -3256,13 +3256,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_SouthAmerica + Data: _CrookJailCall_Patty_Oceania - Name: $v Entry: 7 Data: 185|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 @@ -3311,16 +3311,71 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FadeOutMusic + Data: _CrookJailCall_Patty_SouthAmerica - Name: $v Entry: 7 Data: 188|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: 189|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 190|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: 191|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FadeOutMusic - Name: k__BackingField Entry: 7 - Data: 189|System.RuntimeType, mscorlib + Data: 192|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -3329,7 +3384,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 189 + Data: 192 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3344,7 +3399,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 190|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 193|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 ca2c099..de30b40 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -49,6 +49,7 @@ public enum SFXEventType FogHorn, JailDoorSlam, PhoneRing, + TimerEnd, CarmenEscape } @@ -98,6 +99,7 @@ public class AudioManager : UdonSharpBehaviour [SerializeField] private AudioClip _FogHorn = null; [SerializeField] private AudioClip _JailDoorSlam = null; [SerializeField] private AudioClip _PhoneRing = null; + [SerializeField] private AudioClip _TimerEnd = null; [SerializeField] private AudioClip _CarmenEscape = null; [Space][Header("Crook Themes")] @@ -270,6 +272,7 @@ public class AudioManager : UdonSharpBehaviour case SFXEventType.FogHorn: _SFXPlayer.clip = _FogHorn; break; case SFXEventType.JailDoorSlam: _SFXPlayer.clip = _JailDoorSlam; break; case SFXEventType.PhoneRing: _SFXPlayer.clip = _PhoneRing; break; + case SFXEventType.TimerEnd: _SFXPlayer.clip = _TimerEnd; break; case SFXEventType.CarmenEscape: _SFXPlayer.clip = _CarmenEscape; break; default: _SFXPlayer.clip = null; break; diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 0f5828c..81fd981 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -349,6 +349,9 @@ public class GameManagerRound3 : GameManagerBase "- Found " + SuccessCounter + " countries in " + TIMER_LENGTH + " seconds.\n\n" + "- There's one more thing I want you to do for us. You know what it is..."; + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, + "PlaySFX", SFXEventType.TimerEnd); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "StopMusic"); SendCustomEventDelayedSeconds(nameof(PlayWindDownMusic), 2.5f); SendCustomEventDelayedSeconds(nameof(PlayNewspaperLoseAnimation), 3.0f); diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: diff --git a/Credits And License Requirements.txt b/Credits And License Requirements.txt index b2674f9..fe883fc 100644 --- a/Credits And License Requirements.txt +++ b/Credits And License Requirements.txt @@ -3,6 +3,7 @@ - Mancunian dot matrix printer by azumarill -- https://freesound.org/s/322125/ -- License: Attribution 3.0 - ImagesWriter II Power-On Sound by jewettg -- https://freesound.org/s/662715/ -- License: Creative Commons 0 - Stromberg Carlson 1543.wav by Hockinfinger -- https://freesound.org/s/274436/ -- License: Creative Commons 0 +- Zanussi Z930 drier - last minutes of drying with buzzer by tryl -- https://freesound.org/s/449829/ -- License: Attribution 4.0 ------------------------------------------------------------------------------- @@ -14,5 +15,9 @@ NEED TO PURCHASE: - - Disc 1 - Lever Cartoon 67-01 - - Disc 3 - Electronic 16-02 - - Disc 3 - Thunder 93-03 +- - Disc 3 - SciFi 28-01 +- - Disc 3 - SciFi 33-03 +- - Disc 3 - SciFi 34-03 +- - Disc 3 - SciFi 83-02 - - Disc 5 - Horn Fog 52-05 - Berlin Atmospheres - Sound Effect #0307 \ No newline at end of file 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