diff --git a/Assets/Audio/SFX/Buzzer.wav b/Assets/Audio/SFX/Buzzer.wav index 2938eaa..91caac3 100644 Binary files a/Assets/Audio/SFX/Buzzer.wav and b/Assets/Audio/SFX/Buzzer.wav differ diff --git a/Assets/Audio/SFX/Case Location Bell.wav b/Assets/Audio/SFX/Case Location Bell.wav index f44c3b9..8b4d877 100644 Binary files a/Assets/Audio/SFX/Case Location Bell.wav and b/Assets/Audio/SFX/Case Location Bell.wav differ diff --git a/Assets/Audio/SFX/Case Location Bell.wav.meta b/Assets/Audio/SFX/Case Location Bell.wav.meta index eacd366..7733232 100644 --- a/Assets/Audio/SFX/Case Location Bell.wav.meta +++ b/Assets/Audio/SFX/Case Location Bell.wav.meta @@ -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: diff --git a/Assets/Audio/SFX/Crook Intros.meta b/Assets/Audio/SFX/Crook Intros.meta new file mode 100644 index 0000000..ab1a97e --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73c4deadf138fd44eb9dabb76543dc11 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Contessa.wav b/Assets/Audio/SFX/Crook Intros/Contessa.wav new file mode 100644 index 0000000..d5fe952 Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Contessa.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Contessa.wav.meta b/Assets/Audio/SFX/Crook Intros/Contessa.wav.meta new file mode 100644 index 0000000..21cfcbb --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Contessa.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 82bb08241eeb0cf40a74d97c1e51b444 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Double Trouble.wav b/Assets/Audio/SFX/Crook Intros/Double Trouble.wav new file mode 100644 index 0000000..6864062 Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Double Trouble.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Double Trouble.wav.meta b/Assets/Audio/SFX/Crook Intros/Double Trouble.wav.meta new file mode 100644 index 0000000..266d9af --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Double Trouble.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: e97b7d3dc5f0bfe46a77d46398bb2bb6 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Eartha Brute.wav b/Assets/Audio/SFX/Crook Intros/Eartha Brute.wav new file mode 100644 index 0000000..a0bf8b3 Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Eartha Brute.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Eartha Brute.wav.meta b/Assets/Audio/SFX/Crook Intros/Eartha Brute.wav.meta new file mode 100644 index 0000000..3c1bbf6 --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Eartha Brute.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 2ed10c3cbd515354b86a997d7654ce49 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Kneemoi.wav b/Assets/Audio/SFX/Crook Intros/Kneemoi.wav new file mode 100644 index 0000000..ecb657b Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Kneemoi.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Kneemoi.wav.meta b/Assets/Audio/SFX/Crook Intros/Kneemoi.wav.meta new file mode 100644 index 0000000..58ea101 --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Kneemoi.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: ee78237f71841974c973a33954ec3819 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Patty Larceny.wav b/Assets/Audio/SFX/Crook Intros/Patty Larceny.wav new file mode 100644 index 0000000..d50afe5 Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Patty Larceny.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Patty Larceny.wav.meta b/Assets/Audio/SFX/Crook Intros/Patty Larceny.wav.meta new file mode 100644 index 0000000..0b1d8ec --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Patty Larceny.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 75e384f56f6a8de4faf886c5dfe8d0c5 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Robocrook.wav b/Assets/Audio/SFX/Crook Intros/Robocrook.wav new file mode 100644 index 0000000..48507d4 Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Robocrook.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Robocrook.wav.meta b/Assets/Audio/SFX/Crook Intros/Robocrook.wav.meta new file mode 100644 index 0000000..61674fa --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Robocrook.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 8c2ee995f8b83374d83d5ec61dfcea9a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Sarah Nade.wav b/Assets/Audio/SFX/Crook Intros/Sarah Nade.wav new file mode 100644 index 0000000..243bd3f Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Sarah Nade.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Sarah Nade.wav.meta b/Assets/Audio/SFX/Crook Intros/Sarah Nade.wav.meta new file mode 100644 index 0000000..fbb3026 --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Sarah Nade.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 69e69d1ae868b934db2b5d30d3b84f09 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Vic The Slick.wav b/Assets/Audio/SFX/Crook Intros/Vic The Slick.wav new file mode 100644 index 0000000..53fb0fa Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Vic The Slick.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Vic The Slick.wav.meta b/Assets/Audio/SFX/Crook Intros/Vic The Slick.wav.meta new file mode 100644 index 0000000..0d057f7 --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Vic The Slick.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 8dfe401af9ae14b499ce373ae6e54ffb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Crook Intros/Wonder Rat.wav b/Assets/Audio/SFX/Crook Intros/Wonder Rat.wav new file mode 100644 index 0000000..bca726a Binary files /dev/null and b/Assets/Audio/SFX/Crook Intros/Wonder Rat.wav differ diff --git a/Assets/Audio/SFX/Crook Intros/Wonder Rat.wav.meta b/Assets/Audio/SFX/Crook Intros/Wonder Rat.wav.meta new file mode 100644 index 0000000..8bca30d --- /dev/null +++ b/Assets/Audio/SFX/Crook Intros/Wonder Rat.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 88115708cf0379b41b99e1009e45aa01 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Rockapella Ident 2.wav.meta b/Assets/Audio/SFX/Rockapella Ident 2.wav.meta index a9eafb7..0996134 100644 --- a/Assets/Audio/SFX/Rockapella Ident 2.wav.meta +++ b/Assets/Audio/SFX/Rockapella Ident 2.wav.meta @@ -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: diff --git a/Assets/Audio/SFX/The Loot.wav.meta b/Assets/Audio/SFX/The Loot.wav.meta index b61b61b..51b3c59 100644 --- a/Assets/Audio/SFX/The Loot.wav.meta +++ b/Assets/Audio/SFX/The Loot.wav.meta @@ -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: diff --git a/Assets/Audio/SFX/The Warrant.wav b/Assets/Audio/SFX/The Warrant.wav new file mode 100644 index 0000000..edc6e0d Binary files /dev/null and b/Assets/Audio/SFX/The Warrant.wav differ diff --git a/Assets/Audio/SFX/The Warrant.wav.meta b/Assets/Audio/SFX/The Warrant.wav.meta new file mode 100644 index 0000000..df677a8 --- /dev/null +++ b/Assets/Audio/SFX/The Warrant.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 54b6be0d7456ff84faff67734e63f713 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + forceToMono: 1 + normalize: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Effects.meta b/Assets/Materials/Effects.meta new file mode 100644 index 0000000..4ffdc9e --- /dev/null +++ b/Assets/Materials/Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d790db0d35ff51478b6ece10fb082d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_BuzzedInPodiumOutline.mat b/Assets/Materials/Effects/M_BuzzedInPodiumOutline.mat similarity index 100% rename from Assets/Materials/M_BuzzedInPodiumOutline.mat rename to Assets/Materials/Effects/M_BuzzedInPodiumOutline.mat diff --git a/Assets/Materials/M_BuzzedInPodiumOutline.mat.meta b/Assets/Materials/Effects/M_BuzzedInPodiumOutline.mat.meta similarity index 100% rename from Assets/Materials/M_BuzzedInPodiumOutline.mat.meta rename to Assets/Materials/Effects/M_BuzzedInPodiumOutline.mat.meta diff --git a/Assets/Materials/M_RenderSphereOutline.mat b/Assets/Materials/Effects/M_RenderSphereOutline.mat similarity index 100% rename from Assets/Materials/M_RenderSphereOutline.mat rename to Assets/Materials/Effects/M_RenderSphereOutline.mat diff --git a/Assets/Materials/M_RenderSphereOutline.mat.meta b/Assets/Materials/Effects/M_RenderSphereOutline.mat.meta similarity index 100% rename from Assets/Materials/M_RenderSphereOutline.mat.meta rename to Assets/Materials/Effects/M_RenderSphereOutline.mat.meta diff --git a/Assets/Materials/Paint.meta b/Assets/Materials/Paint.meta new file mode 100644 index 0000000..9eb22b9 --- /dev/null +++ b/Assets/Materials/Paint.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75358c804bbdbd24a9e25e4b2629b52d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_LocationBoardFrontFace.mat b/Assets/Materials/Paint/M_CoolGreyPaint.mat similarity index 98% rename from Assets/Materials/M_LocationBoardFrontFace.mat rename to Assets/Materials/Paint/M_CoolGreyPaint.mat index 3265b6a..aa02595 100644 --- a/Assets/Materials/M_LocationBoardFrontFace.mat +++ b/Assets/Materials/Paint/M_CoolGreyPaint.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_LocationBoardFrontFace + m_Name: M_CoolGreyPaint m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/M_LocationBoardFrontFace.mat.meta b/Assets/Materials/Paint/M_CoolGreyPaint.mat.meta similarity index 100% rename from Assets/Materials/M_LocationBoardFrontFace.mat.meta rename to Assets/Materials/Paint/M_CoolGreyPaint.mat.meta diff --git a/Assets/Materials/M_Podium.mat b/Assets/Materials/Paint/M_GreenPaint.mat similarity index 96% rename from Assets/Materials/M_Podium.mat rename to Assets/Materials/Paint/M_GreenPaint.mat index 59b5c4f..8ebf7b4 100644 --- a/Assets/Materials/M_Podium.mat +++ b/Assets/Materials/Paint/M_GreenPaint.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_Podium + m_Name: M_GreenPaint m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -85,6 +85,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 1, b: 0.38039207, a: 1} + - _Color: {r: 0.4509804, g: 0.78431374, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/M_Podium.mat.meta b/Assets/Materials/Paint/M_GreenPaint.mat.meta similarity index 100% rename from Assets/Materials/M_Podium.mat.meta rename to Assets/Materials/Paint/M_GreenPaint.mat.meta diff --git a/Assets/Materials/M_LocationBoardPanel.mat b/Assets/Materials/Paint/M_YellowPaint.mat similarity index 96% rename from Assets/Materials/M_LocationBoardPanel.mat rename to Assets/Materials/Paint/M_YellowPaint.mat index cf96f59..253879b 100644 --- a/Assets/Materials/M_LocationBoardPanel.mat +++ b/Assets/Materials/Paint/M_YellowPaint.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_LocationBoardPanel + m_Name: M_YellowPaint m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -85,6 +85,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.78431374, g: 0.78431374, b: 0, a: 1} + - _Color: {r: 0.85882354, g: 0.78431374, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/M_LocationBoardPanel.mat.meta b/Assets/Materials/Paint/M_YellowPaint.mat.meta similarity index 100% rename from Assets/Materials/M_LocationBoardPanel.mat.meta rename to Assets/Materials/Paint/M_YellowPaint.mat.meta diff --git a/Assets/Materials/Paper.meta b/Assets/Materials/Paper.meta new file mode 100644 index 0000000..2a3f90e --- /dev/null +++ b/Assets/Materials/Paper.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46d9f98dc8516bd4c8e89a08a05b6c63 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_PaperBorder.mat b/Assets/Materials/Paper/M_BlackPaper.mat similarity index 99% rename from Assets/Materials/M_PaperBorder.mat rename to Assets/Materials/Paper/M_BlackPaper.mat index 6b3a3b0..013557b 100644 --- a/Assets/Materials/M_PaperBorder.mat +++ b/Assets/Materials/Paper/M_BlackPaper.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_PaperBorder + m_Name: M_BlackPaper m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/M_PaperBorder.mat.meta b/Assets/Materials/Paper/M_BlackPaper.mat.meta similarity index 100% rename from Assets/Materials/M_PaperBorder.mat.meta rename to Assets/Materials/Paper/M_BlackPaper.mat.meta diff --git a/Assets/Materials/M_BluePaper.mat b/Assets/Materials/Paper/M_BluePaper.mat similarity index 100% rename from Assets/Materials/M_BluePaper.mat rename to Assets/Materials/Paper/M_BluePaper.mat diff --git a/Assets/Materials/M_BluePaper.mat.meta b/Assets/Materials/Paper/M_BluePaper.mat.meta similarity index 100% rename from Assets/Materials/M_BluePaper.mat.meta rename to Assets/Materials/Paper/M_BluePaper.mat.meta diff --git a/Assets/Materials/M_GreenPaper.mat b/Assets/Materials/Paper/M_GreenPaper.mat similarity index 100% rename from Assets/Materials/M_GreenPaper.mat rename to Assets/Materials/Paper/M_GreenPaper.mat diff --git a/Assets/Materials/M_GreenPaper.mat.meta b/Assets/Materials/Paper/M_GreenPaper.mat.meta similarity index 100% rename from Assets/Materials/M_GreenPaper.mat.meta rename to Assets/Materials/Paper/M_GreenPaper.mat.meta diff --git a/Assets/Materials/Paper/M_IndigoPaper.mat b/Assets/Materials/Paper/M_IndigoPaper.mat new file mode 100644 index 0000000..b0153f1 --- /dev/null +++ b/Assets/Materials/Paper/M_IndigoPaper.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_IndigoPaper + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: + - _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 511a2a95e47da9a4fb1b0b8146ad3e70, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Bicubic: 0 + - _BumpScale: 0.225 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableGeometricSpecularAA: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _LightmapType: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.4509804, g: 0, b: 0.7830189, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paper/M_IndigoPaper.mat.meta b/Assets/Materials/Paper/M_IndigoPaper.mat.meta new file mode 100644 index 0000000..94e11d2 --- /dev/null +++ b/Assets/Materials/Paper/M_IndigoPaper.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80f2b6f3bfbc50240b0765a56e8a837e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_OrangePaper.mat b/Assets/Materials/Paper/M_OrangePaper.mat similarity index 100% rename from Assets/Materials/M_OrangePaper.mat rename to Assets/Materials/Paper/M_OrangePaper.mat diff --git a/Assets/Materials/M_OrangePaper.mat.meta b/Assets/Materials/Paper/M_OrangePaper.mat.meta similarity index 100% rename from Assets/Materials/M_OrangePaper.mat.meta rename to Assets/Materials/Paper/M_OrangePaper.mat.meta diff --git a/Assets/Materials/M_PinkPaper.mat b/Assets/Materials/Paper/M_PinkPaper.mat similarity index 100% rename from Assets/Materials/M_PinkPaper.mat rename to Assets/Materials/Paper/M_PinkPaper.mat diff --git a/Assets/Materials/M_PinkPaper.mat.meta b/Assets/Materials/Paper/M_PinkPaper.mat.meta similarity index 100% rename from Assets/Materials/M_PinkPaper.mat.meta rename to Assets/Materials/Paper/M_PinkPaper.mat.meta diff --git a/Assets/Materials/M_Buzzer.mat b/Assets/Materials/Paper/M_RedPaper.mat similarity index 96% rename from Assets/Materials/M_Buzzer.mat rename to Assets/Materials/Paper/M_RedPaper.mat index fa343fa..460d76b 100644 --- a/Assets/Materials/M_Buzzer.mat +++ b/Assets/Materials/Paper/M_RedPaper.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_Buzzer + m_Name: M_RedPaper m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -64,7 +64,7 @@ Material: m_Ints: [] m_Floats: - _Bicubic: 0 - - _BumpScale: 1 + - _BumpScale: 0.225 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -85,6 +85,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paper/M_RedPaper.mat.meta b/Assets/Materials/Paper/M_RedPaper.mat.meta new file mode 100644 index 0000000..8d19d88 --- /dev/null +++ b/Assets/Materials/Paper/M_RedPaper.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98438748f07992c4a9eca84eb166591b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Paper/M_VioletPaper.mat b/Assets/Materials/Paper/M_VioletPaper.mat new file mode 100644 index 0000000..9a13aaa --- /dev/null +++ b/Assets/Materials/Paper/M_VioletPaper.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_VioletPaper + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: + - _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 511a2a95e47da9a4fb1b0b8146ad3e70, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Bicubic: 0 + - _BumpScale: 0.225 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableGeometricSpecularAA: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _LightmapType: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.78431374, g: 0.45098037, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paper/M_VioletPaper.mat.meta b/Assets/Materials/Paper/M_VioletPaper.mat.meta new file mode 100644 index 0000000..95ecd63 --- /dev/null +++ b/Assets/Materials/Paper/M_VioletPaper.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68d52ca36879f8942ab6e0fb16fe541d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_WhitePaper.mat b/Assets/Materials/Paper/M_WhitePaper.mat similarity index 100% rename from Assets/Materials/M_WhitePaper.mat rename to Assets/Materials/Paper/M_WhitePaper.mat diff --git a/Assets/Materials/M_WhitePaper.mat.meta b/Assets/Materials/Paper/M_WhitePaper.mat.meta similarity index 100% rename from Assets/Materials/M_WhitePaper.mat.meta rename to Assets/Materials/Paper/M_WhitePaper.mat.meta diff --git a/Assets/Materials/Paper/M_YellowPaper.mat b/Assets/Materials/Paper/M_YellowPaper.mat new file mode 100644 index 0000000..44738e5 --- /dev/null +++ b/Assets/Materials/Paper/M_YellowPaper.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_YellowPaper + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: + - _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 511a2a95e47da9a4fb1b0b8146ad3e70, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Bicubic: 0 + - _BumpScale: 0.225 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableGeometricSpecularAA: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _LightmapType: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paper/M_YellowPaper.mat.meta b/Assets/Materials/Paper/M_YellowPaper.mat.meta new file mode 100644 index 0000000..8e0d0a8 --- /dev/null +++ b/Assets/Materials/Paper/M_YellowPaper.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d62070baebe700e4797989f459c7c810 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Plastic.meta b/Assets/Materials/Plastic.meta new file mode 100644 index 0000000..c7f0d4b --- /dev/null +++ b/Assets/Materials/Plastic.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b54301c1a00504347a81538ac39740b5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Plastic/M_BlackPlastic.mat b/Assets/Materials/Plastic/M_BlackPlastic.mat new file mode 100644 index 0000000..026355a --- /dev/null +++ b/Assets/Materials/Plastic/M_BlackPlastic.mat @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_BlackPlastic + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Bicubic: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnableGeometricSpecularAA: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _LightmapType: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularAAScreenSpaceVariance: 0.1 + - _SpecularAAThreshold: 0.2 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/M_Buzzer.mat.meta b/Assets/Materials/Plastic/M_BlackPlastic.mat.meta similarity index 100% rename from Assets/Materials/M_Buzzer.mat.meta rename to Assets/Materials/Plastic/M_BlackPlastic.mat.meta diff --git a/Assets/Prefabs/Location Board.prefab b/Assets/Prefabs/Location Board.prefab index 2817425..c53c708 100644 --- a/Assets/Prefabs/Location Board.prefab +++ b/Assets/Prefabs/Location Board.prefab @@ -104,6 +104,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 89444350531234482} m_PrefabAsset: {fileID: 0} +--- !u!23 &1546332666034068312 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 89444350531234482} + m_PrefabAsset: {fileID: 0} --- !u!114 &5206201859598067541 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5295635200381177319, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -225,6 +231,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 223719352378488890} m_PrefabAsset: {fileID: 0} +--- !u!23 &1680590211156347344 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 223719352378488890} + m_PrefabAsset: {fileID: 0} --- !u!114 &5361306351096051165 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5295635200381177319, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -346,6 +358,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 265375147395235909} m_PrefabAsset: {fileID: 0} +--- !u!23 &1722245594223391151 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 265375147395235909} + m_PrefabAsset: {fileID: 0} --- !u!114 &5391703078400658850 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5295635200381177319, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -1328,6 +1346,22 @@ MonoBehaviour: _udonSharpBackingUdonBehaviour: {fileID: 5696832292153495865} _GameManager: {fileID: 0} _AudioManager: {fileID: 0} + LocationPanelInfoSheets: + - {fileID: 4763975575403675558} + - {fileID: 2619037387196747890} + - {fileID: 8923637585572248293} + - {fileID: 6484795957763590939} + - {fileID: 5819985273670984072} + - {fileID: 1722245594223391151} + - {fileID: 992467814237068154} + - {fileID: 6534664131828962150} + - {fileID: 4650604585810619509} + - {fileID: 3365563815330780686} + - {fileID: 1680590211156347344} + - {fileID: 5829412507838511314} + - {fileID: 3097184674922993204} + - {fileID: 1546332666034068312} + - {fileID: 3212990329027691027} LocationPanelsEmpty: - {fileID: 1887970850060299027} - {fileID: 7181055310898242149} @@ -1408,6 +1442,11 @@ MonoBehaviour: - {fileID: 8633085275759225401} - {fileID: 5206201859598067541} - {fileID: 8188491842622275102} + _LocationSheetMaterialSelections: + - {fileID: 2100000, guid: d1b6333591e357f45b3761f4314b574d, type: 2} + - {fileID: 2100000, guid: d2d3c935fbbe74940915482a36f77687, type: 2} + - {fileID: 2100000, guid: e3bf0e4e3864c2149b48a821a799c6f4, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} --- !u!114 &5696832292153495865 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2373,6 +2412,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, type: 3} +--- !u!23 &992467814237068154 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 1841299637018077840} + m_PrefabAsset: {fileID: 0} --- !u!4 &2129878179006128149 stripped Transform: m_CorrespondingSourceObject: {fileID: 289150293571046021, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -2494,6 +2539,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, type: 3} +--- !u!23 &2619037387196747890 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 3463506521819390360} + m_PrefabAsset: {fileID: 0} --- !u!4 &3752514971746675485 stripped Transform: m_CorrespondingSourceObject: {fileID: 289150293571046021, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -2615,6 +2666,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, type: 3} +--- !u!23 &3212990329027691027 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 4097921455078601721} + m_PrefabAsset: {fileID: 0} --- !u!4 &4385935884183796092 stripped Transform: m_CorrespondingSourceObject: {fileID: 289150293571046021, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -2731,6 +2788,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, type: 3} +--- !u!23 &3365563815330780686 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 4250423886214883300} + m_PrefabAsset: {fileID: 0} --- !u!4 &4539574178108206433 stripped Transform: m_CorrespondingSourceObject: {fileID: 289150293571046021, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -2852,6 +2915,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, type: 3} +--- !u!23 &3097184674922993204 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 4517956471384631262} + m_PrefabAsset: {fileID: 0} --- !u!4 &4228956817483263323 stripped Transform: m_CorrespondingSourceObject: {fileID: 289150293571046021, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -2991,6 +3060,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4939557847642312802} m_PrefabAsset: {fileID: 0} +--- !u!23 &5819985273670984072 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 4939557847642312802} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4948985116202469688 PrefabInstance: m_ObjectHideFlags: 0 @@ -3107,6 +3182,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4948985116202469688} m_PrefabAsset: {fileID: 0} +--- !u!23 &5829412507838511314 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 4948985116202469688} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5599935747797564145 PrefabInstance: m_ObjectHideFlags: 0 @@ -3228,6 +3309,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5599935747797564145} m_PrefabAsset: {fileID: 0} +--- !u!23 &6484795957763590939 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 5599935747797564145} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5685691260207735436 PrefabInstance: m_ObjectHideFlags: 0 @@ -3349,6 +3436,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5685691260207735436} m_PrefabAsset: {fileID: 0} +--- !u!23 &6534664131828962150 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 5685691260207735436} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6107492763607244191 PrefabInstance: m_ObjectHideFlags: 0 @@ -3464,6 +3557,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!23 &4650604585810619509 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 6107492763607244191} + m_PrefabAsset: {fileID: 0} --- !u!4 &5819047537907373850 stripped Transform: m_CorrespondingSourceObject: {fileID: 289150293571046021, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -3533,6 +3632,11 @@ PrefabInstance: propertyPath: m_Name value: LocationBoardInfoSheet objectReference: {fileID: 0} + - target: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5295635200381177319, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, type: 3} propertyPath: m_fontSize @@ -3580,6 +3684,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!23 &4763975575403675558 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 6220987311019904588} + m_PrefabAsset: {fileID: 0} --- !u!4 &5932971715260662985 stripped Transform: m_CorrespondingSourceObject: {fileID: 289150293571046021, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, @@ -3702,3 +3812,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8043228198772984591} m_PrefabAsset: {fileID: 0} +--- !u!23 &8923637585572248293 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 1461532928036008426, guid: bc5fbcb7ddd8d0d46a9a656aca87ee86, + type: 3} + m_PrefabInstance: {fileID: 8043228198772984591} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index cbc4cdf..c34675b 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -11357,6 +11357,7 @@ MonoBehaviour: _HostCard: {fileID: 379391087} _CaseManager: {fileID: 841163054} _LocationBoard: {fileID: 1748199014} + _AudioManager: {fileID: 1947493795} --- !u!1001 &881903122 PrefabInstance: m_ObjectHideFlags: 0 @@ -25173,11 +25174,30 @@ MonoBehaviour: _SFXPlayer: {fileID: 1547939853} _TheChase: {fileID: 8300000, guid: ebb0e1809180b8e4b8ae4c4fe1671ae7, type: 3} _ThinkAboutIt: {fileID: 8300000, guid: fd2e7d68447011640a244f302d442395, type: 3} + _RecoverTheLoot: {fileID: 8300000, guid: 627fefde5bcc34447857f028da272a9a, type: 3} _WhereInTheWorld: {fileID: 8300000, guid: e810feeb6c2063747bbb5f735a88bee9, type: 3} _RockapellaIdent: {fileID: 8300000, guid: 3dd54f8dd36092b4d9664c76ccf9ab49, type: 3} _Ding: {fileID: 8300000, guid: c73e1e65b24947b479626ae419424e84, type: 3} _Buzzer: {fileID: 8300000, guid: bc5aa9668b30b7e48a492e3308a2a802, type: 3} _TheLoot: {fileID: 8300000, guid: 66a73bb07c1203843831c12df9c02c30, type: 3} + _TheWarrant: {fileID: 8300000, guid: 54b6be0d7456ff84faff67734e63f713, type: 3} + _CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444, + type: 3} + _CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6, + type: 3} + _CrookTheme_EarthaBrute: {fileID: 8300000, guid: 2ed10c3cbd515354b86a997d7654ce49, + type: 3} + _CrookTheme_Kneemoi: {fileID: 8300000, guid: ee78237f71841974c973a33954ec3819, type: 3} + _CrookTheme_PattyLarceny: {fileID: 8300000, guid: 75e384f56f6a8de4faf886c5dfe8d0c5, + type: 3} + _CrookTheme_Robocrook: {fileID: 8300000, guid: 8c2ee995f8b83374d83d5ec61dfcea9a, + type: 3} + _CrookTheme_SarahNade: {fileID: 8300000, guid: 69e69d1ae868b934db2b5d30d3b84f09, + type: 3} + _CrookTheme_VicTheSlick: {fileID: 8300000, guid: 8dfe401af9ae14b499ce373ae6e54ffb, + type: 3} + _CrookTheme_WonderRat: {fileID: 8300000, guid: 88115708cf0379b41b99e1009e45aa01, + type: 3} --- !u!1 &1953862613 GameObject: m_ObjectHideFlags: 0 @@ -29665,6 +29685,36 @@ PrefabInstance: value: objectReference: {fileID: 4697986623920268369, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} + - target: {fileID: 4697986623920268369, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, + type: 3} + propertyPath: _LocationSheetMaterialSelections.Array.size + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4697986623920268369, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, + type: 3} + propertyPath: _LocationSheetMaterialSelections.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - target: {fileID: 4697986623920268369, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, + type: 3} + propertyPath: _LocationSheetMaterialSelections.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: d1b6333591e357f45b3761f4314b574d, type: 2} + - target: {fileID: 4697986623920268369, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, + type: 3} + propertyPath: _LocationSheetMaterialSelections.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: d2d3c935fbbe74940915482a36f77687, type: 2} + - target: {fileID: 4697986623920268369, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, + type: 3} + propertyPath: _LocationSheetMaterialSelections.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: e3bf0e4e3864c2149b48a821a799c6f4, type: 2} + - target: {fileID: 4697986623920268369, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, + type: 3} + propertyPath: _LocationSheetMaterialSelections.Array.data[4] + value: + objectReference: {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - target: {fileID: 4803692038218823453, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} propertyPath: serializationData.Prefab diff --git a/Assets/UdonSharp/AudioManager.asset b/Assets/UdonSharp/AudioManager.asset index 6abd900..fadb17d 100644 --- a/Assets/UdonSharp/AudioManager.asset +++ b/Assets/UdonSharp/AudioManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 9 + Data: 20 - Name: Entry: 7 Data: @@ -287,13 +287,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _WhereInTheWorld + Data: _RecoverTheLoot - Name: $v Entry: 7 Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _WhereInTheWorld + Data: _RecoverTheLoot - Name: k__BackingField Entry: 9 Data: 10 @@ -341,13 +341,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _RockapellaIdent + Data: _WhereInTheWorld - Name: $v Entry: 7 Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _RockapellaIdent + Data: _WhereInTheWorld - Name: k__BackingField Entry: 9 Data: 10 @@ -395,13 +395,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Ding + Data: _RockapellaIdent - Name: $v Entry: 7 Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Ding + Data: _RockapellaIdent - Name: k__BackingField Entry: 9 Data: 10 @@ -425,19 +425,10 @@ MonoBehaviour: Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 25|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: SFX - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -458,13 +449,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Buzzer + Data: _Ding - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Buzzer + Data: _Ding - Name: k__BackingField Entry: 9 Data: 10 @@ -485,10 +476,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 28|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: SFX + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -512,13 +512,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TheLoot + Data: _Buzzer - Name: $v Entry: 7 Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TheLoot + Data: _Buzzer - Name: k__BackingField Entry: 9 Data: 10 @@ -561,6 +561,609 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _TheLoot + - Name: $v + Entry: 7 + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TheLoot + - 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: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 35|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: _TheWarrant + - Name: $v + Entry: 7 + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TheWarrant + - 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: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 38|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: _CrookTheme_Contessa + - Name: $v + Entry: 7 + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_Contessa + - 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: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 41|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Crook Themes + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CrookTheme_DoubleTrouble + - Name: $v + Entry: 7 + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_DoubleTrouble + - 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: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 45|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: _CrookTheme_EarthaBrute + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_EarthaBrute + - 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: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 48|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: _CrookTheme_Kneemoi + - Name: $v + Entry: 7 + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_Kneemoi + - 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: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 51|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: _CrookTheme_PattyLarceny + - Name: $v + Entry: 7 + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_PattyLarceny + - 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: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CrookTheme_Robocrook + - Name: $v + Entry: 7 + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_Robocrook + - 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: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 57|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: _CrookTheme_SarahNade + - Name: $v + Entry: 7 + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_SarahNade + - 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: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 60|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: _CrookTheme_VicTheSlick + - Name: $v + Entry: 7 + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_VicTheSlick + - 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: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 63|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: _CrookTheme_WonderRat + - Name: $v + Entry: 7 + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookTheme_WonderRat + - 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: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 66|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: 13 Data: diff --git a/Assets/UdonSharp/AudioManager.cs b/Assets/UdonSharp/AudioManager.cs index 9a8d088..8039ae7 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -11,6 +11,7 @@ public enum MusicEventType None, TheChase, ThinkAboutIt, + RecoverTheLoot, WhereInTheWorld, RockapellaIdent } @@ -21,7 +22,8 @@ public enum SFXEventType Ding, Buzzer, - TheLoot + TheLoot, + TheWarrant } @@ -34,6 +36,7 @@ public class AudioManager : UdonSharpBehaviour [Header("Music")] [SerializeField] private AudioClip _TheChase = null; [SerializeField] private AudioClip _ThinkAboutIt = null; + [SerializeField] private AudioClip _RecoverTheLoot = null; [SerializeField] private AudioClip _WhereInTheWorld = null; [SerializeField] private AudioClip _RockapellaIdent = null; @@ -42,31 +45,50 @@ public class AudioManager : UdonSharpBehaviour [SerializeField] private AudioClip _Buzzer = null; [SerializeField] private AudioClip _TheLoot = null; + [SerializeField] private AudioClip _TheWarrant = null; + + [Header("Crook Themes")] + [SerializeField] private AudioClip _CrookTheme_Contessa = null; + [SerializeField] private AudioClip _CrookTheme_DoubleTrouble = null; + [SerializeField] private AudioClip _CrookTheme_EarthaBrute = null; + [SerializeField] private AudioClip _CrookTheme_Kneemoi = null; + [SerializeField] private AudioClip _CrookTheme_PattyLarceny = null; + [SerializeField] private AudioClip _CrookTheme_Robocrook = null; + [SerializeField] private AudioClip _CrookTheme_SarahNade = null; + [SerializeField] private AudioClip _CrookTheme_VicTheSlick = null; + [SerializeField] private AudioClip _CrookTheme_WonderRat = null; [NetworkCallable] public void PlayMusic(MusicEventType MusicEvent) { - PlayMusicInternal(MusicEvent, false); + _PlayMusic_Internal(MusicEvent, false); } [NetworkCallable] public void PlayMusicLoop(MusicEventType MusicEvent) { - PlayMusicInternal(MusicEvent, true); + _PlayMusic_Internal(MusicEvent, true); } - private void PlayMusicInternal(MusicEventType MusicEvent, bool Loop) + [NetworkCallable] + public void StopMusic() + { + _PlayMusic_Internal(MusicEventType.None, false); + } + + private void _PlayMusic_Internal(MusicEventType MusicEvent, bool Loop) { _MusicPlayer.Stop(); switch (MusicEvent) { - case MusicEventType.TheChase: _MusicPlayer.clip = _TheChase; break; - case MusicEventType.ThinkAboutIt: _MusicPlayer.clip = _ThinkAboutIt; break; - case MusicEventType.WhereInTheWorld: _MusicPlayer.clip = _WhereInTheWorld; break; - case MusicEventType.RockapellaIdent: _MusicPlayer.clip = _RockapellaIdent; break; - default: _MusicPlayer.clip = null; break; + case MusicEventType.TheChase: _MusicPlayer.clip = _TheChase; break; + case MusicEventType.ThinkAboutIt: _MusicPlayer.clip = _ThinkAboutIt; break; + case MusicEventType.RecoverTheLoot: _MusicPlayer.clip = _RecoverTheLoot; break; + case MusicEventType.WhereInTheWorld: _MusicPlayer.clip = _WhereInTheWorld; break; + case MusicEventType.RockapellaIdent: _MusicPlayer.clip = _RockapellaIdent; break; + default: _MusicPlayer.clip = null; break; } _MusicPlayer.loop = Loop; @@ -79,31 +101,68 @@ public class AudioManager : UdonSharpBehaviour [NetworkCallable] public void PlaySFX(SFXEventType SFXEvent) { - PlaySFXInternal(SFXEvent); + _PlaySFX_Internal(SFXEvent); } + [NetworkCallable] public void PlaySFXAtPitch(SFXEventType SFXEvent, float Pitch) { - PlaySFXInternal(SFXEvent, Pitch); + _PlaySFX_Internal(SFXEvent, Pitch); } - private void PlaySFXInternal(SFXEventType SFXEvent, float Pitch = 1.0f) + private void _PlaySFX_Internal(SFXEventType SFXEvent, float Pitch = 1.0f) { _SFXPlayer.Stop(); switch (SFXEvent) { - case SFXEventType.Ding: _SFXPlayer.clip = _Ding; break; - case SFXEventType.Buzzer: _SFXPlayer.clip = _Buzzer; break; + case SFXEventType.Ding: _SFXPlayer.clip = _Ding; break; + case SFXEventType.Buzzer: _SFXPlayer.clip = _Buzzer; break; - case SFXEventType.TheLoot: _SFXPlayer.clip = _TheLoot; break; + case SFXEventType.TheLoot: _SFXPlayer.clip = _TheLoot; break; + case SFXEventType.TheWarrant: _SFXPlayer.clip = _TheWarrant; break; - default: _SFXPlayer.clip = null; break; + default: _SFXPlayer.clip = null; break; } if (_SFXPlayer.clip != null) + { _SFXPlayer.pitch = Pitch; - _SFXPlayer.Play(); + _SFXPlayer.Play(); + } + } + + + [NetworkCallable] + public void PlayCrookTheme(AccusedCrook Crook) + { + _PlayCrookTheme_Internal(Crook); + } + + private void _PlayCrookTheme_Internal(AccusedCrook Crook) + { + _SFXPlayer.Stop(); + + switch (Crook) + { + case AccusedCrook.Contessa: _SFXPlayer.clip = _CrookTheme_Contessa; break; + case AccusedCrook.DoubleTrouble: _SFXPlayer.clip = _CrookTheme_DoubleTrouble; break; + case AccusedCrook.EarthaBrute: _SFXPlayer.clip = _CrookTheme_EarthaBrute; break; + case AccusedCrook.Kneemoi: _SFXPlayer.clip = _CrookTheme_Kneemoi; break; + case AccusedCrook.PattyLarceny: _SFXPlayer.clip = _CrookTheme_PattyLarceny; break; + case AccusedCrook.Robocrook: _SFXPlayer.clip = _CrookTheme_Robocrook; break; + case AccusedCrook.SarahNade: _SFXPlayer.clip = _CrookTheme_SarahNade; break; + case AccusedCrook.VicTheSlick: _SFXPlayer.clip = _CrookTheme_VicTheSlick; break; + case AccusedCrook.WonderRat: _SFXPlayer.clip = _CrookTheme_WonderRat; break; + + default: _SFXPlayer.clip = null; break; + } + + _SFXPlayer.pitch = 1.0f; + if (_SFXPlayer.clip != null) + { + _SFXPlayer.Play(); + } } // A messy group of variables that are used for pitch correction of sound effects diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index e81346a..020ad6e 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -1,4 +1,5 @@  +using System.Runtime.InteropServices.WindowsRuntime; using UdonSharp; using UnityEngine; using VRC.SDK3.Data; @@ -9,6 +10,22 @@ using VRC.Udon; using VRC.Udon.Common.Interfaces; +public enum AccusedCrook +{ + Contessa, + DoubleTrouble, + EarthaBrute, + Kneemoi, + PattyLarceny, + Robocrook, + SarahNade, + VicTheSlick, + WonderRat, + + INDEX_MAX +} + + [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class CaseManager : UdonSharpBehaviour { @@ -72,7 +89,7 @@ public class CaseManager : UdonSharpBehaviour // ErrorString = "Ensure the 'Round 3' dictionary entry is whatever it's meant to be once it's done being decided."; //} - ContinueToRound1(); + ContinueToRound2(); } else { @@ -114,4 +131,42 @@ public class CaseManager : UdonSharpBehaviour return ""; } + + + public string GetCaseTitle() + { + return _CaseFile["Case Title"].ToString(); + } + public string GetLoot() + { + return _CaseFile["Stolen Loot"].ToString(); + } + public AccusedCrook GetCrook() + { + return (AccusedCrook)_CaseFile["Accused Crook"].Number; + } + + + public string CrookToString(AccusedCrook Crook) + { + switch (Crook) + { + case AccusedCrook.Contessa: return "Contessa"; + case AccusedCrook.DoubleTrouble: return "Double Trouble"; + case AccusedCrook.EarthaBrute: return "Eartha Brute"; + case AccusedCrook.Kneemoi: return "Kneemoi"; + case AccusedCrook.PattyLarceny: return "Patty Larceny"; + case AccusedCrook.Robocrook: return "Robocrook"; + case AccusedCrook.SarahNade: return "Sarah Nade"; + case AccusedCrook.VicTheSlick: return "Vic The Slick"; + case AccusedCrook.WonderRat: return "Wonder Rat"; + } + + return "[[ERROR]]"; + } + + public string GetAccusedCrook() + { + return CrookToString((AccusedCrook)(int)_CaseFile["Accused Crook"].Number); + } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index dc6726f..2a0afda 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -10,7 +10,7 @@ using VRC.Udon.Common.Interfaces; using VRC.Udon.Serialization.OdinSerializer.Utilities; -public enum GameType +public enum RoundType { None, LocateTheCrook, @@ -18,9 +18,9 @@ public enum GameType ChaseCarmen } -public enum QuestionType +public enum RoundSegmentType { - BetweenRounds, + BetweenSegments, MultipleChoice, LightningRound, @@ -63,10 +63,10 @@ public class GameManagerBase : UdonSharpBehaviour _HostCardUseButtonDown_Internal(); } - protected virtual HostCardInterfaceBase GetHostCardInterface(QuestionType Question) + protected virtual HostCardInterfaceBase GetHostCardInterface(RoundSegmentType Question) { Debug.LogError("You should not be seeing this. You don't need to call base.GetHostCardInterface()"); - return _HostCard.EnableHostCardDisplay(GameType.None, Question); + return _HostCard.EnableHostCardDisplay(RoundType.None, Question); } protected virtual void _HostCardUseButtonDown_Internal() @@ -80,28 +80,32 @@ public class GameManagerBase : UdonSharpBehaviour public virtual void LoadQuestionData(DataToken Data) { } - protected string GameTypeToString(GameType Type) + protected string RoundTypeToString(RoundType Type) { switch ((int)Type) { - case (int)GameType.LocateTheCrook: return "Locate The Crook"; - case (int)GameType.RecoverTheLoot: return "Recover The Loot"; - case (int)GameType.ChaseCarmen: return "Chase Carmen"; + case (int)RoundType.LocateTheCrook: return "Locate The Crook"; + case (int)RoundType.RecoverTheLoot: return "Recover The Loot"; + case (int)RoundType.ChaseCarmen: return "Chase Carmen"; default: return "[[ERROR]]"; } } - protected string QuestionTypeToString(QuestionType Type) + protected string RoundSegmentTypeToString(RoundSegmentType Type) { - switch ((int)Type) + switch (Type) { - case (int)QuestionType.BetweenRounds: return "None"; - case (int)QuestionType.MultipleChoice: return "Standard Round"; - case (int)QuestionType.LightningRound: return "Lightning Round"; - case (int)QuestionType.DumpsterDive: return "Dumpster Dive"; - case (int)QuestionType.TheChase: return "The Chase"; - case (int)QuestionType.FinalRound: return "Final Round"; - case (int)QuestionType.Tiebreaker: return "Tiebreaker"; + case RoundSegmentType.BetweenSegments: return "None"; + case RoundSegmentType.MultipleChoice: return "Standard Round"; + case RoundSegmentType.LightningRound: return "Lightning Round"; + case RoundSegmentType.DumpsterDive: return "Dumpster Dive"; + case RoundSegmentType.TheChase: return "The Chase"; + case RoundSegmentType.FinalRound: return "Final Round"; + case RoundSegmentType.Tiebreaker: return "Tiebreaker"; + + case RoundSegmentType.RecoverTheLootExplainer: return "Recover The Loot - Briefing"; + case RoundSegmentType.RecoverTheLoot: return "Recover The Loot"; + default: return "[[ERROR]]"; } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index bbddbc0..4484688 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -49,7 +49,7 @@ public class GameManagerRound1 : GameManagerBase _QuestionsList.Clear(); HostCardBetweenRoundsInterface Interface = - (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); DataList DataDict = Data.DataList; for (int i = 0; i < DataDict.Count; i++) @@ -87,11 +87,11 @@ public class GameManagerRound1 : GameManagerBase private void NewMultipleChoiceQuestion() { HostCardMultipleChoiceInterface Interface = - (HostCardMultipleChoiceInterface)GetHostCardInterface(QuestionType.MultipleChoice); + (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); ResetMultipleChoiceInterface(Interface); - Interface.HeaderUI.text = QuestionTypeToString((QuestionType)((int)_CurrentQuestion["Type"].Number)); + Interface.HeaderUI.text = RoundSegmentTypeToString((RoundSegmentType)((int)_CurrentQuestion["Type"].Number)); DataList ClueStrings = _CurrentQuestion["Clues"].DataList; for (int i = 0; i < Interface.CluesUI.Length && i < ClueStrings.Count; i++) @@ -119,7 +119,7 @@ public class GameManagerRound1 : GameManagerBase private void MultipleChoiceRevealChoice1() { HostCardMultipleChoiceInterface Interface = - (HostCardMultipleChoiceInterface)GetHostCardInterface(QuestionType.MultipleChoice); + (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); Interface.ChoiceButtonImages[0].color = (_QuestionCorrectResponse == 1) ? Color.green : Color.red; @@ -131,7 +131,7 @@ public class GameManagerRound1 : GameManagerBase private void MultipleChoiceRevealChoice2() { HostCardMultipleChoiceInterface Interface = - (HostCardMultipleChoiceInterface)GetHostCardInterface(QuestionType.MultipleChoice); + (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); Interface.ChoiceButtonImages[1].color = (_QuestionCorrectResponse == 2) ? Color.green : Color.red; @@ -143,7 +143,7 @@ public class GameManagerRound1 : GameManagerBase private void MultipleChoiceRevealChoice3() { HostCardMultipleChoiceInterface Interface = - (HostCardMultipleChoiceInterface)GetHostCardInterface(QuestionType.MultipleChoice); + (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); Interface.ChoiceButtonImages[2].color = (_QuestionCorrectResponse == 3) ? Color.green : Color.red; DataList Choices = _CurrentQuestion["Choices"].DataList; @@ -188,7 +188,7 @@ public class GameManagerRound1 : GameManagerBase } HostCardMultipleChoiceInterface Interface = - (HostCardMultipleChoiceInterface)GetHostCardInterface(QuestionType.MultipleChoice); + (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); Interface.HeaderUI.text = "LOCKED IN"; for (int i = 0; i < Interface.CluesUI.Length; i++) @@ -210,7 +210,7 @@ public class GameManagerRound1 : GameManagerBase private void MultipleChoiceRevealAnswersAndAssignPoints() { HostCardMultipleChoiceInterface Interface = - (HostCardMultipleChoiceInterface)GetHostCardInterface(QuestionType.MultipleChoice); + (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice); Interface.HeaderUI.text = "ANSWER REVEALED"; @@ -229,9 +229,9 @@ public class GameManagerRound1 : GameManagerBase private void BeginLightningRound() { HostCardLightningRoundInterface Interface = - (HostCardLightningRoundInterface)GetHostCardInterface(QuestionType.LightningRound); + (HostCardLightningRoundInterface)GetHostCardInterface(RoundSegmentType.LightningRound); - Interface.HeaderUI.text = QuestionTypeToString((QuestionType)((int)_CurrentQuestion["Type"].Number)) + " | " + _CurrentQuestion["Location"].ToString(); + Interface.HeaderUI.text = RoundSegmentTypeToString((RoundSegmentType)((int)_CurrentQuestion["Type"].Number)) + " | " + _CurrentQuestion["Location"].ToString(); for (int i = 0; i < Interface.ChoiceUI.Length && i < Interface.ChoiceButtons.Length; i++) { Interface.ChoiceUI[i].text = ""; @@ -248,7 +248,7 @@ public class GameManagerRound1 : GameManagerBase DataDictionary CurrentQuestion = _CurrentQuestion["Questions"].DataList[Question - 1].DataDictionary; HostCardLightningRoundInterface Interface = - (HostCardLightningRoundInterface)GetHostCardInterface(QuestionType.LightningRound); + (HostCardLightningRoundInterface)GetHostCardInterface(RoundSegmentType.LightningRound); Interface.QuestionUI.text = CurrentQuestion["Question"].ToString(); @@ -275,7 +275,7 @@ public class GameManagerRound1 : GameManagerBase if (_QuestionCorrectResponse == Answer) { HostCardLightningRoundInterface Interface = - (HostCardLightningRoundInterface)GetHostCardInterface(QuestionType.LightningRound); + (HostCardLightningRoundInterface)GetHostCardInterface(RoundSegmentType.LightningRound); for (int i = 0; i < Interface.ChoiceButtons.Length; i++) { @@ -322,9 +322,9 @@ public class GameManagerRound1 : GameManagerBase private void BeginTheChase() { HostCardTheChaseInterface Interface = - (HostCardTheChaseInterface)GetHostCardInterface(QuestionType.TheChase); + (HostCardTheChaseInterface)GetHostCardInterface(RoundSegmentType.TheChase); - Interface.HeaderUI.text = QuestionTypeToString((QuestionType)((int)_CurrentQuestion["Type"].Number)); + Interface.HeaderUI.text = RoundSegmentTypeToString((RoundSegmentType)((int)_CurrentQuestion["Type"].Number)); Interface.ClueUI.text = ""; for (int i = 0; i < Interface.ChoiceUI.Length && i < Interface.ChoiceButtons.Length; i++) { @@ -339,12 +339,12 @@ public class GameManagerRound1 : GameManagerBase private void PlayTheChaseMusic() { HostCardTheChaseInterface Interface = - (HostCardTheChaseInterface)GetHostCardInterface(QuestionType.TheChase); + (HostCardTheChaseInterface)GetHostCardInterface(RoundSegmentType.TheChase); NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "PlayMusic", MusicEventType.TheChase); - Interface.HeaderUI.text = QuestionTypeToString(QuestionType.TheChase); + Interface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.TheChase); Interface.ClueUI.text = "All of these questions are worth 5 Acme Crimebucks. Hands on your buzzers. Listen carefully. Here we go."; EnableBuzzers(); @@ -357,7 +357,7 @@ public class GameManagerRound1 : GameManagerBase DataDictionary CurrentClue = _CurrentQuestion["Clues"].DataList[Clue - 1].DataDictionary; HostCardTheChaseInterface Interface = - (HostCardTheChaseInterface)GetHostCardInterface(QuestionType.TheChase); + (HostCardTheChaseInterface)GetHostCardInterface(RoundSegmentType.TheChase); Interface.ClueUI.text = CurrentClue["Clue"].ToString(); @@ -413,7 +413,7 @@ public class GameManagerRound1 : GameManagerBase public void TheChaseEndClue() { HostCardTheChaseInterface Interface = - (HostCardTheChaseInterface)GetHostCardInterface(QuestionType.TheChase); + (HostCardTheChaseInterface)GetHostCardInterface(RoundSegmentType.TheChase); for (int i = 0; i < Interface.ChoiceButtons.Length; i++) { @@ -430,9 +430,9 @@ public class GameManagerRound1 : GameManagerBase private void BeginFinalRound() { HostCardFinalRoundInterface Interface = - (HostCardFinalRoundInterface)GetHostCardInterface(QuestionType.FinalRound); + (HostCardFinalRoundInterface)GetHostCardInterface(RoundSegmentType.FinalRound); - Interface.HeaderUI.text = QuestionTypeToString((QuestionType)((int)_CurrentQuestion["Type"].Number)) + " | Showing Map Preview"; + Interface.HeaderUI.text = RoundSegmentTypeToString((RoundSegmentType)((int)_CurrentQuestion["Type"].Number)) + " | Showing Map Preview"; EnableRiskCards(); @@ -456,7 +456,7 @@ public class GameManagerRound1 : GameManagerBase private void PlayThinkingMusic() { HostCardBetweenRoundsInterface Interface = - (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); Interface.HeaderUI.text = "Think about it..."; NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, @@ -465,7 +465,7 @@ public class GameManagerRound1 : GameManagerBase } public void ThinkAboutItCountdownFinished() { - GetHostCardInterface(QuestionType.FinalRound); + GetHostCardInterface(RoundSegmentType.FinalRound); for (int i = 0; i < _PlayerPodiums.Length; i++) { @@ -484,7 +484,7 @@ public class GameManagerRound1 : GameManagerBase private void FinalRoundRevealChoice1() { HostCardFinalRoundInterface Interface = - (HostCardFinalRoundInterface)GetHostCardInterface(QuestionType.FinalRound); + (HostCardFinalRoundInterface)GetHostCardInterface(RoundSegmentType.FinalRound); Interface.ChoiceButtonImages[0].color = (_QuestionCorrectResponse == 1) ? Color.green : Color.red; NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, @@ -495,7 +495,7 @@ public class GameManagerRound1 : GameManagerBase private void FinalRoundRevealChoice2() { HostCardFinalRoundInterface Interface = - (HostCardFinalRoundInterface)GetHostCardInterface(QuestionType.FinalRound); + (HostCardFinalRoundInterface)GetHostCardInterface(RoundSegmentType.FinalRound); Interface.ChoiceButtonImages[1].color = (_QuestionCorrectResponse == 2) ? Color.green : Color.red; NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, @@ -506,7 +506,7 @@ public class GameManagerRound1 : GameManagerBase private void FinalRoundRevealChoice3() { HostCardFinalRoundInterface Interface = - (HostCardFinalRoundInterface)GetHostCardInterface(QuestionType.FinalRound); + (HostCardFinalRoundInterface)GetHostCardInterface(RoundSegmentType.FinalRound); Interface.ChoiceButtonImages[2].color = (_QuestionCorrectResponse == 3) ? Color.green : Color.red; DataList Choices = _CurrentQuestion["Choices"].DataList; @@ -551,7 +551,7 @@ public class GameManagerRound1 : GameManagerBase } HostCardFinalRoundInterface Interface = - (HostCardFinalRoundInterface)GetHostCardInterface(QuestionType.FinalRound); + (HostCardFinalRoundInterface)GetHostCardInterface(RoundSegmentType.FinalRound); Interface.HeaderUI.text = "LOCKED IN"; for (int i = 0; i < Interface.CluesUI.Length; i++) @@ -603,7 +603,7 @@ public class GameManagerRound1 : GameManagerBase int PlayerNumber = _FinalRoundPlayersSortedByScore[PlayerPlace - 1]; HostCardBetweenRoundsInterface Interface = - (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); Interface.HeaderUI.text = "Player: " + _PlayerPodiums[PlayerNumber - 1].PlayerName; _PlayerPodiums[PlayerNumber - 1].EnableBuzzInEffect(true); @@ -644,7 +644,7 @@ public class GameManagerRound1 : GameManagerBase } HostCardBetweenRoundsInterface Interface = - (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); bool TiebreakerNeeded = false; if (SortedPlayerScores[1] == SortedPlayerScores[2]) @@ -700,7 +700,7 @@ public class GameManagerRound1 : GameManagerBase DisableBuzzers(); HostCardBetweenRoundsInterface Interface = - (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); _QuestionIndex++; if (_QuestionIndex >= _QuestionsList.Count) @@ -714,7 +714,7 @@ public class GameManagerRound1 : GameManagerBase _QuestionStage = 0; // Again, why does this work, but not just casting to an enum? - Interface.HeaderUI.text = "Upcoming Question: " + QuestionTypeToString((QuestionType)((int)_CurrentQuestion["Type"].Number)); + Interface.HeaderUI.text = "Upcoming Question: " + RoundSegmentTypeToString((RoundSegmentType)((int)_CurrentQuestion["Type"].Number)); EnableInteraction("Show Next Question"); } @@ -862,10 +862,10 @@ public class GameManagerRound1 : GameManagerBase // solution was "it's not a problem, it's two numbers, they're the same fucking thing". switch ((int)_CurrentQuestion["Type"].Number) { - case (int)QuestionType.MultipleChoice: AdvanceMultipleChoiceStage(); break; - case (int)QuestionType.LightningRound: AdvanceLightningRoundQuestion(); break; - case (int)QuestionType.TheChase: AdvanceTheChase(); break; - case (int)QuestionType.FinalRound: AdvanceFinalRound(); break; + case (int)RoundSegmentType.MultipleChoice: AdvanceMultipleChoiceStage(); break; + case (int)RoundSegmentType.LightningRound: AdvanceLightningRoundQuestion(); break; + case (int)RoundSegmentType.TheChase: AdvanceTheChase(); break; + case (int)RoundSegmentType.FinalRound: AdvanceFinalRound(); break; } RequestSerialization(); @@ -955,8 +955,8 @@ public class GameManagerRound1 : GameManagerBase _CurrentQuestion = _QuestionsList[_QuestionIndex].DataDictionary; HostCardBetweenRoundsInterface Interface = - (HostCardBetweenRoundsInterface)GetHostCardInterface(QuestionType.BetweenRounds); - Interface.HeaderUI.text = "Upcoming Question: " + QuestionTypeToString((QuestionType)((int)_CurrentQuestion["Type"].Number)); + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + Interface.HeaderUI.text = "Upcoming Question: " + RoundSegmentTypeToString((RoundSegmentType)((int)_CurrentQuestion["Type"].Number)); _GameHasBegun = true; return; @@ -965,8 +965,8 @@ public class GameManagerRound1 : GameManagerBase AdvanceQuestion(); } - protected override HostCardInterfaceBase GetHostCardInterface(QuestionType Question) + protected override HostCardInterfaceBase GetHostCardInterface(RoundSegmentType Question) { - return _HostCard.EnableHostCardDisplay(GameType.LocateTheCrook, Question); + return _HostCard.EnableHostCardDisplay(RoundType.LocateTheCrook, Question); } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 69d67b3..68d431e 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: 6 + Data: 7 - Name: Entry: 7 Data: @@ -290,16 +290,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LandmarkData + Data: _AudioManager - Name: $v Entry: 7 Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LandmarkData + Data: _AudioManager - Name: k__BackingField Entry: 7 Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: AudioManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - 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: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 21|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: _LandmarkData + - Name: $v + Entry: 7 + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LandmarkData + - Name: k__BackingField + Entry: 7 + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -308,7 +368,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 19 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -323,7 +383,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -347,13 +407,13 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 7 - Data: 22|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -362,7 +422,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 22 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -377,7 +437,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|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 e683afb..7b2b9ed 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -23,6 +23,8 @@ public class GameManagerRound2 : GameManagerBase [SerializeField] private LocationBoard _LocationBoard; + [SerializeField] private AudioManager _AudioManager; + private DataDictionary _LandmarkData; private int _StageIndex = 0; @@ -62,7 +64,9 @@ public class GameManagerRound2 : GameManagerBase private void DisplayBriefing() { HostCardRecoverTheLootExplainerInterface RecoverTheLootInterface = - (HostCardRecoverTheLootExplainerInterface)GetHostCardInterface(QuestionType.RecoverTheLootExplainer); + (HostCardRecoverTheLootExplainerInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLootExplainer); + + RecoverTheLootInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.RecoverTheLootExplainer); } private void PopulateLandmarkDataOnLocationBoard() @@ -87,12 +91,14 @@ public class GameManagerRound2 : GameManagerBase Debug.LogError("Malformed landmark entry. Ensure each landmark is a dictionary containing a 'Landmark' key."); } } + + _LocationBoard.RandomiseLocations(); } - private void PopulateLandmarkDataOnHostCard() + private void BeginRound() { HostCardRecoverTheLootInterface RecoverTheLootInterface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); DataList Landmarks = _LandmarkData["Landmarks"].DataList; for (int i = 0; i < Landmarks.Count; i++) @@ -102,28 +108,46 @@ public class GameManagerRound2 : GameManagerBase RecoverTheLootInterface.AddLandmarkName(i, Landmarks[i].DataDictionary["Landmark"].ToString()); } } + + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + "PlayMusicLoop", MusicEventType.RecoverTheLoot); } public void OnTheRightTrack() { HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); - Interface.SetComment("On the right track.", Color.green); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); + Interface.SetComment("On the right track. You get a free turn.", Color.green); } public void AlmostThere() { HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); - Interface.SetComment("Almost got it...", Color.yellow); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); + Interface.SetComment("Almost got it. Another free turn.", Color.yellow); } public void OutOfOrder(PanelType Type) { HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); - Interface.SetComment("Found " + PanelTypeToString(Type) + ". Remember the order: loot, warrant, crook. Use some strategy.", Color.yellow); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); + + string PanelToken = ""; + switch (Type) + { + case PanelType.Loot: + PanelToken = _CaseManager.GetLoot(); + break; + case PanelType.Warrant: + PanelToken = "the warrant"; + break; + case PanelType.Crook: + PanelToken = _CaseManager.GetAccusedCrook(); + break; + } + + Interface.SetComment("Found " + PanelToken + ". Remember the order: loot, warrant, crook. Use some strategy.", Color.yellow); } // All of these next functions are the end of a turn, and should disable @@ -131,7 +155,7 @@ public class GameManagerRound2 : GameManagerBase public void NothingThere() { HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment("Nothing there.", Color.black); Interface.EnableAllPanelButtons(false); @@ -140,7 +164,7 @@ public class GameManagerRound2 : GameManagerBase public void AlreadyTried() { HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment("Already tried that one.", Color.black); Interface.EnableAllPanelButtons(false); @@ -149,21 +173,24 @@ public class GameManagerRound2 : GameManagerBase public void NiceStrategy() { HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment("Nice strategy.", Color.green); Interface.EnableAllPanelButtons(false); } - // This is for when the player wins the game. This should disable all - // inputs, and should also enable victory animations. + // This is for when a player wins the game. This should disable all inputs, + // and should also enable victory animations. public void YoureWinner() { HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.SetComment("Winner! Congratulations, [[PLAYER]]", Color.red); Interface.EnableAllPanelButtons(false); + + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, + "StopMusic"); } @@ -175,7 +202,7 @@ public class GameManagerRound2 : GameManagerBase "ResetPanelBoard"); HostCardRecoverTheLootInterface Interface = - (HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot); + (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); Interface.EnableAllPanelButtons(true); @@ -183,9 +210,31 @@ public class GameManagerRound2 : GameManagerBase } - protected override HostCardInterfaceBase GetHostCardInterface(QuestionType Question) + public void PlayTheLoot() { - return _HostCard.EnableHostCardDisplay(GameType.RecoverTheLoot, Question); + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, + NetworkEventTarget.All, + "PlaySFX", SFXEventType.TheLoot); + } + + public void PlayTheWarrant() + { + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, + NetworkEventTarget.All, + "PlaySFX", SFXEventType.TheWarrant); + } + + public void PlayTheCrookTheme() + { + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, + NetworkEventTarget.All, + "PlayCrookTheme", _CaseManager.GetCrook()); + } + + + protected override HostCardInterfaceBase GetHostCardInterface(RoundSegmentType Question) + { + return _HostCard.EnableHostCardDisplay(RoundType.RecoverTheLoot, Question); } @@ -194,15 +243,15 @@ public class GameManagerRound2 : GameManagerBase _StageIndex++; switch(_StageIndex) { - case 1: DisplayBriefing(); break; - case 2: PopulateLandmarkDataOnHostCard(); break; + case 1: DisplayBriefing(); break; + case 2: BeginRound(); break; } } public void Button_RevealPanel(int Panel) { - ((HostCardRecoverTheLootInterface)GetHostCardInterface(QuestionType.RecoverTheLoot)) + ((HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot)) .DisablePanelButton(Panel); NetworkCalling.SendCustomNetworkEvent( (IUdonEventReceiver)_LocationBoard, diff --git a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs index 88c4f12..a7439ca 100644 --- a/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs +++ b/Assets/UdonSharp/Host Card Interfaces/HostCardManager.cs @@ -32,20 +32,26 @@ public class HostCardManager : UdonSharpBehaviour public override void OnPickup() { - Networking.SetOwner(Networking.LocalPlayer, gameObject); - _StoredJumpImpulse = Networking.LocalPlayer.GetJumpImpulse(); - Networking.LocalPlayer.SetJumpImpulse(0.0f); - _IsBeingHeld = true; + if (gameObject != null) + { + Networking.SetOwner(Networking.LocalPlayer, gameObject); + _StoredJumpImpulse = Networking.LocalPlayer.GetJumpImpulse(); + Networking.LocalPlayer.SetJumpImpulse(0.0f); + _IsBeingHeld = true; + } base.OnPickup(); } public override void OnDrop() { - Networking.SetOwner(Networking.InstanceOwner, gameObject); - Networking.LocalPlayer.SetJumpImpulse(_StoredJumpImpulse); - _StoredJumpImpulse = 0.0f; - _IsBeingHeld = false; + if (gameObject != null) + { + Networking.SetOwner(Networking.InstanceOwner, gameObject); + Networking.LocalPlayer.SetJumpImpulse(_StoredJumpImpulse); + _StoredJumpImpulse = 0.0f; + _IsBeingHeld = false; + } base.OnDrop(); } @@ -97,7 +103,7 @@ public class HostCardManager : UdonSharpBehaviour } - public HostCardInterfaceBase EnableHostCardDisplay(GameType Game, QuestionType Question) + public HostCardInterfaceBase EnableHostCardDisplay(RoundType Game, RoundSegmentType Question) { _BetweenRoundsInterface.gameObject.SetActive(false); _MultipleChoiceInterface.gameObject.SetActive(false); @@ -110,41 +116,41 @@ public class HostCardManager : UdonSharpBehaviour switch (Game) { - case GameType.LocateTheCrook: + case RoundType.LocateTheCrook: { switch (Question) { - case QuestionType.MultipleChoice: + case RoundSegmentType.MultipleChoice: _MultipleChoiceInterface.gameObject.SetActive(true); return _MultipleChoiceInterface; - case QuestionType.LightningRound: + case RoundSegmentType.LightningRound: _LightningRoundInterface.gameObject.SetActive(true); return _LightningRoundInterface; - case QuestionType.DumpsterDive: break; - case QuestionType.TheChase: + case RoundSegmentType.DumpsterDive: break; + case RoundSegmentType.TheChase: _TheChaseInterface.gameObject.SetActive(true); return _TheChaseInterface; - case QuestionType.FinalRound: + case RoundSegmentType.FinalRound: _FinalRoundInterface.gameObject.SetActive(true); return _FinalRoundInterface; - case QuestionType.Tiebreaker: + case RoundSegmentType.Tiebreaker: _BetweenRoundsInterface.gameObject.SetActive(true); return _BetweenRoundsInterface; } } break; - case GameType.RecoverTheLoot: + case RoundType.RecoverTheLoot: { switch(Question) { - case QuestionType.RecoverTheLootExplainer: + case RoundSegmentType.RecoverTheLootExplainer: _RecoverTheLootExplainerInterface.gameObject.SetActive(true); return _RecoverTheLootExplainerInterface; - case QuestionType.RecoverTheLoot: + case RoundSegmentType.RecoverTheLoot: _RecoverTheLootInterface.gameObject.SetActive(true); return _RecoverTheLootInterface; } } break; - case GameType.ChaseCarmen: + case RoundType.ChaseCarmen: { } break; diff --git a/Assets/UdonSharp/Location Board/LocationBoard.asset b/Assets/UdonSharp/Location Board/LocationBoard.asset index 9374aea..68c2f8d 100644 --- a/Assets/UdonSharp/Location Board/LocationBoard.asset +++ b/Assets/UdonSharp/Location Board/LocationBoard.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 14 + Data: 17 - Name: Entry: 7 Data: @@ -362,19 +362,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: LocationPanelsEmpty + Data: LocationPanelInfoSheets - Name: $v Entry: 7 Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: LocationPanelsEmpty + Data: LocationPanelInfoSheets - Name: k__BackingField Entry: 7 Data: 25|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.GameObject[], UnityEngine.CoreModule + Data: UnityEngine.MeshRenderer[], UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -416,19 +416,73 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: LocationPanelsLoot + Data: LocationPanelsEmpty - Name: $v Entry: 7 Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: LocationPanelsEmpty + - Name: k__BackingField + Entry: 7 + Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 28 + - 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: 29|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: LocationPanelsLoot + - Name: $v + Entry: 7 + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationPanelsLoot - Name: k__BackingField Entry: 9 - Data: 25 + Data: 28 - Name: k__BackingField Entry: 9 - Data: 25 + Data: 28 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -443,7 +497,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -467,16 +521,16 @@ MonoBehaviour: Data: LocationPanelsWarrant - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationPanelsWarrant - Name: k__BackingField Entry: 9 - Data: 25 + Data: 28 - Name: k__BackingField Entry: 9 - Data: 25 + Data: 28 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -491,7 +545,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -515,70 +569,16 @@ MonoBehaviour: Data: LocationPanelsCrook - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationPanelsCrook - Name: k__BackingField Entry: 9 - Data: 25 + Data: 28 - Name: k__BackingField Entry: 9 - Data: 25 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 32|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: LocationPanelText - - Name: $v - Entry: 7 - Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: LocationPanelText - - Name: k__BackingField - Entry: 7 - Data: 34|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: TMPro.TextMeshProUGUI[], Unity.TextMeshPro - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 34 + Data: 28 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -614,19 +614,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Animator + Data: LocationPanelText - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Animator + Data: LocationPanelText - Name: k__BackingField Entry: 7 Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule + Data: TMPro.TextMeshProUGUI[], Unity.TextMeshPro - Name: Entry: 8 Data: @@ -644,7 +644,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -668,10 +668,124 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ActiveSpinners + Data: _LocationSheetMaterialSelections - Name: $v Entry: 7 Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LocationSheetMaterialSelections + - Name: k__BackingField + Entry: 7 + Data: 40|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Material[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 40 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Animator + - Name: $v + Entry: 7 + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Animator + - Name: k__BackingField + Entry: 7 + Data: 44|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 44 + - 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: 45|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: _ActiveSpinners + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActiveSpinners @@ -693,120 +807,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 41|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: _OrderIsCorrect - - Name: $v - Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _OrderIsCorrect - - Name: k__BackingField - Entry: 7 - Data: 43|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean[], mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 43 - - 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: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 45|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: _HasBeenCheckedBefore - - Name: $v - Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _HasBeenCheckedBefore - - Name: k__BackingField - Entry: 9 - Data: 43 - - Name: k__BackingField - Entry: 9 - Data: 43 - - 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: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -831,6 +831,186 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _OrderIsCorrect + - Name: $v + Entry: 7 + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _OrderIsCorrect + - Name: k__BackingField + Entry: 7 + Data: 50|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 52|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: _HasBeenCheckedBefore + - Name: $v + Entry: 7 + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _HasBeenCheckedBefore + - Name: k__BackingField + Entry: 9 + Data: 50 + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 55|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: _RandomMaterialSettings + - Name: $v + Entry: 7 + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _RandomMaterialSettings + - Name: k__BackingField + Entry: 7 + Data: 57|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 57 + - 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: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 60|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Location Board/LocationBoard.cs b/Assets/UdonSharp/Location Board/LocationBoard.cs index aea8f01..f28a740 100644 --- a/Assets/UdonSharp/Location Board/LocationBoard.cs +++ b/Assets/UdonSharp/Location Board/LocationBoard.cs @@ -1,4 +1,5 @@  +using System.Collections.Generic; using TMPro; using UdonSharp; using UnityEngine; @@ -15,32 +16,33 @@ public class LocationBoard : UdonSharpBehaviour [SerializeField] private GameManagerRound2 _GameManager; [SerializeField] private AudioManager _AudioManager; - [UdonSynced, FieldChangeCallback(nameof(LootLocation))] private int _LootLocation = 0; - [UdonSynced, FieldChangeCallback(nameof(WarrantLocation))] private int _WarrantLocation = 0; - [UdonSynced, FieldChangeCallback(nameof(CrookLocation))] private int _CrookLocation = 0; + [UdonSynced, FieldChangeCallback(nameof(LootLocation))] private int _LootLocation = 0; + [UdonSynced, FieldChangeCallback(nameof(WarrantLocation))] private int _WarrantLocation = 0; + [UdonSynced, FieldChangeCallback(nameof(CrookLocation))] private int _CrookLocation = 0; + public MeshRenderer[] LocationPanelInfoSheets; public GameObject[] LocationPanelsEmpty; public GameObject[] LocationPanelsLoot; public GameObject[] LocationPanelsWarrant; public GameObject[] LocationPanelsCrook; public TextMeshProUGUI[] LocationPanelText; + [SerializeField] private Material[] _LocationSheetMaterialSelections; + private Animator _Animator; [UdonSynced] private int _ActiveSpinners = 0; [UdonSynced] private bool[] _OrderIsCorrect = new bool[3]; [UdonSynced] private bool[] _HasBeenCheckedBefore; + [UdonSynced, FieldChangeCallback(nameof(RandomMaterialSettings))] private int[] _RandomMaterialSettings; + private void Start() { _HasBeenCheckedBefore = new bool[LocationPanelsEmpty.Length]; _Animator = GetComponent(); - - // ********** DEBUG ********** - RandomiseLocation(); - // ******** END DEBUG ******** } [NetworkCallable] @@ -168,14 +170,16 @@ public class LocationBoard : UdonSharpBehaviour { if (Panel == LootLocation) { - SendCustomEventDelayedSeconds(nameof(PlayTheLoot), 0.35f); + _GameManager.SendCustomEventDelayedSeconds("PlayTheLoot", 0.35f); + } + else if (Panel == WarrantLocation) + { + _GameManager.SendCustomEventDelayedSeconds("PlayTheWarrant", 0.35f); + } + else if (Panel == CrookLocation) + { + _GameManager.SendCustomEventDelayedSeconds("PlayTheCrookTheme", 0.35f); } - //else if (Panel == WarrantLocation) - //{ - //} - //else if (Panel == CrookLocation) - //{ - //} } if (_OrderIsCorrect[0] && _OrderIsCorrect[1] && _OrderIsCorrect[2]) @@ -188,14 +192,6 @@ public class LocationBoard : UdonSharpBehaviour } - public void PlayTheLoot() - { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, - NetworkEventTarget.All, - "PlaySFX", SFXEventType.TheLoot); - } - - public void InitiateBoardReset() { _GameManager.LocationBoardReset(); } [NetworkCallable] @@ -209,7 +205,7 @@ public class LocationBoard : UdonSharpBehaviour _OrderIsCorrect[0] = _OrderIsCorrect[1] = _OrderIsCorrect[2] = false; } - public void RandomiseLocation() + public void RandomiseLocations() { Random.InitState(Networking.GetServerTimeInMilliseconds()); @@ -234,9 +230,41 @@ public class LocationBoard : UdonSharpBehaviour _HasBeenCheckedBefore[i] = false; } + RandomiseMaterials(); + RequestSerialization(); } + private void RandomiseMaterials() + { + int[] MaterialsArray = new int[LocationPanelInfoSheets.Length]; + int PreviousMaterial = 0; + for (int i = 0; i < MaterialsArray.Length; i++) + { + int RandomValue = PreviousMaterial; + while (RandomValue == PreviousMaterial) + { + RandomValue = Random.Range(0, _LocationSheetMaterialSelections.Length); + } + PreviousMaterial = RandomValue; + + MaterialsArray[i] = RandomValue; + } + + RandomMaterialSettings = MaterialsArray; + + RequestSerialization(); + } + private void ApplyRandomMaterials() + { + for (int i = 0; i < RandomMaterialSettings.Length; i++) + { + Material[] Materials = LocationPanelInfoSheets[i].materials; + Materials[1] = _LocationSheetMaterialSelections[RandomMaterialSettings[i]]; + LocationPanelInfoSheets[i].materials = Materials; + } + } + private void PlaceEmpty(int Panel) { if (Panel > 0) @@ -318,4 +346,14 @@ public class LocationBoard : UdonSharpBehaviour } get => _CrookLocation; } + + public int[] RandomMaterialSettings + { + set + { + _RandomMaterialSettings = value; + ApplyRandomMaterials(); + } + get => _RandomMaterialSettings; + } } diff --git a/Poi.Tools.csproj b/Poi.Tools.csproj index 6b2a38b..b6a9c14 100644 --- a/Poi.Tools.csproj +++ b/Poi.Tools.csproj @@ -1149,14 +1149,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index ba6209e..d925021 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -10,8 +10,8 @@ AudioManager: Default Speaker Mode: 2 m_SampleRate: 48000 m_DSPBufferSize: 1024 - m_VirtualVoiceCount: 64 - m_RealVoiceCount: 32 + m_VirtualVoiceCount: 32 + m_RealVoiceCount: 24 m_EnableOutputSuspension: 1 m_SpatializerPlugin: OculusSpatializer m_AmbisonicDecoderPlugin: OculusSpatializer diff --git a/Raw Files/SFX/Case Location Bell.aup3 b/Raw Files/SFX/Case Location Bell.aup3 index 4579c18..fe05f9b 100644 Binary files a/Raw Files/SFX/Case Location Bell.aup3 and b/Raw Files/SFX/Case Location Bell.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Contessa.aup3 b/Raw Files/SFX/Crook Themes/Contessa.aup3 new file mode 100644 index 0000000..29f9fb7 Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Contessa.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Double Trouble.aup3 b/Raw Files/SFX/Crook Themes/Double Trouble.aup3 new file mode 100644 index 0000000..09888d9 Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Double Trouble.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Eartha Brute.aup3 b/Raw Files/SFX/Crook Themes/Eartha Brute.aup3 new file mode 100644 index 0000000..83dc3ea Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Eartha Brute.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Kneemoi.aup3 b/Raw Files/SFX/Crook Themes/Kneemoi.aup3 new file mode 100644 index 0000000..f50014a Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Kneemoi.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Patty Larceny.aup3 b/Raw Files/SFX/Crook Themes/Patty Larceny.aup3 new file mode 100644 index 0000000..5a873fd Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Patty Larceny.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Robocrook.aup3 b/Raw Files/SFX/Crook Themes/Robocrook.aup3 new file mode 100644 index 0000000..77f88ef Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Robocrook.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Sarah Nade.aup3 b/Raw Files/SFX/Crook Themes/Sarah Nade.aup3 new file mode 100644 index 0000000..4e35eb7 Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Sarah Nade.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Vic The Slick.aup3 b/Raw Files/SFX/Crook Themes/Vic The Slick.aup3 new file mode 100644 index 0000000..7219b7a Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Vic The Slick.aup3 differ diff --git a/Raw Files/SFX/Crook Themes/Wonder Rat.aup3 b/Raw Files/SFX/Crook Themes/Wonder Rat.aup3 new file mode 100644 index 0000000..2845472 Binary files /dev/null and b/Raw Files/SFX/Crook Themes/Wonder Rat.aup3 differ diff --git a/Raw Files/SFX/The Warrant.aup3 b/Raw Files/SFX/The Warrant.aup3 new file mode 100644 index 0000000..d25e995 Binary files /dev/null and b/Raw Files/SFX/The Warrant.aup3 differ diff --git a/Thry/presets_known_materials.txt b/Thry/presets_known_materials.txt index 6c4bd9e..2658beb 100644 --- a/Thry/presets_known_materials.txt +++ b/Thry/presets_known_materials.txt @@ -395,3 +395,7 @@ d2d3c935fbbe74940915482a36f77687 e3bf0e4e3864c2149b48a821a799c6f4 d1b6333591e357f45b3761f4314b574d 71ede89a28bd60e4ca2918572046ba90 +d62070baebe700e4797989f459c7c810 +98438748f07992c4a9eca84eb166591b +68d52ca36879f8942ab6e0fb16fe541d +80f2b6f3bfbc50240b0765a56e8a837e diff --git a/ThryAssemblyDefinition.csproj b/ThryAssemblyDefinition.csproj index 30de29b..043956c 100644 --- a/ThryAssemblyDefinition.csproj +++ b/ThryAssemblyDefinition.csproj @@ -1249,14 +1249,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index 835468e..ac6db56 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UdonSharp.Lib.csproj b/UdonSharp.Lib.csproj index fdd42af..474574e 100644 --- a/UdonSharp.Lib.csproj +++ b/UdonSharp.Lib.csproj @@ -1121,14 +1121,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UdonSharp.Runtime.csproj b/UdonSharp.Runtime.csproj index 62564ab..ba74349 100644 --- a/UdonSharp.Runtime.csproj +++ b/UdonSharp.Runtime.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Addressables.csproj b/UniTask.Addressables.csproj index bae8e93..fb0f47b 100644 --- a/UniTask.Addressables.csproj +++ b/UniTask.Addressables.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.DOTween.csproj b/UniTask.DOTween.csproj index 478d57b..dabbbec 100644 --- a/UniTask.DOTween.csproj +++ b/UniTask.DOTween.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.Editor.csproj b/UniTask.Editor.csproj index a39cffe..473d503 100644 --- a/UniTask.Editor.csproj +++ b/UniTask.Editor.csproj @@ -1128,14 +1128,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index d608348..fd7ad68 100644 --- a/UniTask.Linq.csproj +++ b/UniTask.Linq.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.TextMeshPro.csproj b/UniTask.TextMeshPro.csproj index 8de78ee..cc5e8cf 100644 --- a/UniTask.TextMeshPro.csproj +++ b/UniTask.TextMeshPro.csproj @@ -1123,14 +1123,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UniTask.csproj b/UniTask.csproj index ff2c404..c1c2d15 100644 --- a/UniTask.csproj +++ b/UniTask.csproj @@ -1189,14 +1189,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/UnityEditorTests.csproj b/UnityEditorTests.csproj index fd56b97..f57b82f 100644 --- a/UnityEditorTests.csproj +++ b/UnityEditorTests.csproj @@ -990,14 +990,14 @@ Library\ScriptAssemblies\UnityEditor.TestRunner.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ClientSim.Editor.csproj b/VRC.ClientSim.Editor.csproj index 20834b5..2cc0fd2 100644 --- a/VRC.ClientSim.Editor.csproj +++ b/VRC.ClientSim.Editor.csproj @@ -1159,14 +1159,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index b633eb0..c4619f3 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -1264,14 +1264,14 @@ Library\ScriptAssemblies\Unity.InputSystem.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.ExampleCentral.Editor.csproj b/VRC.ExampleCentral.Editor.csproj index 73b783a..c33d7fd 100644 --- a/VRC.ExampleCentral.Editor.csproj +++ b/VRC.ExampleCentral.Editor.csproj @@ -1138,14 +1138,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index 088871a..e8c1069 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -1181,14 +1181,14 @@ Library\ScriptAssemblies\Unity.TextMeshPro.Editor.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 66ee270..80863e5 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -1149,14 +1149,14 @@ Library\ScriptAssemblies\Cinemachine.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.BuildPipeline.csproj b/VRC.SDKBase.Editor.BuildPipeline.csproj index 29cfdf4..ed626b7 100644 --- a/VRC.SDKBase.Editor.BuildPipeline.csproj +++ b/VRC.SDKBase.Editor.BuildPipeline.csproj @@ -1118,14 +1118,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.SDKBase.Editor.ShaderStripping.csproj b/VRC.SDKBase.Editor.ShaderStripping.csproj index 208cd12..76e0eff 100644 --- a/VRC.SDKBase.Editor.ShaderStripping.csproj +++ b/VRC.SDKBase.Editor.ShaderStripping.csproj @@ -1127,14 +1127,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 8d952c3..221ccd3 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -1258,14 +1258,14 @@ Library\ScriptAssemblies\Unity.XR.Oculus.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index dfaf574..457487c 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -1185,14 +1185,14 @@ Library\ScriptAssemblies\Unity.Timeline.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.Editor.csproj b/VRC.Udon.Editor.csproj index 2a48698..a9bee13 100644 --- a/VRC.Udon.Editor.csproj +++ b/VRC.Udon.Editor.csproj @@ -1206,14 +1206,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/VRC.Udon.Serialization.OdinSerializer.csproj b/VRC.Udon.Serialization.OdinSerializer.csproj index dea0bb8..c19e98a 100644 --- a/VRC.Udon.Serialization.OdinSerializer.csproj +++ b/VRC.Udon.Serialization.OdinSerializer.csproj @@ -1305,14 +1305,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index 6252443..48b5212 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -1143,14 +1143,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + diff --git a/VRWorldToolkit.Editor.csproj b/VRWorldToolkit.Editor.csproj index 6586dc2..c8493d8 100644 --- a/VRWorldToolkit.Editor.csproj +++ b/VRWorldToolkit.Editor.csproj @@ -1146,14 +1146,14 @@ Library\ScriptAssemblies\Unity.Postprocessing.Runtime.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/com.vrchat.core.vpm-resolver.Editor.csproj b/com.vrchat.core.vpm-resolver.Editor.csproj index ee65efd..7071a0e 100644 --- a/com.vrchat.core.vpm-resolver.Editor.csproj +++ b/com.vrchat.core.vpm-resolver.Editor.csproj @@ -1142,14 +1142,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.Editor.csproj b/vrchat.jordo.easyquestswitch.Editor.csproj index 436bfe1..efa55bb 100644 --- a/vrchat.jordo.easyquestswitch.Editor.csproj +++ b/vrchat.jordo.easyquestswitch.Editor.csproj @@ -1129,14 +1129,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False + Library\ScriptAssemblies\UnityEditor.TestRunner.dll False diff --git a/vrchat.jordo.easyquestswitch.csproj b/vrchat.jordo.easyquestswitch.csproj index 8c0c6db..5925cbf 100644 --- a/vrchat.jordo.easyquestswitch.csproj +++ b/vrchat.jordo.easyquestswitch.csproj @@ -1151,14 +1151,14 @@ D:\Program Files\Unity Hub\Editor\2022.3.22f1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\Facades\System.Xml.XPath.XDocument.dll False - - Library\ScriptAssemblies\UnityEngine.UI.dll - False - Library\ScriptAssemblies\UnityEditor.UI.dll False + + Library\ScriptAssemblies\UnityEngine.UI.dll + False +