diff --git a/Assets/Audio/Music/Round 2 Win.wav b/Assets/Audio/Music/Round 2 Win.wav new file mode 100644 index 0000000..0848978 Binary files /dev/null and b/Assets/Audio/Music/Round 2 Win.wav differ diff --git a/Assets/Audio/Music/Round 2 Win.wav.meta b/Assets/Audio/Music/Round 2 Win.wav.meta new file mode 100644 index 0000000..cafe952 --- /dev/null +++ b/Assets/Audio/Music/Round 2 Win.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 4622696ae6c719146bb7274d0fbbfc85 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + 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 b1d4ce3..a592f17 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -11548,7 +11548,6 @@ MonoBehaviour: - {fileID: 1662151577} _CommentUI: {fileID: 1394546108} _ButtonColourEnabled: {r: 1, g: 1, b: 1, a: 1} - _ButtonColourDisabled: {r: 0.5, g: 0.5, b: 0.5, a: 1} _ButtonColourLoot: {r: 0, g: 0.78431374, b: 0, a: 1} _ButtonColourWarrant: {r: 0.78431374, g: 0.78431374, b: 0, a: 1} _ButtonColourCrook: {r: 0.78431374, g: 0, b: 0, a: 1} @@ -95779,6 +95778,7 @@ MonoBehaviour: _ThinkAboutIt: {fileID: 8300000, guid: fd2e7d68447011640a244f302d442395, type: 3} _CapitalLoop: {fileID: 8300000, guid: b3309f21d81fe874ea5d6082759667d3, type: 3} _RecoverTheLoot: {fileID: 8300000, guid: 627fefde5bcc34447857f028da272a9a, type: 3} + _YoureWinner: {fileID: 8300000, guid: 4622696ae6c719146bb7274d0fbbfc85, type: 3} _IFeelGood: {fileID: 8300000, guid: 408c94c3132deb04187b5f2ac79f075d, type: 3} _CarmenChaseMusic: {fileID: 8300000, guid: 5f74dca797856b746941aedb98365725, type: 3} _WhereInTheWorld: {fileID: 8300000, guid: e810feeb6c2063747bbb5f735a88bee9, type: 3} diff --git a/Assets/UdonSharp/AudioManager.asset b/Assets/UdonSharp/AudioManager.asset index bf1449b..3b787d5 100644 --- a/Assets/UdonSharp/AudioManager.asset +++ b/Assets/UdonSharp/AudioManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 102 + Data: 103 - Name: Entry: 7 Data: @@ -566,13 +566,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _IFeelGood + Data: _YoureWinner - Name: $v Entry: 7 Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _IFeelGood + Data: _YoureWinner - Name: k__BackingField Entry: 9 Data: 10 @@ -620,13 +620,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenChaseMusic + Data: _IFeelGood - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenChaseMusic + Data: _IFeelGood - Name: k__BackingField Entry: 9 Data: 10 @@ -674,13 +674,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _WhereInTheWorld + Data: _CarmenChaseMusic - Name: $v Entry: 7 Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _WhereInTheWorld + Data: _CarmenChaseMusic - Name: k__BackingField Entry: 9 Data: 10 @@ -728,13 +728,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _RockapellaIdent + Data: _WhereInTheWorld - Name: $v Entry: 7 Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _RockapellaIdent + Data: _WhereInTheWorld - Name: k__BackingField Entry: 9 Data: 10 @@ -782,13 +782,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Ding + Data: _RockapellaIdent - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Ding + Data: _RockapellaIdent - Name: k__BackingField Entry: 9 Data: 10 @@ -812,28 +812,10 @@ MonoBehaviour: Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 47|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 48|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: SFX - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -854,13 +836,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Buzzer + Data: _Ding - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Buzzer + Data: _Ding - Name: k__BackingField Entry: 9 Data: 10 @@ -881,10 +863,28 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 50|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 51|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: SFX + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -908,13 +908,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Round1Correct + Data: _Buzzer - Name: $v Entry: 7 Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Round1Correct + Data: _Buzzer - Name: k__BackingField Entry: 9 Data: 10 @@ -962,13 +962,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Round1Incorrect + Data: _Round1Correct - Name: $v Entry: 7 Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Round1Incorrect + Data: _Round1Correct - Name: k__BackingField Entry: 9 Data: 10 @@ -1016,13 +1016,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ACMECrimenetComputerIdle + Data: _Round1Incorrect - Name: $v Entry: 7 Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ACMECrimenetComputerIdle + Data: _Round1Incorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1070,13 +1070,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _VideoMusicClue + Data: _ACMECrimenetComputerIdle - Name: $v Entry: 7 Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _VideoMusicClue + Data: _ACMECrimenetComputerIdle - Name: k__BackingField Entry: 9 Data: 10 @@ -1124,13 +1124,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FileCabinetOpen + Data: _VideoMusicClue - Name: $v Entry: 7 Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FileCabinetOpen + Data: _VideoMusicClue - Name: k__BackingField Entry: 9 Data: 10 @@ -1178,13 +1178,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FileCabinetClose + Data: _FileCabinetOpen - Name: $v Entry: 7 Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FileCabinetClose + Data: _FileCabinetOpen - Name: k__BackingField Entry: 9 Data: 10 @@ -1232,13 +1232,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ModemOperation + Data: _FileCabinetClose - Name: $v Entry: 7 Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ModemOperation + Data: _FileCabinetClose - Name: k__BackingField Entry: 9 Data: 10 @@ -1286,13 +1286,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheLoot + Data: _ModemOperation - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheLoot + Data: _ModemOperation - Name: k__BackingField Entry: 9 Data: 10 @@ -1340,13 +1340,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheWarrant + Data: _TheLoot - Name: $v Entry: 7 Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheWarrant + Data: _TheLoot - Name: k__BackingField Entry: 9 Data: 10 @@ -1394,13 +1394,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FogHorn + Data: _TheWarrant - Name: $v Entry: 7 Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FogHorn + Data: _TheWarrant - Name: k__BackingField Entry: 9 Data: 10 @@ -1448,13 +1448,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailDoorSlam + Data: _FogHorn - Name: $v Entry: 7 Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailDoorSlam + Data: _FogHorn - Name: k__BackingField Entry: 9 Data: 10 @@ -1502,13 +1502,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapCorrect + Data: _JailDoorSlam - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapCorrect + Data: _JailDoorSlam - Name: k__BackingField Entry: 9 Data: 10 @@ -1556,13 +1556,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapIncorrect + Data: _MapCorrect - Name: $v Entry: 7 Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapIncorrect + Data: _MapCorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1610,13 +1610,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenInJail + Data: _MapIncorrect - Name: $v Entry: 7 Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenInJail + Data: _MapIncorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1664,13 +1664,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenEscape + Data: _CarmenInJail - Name: $v Entry: 7 Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenEscape + Data: _CarmenInJail - Name: k__BackingField Entry: 9 Data: 10 @@ -1718,13 +1718,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LeverCartoon + Data: _CarmenEscape - Name: $v Entry: 7 Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LeverCartoon + Data: _CarmenEscape - Name: k__BackingField Entry: 9 Data: 10 @@ -1772,13 +1772,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Boing + Data: _LeverCartoon - Name: $v Entry: 7 Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Boing + Data: _LeverCartoon - Name: k__BackingField Entry: 9 Data: 10 @@ -1827,13 +1827,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Boing2 + Data: _Boing - Name: $v Entry: 7 Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Boing2 + Data: _Boing - Name: k__BackingField Entry: 9 Data: 10 @@ -1882,13 +1882,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Printer + Data: _Boing2 - Name: $v Entry: 7 Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Printer + Data: _Boing2 - Name: k__BackingField Entry: 9 Data: 10 @@ -1937,13 +1937,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Thunder + Data: _Printer - Name: $v Entry: 7 Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Thunder + Data: _Printer - Name: k__BackingField Entry: 9 Data: 10 @@ -1992,13 +1992,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _DistantFoghorn + Data: _Thunder - Name: $v Entry: 7 Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _DistantFoghorn + Data: _Thunder - Name: k__BackingField Entry: 9 Data: 10 @@ -2047,13 +2047,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LightSwitch + Data: _DistantFoghorn - Name: $v Entry: 7 Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LightSwitch + Data: _DistantFoghorn - Name: k__BackingField Entry: 9 Data: 10 @@ -2102,13 +2102,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PhoneRing + Data: _LightSwitch - Name: $v Entry: 7 Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PhoneRing + Data: _LightSwitch - Name: k__BackingField Entry: 9 Data: 10 @@ -2157,13 +2157,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TimerEnd + Data: _PhoneRing - Name: $v Entry: 7 Data: 122|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TimerEnd + Data: _PhoneRing - Name: k__BackingField Entry: 9 Data: 10 @@ -2212,13 +2212,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Contessa + Data: _TimerEnd - Name: $v Entry: 7 Data: 125|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Contessa + Data: _TimerEnd - Name: k__BackingField Entry: 9 Data: 10 @@ -2243,28 +2243,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 127|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 128|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook Themes - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 129|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 127|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2285,13 +2267,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: $v Entry: 7 - Data: 130|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 128|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_DoubleTrouble + Data: _CrookTheme_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -2312,11 +2294,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 131|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 129|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 130|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 131|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook Themes + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 132|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2340,13 +2340,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: $v Entry: 7 Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_EarthaBrute + Data: _CrookTheme_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2395,13 +2395,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: $v Entry: 7 Data: 136|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -2450,13 +2450,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: $v Entry: 7 Data: 139|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -2505,13 +2505,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: $v Entry: 7 Data: 142|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -2560,13 +2560,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: $v Entry: 7 Data: 145|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2615,13 +2615,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: $v Entry: 7 Data: 148|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2670,13 +2670,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: $v Entry: 7 Data: 151|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2725,13 +2725,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: $v Entry: 7 Data: 154|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -2780,13 +2780,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_WonderRat - Name: $v Entry: 7 Data: 157|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -2811,28 +2811,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 159|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 160|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook In Jail - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 161|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 159|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2853,13 +2835,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_DoubleTrouble + Data: _CrookInJail_Contessa - Name: $v Entry: 7 - Data: 162|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 160|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_DoubleTrouble + Data: _CrookInJail_Contessa - Name: k__BackingField Entry: 9 Data: 10 @@ -2880,11 +2862,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 163|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 161|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 162|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 163|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook In Jail + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 164|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2908,13 +2908,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_EarthaBrute + Data: _CrookInJail_DoubleTrouble - Name: $v Entry: 7 Data: 165|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_EarthaBrute + Data: _CrookInJail_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2963,13 +2963,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_EarthaBrute - Name: $v Entry: 7 Data: 168|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -3018,13 +3018,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_Kneemoi - Name: $v Entry: 7 Data: 171|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -3073,13 +3073,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_PattyLarceny - Name: $v Entry: 7 Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -3128,13 +3128,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_Robocrook - Name: $v Entry: 7 Data: 177|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -3183,13 +3183,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_SarahNade - Name: $v Entry: 7 Data: 180|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -3238,13 +3238,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_TopGrunge - Name: $v Entry: 7 Data: 183|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -3293,13 +3293,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_VicTheSlick - Name: $v Entry: 7 Data: 186|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -3348,13 +3348,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Contessa_Africa + Data: _CrookInJail_WonderRat - Name: $v Entry: 7 Data: 189|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Contessa_Africa + Data: _CrookInJail_WonderRat - Name: k__BackingField Entry: 9 Data: 10 @@ -3379,28 +3379,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 191|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 192|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Crook Jail Calls - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 193|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 191|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3421,13 +3403,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Contessa_Asia + Data: _CrookJailCall_Contessa_Africa - Name: $v Entry: 7 - Data: 194|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 192|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Contessa_Asia + Data: _CrookJailCall_Contessa_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -3448,11 +3430,29 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 195|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 193|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 194|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 195|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook Jail Calls + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 196|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -3476,13 +3476,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Contessa_Europe + Data: _CrookJailCall_Contessa_Asia - Name: $v Entry: 7 Data: 197|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Contessa_Europe + Data: _CrookJailCall_Contessa_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -3531,13 +3531,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Contessa_NorthAmerica + Data: _CrookJailCall_Contessa_Europe - Name: $v Entry: 7 Data: 200|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Contessa_NorthAmerica + Data: _CrookJailCall_Contessa_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -3586,13 +3586,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Contessa_Oceania + Data: _CrookJailCall_Contessa_NorthAmerica - Name: $v Entry: 7 Data: 203|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Contessa_Oceania + Data: _CrookJailCall_Contessa_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -3641,13 +3641,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Contessa_SouthAmerica + Data: _CrookJailCall_Contessa_Oceania - Name: $v Entry: 7 Data: 206|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Contessa_SouthAmerica + Data: _CrookJailCall_Contessa_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -3696,13 +3696,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Africa + Data: _CrookJailCall_Contessa_SouthAmerica - Name: $v Entry: 7 Data: 209|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Africa + Data: _CrookJailCall_Contessa_SouthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -3727,19 +3727,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 211|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 212|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 211|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -3760,13 +3751,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Asia + Data: _CrookJailCall_DoubleTrouble_Africa - Name: $v Entry: 7 - Data: 213|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 212|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Asia + Data: _CrookJailCall_DoubleTrouble_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -3787,11 +3778,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 214|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 213|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 214|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 215|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -3815,13 +3815,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Europe + Data: _CrookJailCall_DoubleTrouble_Asia - Name: $v Entry: 7 Data: 216|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Europe + Data: _CrookJailCall_DoubleTrouble_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -3870,13 +3870,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_NorthAmerica + Data: _CrookJailCall_DoubleTrouble_Europe - Name: $v Entry: 7 Data: 219|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_NorthAmerica + Data: _CrookJailCall_DoubleTrouble_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -3925,13 +3925,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Oceania + Data: _CrookJailCall_DoubleTrouble_NorthAmerica - Name: $v Entry: 7 Data: 222|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Oceania + Data: _CrookJailCall_DoubleTrouble_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -3980,13 +3980,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_SouthAmerica + Data: _CrookJailCall_DoubleTrouble_Oceania - Name: $v Entry: 7 Data: 225|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_SouthAmerica + Data: _CrookJailCall_DoubleTrouble_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -4035,13 +4035,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_Africa + Data: _CrookJailCall_DoubleTrouble_SouthAmerica - Name: $v Entry: 7 Data: 228|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_Africa + Data: _CrookJailCall_DoubleTrouble_SouthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -4066,19 +4066,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 230|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 231|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 230|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4099,13 +4090,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_Asia + Data: _CrookJailCall_Eartha_Africa - Name: $v Entry: 7 - Data: 232|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 231|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_Asia + Data: _CrookJailCall_Eartha_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -4126,11 +4117,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 233|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 232|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 233|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 234|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -4154,13 +4154,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_Europe + Data: _CrookJailCall_Eartha_Asia - Name: $v Entry: 7 Data: 235|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_Europe + Data: _CrookJailCall_Eartha_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -4209,13 +4209,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_NorthAmerica + Data: _CrookJailCall_Eartha_Europe - Name: $v Entry: 7 Data: 238|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_NorthAmerica + Data: _CrookJailCall_Eartha_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -4264,13 +4264,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_Oceania + Data: _CrookJailCall_Eartha_NorthAmerica - Name: $v Entry: 7 Data: 241|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_Oceania + Data: _CrookJailCall_Eartha_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -4319,13 +4319,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_SouthAmerica + Data: _CrookJailCall_Eartha_Oceania - Name: $v Entry: 7 Data: 244|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_SouthAmerica + Data: _CrookJailCall_Eartha_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -4374,13 +4374,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Kneemoi_Africa + Data: _CrookJailCall_Eartha_SouthAmerica - Name: $v Entry: 7 Data: 247|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Kneemoi_Africa + Data: _CrookJailCall_Eartha_SouthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -4405,19 +4405,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 249|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 250|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 249|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4438,13 +4429,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Kneemoi_Asia + Data: _CrookJailCall_Kneemoi_Africa - Name: $v Entry: 7 - Data: 251|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 250|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Kneemoi_Asia + Data: _CrookJailCall_Kneemoi_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -4465,11 +4456,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 252|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 251|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 252|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 253|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -4493,13 +4493,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Kneemoi_Europe + Data: _CrookJailCall_Kneemoi_Asia - Name: $v Entry: 7 Data: 254|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Kneemoi_Europe + Data: _CrookJailCall_Kneemoi_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -4548,13 +4548,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Kneemoi_NorthAmerica + Data: _CrookJailCall_Kneemoi_Europe - Name: $v Entry: 7 Data: 257|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Kneemoi_NorthAmerica + Data: _CrookJailCall_Kneemoi_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -4603,13 +4603,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Kneemoi_Oceania + Data: _CrookJailCall_Kneemoi_NorthAmerica - Name: $v Entry: 7 Data: 260|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Kneemoi_Oceania + Data: _CrookJailCall_Kneemoi_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -4658,13 +4658,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Kneemoi_SouthAmerica + Data: _CrookJailCall_Kneemoi_Oceania - Name: $v Entry: 7 Data: 263|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Kneemoi_SouthAmerica + Data: _CrookJailCall_Kneemoi_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -4713,13 +4713,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookJailCall_Kneemoi_SouthAmerica - Name: $v Entry: 7 Data: 266|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookJailCall_Kneemoi_SouthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -4744,19 +4744,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 268|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 269|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 268|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -4777,13 +4768,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Asia + Data: _CrookJailCall_Patty_Africa - Name: $v Entry: 7 - Data: 270|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 269|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 @@ -4804,11 +4795,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 271|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 270|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 271|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 272|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -4832,13 +4832,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Europe + Data: _CrookJailCall_Patty_Asia - Name: $v Entry: 7 Data: 273|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 @@ -4887,13 +4887,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_NorthAmerica + Data: _CrookJailCall_Patty_Europe - Name: $v Entry: 7 Data: 276|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 @@ -4942,13 +4942,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Oceania + Data: _CrookJailCall_Patty_NorthAmerica - Name: $v Entry: 7 Data: 279|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 @@ -4997,13 +4997,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_SouthAmerica + Data: _CrookJailCall_Patty_Oceania - Name: $v Entry: 7 Data: 282|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 @@ -5052,13 +5052,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Robocrook_Africa + Data: _CrookJailCall_Patty_SouthAmerica - Name: $v Entry: 7 Data: 285|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Robocrook_Africa + Data: _CrookJailCall_Patty_SouthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -5083,19 +5083,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 287|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 288|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 287|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -5116,13 +5107,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Robocrook_Asia + Data: _CrookJailCall_Robocrook_Africa - Name: $v Entry: 7 - Data: 289|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 288|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Robocrook_Asia + Data: _CrookJailCall_Robocrook_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -5143,11 +5134,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 290|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 289|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 290|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 291|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -5171,13 +5171,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Robocrook_Europe + Data: _CrookJailCall_Robocrook_Asia - Name: $v Entry: 7 Data: 292|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Robocrook_Europe + Data: _CrookJailCall_Robocrook_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -5226,13 +5226,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Robocrook_NorthAmerica + Data: _CrookJailCall_Robocrook_Europe - Name: $v Entry: 7 Data: 295|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Robocrook_NorthAmerica + Data: _CrookJailCall_Robocrook_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -5281,13 +5281,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Robocrook_Oceania + Data: _CrookJailCall_Robocrook_NorthAmerica - Name: $v Entry: 7 Data: 298|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Robocrook_Oceania + Data: _CrookJailCall_Robocrook_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -5336,13 +5336,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Robocrook_SouthAmerica + Data: _CrookJailCall_Robocrook_Oceania - Name: $v Entry: 7 Data: 301|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Robocrook_SouthAmerica + Data: _CrookJailCall_Robocrook_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -5391,13 +5391,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_WonderRat_Africa + Data: _CrookJailCall_Robocrook_SouthAmerica - Name: $v Entry: 7 Data: 304|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_WonderRat_Africa + Data: _CrookJailCall_Robocrook_SouthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -5422,19 +5422,10 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 306|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 307|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 306|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -5455,13 +5446,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_WonderRat_Asia + Data: _CrookJailCall_WonderRat_Africa - Name: $v Entry: 7 - Data: 308|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 307|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_WonderRat_Asia + Data: _CrookJailCall_WonderRat_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -5482,11 +5473,20 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 309|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 308|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 309|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 310|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -5510,13 +5510,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_WonderRat_Europe + Data: _CrookJailCall_WonderRat_Asia - Name: $v Entry: 7 Data: 311|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_WonderRat_Europe + Data: _CrookJailCall_WonderRat_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -5565,13 +5565,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_WonderRat_NorthAmerica + Data: _CrookJailCall_WonderRat_Europe - Name: $v Entry: 7 Data: 314|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_WonderRat_NorthAmerica + Data: _CrookJailCall_WonderRat_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -5620,13 +5620,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_WonderRat_Oceania + Data: _CrookJailCall_WonderRat_NorthAmerica - Name: $v Entry: 7 Data: 317|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_WonderRat_Oceania + Data: _CrookJailCall_WonderRat_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -5675,13 +5675,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_WonderRat_SouthAmerica + Data: _CrookJailCall_WonderRat_Oceania - Name: $v Entry: 7 Data: 320|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_WonderRat_SouthAmerica + Data: _CrookJailCall_WonderRat_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -5730,16 +5730,71 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FadeOutMusic + Data: _CrookJailCall_WonderRat_SouthAmerica - Name: $v Entry: 7 Data: 323|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookJailCall_WonderRat_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: 324|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 325|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: 326|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FadeOutMusic - Name: k__BackingField Entry: 7 - Data: 324|System.RuntimeType, mscorlib + Data: 327|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -5748,7 +5803,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 324 + Data: 327 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -5763,7 +5818,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 325|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 328|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 070602d..914dc03 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -17,6 +17,7 @@ public enum MusicEventType CapitalLoop, RecoverTheLoot, + YoureWinner, IFeelGood, CarmenChaseMusic, @@ -76,6 +77,7 @@ public class AudioManager : UdonSharpBehaviour [SerializeField] private AudioClip _CapitalLoop = null; [SerializeField] private AudioClip _RecoverTheLoot = null; + [SerializeField] private AudioClip _YoureWinner = null; [SerializeField] private AudioClip _IFeelGood = null; [SerializeField] private AudioClip _CarmenChaseMusic = null; @@ -268,6 +270,7 @@ public class AudioManager : UdonSharpBehaviour case MusicEventType.CapitalLoop: _MusicPlayer.clip = _CapitalLoop; break; case MusicEventType.RecoverTheLoot: _MusicPlayer.clip = _RecoverTheLoot; break; + case MusicEventType.YoureWinner: _MusicPlayer.clip = _YoureWinner; break; case MusicEventType.IFeelGood: _MusicPlayer.clip = _IFeelGood; break; case MusicEventType.CarmenChaseMusic: _MusicPlayer.clip = _CarmenChaseMusic; break; diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 0fe0a9e..306bc68 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -67,7 +67,7 @@ public class GameManagerRound1 : GameManagerBase _CameraControllerRound1 = (CameraControllerRound1)_CameraController; if (_CameraControllerRound1 == null) { - Debug.LogError("Camera controller is the wrong type. This will cause a crash for sure."); + Debug.LogError("[GameManagerRound1] Camera controller is the wrong type. This will cause a crash for sure."); } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 7878338..402a441 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 26 + Data: 27 - Name: Entry: 7 Data: @@ -1256,16 +1256,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraControllerRound2 + Data: _RoundIsOver - Name: $v Entry: 7 Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _RoundIsOver + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _CameraControllerRound2 + - Name: $v + Entry: 7 + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound2 - Name: k__BackingField Entry: 7 - Data: 83|System.RuntimeType, mscorlib + Data: 86|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound2, Assembly-CSharp @@ -1289,7 +1343,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1313,7 +1367,7 @@ MonoBehaviour: Data: _PanelToReveal_Cache - Name: $v Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PanelToReveal_Cache @@ -1335,60 +1389,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 86|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: COLOR_STANDARD - - Name: $v - Entry: 7 - Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_STANDARD - - Name: k__BackingField - Entry: 7 - Data: 88|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 88 - - 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: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1412,19 +1412,73 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: $v Entry: 7 Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_STANDARD + - Name: k__BackingField + Entry: 7 + Data: 91|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 91 + - 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: 92|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: COLOR_RED + - Name: $v + Entry: 7 + Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 88 + Data: 91 - Name: k__BackingField Entry: 9 - Data: 88 + Data: 91 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1439,7 +1493,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1463,16 +1517,16 @@ MonoBehaviour: Data: COLOR_YELLOW - Name: $v Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_YELLOW - Name: k__BackingField Entry: 9 - Data: 88 + Data: 91 - Name: k__BackingField Entry: 9 - Data: 88 + Data: 91 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1487,7 +1541,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1511,16 +1565,16 @@ MonoBehaviour: Data: COLOR_GREEN - Name: $v Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_GREEN - Name: k__BackingField Entry: 9 - Data: 88 + Data: 91 - Name: k__BackingField Entry: 9 - Data: 88 + Data: 91 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1535,7 +1589,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 39ae2d9..bfd746c 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -36,6 +36,7 @@ public class GameManagerRound2 : GameManagerBase [UdonSynced] private int _StageIndex = 0; [UdonSynced] private int _CurrentPlayerCounter = 0; [UdonSynced] private string[] _Players = new string[2]; + [UdonSynced] private bool _RoundIsOver = false; private CameraControllerRound2 _CameraControllerRound2 = null; @@ -52,7 +53,7 @@ public class GameManagerRound2 : GameManagerBase _CameraControllerRound2 = (CameraControllerRound2)_CameraController; if (_CameraControllerRound2 == null) { - Debug.LogError("Camera controller is the wrong type. This will cause a crash for sure."); + Debug.LogError("[GameManagerRound2] Camera controller is the wrong type. This will cause a crash for sure."); } } @@ -188,6 +189,7 @@ public class GameManagerRound2 : GameManagerBase private void BeginRound() { _CurrentPlayerCounter = 0; + _RoundIsOver = false; _Players = _CaseManager.GetCurrentWinningPlayers(); if (_Players == null || _Players.Length != 2) @@ -203,7 +205,7 @@ public class GameManagerRound2 : GameManagerBase RecoverTheLootInterface.SetLootButton(_LocationBoard.LootLocation); RecoverTheLootInterface.SetWarrantButton(_LocationBoard.WarrantLocation); RecoverTheLootInterface.SetCrookButton(_LocationBoard.CrookLocation); - RecoverTheLootInterface.EnableAllPanelButtons(true); + RecoverTheLootInterface.ActivateAllPanelButtons(true, true); for (int i = 0; i < _Landmarks.Length; i++) { @@ -268,7 +270,7 @@ public class GameManagerRound2 : GameManagerBase (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment("Nothing there.", COLOR_STANDARD); - Interface.EnableAllPanelButtons(false); + Interface.ActivateAllPanelButtons(false); } public void AlreadyTried() @@ -277,7 +279,7 @@ public class GameManagerRound2 : GameManagerBase (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment("Already tried that one.", COLOR_STANDARD); - Interface.EnableAllPanelButtons(false); + Interface.ActivateAllPanelButtons(false); } public void NiceStrategy() @@ -286,13 +288,14 @@ public class GameManagerRound2 : GameManagerBase (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment("Nice strategy.", COLOR_GREEN); - Interface.EnableAllPanelButtons(false); + Interface.ActivateAllPanelButtons(false); } // This is for when a player wins the game. This should disable all inputs, // and should also enable victory animations. public void YoureWinner() { + _RoundIsOver = true; int WinningPlayerNumber = _CurrentPlayerCounter % _Players.Length; string[] Winner = new string[1]; Winner[0] = _Players[WinningPlayerNumber]; @@ -302,11 +305,13 @@ public class GameManagerRound2 : GameManagerBase (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment("Winner! Congratulations, " + Winner[0], COLOR_RED); - Interface.EnableAllPanelButtons(false); + Interface.ActivateAllPanelButtons(false); _CameraControllerRound2.ActivateLocationBoardAndWinningPlayerCameraSwitcher(); _CameraControllerRound2.ActivateHostWinnerCameraTrigger(); + AdvanceRound(); + SendCustomEventDelayedSeconds(nameof(YoureWinnerDelayedFunctions), 1.0f); } public void YoureWinnerDelayedFunctions() @@ -314,7 +319,11 @@ public class GameManagerRound2 : GameManagerBase _PlayerConfettiCannons[_CurrentPlayerCounter % _Players.Length].Play(); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "StopMusic"); - AdvanceRound(); + SendCustomEventDelayedSeconds(nameof(YoureWinnerDelayedFunctions2), 1.0f); + } + public void YoureWinnerDelayedFunctions2() + { + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.YoureWinner); } @@ -375,18 +384,53 @@ public class GameManagerRound2 : GameManagerBase HostCardRecoverTheLootInterface Interface = (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment(_Players[_CurrentPlayerCounter % _Players.Length] + ", your turn.", COLOR_STANDARD); - SendCustomEventDelayedSeconds(nameof(EnableAllPanelButtons), 0.5f); + SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtons_DelayFunction), 0.5f); } RequestSerialization(); } - public void EnableAllPanelButtons() - { - HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); - Interface.EnableAllPanelButtons(true); - SwitchToCurrentPlayerAndLocationBoardSwitcher(); + public void ActivateAllPanelButtons_DelayFunction() + { + if (!_RoundIsOver) + { + HostCardRecoverTheLootInterface Interface = + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); + Interface.ActivateAllPanelButtons(true, true); + + SwitchToCurrentPlayerAndLocationBoardSwitcher(); + } + } + + + public void FoundTheLoot() + { + _AudioManager.PlaySFX(SFXEventType.TheLoot); + SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtonsExceptTargets_DelayFunction), 1.5f); + } + + public void FoundTheWarrant() + { + _AudioManager.PlaySFX(SFXEventType.TheWarrant); + SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtonsExceptTargets_DelayFunction), 1.5f); + } + + public void FoundTheCrook() + { + _AudioManager.PlayCrookTheme(_CaseManager.GetCrook()); + SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtonsExceptTargets_DelayFunction), 1.5f); + } + + public void ActivateAllPanelButtonsExceptTargets_DelayFunction() + { + if (!_RoundIsOver) + { + HostCardRecoverTheLootInterface Interface = + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); + Interface.ActivateAllPanelButtons(true); + + SwitchToCurrentPlayerAndLocationBoardSwitcher(); + } } @@ -396,22 +440,6 @@ public class GameManagerRound2 : GameManagerBase } - public void PlayTheLoot() - { - _AudioManager.PlaySFX(SFXEventType.TheLoot); - } - - public void PlayTheWarrant() - { - _AudioManager.PlaySFX(SFXEventType.TheWarrant); - } - - public void PlayTheCrookTheme() - { - _AudioManager.PlayCrookTheme(_CaseManager.GetCrook()); - } - - protected override HostCardInterfaceBase GetHostCardInterface(RoundSegmentType Question) { return _HostCard.EnableHostCardDisplay(RoundType.RecoverTheLoot, Question); @@ -446,8 +474,9 @@ public class GameManagerRound2 : GameManagerBase return; } - ((HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot)) - .DisablePanelButton(Panel); + HostCardRecoverTheLootInterface Interface = (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); + Interface.ActivateAllPanelButtons(false); + Interface.DisablePanelButton(Panel); _PanelToReveal_Cache = Panel; diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index e5be590..fda9fb8 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -66,7 +66,7 @@ public class GameManagerRound3 : GameManagerBase _CameraControllerRound3 = (CameraControllerRound3)_CameraController; if (_CameraControllerRound3 == null) { - Debug.LogError("Camera controller is the wrong type. This will cause a crash for sure."); + Debug.LogError("[GameManagerRound3] Camera controller is the wrong type. This will cause a crash for sure."); } } diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs index c659893..21e3cff 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs @@ -1,10 +1,10 @@  +using TMPro; using UdonSharp; using UnityEngine; -using VRC.SDKBase; using VRC.SDK3.Components; +using VRC.SDKBase; using VRC.Udon.Common; -using TMPro; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -84,6 +84,27 @@ public class HostCardManager : UdonSharpBehaviour base.InputJump(Value, Args); } + public override void InputLookVertical(float Value, UdonInputEventArgs Args) + { + if (Networking.LocalPlayer.IsUserInVR() && _IsBeingHeld) + { + _ChangeFontSize_VR((int)Value, Args); + } + + base.InputLookVertical(Value, Args); + } + private void _ChangeFontSize_VR(int Direction, UdonInputEventArgs Args) + { + if (Direction > 0) + { + // Increase host card font sizes here later + } + else if (Direction < 0) + { + // Decrease host card font sizes here later + } + } + public override void OnPickupUseDown() { diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset index 63ad8b5..c6aacd7 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.asset @@ -383,13 +383,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ButtonColourDisabled + Data: _ButtonColourLoot - Name: $v Entry: 7 Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ButtonColourDisabled + Data: _ButtonColourLoot - Name: k__BackingField Entry: 9 Data: 18 @@ -411,60 +411,12 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 22|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: _ButtonColourLoot - - Name: $v - Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _ButtonColourLoot - - 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: 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.SpaceAttribute, UnityEngine.CoreModule + Data: 23|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -491,7 +443,7 @@ MonoBehaviour: Data: _ButtonColourWarrant - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ButtonColourWarrant @@ -513,6 +465,54 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 25|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: _ButtonColourCrook + - Name: $v + Entry: 7 + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ButtonColourCrook + - 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: true - Name: _fieldAttributes Entry: 7 Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -536,19 +536,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ButtonColourCrook + Data: _LootButton - Name: $v Entry: 7 Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ButtonColourCrook + Data: _LootButton - Name: k__BackingField - Entry: 9 - Data: 18 + Entry: 7 + Data: 29|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 18 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -560,10 +566,10 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -584,25 +590,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LootButton + Data: _WarrantButton - Name: $v Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LootButton + Data: _WarrantButton - Name: k__BackingField - Entry: 7 - Data: 31|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 29 - Name: k__BackingField Entry: 9 - Data: 31 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -638,19 +638,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _WarrantButton + Data: _CrookButton - Name: $v Entry: 7 Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _WarrantButton + Data: _CrookButton - Name: k__BackingField Entry: 9 - Data: 31 + Data: 29 - Name: k__BackingField Entry: 9 - Data: 31 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -686,19 +686,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookButton + Data: _DisabledButtons - Name: $v Entry: 7 Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookButton + Data: _DisabledButtons - Name: k__BackingField - Entry: 9 - Data: 31 + Entry: 7 + Data: 36|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean[], mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 31 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -713,7 +719,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs index b4ca596..c974742 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardRecoverTheLootInterface.cs @@ -1,10 +1,8 @@  +using System; using TMPro; -using UnityEngine.UI; using UdonSharp; using UnityEngine; -using VRC.SDKBase; -using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -13,7 +11,6 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase [SerializeField] private TextMeshProUGUI _CommentUI; [Space] public Color _ButtonColourEnabled = Color.white; - public Color _ButtonColourDisabled = Color.gray; [Space] public Color _ButtonColourLoot = new Color(0.0f, 1.0f, 1.0f); public Color _ButtonColourWarrant = new Color(1.0f, 1.0f, 0.0f); @@ -23,6 +20,8 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase private int _WarrantButton = -1; private int _CrookButton = -1; + private bool[] _DisabledButtons; + public void SetComment(string Comment, Color CommentColour) { @@ -37,21 +36,28 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase public void DisablePanelButton(int Panel) { - ChoiceButtons[Panel - 1].enabled = false; - ChoiceButtonImages[Panel - 1].color = _ButtonColourDisabled; + int PanelIndex = Panel - 1; + + ChoiceButtons[PanelIndex].enabled = false; + _DisabledButtons[PanelIndex] = true; + _SetActiveButtonColour(PanelIndex, _DisabledButtons[PanelIndex]); } - public void EnableAllPanelButtons(bool Enable) + public void ActivateAllPanelButtons(bool Activate, bool ResetAllDisabledButtons = false) { - for (int i = 0; i < ChoiceButtons.Length; i++) + if (ResetAllDisabledButtons) { - ChoiceButtons[i].enabled = Enable; - ChoiceButtonImages[i].color = Enable ? _ButtonColourEnabled : _ButtonColourDisabled; + _DisabledButtons = new bool[ChoiceButtons.Length]; } - if (_LootButton >= 0) ChoiceButtonImages[_LootButton].color = _ButtonColourLoot; - if (_WarrantButton >= 0) ChoiceButtonImages[_WarrantButton].color = _ButtonColourWarrant; - if (_CrookButton >= 0) ChoiceButtonImages[_CrookButton].color = _ButtonColourCrook; + for (int i = 0; i < ChoiceButtons.Length; i++) + { + ChoiceButtons[i].enabled = !_DisabledButtons[i]; + if (Activate) + _SetActiveButtonColour(i, _DisabledButtons[i]); + else + _SetActiveButtonColour(i, true); + } } @@ -69,4 +75,17 @@ public class HostCardRecoverTheLootInterface : HostCardInterfaceBase { _CrookButton = (Index - 1) % ChoiceButtons.Length; } + + + private void _SetActiveButtonColour(int ButtonIndex, bool Disabled) + { + if (ButtonIndex == _LootButton) + ChoiceButtonImages[ButtonIndex].color = _ButtonColourLoot * (Disabled ? 0.5f : 1.0f); + else if (ButtonIndex == _WarrantButton) + ChoiceButtonImages[ButtonIndex].color = _ButtonColourWarrant * (Disabled ? 0.5f : 1.0f); + else if (ButtonIndex == _CrookButton) + ChoiceButtonImages[ButtonIndex].color = _ButtonColourCrook * (Disabled ? 0.5f : 1.0f); + else + ChoiceButtonImages[ButtonIndex].color = _ButtonColourEnabled * (Disabled ? 0.5f : 1.0f); + } } diff --git a/Assets/UdonSharp/Location Board/LocationBoard.cs b/Assets/UdonSharp/Location Board/LocationBoard.cs index 3c040b1..c9b1647 100644 --- a/Assets/UdonSharp/Location Board/LocationBoard.cs +++ b/Assets/UdonSharp/Location Board/LocationBoard.cs @@ -234,15 +234,15 @@ public class LocationBoard : UdonSharpBehaviour if (RevealedPanel == LootLocation) { - _GameManager.SendCustomEventDelayedSeconds("PlayTheLoot", 0.35f); + _GameManager.SendCustomEventDelayedSeconds("FoundTheLoot", 0.35f); } else if (RevealedPanel == WarrantLocation) { - _GameManager.SendCustomEventDelayedSeconds("PlayTheWarrant", 0.35f); + _GameManager.SendCustomEventDelayedSeconds("FoundTheWarrant", 0.35f); } else if (RevealedPanel == CrookLocation) { - _GameManager.SendCustomEventDelayedSeconds("PlayTheCrookTheme", 0.35f); + _GameManager.SendCustomEventDelayedSeconds("FoundTheCrook", 0.35f); } if (_OrderIsCorrect[0] && _OrderIsCorrect[1] && _OrderIsCorrect[2]) diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Raw Files/Music/Round 2 Win.aup3 b/Raw Files/Music/Round 2 Win.aup3 new file mode 100644 index 0000000..a923807 Binary files /dev/null and b/Raw Files/Music/Round 2 Win.aup3 differ