diff --git a/Assets/Audio/SFX/HornFog HB05_52_05.wav b/Assets/Audio/SFX/HornFog HB05_52_05.wav new file mode 100644 index 0000000..793da48 Binary files /dev/null and b/Assets/Audio/SFX/HornFog HB05_52_05.wav differ diff --git a/Assets/Audio/SFX/HornFog HB05_52_05.wav.meta b/Assets/Audio/SFX/HornFog HB05_52_05.wav.meta new file mode 100644 index 0000000..b9eb330 --- /dev/null +++ b/Assets/Audio/SFX/HornFog HB05_52_05.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: e85401543a2dade4690ef51e3e8734ad +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/Jail Metal Door - Berlin Atmospheres 0307.wav b/Assets/Audio/SFX/Jail Metal Door - Berlin Atmospheres 0307.wav new file mode 100644 index 0000000..9c74bdc Binary files /dev/null and b/Assets/Audio/SFX/Jail Metal Door - Berlin Atmospheres 0307.wav differ diff --git a/Assets/Audio/SFX/Jail Metal Door - Berlin Atmospheres 0307.wav.meta b/Assets/Audio/SFX/Jail Metal Door - Berlin Atmospheres 0307.wav.meta new file mode 100644 index 0000000..cac02e7 --- /dev/null +++ b/Assets/Audio/SFX/Jail Metal Door - Berlin Atmospheres 0307.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: a77878811d4fadc42930a9ca5be5ea93 +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 907c4b4..c73a807 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -2082,7 +2082,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: TEMPORARY_Button_PlayPattyLarcenyInJail + m_StringArgument: PlayCrookInJail m_BoolArgument: 0 m_CallState: 2 --- !u!114 &92143732 @@ -3111,7 +3111,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: TEMPORARY_Button_PlayFoghorn + m_StringArgument: TEMPORARY_Button_PlayInJailAnimation m_BoolArgument: 0 m_CallState: 2 --- !u!114 &106546792 @@ -3358,16 +3358,27 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 115578770} VideoPool: - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE - - url: https://www.youtube.com/watch?v=s05TnV8pTIE + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + - url: https://www.youtube.com/watch?v=rIgFoXcmG1A + VideoPoolFallback: + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 + - url: https://filehost.battybovine.com/witwics/crook-in-jail/PattyLarcenyInJail.mp4 --- !u!114 &115578772 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3390,7 +3401,8 @@ MonoBehaviour: targetMaterialRenderer: {fileID: 1263458050} targetMaterialProperty: _EmissionMap aspectRatio: 1 - targetAudioSources: [] + targetAudioSources: + - {fileID: 2018849108} maximumResolution: 360 --- !u!1 &116074573 GameObject: @@ -31238,6 +31250,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 967689114} + _HostCard: {fileID: 379391087} _GameConfigPanel: {fileID: 435937997} _CamerasPanel: {fileID: 1333952427} _Round1Panel: {fileID: 1733351611} @@ -42277,7 +42290,7 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: TEMPORARY_Button_PlayPattyLarcenyJailCallAfrica + m_StringArgument: PlayJailCallAfrica m_BoolArgument: 0 m_CallState: 2 --- !u!114 &1314552401 @@ -60985,7 +60998,8 @@ MonoBehaviour: targetMaterialRenderer: {fileID: 1425303463} targetMaterialProperty: _EmissionMap aspectRatio: 1 - targetAudioSources: [] + targetAudioSources: + - {fileID: 2018849108} maximumResolution: 360 --- !u!114 &1762618935 MonoBehaviour: @@ -61010,7 +61024,9 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1762618936} VideoPool: - - url: https://www.youtube.com/watch?v=lOzb6IoIMDI + - url: https://www.youtube.com/watch?v=tYrZ86POthU + VideoPoolFallback: + - url: https://filehost.battybovine.com/witwics/endings/EndCredits2.mp4 --- !u!114 &1762618936 MonoBehaviour: m_ObjectHideFlags: 2 @@ -65690,6 +65706,7 @@ MonoBehaviour: _Boing: {fileID: 8300000, guid: 760080d45978ef54a9074ef55135cebd, type: 3} _Printer: {fileID: 8300000, guid: 3d202995ebfe8e54ba5b655f501722ff, type: 3} _Thunder: {fileID: 8300000, guid: 2983ffa89947cae4e9ab13f0b4861c0d, type: 3} + _FogHorn: {fileID: 8300000, guid: e85401543a2dade4690ef51e3e8734ad, type: 3} _CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444, type: 3} _CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6, @@ -69000,7 +69017,7 @@ MonoBehaviour: aspectRatio: 3 targetAudioSources: - {fileID: 2018849108} - maximumResolution: 480 + maximumResolution: 360 --- !u!4 &2057791822 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/UdonSharp/AudioManager.asset b/Assets/UdonSharp/AudioManager.asset index 4df858f..83ae07a 100644 --- a/Assets/UdonSharp/AudioManager.asset +++ b/Assets/UdonSharp/AudioManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 55 + Data: 56 - Name: Entry: 7 Data: @@ -1610,13 +1610,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Contessa + Data: _FogHorn - Name: $v Entry: 7 Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Contessa + Data: _FogHorn - Name: k__BackingField Entry: 9 Data: 10 @@ -1640,28 +1640,10 @@ MonoBehaviour: Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - 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 + Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1682,13 +1664,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: $v Entry: 7 - Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -1709,10 +1691,28 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 98|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook Themes + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1736,13 +1736,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: $v Entry: 7 Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -1791,13 +1791,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: $v Entry: 7 Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -1846,13 +1846,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: $v Entry: 7 Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -1901,13 +1901,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: $v Entry: 7 Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -1956,13 +1956,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: $v Entry: 7 Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2011,13 +2011,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: $v Entry: 7 Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2066,13 +2066,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: $v Entry: 7 Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2121,13 +2121,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: $v Entry: 7 Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -2176,13 +2176,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_WonderRat - Name: $v Entry: 7 Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -2207,28 +2207,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 126|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 127|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook In Jail - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 128|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 126|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2249,13 +2231,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_DoubleTrouble + Data: _CrookInJail_Contessa - Name: $v Entry: 7 - Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_DoubleTrouble + Data: _CrookInJail_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -2276,11 +2258,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 130|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 128|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 129|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 130|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook In Jail + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 131|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2304,13 +2304,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_EarthaBrute + Data: _CrookInJail_DoubleTrouble - Name: $v Entry: 7 Data: 132|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_EarthaBrute + Data: _CrookInJail_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2359,13 +2359,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_EarthaBrute - Name: $v Entry: 7 Data: 135|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -2414,13 +2414,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_Kneemoi - Name: $v Entry: 7 Data: 138|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -2469,13 +2469,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_PattyLarceny - Name: $v Entry: 7 Data: 141|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -2524,13 +2524,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_Robocrook - Name: $v Entry: 7 Data: 144|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2579,13 +2579,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_SarahNade - Name: $v Entry: 7 Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2634,13 +2634,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_TopGrunge - Name: $v Entry: 7 Data: 150|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2689,13 +2689,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_VicTheSlick - Name: $v Entry: 7 Data: 153|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -2744,13 +2744,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookInJail_WonderRat - Name: $v Entry: 7 Data: 156|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookInJail_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -2775,28 +2775,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 158|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 159|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook Jail Calls - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 160|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 158|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2817,13 +2799,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Asia + Data: _CrookJailCall_Patty_Africa - Name: $v Entry: 7 - Data: 161|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 159|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 @@ -2844,11 +2826,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 162|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 160|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 161|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 162|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook Jail Calls + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 163|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2872,13 +2872,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Europe + Data: _CrookJailCall_Patty_Asia - Name: $v Entry: 7 Data: 164|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 @@ -2927,13 +2927,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_NorthAmerica + Data: _CrookJailCall_Patty_Europe - Name: $v Entry: 7 Data: 167|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 @@ -2982,13 +2982,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Oceania + Data: _CrookJailCall_Patty_NorthAmerica - Name: $v Entry: 7 Data: 170|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 @@ -3037,13 +3037,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_SouthAmerica + Data: _CrookJailCall_Patty_Oceania - Name: $v Entry: 7 Data: 173|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 @@ -3092,16 +3092,71 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FadeOutMusic + Data: _CrookJailCall_Patty_SouthAmerica - Name: $v Entry: 7 Data: 176|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: 177|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 178|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: 179|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FadeOutMusic - Name: k__BackingField Entry: 7 - Data: 177|System.RuntimeType, mscorlib + Data: 180|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -3110,7 +3165,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 177 + Data: 180 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -3125,7 +3180,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 178|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 181|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 2bbf624..bcd17e6 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -45,7 +45,8 @@ public enum SFXEventType LeverCartoon, Boing, Printer, - Thunder + Thunder, + FogHorn } @@ -91,6 +92,7 @@ public class AudioManager : UdonSharpBehaviour [SerializeField] private AudioClip _Boing = null; [SerializeField] private AudioClip _Printer = null; [SerializeField] private AudioClip _Thunder = null; + [SerializeField] private AudioClip _FogHorn = null; [Space][Header("Crook Themes")] [SerializeField] private AudioClip _CrookTheme_Contessa = null; @@ -257,6 +259,7 @@ public class AudioManager : UdonSharpBehaviour case SFXEventType.Boing: _SFXPlayer.clip = _Boing; break; case SFXEventType.Printer: _SFXPlayer.clip = _Printer; break; case SFXEventType.Thunder: _SFXPlayer.clip = _Thunder; break; + case SFXEventType.FogHorn: _SFXPlayer.clip = _FogHorn; break; default: _SFXPlayer.clip = null; break; } diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.asset b/Assets/UdonSharp/CaseVideoSyncPlayer.asset index 934c1a9..e05992a 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer.asset +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 20 + Data: 21 - Name: Entry: 7 Data: @@ -1215,6 +1215,54 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _UseFallback + - Name: $v + Entry: 7 + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _UseFallback + - Name: k__BackingField + Entry: 9 + Data: 18 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 78|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: 13 Data: diff --git a/Assets/UdonSharp/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/CaseVideoSyncPlayer.cs index f8ebcb8..6cfcbf3 100644 --- a/Assets/UdonSharp/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/CaseVideoSyncPlayer.cs @@ -50,6 +50,8 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour private int _MapDownloadIndex = 0; private bool _MapDownloadsInProgress = false; + private bool _UseFallback = false; + private const int IMAGES_PER_MAP_ATLAS = 6; @@ -193,15 +195,13 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour private void _LoadVideo_Private() { - Debug.LogWarning("[CaseVideoSyncPlayer] Loading video " + VideoIndex + "..."); - TryLoadURL(); } public void TryLoadURL() { if (VideoIndex < _CaseManager.GetVideoCount()) { - _VideoPlayer.LoadURL(_CaseManager.GetVideo(VideoIndex)); + _VideoPlayer.LoadURL(_CaseManager.GetVideo(VideoIndex, _UseFallback)); } else { @@ -212,23 +212,19 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour private void _PlayVideo_Private() { - Debug.LogWarning("[CaseVideoSyncPlayer] Playing video " + VideoIndex + "."); - _VideoPlayer.Play(); } private void _StopVideo_Private() { - Debug.LogWarning("[CaseVideoSyncPlayer] Stopping video " + VideoIndex + "."); - _VideoPlayer.Stop(); - + _UseFallback = false; VideoIndex = -1; } public override void OnVideoReady() { - Debug.LogWarning("[CaseVideoSyncPlayer] Video " + VideoIndex + " is ready."); + Debug.Log("[CaseVideoSyncPlayer] Video is ready."); if (_VideoIsPlaying) { @@ -259,10 +255,23 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour break; } - _VideoPlayer.Stop(); + if (_UseFallback) + { + _StopVideo_Private(); + } + else + { + Debug.Log("[CaseVideoSyncPlayer] Attempting fallback in 5 seconds..."); + SendCustomEventDelayedSeconds(nameof(TryLoadFallbackURL), 5.5f); + } base.OnVideoError(VideoError); } + public void TryLoadFallbackURL() + { + _UseFallback = true; + TryLoadURL(); + } public override void OnVideoStart() { @@ -397,6 +406,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour _VideoIndex = value; if (_VideoIndex >= 0) { + _UseFallback = false; _LoadVideo_Private(); } RequestSerialization(); diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 8782477..dd989aa 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -80,7 +80,10 @@ public class GameManagerBase : UdonSharpBehaviour } - public virtual void InitialiseGameMode() { } + public virtual void InitialiseGameMode() + { + _AllowInteractionFromHostCard = true; + } public virtual void SetOwnershipOfObjects(VRCPlayerApi NewOwner) { } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 8a338a2..bea9542 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -345,15 +345,21 @@ public class GameManagerRound2 : GameManagerBase "RevealPanel", Panel); } - public void TEMPORARY_Button_PlayPattyLarcenyInJail() + public void TEMPORARY_Button_PlayInJailAnimation() { - _JailPlayer.PlayVideo = true; - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayCrookInJail", AccusedCrook.PattyLarceny); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.FogHorn); + SendCustomEventDelayedSeconds(nameof(PlayCrookInJail), 1.5f); } - public void TEMPORARY_Button_PlayPattyLarcenyJailCallAfrica() + public void PlayCrookInJail() { - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", AccusedCrook.PattyLarceny, ContinentMap.Africa); + _JailPlayer.PlayVideo = true; + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayCrookInJail", _CaseManager.GetCrook()); + } + + public void PlayJailCallAfrica() + { + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", _CaseManager.GetCrook(), ContinentMap.Africa); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index b2a28b4..0145983 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -307,11 +307,6 @@ public class GameManagerRound3 : GameManagerBase if (_GameStatus != GameStatus.Win) { - for (int i = 0; i < _Markers.Length; i++) - { - _Markers[i].SendCustomNetworkEvent(NetworkEventTarget.All, "Activated", false); - } - GameStatusUpdate(RanOutOfMarkers ? GameStatus.RanOutOfMarkers : GameStatus.RanOutOfTime); HostCardBetweenRoundsInterface GameLossInterface = diff --git a/Assets/UdonSharp/Maps/FloorMapMarker.cs b/Assets/UdonSharp/Maps/FloorMapMarker.cs index 8a65218..a973778 100644 --- a/Assets/UdonSharp/Maps/FloorMapMarker.cs +++ b/Assets/UdonSharp/Maps/FloorMapMarker.cs @@ -1,5 +1,4 @@  -using MMMaellon.LightSync; using UdonSharp; using UnityEngine; using VRC.SDK3.Components; @@ -129,7 +128,7 @@ public class FloorMapMarker : UdonSharpBehaviour { _RigidBodyComponent.constraints = RigidbodyConstraints.None; - _EnableCollisionChecks = true; + if (Active) _EnableCollisionChecks = true; _NoCollisionCounter = 0; _CollidingLocations.Clear(); } @@ -141,7 +140,7 @@ public class FloorMapMarker : UdonSharpBehaviour transform.eulerAngles = new Vector3(0.0f, transform.eulerAngles.y, 0.0f); } - _RigidBodyComponent.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionZ; + _RigidBodyComponent.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionZ | RigidbodyConstraints.FreezeRotation; _NoCollisionCounter = 0; } @@ -262,9 +261,8 @@ public class FloorMapMarker : UdonSharpBehaviour private void DisableMovementCompletely(Vector3 CorrectLocation = new Vector3()) { - _RigidBodyComponent.constraints = RigidbodyConstraints.FreezeAll; transform.eulerAngles = new Vector3(0.0f, transform.eulerAngles.y, 0.0f); - + if (CorrectLocation != Vector3.zero) { transform.position = CorrectLocation; diff --git a/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset b/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset index 7b4cc27..af79b1e 100644 --- a/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset +++ b/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset @@ -44,7 +44,73 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 18 + Data: 19 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _HostCard + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _HostCard + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: HostCardManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - 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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: @@ -53,13 +119,13 @@ MonoBehaviour: Data: _GameConfigPanel - Name: $v Entry: 7 - Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameConfigPanel - Name: k__BackingField Entry: 7 - Data: 3|System.RuntimeType, mscorlib + Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.GameObject, UnityEngine.CoreModule @@ -68,7 +134,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -83,118 +149,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 - 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: _CamerasPanel - - Name: $v - Entry: 7 - Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CamerasPanel - - Name: k__BackingField - Entry: 9 - Data: 3 - - Name: k__BackingField - Entry: 9 - Data: 3 - - 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: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 8|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: _Round1Panel - - Name: $v - Entry: 7 - Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Round1Panel - - Name: k__BackingField - Entry: 9 - Data: 3 - - Name: k__BackingField - Entry: 9 - Data: 3 - - 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: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -218,19 +185,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Round2Panel + Data: _CamerasPanel - Name: $v Entry: 7 Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Round2Panel + Data: _CamerasPanel - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -272,19 +239,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Round3Panel + Data: _Round1Panel - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Round3Panel + Data: _Round1Panel - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 9 - Data: 3 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -326,16 +293,124 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _GameConfigButtonImage + Data: _Round2Panel - Name: $v Entry: 7 Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Round2Panel + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 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: _Round3Panel + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Round3Panel + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 23|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: _GameConfigButtonImage + - Name: $v + Entry: 7 + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameConfigButtonImage - Name: k__BackingField Entry: 7 - Data: 19|System.RuntimeType, mscorlib + Data: 25|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.UI.Image, UnityEngine.UI @@ -344,7 +419,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 19 + Data: 25 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -359,127 +434,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 21|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 27|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 22|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: _CamerasButtonImage - - Name: $v - Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CamerasButtonImage - - Name: k__BackingField - Entry: 9 - Data: 19 - - 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: 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: _Round1ButtonImage - - Name: $v - Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Round1ButtonImage - - Name: k__BackingField - Entry: 9 - Data: 19 - - 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: true - - Name: _fieldAttributes - Entry: 7 - Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -503,19 +470,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Round2ButtonImage + Data: _CamerasButtonImage - Name: $v Entry: 7 Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Round2ButtonImage + Data: _CamerasButtonImage - Name: k__BackingField Entry: 9 - Data: 19 + Data: 25 - Name: k__BackingField Entry: 9 - Data: 19 + Data: 25 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -557,19 +524,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Round3ButtonImage + Data: _Round1ButtonImage - Name: $v Entry: 7 Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Round3ButtonImage + Data: _Round1ButtonImage - Name: k__BackingField Entry: 9 - Data: 19 + Data: 25 - Name: k__BackingField Entry: 9 - Data: 19 + Data: 25 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -611,16 +578,124 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _GameConfigButtonText + Data: _Round2ButtonImage - Name: $v Entry: 7 Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Round2ButtonImage + - Name: k__BackingField + Entry: 9 + Data: 25 + - Name: k__BackingField + Entry: 9 + Data: 25 + - 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: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 37|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: _Round3ButtonImage + - Name: $v + Entry: 7 + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Round3ButtonImage + - Name: k__BackingField + Entry: 9 + Data: 25 + - Name: k__BackingField + Entry: 9 + Data: 25 + - 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: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 40|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: _GameConfigButtonText + - Name: $v + Entry: 7 + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameConfigButtonText - Name: k__BackingField Entry: 7 - Data: 36|System.RuntimeType, mscorlib + Data: 42|System.RuntimeType, mscorlib - Name: Entry: 1 Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro @@ -629,7 +704,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 36 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -644,127 +719,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 38|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 44|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 39|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: _CamerasButtonText - - Name: $v - Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CamerasButtonText - - Name: k__BackingField - Entry: 9 - Data: 36 - - Name: k__BackingField - Entry: 9 - Data: 36 - - 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: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 42|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: _Round1ButtonText - - Name: $v - Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Round1ButtonText - - Name: k__BackingField - Entry: 9 - Data: 36 - - Name: k__BackingField - Entry: 9 - Data: 36 - - 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: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -788,19 +755,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Round2ButtonText + Data: _CamerasButtonText - Name: $v Entry: 7 Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Round2ButtonText + Data: _CamerasButtonText - Name: k__BackingField Entry: 9 - Data: 36 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 36 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -842,19 +809,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Round3ButtonText + Data: _Round1ButtonText - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Round3ButtonText + Data: _Round1ButtonText - Name: k__BackingField Entry: 9 - Data: 36 + Data: 42 - Name: k__BackingField Entry: 9 - Data: 36 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -896,31 +863,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseManager + Data: _Round2ButtonText - Name: $v Entry: 7 Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseManager + Data: _Round2ButtonText - Name: k__BackingField - Entry: 7 - Data: 53|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CaseManager, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 42 - Name: k__BackingField - Entry: 7 - Data: 54|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.Udon.UdonBehaviour, VRC.Udon - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 42 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -935,19 +890,64 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 56|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 + Data: 54|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: _Round3ButtonText + - Name: $v + Entry: 7 + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Round3ButtonText + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - 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: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 - Name: Entry: 7 Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -971,31 +971,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerPodiums + Data: _CaseManager - Name: $v Entry: 7 Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerPodiums + Data: _CaseManager - Name: k__BackingField Entry: 7 Data: 59|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: PlayerPodium[], Assembly-CSharp + Data: CaseManager, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 60|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1010,10 +1004,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 61|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1037,16 +1040,82 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SelectedTabColour + Data: _PlayerPodiums - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SelectedTabColour + Data: _PlayerPodiums - Name: k__BackingField Entry: 7 Data: 64|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: PlayerPodium[], Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 65|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - 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: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 67|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: _SelectedTabColour + - Name: $v + Entry: 7 + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _SelectedTabColour + - Name: k__BackingField + Entry: 7 + Data: 69|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Color, UnityEngine.CoreModule @@ -1055,7 +1124,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 64 + Data: 69 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1070,7 +1139,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs b/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs index 04c2183..ed2e802 100644 --- a/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs +++ b/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs @@ -10,6 +10,10 @@ using VRC.Udon.Common.Interfaces; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class HostPanelInterface : UdonSharpBehaviour { + [SerializeField] private HostCardManager _HostCard; + + [Space] + [SerializeField] private GameObject _GameConfigPanel; [SerializeField] private GameObject _CamerasPanel; diff --git a/Assets/UdonSharp/RandomVideoPlayer.asset b/Assets/UdonSharp/RandomVideoPlayer.asset index 63bdde3..cbb48b1 100644 --- a/Assets/UdonSharp/RandomVideoPlayer.asset +++ b/Assets/UdonSharp/RandomVideoPlayer.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 4 + Data: 5 - Name: Entry: 7 Data: @@ -104,16 +104,64 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _VideoPlayer + Data: VideoPoolFallback - Name: $v Entry: 7 Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPoolFallback + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 6|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: _VideoPlayer + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayer - Name: k__BackingField Entry: 7 - Data: 6|System.RuntimeType, mscorlib + Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3 @@ -122,7 +170,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 6 + Data: 8 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -137,7 +185,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -161,13 +209,13 @@ MonoBehaviour: Data: _VideoIndex - Name: $v Entry: 7 - Data: 8|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoIndex - Name: k__BackingField Entry: 7 - Data: 9|System.RuntimeType, mscorlib + Data: 11|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -176,7 +224,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 9 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -191,19 +239,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 11|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 13|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 12|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 14|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -227,13 +275,13 @@ MonoBehaviour: Data: _VideoIsPlaying - Name: $v Entry: 7 - Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoIsPlaying - Name: k__BackingField Entry: 7 - Data: 14|System.RuntimeType, mscorlib + Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -242,7 +290,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 14 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -257,19 +305,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 16|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 18|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 17|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 19|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/RandomVideoPlayer.cs b/Assets/UdonSharp/RandomVideoPlayer.cs index 8c027d1..e28f773 100644 --- a/Assets/UdonSharp/RandomVideoPlayer.cs +++ b/Assets/UdonSharp/RandomVideoPlayer.cs @@ -10,6 +10,7 @@ using VRC.Udon; public class RandomVideoPlayer : UdonSharpBehaviour { public VRCUrl[] VideoPool; + public VRCUrl[] VideoPoolFallback; private BaseVRCVideoPlayer _VideoPlayer; @@ -24,7 +25,13 @@ public class RandomVideoPlayer : UdonSharpBehaviour public void LoadRandomVideo() { - VideoIndex = Random.Range(0, VideoPool.Length); + int RandomIndex = -1; + for (int i = 0; i < 3; i++) + { + RandomIndex = Random.Range(0, VideoPool.Length); + if (RandomIndex >= 0 && RandomIndex != VideoIndex) break; + } + VideoIndex = RandomIndex; } private void _PlayVideo_Private() @@ -37,12 +44,12 @@ public class RandomVideoPlayer : UdonSharpBehaviour { transform.position = new Vector3(transform.position.x, 1000.0f, transform.position.z); _VideoPlayer.Stop(); - VideoIndex = -1; } public override void OnVideoEnd() { transform.position = new Vector3(transform.position.x, 1000.0f, transform.position.z); + PlayVideo = false; base.OnVideoEnd(); } diff --git a/Credits And License Requirements.txt b/Credits And License Requirements.txt index 3d161fd..be7dbe7 100644 --- a/Credits And License Requirements.txt +++ b/Credits And License Requirements.txt @@ -2,16 +2,16 @@ - 56k Modem.mp3 by BlueNeon -- https://freesound.org/s/203512/ -- License: Attribution NonCommercial 3.0 - 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 -- Hannah Barbera Sound Effects Library -- - Disc 1 - Boing Cartoon 14-15 -- - Disc 1 - Lever Cartoon 67-01 -- - Disc 3 - Electronic 16-02 -- - Disc 3 - Thunder 93-03 -- Hollywood Edge Super Single Vol. 1 -- - Fog Horn 1 ------------------------------------------------------------------------------- NEED TO PURCHASE: - Futura Now Headline Condensed Bold: -- - https://www.myfonts.com/products/headline-condensed-bold-futura-now-348079 \ No newline at end of file +- - https://www.myfonts.com/products/headline-condensed-bold-futura-now-348079 +- Hannah Barbera Sound Effects Library +- - Disc 1 - Boing Cartoon 14-15 +- - Disc 1 - Lever Cartoon 67-01 +- - Disc 3 - Electronic 16-02 +- - Disc 3 - Thunder 93-03 +- - 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