- Foghorn and Crook In Jail animations implemented
- GameManager initialisation now also enables interactions no matter what - Markers are no longer unnecessarily deactivated at the end of a round - Markers have better physics when dropped and disabled - Attempted to add fallback support to video players
This commit is contained in:
parent
20c481001f
commit
1f921988ef
BIN
Assets/Audio/SFX/HornFog HB05_52_05.wav
Normal file
BIN
Assets/Audio/SFX/HornFog HB05_52_05.wav
Normal file
Binary file not shown.
41
Assets/Audio/SFX/HornFog HB05_52_05.wav.meta
Normal file
41
Assets/Audio/SFX/HornFog HB05_52_05.wav.meta
Normal file
@ -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:
|
||||
BIN
Assets/Audio/SFX/Jail Metal Door - Berlin Atmospheres 0307.wav
Normal file
BIN
Assets/Audio/SFX/Jail Metal Door - Berlin Atmospheres 0307.wav
Normal file
Binary file not shown.
@ -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:
|
||||
@ -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
|
||||
|
||||
@ -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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_Contessa
|
||||
Data: _FogHorn
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_DoubleTrouble
|
||||
Data: _CrookTheme_Contessa
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_EarthaBrute
|
||||
Data: _CrookTheme_DoubleTrouble
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_Kneemoi
|
||||
Data: _CrookTheme_EarthaBrute
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_PattyLarceny
|
||||
Data: _CrookTheme_Kneemoi
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_Robocrook
|
||||
Data: _CrookTheme_PattyLarceny
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_SarahNade
|
||||
Data: _CrookTheme_Robocrook
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_TopGrunge
|
||||
Data: _CrookTheme_SarahNade
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_VicTheSlick
|
||||
Data: _CrookTheme_TopGrunge
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookTheme_WonderRat
|
||||
Data: _CrookTheme_VicTheSlick
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_Contessa
|
||||
Data: _CrookTheme_WonderRat
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_DoubleTrouble
|
||||
Data: _CrookInJail_Contessa
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_EarthaBrute
|
||||
Data: _CrookInJail_DoubleTrouble
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_Kneemoi
|
||||
Data: _CrookInJail_EarthaBrute
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_PattyLarceny
|
||||
Data: _CrookInJail_Kneemoi
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_Robocrook
|
||||
Data: _CrookInJail_PattyLarceny
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_SarahNade
|
||||
Data: _CrookInJail_Robocrook
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_TopGrunge
|
||||
Data: _CrookInJail_SarahNade
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_VicTheSlick
|
||||
Data: _CrookInJail_TopGrunge
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookInJail_WonderRat
|
||||
Data: _CrookInJail_VicTheSlick
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookJailCall_Patty_Africa
|
||||
Data: _CrookInJail_WonderRat
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookJailCall_Patty_Asia
|
||||
Data: _CrookJailCall_Patty_Africa
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookJailCall_Patty_Europe
|
||||
Data: _CrookJailCall_Patty_Asia
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookJailCall_Patty_NorthAmerica
|
||||
Data: _CrookJailCall_Patty_Europe
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookJailCall_Patty_Oceania
|
||||
Data: _CrookJailCall_Patty_NorthAmerica
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookJailCall_Patty_SouthAmerica
|
||||
Data: _CrookJailCall_Patty_Oceania
|
||||
- Name: <UserType>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CrookJailCall_Patty_SouthAmerica
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 10
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 10
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _FadeOutMusic
|
||||
- Name: <UserType>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: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 177
|
||||
Data: 180
|
||||
- Name: <SyncMode>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
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _UseFallback
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 18
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 18
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>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:
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -80,7 +80,10 @@ public class GameManagerBase : UdonSharpBehaviour
|
||||
}
|
||||
|
||||
|
||||
public virtual void InitialiseGameMode() { }
|
||||
public virtual void InitialiseGameMode()
|
||||
{
|
||||
_AllowInteractionFromHostCard = true;
|
||||
}
|
||||
|
||||
public virtual void SetOwnershipOfObjects(VRCPlayerApi NewOwner) { }
|
||||
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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 =
|
||||
|
||||
@ -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,7 +261,6 @@ 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)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -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;
|
||||
|
||||
|
||||
@ -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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoPoolFallback
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 3
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 3
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
- Name:
|
||||
Entry: 6
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <IsSerialized>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _VideoPlayer
|
||||
- Name: <UserType>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: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 6
|
||||
Data: 8
|
||||
- Name: <SyncMode>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _VideoIndex
|
||||
- Name: <UserType>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: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 9
|
||||
Data: 11
|
||||
- Name: <SyncMode>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: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _VideoIsPlaying
|
||||
- Name: <UserType>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: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 14
|
||||
Data: 16
|
||||
- Name: <SyncMode>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:
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
- 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
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user