ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

- Floor map markers have improved physics and weight.

Browse Source 
- Added a delay for re-enabling buttons in Round 2, to prevent sync issues.
- Added a button to play a phone ringing sound after Round 2.
This commit is contained in:
Jamie Greunbaum 2025-08-25 04:54:08 -04:00
parent b5dd078ee1
commit 76b1352bd3
8 changed files with 234 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Assets/Audio/SFX/274436__hockinfinger__stromberg-carlson-1543.wav.meta
View File

@ -9,13 +9,31 @@ AudioImporter:
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
quality: 0.7
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 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: 0
loadInBackground: 1
ambisonic: 0
3D: 1
userData:

4
Assets/Prefabs/Maps/Floor Map Marker.prefab
View File

@ -412,8 +412,8 @@ Rigidbody:
serializedVersion: 4
m_Mass: 1
m_Drag: 0
m_AngularDrag: 1.5
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_AngularDrag: 0.5
m_CenterOfMass: {x: 0, y: -0.1, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:

9
Assets/Scenes/witwics.unity
View File

@ -2082,7 +2082,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: PlayCrookInJail
m_StringArgument: PhoneRing
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_PlayInJailAnimation
m_StringArgument: PlayInJailAnimation
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &106546792
@ -3602,7 +3602,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Play Patty In Jail
m_text: Phone Ring
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2}
m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9,
@ -15909,7 +15909,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Foghorn
m_text: Play In Jail Animation
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2}
m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9,
@ -65653,6 +65653,7 @@ MonoBehaviour:
_Printer: {fileID: 8300000, guid: 3d202995ebfe8e54ba5b655f501722ff, type: 3}
_Thunder: {fileID: 8300000, guid: 2983ffa89947cae4e9ab13f0b4861c0d, type: 3}
_FogHorn: {fileID: 8300000, guid: e85401543a2dade4690ef51e3e8734ad, type: 3}
_PhoneRing: {fileID: 8300000, guid: e204469f7d81f814faa906180db7f455, type: 3}
_CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444,
type: 3}
_CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6,

308
Assets/UdonSharp/AudioManager.asset
View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 56
Data: 57
- Name:
Entry: 7
Data:
@ -1664,13 +1664,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_Contessa
Data: _PhoneRing
- Name: $v
Entry: 7
Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CrookTheme_Contessa
Data: _PhoneRing
- Name: <UserType>k__BackingField
Entry: 9
Data: 10
@ -1694,28 +1694,10 @@ MonoBehaviour:
Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 3
Data: 1
- 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
Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@ -1736,13 +1718,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_DoubleTrouble
Data: _CrookTheme_Contessa
- Name: $v
Entry: 7
Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 98|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
@ -1763,11 +1745,28 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
Data: 3
- Name:
Entry: 7
Data: 100|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 101|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: Crook Themes
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 102|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -1791,13 +1790,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_EarthaBrute
Data: _CrookTheme_DoubleTrouble
- Name: $v
Entry: 7
Data: 103|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
@ -1846,13 +1845,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_Kneemoi
Data: _CrookTheme_EarthaBrute
- Name: $v
Entry: 7
Data: 106|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
@ -1901,13 +1900,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_PattyLarceny
Data: _CrookTheme_Kneemoi
- Name: $v
Entry: 7
Data: 109|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
@ -1956,13 +1955,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_Robocrook
Data: _CrookTheme_PattyLarceny
- Name: $v
Entry: 7
Data: 112|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
@ -2011,13 +2010,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_SarahNade
Data: _CrookTheme_Robocrook
- Name: $v
Entry: 7
Data: 115|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
@ -2066,13 +2065,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_TopGrunge
Data: _CrookTheme_SarahNade
- Name: $v
Entry: 7
Data: 118|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
@ -2121,13 +2120,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_VicTheSlick
Data: _CrookTheme_TopGrunge
- Name: $v
Entry: 7
Data: 121|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
@ -2176,13 +2175,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookTheme_WonderRat
Data: _CrookTheme_VicTheSlick
- Name: $v
Entry: 7
Data: 124|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
@ -2231,13 +2230,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_Contessa
Data: _CrookTheme_WonderRat
- Name: $v
Entry: 7
Data: 127|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
@ -2262,28 +2261,10 @@ MonoBehaviour:
mscorlib
- Name:
Entry: 12
Data: 3
Data: 1
- 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
Data: 129|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@ -2304,13 +2285,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_DoubleTrouble
Data: _CrookInJail_Contessa
- Name: $v
Entry: 7
Data: 132|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 130|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
@ -2331,11 +2312,29 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 133|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 131|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 1
Data: 3
- Name:
Entry: 7
Data: 132|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 133|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: Crook In Jail
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 134|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -2359,13 +2358,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_EarthaBrute
Data: _CrookInJail_DoubleTrouble
- Name: $v
Entry: 7
Data: 135|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
@ -2414,13 +2413,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_Kneemoi
Data: _CrookInJail_EarthaBrute
- Name: $v
Entry: 7
Data: 138|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
@ -2469,13 +2468,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_PattyLarceny
Data: _CrookInJail_Kneemoi
- Name: $v
Entry: 7
Data: 141|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
@ -2524,13 +2523,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_Robocrook
Data: _CrookInJail_PattyLarceny
- Name: $v
Entry: 7
Data: 144|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
@ -2579,13 +2578,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_SarahNade
Data: _CrookInJail_Robocrook
- Name: $v
Entry: 7
Data: 147|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
@ -2634,13 +2633,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_TopGrunge
Data: _CrookInJail_SarahNade
- Name: $v
Entry: 7
Data: 150|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
@ -2689,13 +2688,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_VicTheSlick
Data: _CrookInJail_TopGrunge
- Name: $v
Entry: 7
Data: 153|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
@ -2744,13 +2743,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookInJail_WonderRat
Data: _CrookInJail_VicTheSlick
- Name: $v
Entry: 7
Data: 156|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
@ -2799,13 +2798,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookJailCall_Patty_Africa
Data: _CrookInJail_WonderRat
- Name: $v
Entry: 7
Data: 159|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
@ -2830,28 +2829,10 @@ MonoBehaviour:
mscorlib
- Name:
Entry: 12
Data: 3
Data: 1
- 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
Data: 161|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@ -2872,13 +2853,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookJailCall_Patty_Asia
Data: _CrookJailCall_Patty_Africa
- Name: $v
Entry: 7
Data: 164|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 162|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
@ -2899,11 +2880,29 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 165|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 163|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 1
Data: 3
- Name:
Entry: 7
Data: 164|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 165|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
- Name: header
Entry: 1
Data: Crook Jail Calls
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 166|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -2927,13 +2926,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookJailCall_Patty_Europe
Data: _CrookJailCall_Patty_Asia
- Name: $v
Entry: 7
Data: 167|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
@ -2982,13 +2981,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookJailCall_Patty_NorthAmerica
Data: _CrookJailCall_Patty_Europe
- Name: $v
Entry: 7
Data: 170|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
@ -3037,13 +3036,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookJailCall_Patty_Oceania
Data: _CrookJailCall_Patty_NorthAmerica
- Name: $v
Entry: 7
Data: 173|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
@ -3092,13 +3091,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CrookJailCall_Patty_SouthAmerica
Data: _CrookJailCall_Patty_Oceania
- Name: $v
Entry: 7
Data: 176|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
@ -3147,16 +3146,71 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _FadeOutMusic
Data: _CrookJailCall_Patty_SouthAmerica
- Name: $v
Entry: 7
Data: 179|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: 180|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 181|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: 182|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _FadeOutMusic
- Name: <UserType>k__BackingField
Entry: 7
Data: 180|System.RuntimeType, mscorlib
Data: 183|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean, mscorlib
@ -3165,7 +3219,7 @@ MonoBehaviour:
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 180
Data: 183
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@ -3180,7 +3234,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 181|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 184|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12

5
Assets/UdonSharp/AudioManager.cs
View File

@ -46,7 +46,8 @@ public enum SFXEventType
Boing,
Printer,
Thunder,
FogHorn
FogHorn,
PhoneRing
}
@ -93,6 +94,7 @@ public class AudioManager : UdonSharpBehaviour
[SerializeField] private AudioClip _Printer = null;
[SerializeField] private AudioClip _Thunder = null;
[SerializeField] private AudioClip _FogHorn = null;
[SerializeField] private AudioClip _PhoneRing = null;
[Space][Header("Crook Themes")]
[SerializeField] private AudioClip _CrookTheme_Contessa = null;
@ -262,6 +264,7 @@ public class AudioManager : UdonSharpBehaviour
case SFXEventType.Printer: _SFXPlayer.clip = _Printer; break;
case SFXEventType.Thunder: _SFXPlayer.clip = _Thunder; break;
case SFXEventType.FogHorn: _SFXPlayer.clip = _FogHorn; break;
case SFXEventType.PhoneRing: _SFXPlayer.clip = _PhoneRing; break;
default: _SFXPlayer.clip = null; break;
}

13
Assets/UdonSharp/Game Managers/GameManagerRound2.cs
View File

@ -303,11 +303,17 @@ public class GameManagerRound2 : GameManagerBase
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.SetComment(_Players[_CurrentPlayerCounter % _Players.Length] + ", your turn.", COLOR_STANDARD);
Interface.EnableAllPanelButtons(true);
SendCustomEventDelayedSeconds(nameof(EnableAllPanelButtons), 0.5f);
}
RequestSerialization();
}
public void EnableAllPanelButtons()
{
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.EnableAllPanelButtons(true);
}
public Texture GetCrookPortrait()
@ -386,6 +392,11 @@ public class GameManagerRound2 : GameManagerBase
_JailChain.Show = false;
}
public void PhoneRing()
{
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.PhoneRing);
}
public void PlayJailCallAfrica()
{
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", _CaseManager.GetCrook(), ContinentMap.Africa);

8
Assets/UdonSharp/Maps/FloorMapMarker.cs
View File

@ -134,13 +134,12 @@ public class FloorMapMarker : UdonSharpBehaviour
}
else
{
VRCPlayerApi Owner = Networking.GetOwner(gameObject);
if (!Owner.IsUserInVR())
if (!_CurrentOwner.IsUserInVR())
{
transform.eulerAngles = new Vector3(0.0f, transform.eulerAngles.y, 0.0f);
}
_RigidBodyComponent.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionZ | RigidbodyConstraints.FreezeRotation;
_RigidBodyComponent.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionZ;
_NoCollisionCounter = 0;
}
@ -261,6 +260,7 @@ public class FloorMapMarker : UdonSharpBehaviour
private void DisableMovementCompletely(Vector3 CorrectLocation = new Vector3())
{
_RigidBodyComponent.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionZ | RigidbodyConstraints.FreezeRotation;
transform.eulerAngles = new Vector3(0.0f, transform.eulerAngles.y, 0.0f);
if (CorrectLocation != Vector3.zero)
@ -273,7 +273,7 @@ public class FloorMapMarker : UdonSharpBehaviour
private bool IsUpright()
{
return (Vector3.Dot(transform.up, Vector3.up) >= 0.85f);
return (Vector3.Dot(transform.up, Vector3.up) >= 0.8f);
}

4
ProjectSettings/AudioManager.asset
View File

@ -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