diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ce3f1df..21ef883 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -71,6 +71,7 @@ + diff --git a/Assets/Animations/Detective Noir Effect/Off.anim b/Assets/Animations/Detective Noir Effect/Off.anim index f64332d..c16a713 100644 --- a/Assets/Animations/Detective Noir Effect/Off.anim +++ b/Assets/Animations/Detective Noir Effect/Off.anim @@ -59,6 +59,27 @@ AnimationClip: classID: 114 script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 50 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: priority + path: Detective Noir Filter + classID: 114 + script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + flags: 0 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -85,6 +106,15 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2337361004 + attribute: 1655102503 + script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -149,6 +179,27 @@ AnimationClip: classID: 114 script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 50 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: priority + path: Detective Noir Filter + classID: 114 + script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animations/Detective Noir Effect/On.anim b/Assets/Animations/Detective Noir Effect/On.anim index ef14be3..f2658d1 100644 --- a/Assets/Animations/Detective Noir Effect/On.anim +++ b/Assets/Animations/Detective Noir Effect/On.anim @@ -68,6 +68,36 @@ AnimationClip: classID: 114 script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 50 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 150 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: priority + path: Detective Noir Filter + classID: 114 + script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + flags: 0 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -94,6 +124,15 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 2337361004 + attribute: 1655102503 + script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -167,6 +206,36 @@ AnimationClip: classID: 114 script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 50 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 150 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: priority + path: Detective Noir Filter + classID: 114 + script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Audio/SFX/507472__danjocross__great-echoing-foghorn_CC0.wav b/Assets/Audio/SFX/507472__danjocross__great-echoing-foghorn_CC0.wav new file mode 100644 index 0000000..9ad71e3 Binary files /dev/null and b/Assets/Audio/SFX/507472__danjocross__great-echoing-foghorn_CC0.wav differ diff --git a/Assets/Audio/SFX/507472__danjocross__great-echoing-foghorn_CC0.wav.meta b/Assets/Audio/SFX/507472__danjocross__great-echoing-foghorn_CC0.wav.meta new file mode 100644 index 0000000..04ba27f --- /dev/null +++ b/Assets/Audio/SFX/507472__danjocross__great-echoing-foghorn_CC0.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: 78b792a0619f7834d92308d98c2ce31e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 8000 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 8000 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 8000 + 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/615283__nickrandomsounds__light-switch-on-and-off_CC0.wav b/Assets/Audio/SFX/615283__nickrandomsounds__light-switch-on-and-off_CC0.wav new file mode 100644 index 0000000..c38d4f4 Binary files /dev/null and b/Assets/Audio/SFX/615283__nickrandomsounds__light-switch-on-and-off_CC0.wav differ diff --git a/Assets/Audio/SFX/615283__nickrandomsounds__light-switch-on-and-off_CC0.wav.meta b/Assets/Audio/SFX/615283__nickrandomsounds__light-switch-on-and-off_CC0.wav.meta new file mode 100644 index 0000000..f676e24 --- /dev/null +++ b/Assets/Audio/SFX/615283__nickrandomsounds__light-switch-on-and-off_CC0.wav.meta @@ -0,0 +1,41 @@ +fileFormatVersion: 2 +guid: c00d231b20e91fb4e862d9038821d7f8 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.7 + conversionMode: 0 + preloadAudioData: 1 + platformSettingOverrides: + 4: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + compressionFormat: 1 + quality: 0.25 + conversionMode: 0 + preloadAudioData: 1 + 7: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 2 + sampleRateOverride: 22050 + 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/M_LocationBoard_Crook.mat b/Assets/Materials/M_LocationBoard_Crook.mat index f822bff..26158d6 100644 --- a/Assets/Materials/M_LocationBoard_Crook.mat +++ b/Assets/Materials/M_LocationBoard_Crook.mat @@ -46,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 867f4ce5530ce114ca449b7e1d916a17, type: 3} + m_Texture: {fileID: 2800000, guid: a62e19c8949d6ff40b648cb64023eb59, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Prefabs/Case List/Case List Entry Template.prefab b/Assets/Prefabs/Case List/Case List Entry Template.prefab index c184bde..ca99a28 100644 --- a/Assets/Prefabs/Case List/Case List Entry Template.prefab +++ b/Assets/Prefabs/Case List/Case List Entry Template.prefab @@ -636,6 +636,8 @@ MonoBehaviour: url: MapFiles: [] VideoFiles: [] + FallbackVideoFiles: [] + ClueImages: [] _CaseTitleText: {fileID: 5289319896243535637} _CrookNameText: {fileID: 8359197988175629327} _StolenLootText: {fileID: 2357634297786518751} @@ -658,7 +660,7 @@ MonoBehaviour: SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 - _syncMethod: 2 + _syncMethod: 3 serializedProgramAsset: {fileID: 11400000, guid: 2240fb6ca7b75564cb595ed95626b100, type: 2} programSource: {fileID: 11400000, guid: 6eb02c8d09c27f945b43ed852bff57f4, type: 2} diff --git a/Assets/Prefabs/Case List/Entries/1994/A Disaster Aria.prefab b/Assets/Prefabs/Case List/Entries/1994/A Disaster Aria.prefab index 8a08b13..2fe3d48 100644 --- a/Assets/Prefabs/Case List/Entries/1994/A Disaster Aria.prefab +++ b/Assets/Prefabs/Case List/Entries/1994/A Disaster Aria.prefab @@ -271,7 +271,7 @@ PrefabInstance: - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: ClueImages.Array.size - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} @@ -332,32 +332,32 @@ PrefabInstance: - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[0].url - value: https://witwics.actual.horse/1992/bad-day-on-broadway/Intro.mp4 + value: https://witwics.actual.horse/1994/a-disaster-aria/Intro.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[1].url - value: https://witwics.actual.horse/1992/bad-day-on-broadway/Chief.mp4 + value: https://witwics.actual.horse/1994/a-disaster-aria/DetectiveNoir.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[2].url - value: https://witwics.actual.horse/1992/bad-day-on-broadway/ACMEParabolanet.mp4 + value: https://witwics.actual.horse/1994/a-disaster-aria/PhilTheBarber.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[3].url - value: https://witwics.actual.horse/1992/bad-day-on-broadway/PhoneTap.mp4 + value: https://witwics.actual.horse/1994/a-disaster-aria/PhoneTap.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[4].url - value: https://witwics.actual.horse/1992/bad-day-on-broadway/Shakespeare.mp4 + value: https://witwics.actual.horse/1994/a-disaster-aria/NeedThatOpera.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: VideoFiles.Array.data[5].url - value: https://witwics.actual.horse/1992/bad-day-on-broadway/MauryPovich.mp4 + value: https://witwics.actual.horse/1994/a-disaster-aria/Kodo.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} @@ -367,32 +367,32 @@ PrefabInstance: - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: FallbackVideoFiles.Array.data[0].url - value: https://filehost.battybovine.com/witwics/bad-day-on-broadway/Intro.mp4 + value: https://filehost.battybovine.com/witwics/a-disaster-aria/Intro.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: FallbackVideoFiles.Array.data[1].url - value: https://filehost.battybovine.com/witwics/bad-day-on-broadway/Intro.mp4 + value: https://filehost.battybovine.com/witwics/a-disaster-aria/DetectiveNoir.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: FallbackVideoFiles.Array.data[2].url - value: https://filehost.battybovine.com/witwics/bad-day-on-broadway/ACMEParabolanet.mp4 + value: https://filehost.battybovine.com/witwics/a-disaster-aria/PhilTheBarber.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: FallbackVideoFiles.Array.data[3].url - value: https://filehost.battybovine.com/witwics/bad-day-on-broadway/PhoneTap.mp4 + value: https://filehost.battybovine.com/witwics/a-disaster-aria/PhoneTap.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: FallbackVideoFiles.Array.data[4].url - value: https://filehost.battybovine.com/witwics/bad-day-on-broadway/Shakespeare.mp4 + value: https://filehost.battybovine.com/witwics/a-disaster-aria/NeedThatOpera.mp4 objectReference: {fileID: 0} - target: {fileID: 6858734047833335697, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: FallbackVideoFiles.Array.data[5].url - value: https://filehost.battybovine.com/witwics/bad-day-on-broadway/MauryPovich.mp4 + value: https://filehost.battybovine.com/witwics/a-disaster-aria/Kodo.mp4 objectReference: {fileID: 0} - target: {fileID: 7635005722111176880, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} diff --git a/Assets/Prefabs/Detective Noir Effect.prefab b/Assets/Prefabs/Detective Noir Effect.prefab index 0dbc30e..5aa735b 100644 --- a/Assets/Prefabs/Detective Noir Effect.prefab +++ b/Assets/Prefabs/Detective Noir Effect.prefab @@ -10,6 +10,8 @@ GameObject: m_Component: - component: {fileID: 6120668579714775073} - component: {fileID: 8150590898460676725} + - component: {fileID: 5375092276513222770} + - component: {fileID: 9200279362805549541} m_Layer: 0 m_Name: Detective Noir Effect m_TagString: Untagged @@ -26,7 +28,7 @@ Transform: m_GameObject: {fileID: 6882989511465335218} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.4400043, y: -0.10795, z: -4.460001} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -54,6 +56,56 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &5375092276513222770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6882989511465335218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f869d57eb7111c24faac6199a920b5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 9200279362805549541} + _AudioManager: {fileID: 0} + _Animator: {fileID: 8150590898460676725} +--- !u!114 &9200279362805549541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6882989511465335218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 8cfb36b9d91a52144944b7b7483eca8a, + type: 2} + programSource: {fileID: 11400000, guid: da559b73fe438124eb755624f938f789, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 --- !u!1 &8388047611058773770 GameObject: m_ObjectHideFlags: 0 @@ -80,7 +132,7 @@ Transform: m_GameObject: {fileID: 8388047611058773770} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.91, y: 1.186, z: 0.17} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -102,4 +154,4 @@ MonoBehaviour: isGlobal: 1 blendDistance: 1.33 weight: 1 - priority: 100 + priority: 150 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 1bf83ac..14d23ce 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -44071,6 +44071,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} +--- !u!1 &1074789658 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6882989511465335218, guid: bf667ba13e10e0c48a06066e3e1a29ae, + type: 3} + m_PrefabInstance: {fileID: 7187778359178514365} + m_PrefabAsset: {fileID: 0} --- !u!1 &1074804291 GameObject: m_ObjectHideFlags: 0 @@ -74575,6 +74581,7 @@ GameObject: - component: {fileID: 1855771788} - component: {fileID: 1855771787} - component: {fileID: 1855771786} + - component: {fileID: 1855771789} m_Layer: 0 m_Name: EQS_DATA m_TagString: EditorOnly @@ -74619,6 +74626,9 @@ MonoBehaviour: - Target: {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} Type: {fileID: 1855771786} Foldout: 1 + - Target: {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + Type: {fileID: 1855771789} + Foldout: 1 version: 131 buildInfo: CachedBuildTarget: 19 @@ -74638,6 +74648,27 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1855771789 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855771785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dd3386b3f1c214f4392a8072b69205e8, type: 3} + m_Name: + m_EditorClassIdentifier: + Shader: + PC: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + Quest: {fileID: 4800000, guid: 8b39b95ac85682040beff730e0cfc77a, type: 3} + MainColor: + PC: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + Quest: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + GPUInstancing: + PC: 1 + Quest: 1 --- !u!1 &1857279152 GameObject: m_ObjectHideFlags: 0 @@ -77721,18 +77752,20 @@ MonoBehaviour: _ModemOperation: {fileID: 8300000, guid: 5edc86d0e2d307e498d89a513a1fe196, type: 3} _TheLoot: {fileID: 8300000, guid: 66a73bb07c1203843831c12df9c02c30, type: 3} _TheWarrant: {fileID: 8300000, guid: 54b6be0d7456ff84faff67734e63f713, type: 3} + _FogHorn: {fileID: 8300000, guid: e85401543a2dade4690ef51e3e8734ad, type: 3} + _JailDoorSlam: {fileID: 8300000, guid: a77878811d4fadc42930a9ca5be5ea93, type: 3} _MapCorrect: {fileID: 8300000, guid: 680142b640a682d4a92c9935828c2311, type: 3} _MapIncorrect: {fileID: 8300000, guid: 1494bab0c02f97843ba2bc2b6c1fa4ee, type: 3} _CarmenInJail: {fileID: 8300000, guid: a3782a44fca9d2d439318892b75d3b93, type: 3} + _CarmenEscape: {fileID: 8300000, guid: d608d8310e3f92546acd07ff6240d29b, type: 3} _LeverCartoon: {fileID: 8300000, guid: 42a7290f75e32364099536ce9cb2d75c, type: 3} _Boing: {fileID: 8300000, guid: 760080d45978ef54a9074ef55135cebd, type: 3} _Printer: {fileID: 8300000, guid: 3d202995ebfe8e54ba5b655f501722ff, type: 3} _Thunder: {fileID: 8300000, guid: 2983ffa89947cae4e9ab13f0b4861c0d, type: 3} - _FogHorn: {fileID: 8300000, guid: e85401543a2dade4690ef51e3e8734ad, type: 3} - _JailDoorSlam: {fileID: 8300000, guid: a77878811d4fadc42930a9ca5be5ea93, type: 3} + _DistantFoghorn: {fileID: 8300000, guid: 78b792a0619f7834d92308d98c2ce31e, type: 3} + _LightSwitch: {fileID: 8300000, guid: c00d231b20e91fb4e862d9038821d7f8, type: 3} _PhoneRing: {fileID: 8300000, guid: e204469f7d81f814faa906180db7f455, type: 3} _TimerEnd: {fileID: 8300000, guid: 9c9e0cef11278c843b24b1eecdc17f05, type: 3} - _CarmenEscape: {fileID: 8300000, guid: d608d8310e3f92546acd07ff6240d29b, type: 3} _CrookTheme_Contessa: {fileID: 8300000, guid: 82bb08241eeb0cf40a74d97c1e51b444, type: 3} _CrookTheme_DoubleTrouble: {fileID: 8300000, guid: e97b7d3dc5f0bfe46a77d46398bb2bb6, @@ -92027,43 +92060,40 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} @@ -92074,16 +92104,19 @@ MonoBehaviour: - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -97111,6 +97144,10 @@ MonoBehaviour: ID: 1515 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1074789658} + ID: 1516 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -97123,10 +97160,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2110808113} m_Modifications: + - target: {fileID: 5375092276513222770, guid: bf667ba13e10e0c48a06066e3e1a29ae, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 5375092276513222770, guid: bf667ba13e10e0c48a06066e3e1a29ae, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 5375092276513222770, guid: bf667ba13e10e0c48a06066e3e1a29ae, + type: 3} - target: {fileID: 6120668579714775073, guid: bf667ba13e10e0c48a06066e3e1a29ae, type: 3} propertyPath: m_LocalPosition.x - value: 7.4400043 + value: 7.53 objectReference: {fileID: 0} - target: {fileID: 6120668579714775073, guid: bf667ba13e10e0c48a06066e3e1a29ae, type: 3} @@ -97136,7 +97184,7 @@ PrefabInstance: - target: {fileID: 6120668579714775073, guid: bf667ba13e10e0c48a06066e3e1a29ae, type: 3} propertyPath: m_LocalPosition.z - value: -4.460001 + value: -3.58 objectReference: {fileID: 0} - target: {fileID: 6120668579714775073, guid: bf667ba13e10e0c48a06066e3e1a29ae, type: 3} @@ -97183,17 +97231,28 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8461246687999046176, guid: bf667ba13e10e0c48a06066e3e1a29ae, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bf667ba13e10e0c48a06066e3e1a29ae, type: 3} ---- !u!95 &7187778359178514366 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 8150590898460676725, guid: bf667ba13e10e0c48a06066e3e1a29ae, +--- !u!114 &7187778359178514366 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5375092276513222770, guid: bf667ba13e10e0c48a06066e3e1a29ae, type: 3} m_PrefabInstance: {fileID: 7187778359178514365} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1074789658} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f869d57eb7111c24faac6199a920b5e1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &7187778359178514367 stripped Transform: m_CorrespondingSourceObject: {fileID: 6120668579714775073, guid: bf667ba13e10e0c48a06066e3e1a29ae, diff --git a/Assets/UdonSharp/AudioManager.asset b/Assets/UdonSharp/AudioManager.asset index 4d13c73..5df9736 100644 --- a/Assets/UdonSharp/AudioManager.asset +++ b/Assets/UdonSharp/AudioManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 73 + Data: 75 - Name: Entry: 7 Data: @@ -1286,13 +1286,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapCorrect + Data: _FogHorn - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapCorrect + Data: _FogHorn - Name: k__BackingField Entry: 9 Data: 10 @@ -1340,13 +1340,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _MapIncorrect + Data: _JailDoorSlam - Name: $v Entry: 7 Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _MapIncorrect + Data: _JailDoorSlam - Name: k__BackingField Entry: 9 Data: 10 @@ -1394,13 +1394,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenInJail + Data: _MapCorrect - Name: $v Entry: 7 Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenInJail + Data: _MapCorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1448,13 +1448,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LeverCartoon + Data: _MapIncorrect - Name: $v Entry: 7 Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LeverCartoon + Data: _MapIncorrect - Name: k__BackingField Entry: 9 Data: 10 @@ -1502,13 +1502,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Boing + Data: _CarmenInJail - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Boing + Data: _CarmenInJail - Name: k__BackingField Entry: 9 Data: 10 @@ -1556,13 +1556,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Printer + Data: _CarmenEscape - Name: $v Entry: 7 Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Printer + Data: _CarmenEscape - Name: k__BackingField Entry: 9 Data: 10 @@ -1610,13 +1610,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Thunder + Data: _LeverCartoon - Name: $v Entry: 7 Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Thunder + Data: _LeverCartoon - Name: k__BackingField Entry: 9 Data: 10 @@ -1664,13 +1664,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FogHorn + Data: _Boing - Name: $v Entry: 7 Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FogHorn + Data: _Boing - Name: k__BackingField Entry: 9 Data: 10 @@ -1718,13 +1718,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailDoorSlam + Data: _Printer - Name: $v Entry: 7 Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailDoorSlam + Data: _Printer - Name: k__BackingField Entry: 9 Data: 10 @@ -1772,13 +1772,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PhoneRing + Data: _Thunder - Name: $v Entry: 7 Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PhoneRing + Data: _Thunder - Name: k__BackingField Entry: 9 Data: 10 @@ -1827,13 +1827,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TimerEnd + Data: _DistantFoghorn - Name: $v Entry: 7 Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TimerEnd + Data: _DistantFoghorn - Name: k__BackingField Entry: 9 Data: 10 @@ -1882,13 +1882,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CarmenEscape + Data: _LightSwitch - Name: $v Entry: 7 Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CarmenEscape + Data: _LightSwitch - Name: k__BackingField Entry: 9 Data: 10 @@ -1937,13 +1937,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Contessa + Data: _PhoneRing - Name: $v Entry: 7 Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Contessa + Data: _PhoneRing - Name: k__BackingField Entry: 9 Data: 10 @@ -1966,12 +1966,122 @@ MonoBehaviour: Entry: 7 Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 112|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: _TimerEnd + - Name: $v + Entry: 7 + Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _TimerEnd + - 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: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 115|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: 116|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: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 112|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 118|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1980,123 +2090,13 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 113|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 119|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Crook Themes - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 114|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: 115|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: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 117|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: 118|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: 119|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 120|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2120,13 +2120,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_DoubleTrouble - Name: $v Entry: 7 Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Kneemoi + Data: _CrookTheme_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2175,13 +2175,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_EarthaBrute - Name: $v Entry: 7 Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_PattyLarceny + Data: _CrookTheme_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -2230,13 +2230,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_Kneemoi - Name: $v Entry: 7 Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_Robocrook + Data: _CrookTheme_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -2285,13 +2285,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_PattyLarceny - Name: $v Entry: 7 Data: 130|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_SarahNade + Data: _CrookTheme_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -2340,13 +2340,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_Robocrook - Name: $v Entry: 7 Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_TopGrunge + Data: _CrookTheme_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2395,13 +2395,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_SarahNade - Name: $v Entry: 7 Data: 136|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_VicTheSlick + Data: _CrookTheme_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -2450,13 +2450,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_TopGrunge - Name: $v Entry: 7 Data: 139|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookTheme_WonderRat + Data: _CrookTheme_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -2505,13 +2505,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_VicTheSlick - Name: $v Entry: 7 Data: 142|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Contessa + Data: _CrookTheme_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -2534,12 +2534,122 @@ MonoBehaviour: Entry: 7 Data: 143|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 144|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: 145|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: 146|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 147|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: _CrookInJail_Contessa + - Name: $v + Entry: 7 + Data: 148|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookInJail_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: 149|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 144|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 150|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -2548,123 +2658,13 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 145|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 151|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Crook In Jail - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 146|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: _CrookInJail_DoubleTrouble - - Name: $v - Entry: 7 - Data: 147|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CrookInJail_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: 148|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 149|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: _CrookInJail_EarthaBrute - - Name: $v - Entry: 7 - Data: 150|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CrookInJail_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: 151|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 152|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2688,13 +2688,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_DoubleTrouble - Name: $v Entry: 7 Data: 153|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Kneemoi + Data: _CrookInJail_DoubleTrouble - Name: k__BackingField Entry: 9 Data: 10 @@ -2743,13 +2743,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_EarthaBrute - Name: $v Entry: 7 Data: 156|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_PattyLarceny + Data: _CrookInJail_EarthaBrute - Name: k__BackingField Entry: 9 Data: 10 @@ -2798,13 +2798,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_Kneemoi - Name: $v Entry: 7 Data: 159|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_Robocrook + Data: _CrookInJail_Kneemoi - Name: k__BackingField Entry: 9 Data: 10 @@ -2853,13 +2853,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_PattyLarceny - Name: $v Entry: 7 Data: 162|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_SarahNade + Data: _CrookInJail_PattyLarceny - Name: k__BackingField Entry: 9 Data: 10 @@ -2908,13 +2908,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_Robocrook - Name: $v Entry: 7 Data: 165|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_TopGrunge + Data: _CrookInJail_Robocrook - Name: k__BackingField Entry: 9 Data: 10 @@ -2963,13 +2963,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_SarahNade - Name: $v Entry: 7 Data: 168|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_VicTheSlick + Data: _CrookInJail_SarahNade - Name: k__BackingField Entry: 9 Data: 10 @@ -3018,13 +3018,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_TopGrunge - Name: $v Entry: 7 Data: 171|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookInJail_WonderRat + Data: _CrookInJail_TopGrunge - Name: k__BackingField Entry: 9 Data: 10 @@ -3073,13 +3073,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Africa + Data: _CrookInJail_VicTheSlick - Name: $v Entry: 7 Data: 174|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Africa + Data: _CrookInJail_VicTheSlick - Name: k__BackingField Entry: 9 Data: 10 @@ -3102,12 +3102,122 @@ MonoBehaviour: Entry: 7 Data: 175|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 176|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: _CrookInJail_WonderRat + - Name: $v + Entry: 7 + Data: 177|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookInJail_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: 178|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 179|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: _CrookJailCall_DoubleTrouble_Africa + - Name: $v + Entry: 7 + Data: 180|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookJailCall_DoubleTrouble_Africa + - 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: 181|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 176|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 182|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -3116,123 +3226,13 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 177|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 183|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Crook Jail Calls - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 178|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Asia - - Name: $v - Entry: 7 - Data: 179|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Asia - - 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: 180|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 181|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Europe - - Name: $v - Entry: 7 - Data: 182|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Europe - - 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: 183|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 184|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -3256,13 +3256,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_NorthAmerica + Data: _CrookJailCall_DoubleTrouble_Asia - Name: $v Entry: 7 Data: 185|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_NorthAmerica + Data: _CrookJailCall_DoubleTrouble_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -3311,13 +3311,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Oceania + Data: _CrookJailCall_DoubleTrouble_Europe - Name: $v Entry: 7 Data: 188|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_Oceania + Data: _CrookJailCall_DoubleTrouble_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -3366,13 +3366,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_DoubleTrouble_SouthAmerica + Data: _CrookJailCall_DoubleTrouble_NorthAmerica - Name: $v Entry: 7 Data: 191|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_DoubleTrouble_SouthAmerica + Data: _CrookJailCall_DoubleTrouble_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -3421,13 +3421,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_Africa + Data: _CrookJailCall_DoubleTrouble_Oceania - Name: $v Entry: 7 Data: 194|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_Africa + Data: _CrookJailCall_DoubleTrouble_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -3476,13 +3476,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_Asia + Data: _CrookJailCall_DoubleTrouble_SouthAmerica - Name: $v Entry: 7 Data: 197|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_Asia + Data: _CrookJailCall_DoubleTrouble_SouthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -3531,13 +3531,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_Europe + Data: _CrookJailCall_Eartha_Africa - Name: $v Entry: 7 Data: 200|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_Europe + Data: _CrookJailCall_Eartha_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -3586,13 +3586,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_NorthAmerica + Data: _CrookJailCall_Eartha_Asia - Name: $v Entry: 7 Data: 203|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_NorthAmerica + Data: _CrookJailCall_Eartha_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -3641,13 +3641,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_Oceania + Data: _CrookJailCall_Eartha_Europe - Name: $v Entry: 7 Data: 206|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_Oceania + Data: _CrookJailCall_Eartha_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -3696,13 +3696,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Eartha_SouthAmerica + Data: _CrookJailCall_Eartha_NorthAmerica - Name: $v Entry: 7 Data: 209|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Eartha_SouthAmerica + Data: _CrookJailCall_Eartha_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -3751,13 +3751,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookJailCall_Eartha_Oceania - Name: $v Entry: 7 Data: 212|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Africa + Data: _CrookJailCall_Eartha_Oceania - Name: k__BackingField Entry: 9 Data: 10 @@ -3806,13 +3806,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Asia + Data: _CrookJailCall_Eartha_SouthAmerica - Name: $v Entry: 7 Data: 215|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Asia + Data: _CrookJailCall_Eartha_SouthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -3861,13 +3861,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Europe + Data: _CrookJailCall_Patty_Africa - Name: $v Entry: 7 Data: 218|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Europe + Data: _CrookJailCall_Patty_Africa - Name: k__BackingField Entry: 9 Data: 10 @@ -3916,13 +3916,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_NorthAmerica + Data: _CrookJailCall_Patty_Asia - Name: $v Entry: 7 Data: 221|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_NorthAmerica + Data: _CrookJailCall_Patty_Asia - Name: k__BackingField Entry: 9 Data: 10 @@ -3971,13 +3971,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_Oceania + Data: _CrookJailCall_Patty_Europe - Name: $v Entry: 7 Data: 224|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_Oceania + Data: _CrookJailCall_Patty_Europe - Name: k__BackingField Entry: 9 Data: 10 @@ -4026,13 +4026,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookJailCall_Patty_SouthAmerica + Data: _CrookJailCall_Patty_NorthAmerica - Name: $v Entry: 7 Data: 227|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookJailCall_Patty_SouthAmerica + Data: _CrookJailCall_Patty_NorthAmerica - Name: k__BackingField Entry: 9 Data: 10 @@ -4081,16 +4081,126 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FadeOutMusic + Data: _CrookJailCall_Patty_Oceania - Name: $v Entry: 7 Data: 230|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookJailCall_Patty_Oceania + - 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: 231|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 232|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: _CrookJailCall_Patty_SouthAmerica + - Name: $v + Entry: 7 + Data: 233|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookJailCall_Patty_SouthAmerica + - Name: k__BackingField + Entry: 9 + Data: 10 + - Name: k__BackingField + Entry: 9 + Data: 10 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 234|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 235|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _FadeOutMusic + - Name: $v + Entry: 7 + Data: 236|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FadeOutMusic - Name: k__BackingField Entry: 7 - Data: 231|System.RuntimeType, mscorlib + Data: 237|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -4099,7 +4209,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 231 + Data: 237 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -4114,7 +4224,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 232|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 238|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/AudioManager.cs b/Assets/UdonSharp/AudioManager.cs index e20d0dd..36d363c 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -37,21 +37,23 @@ public enum SFXEventType TheLoot, TheWarrant, + FogHorn, + JailDoorSlam, InJail, MapCorrect, MapIncorrect, CarmenInJail, + CarmenEscape, LeverCartoon, Boing, Printer, Thunder, - FogHorn, - JailDoorSlam, + DistantFoghorn, + LightSwitch, PhoneRing, - TimerEnd, - CarmenEscape + TimerEnd } @@ -89,20 +91,22 @@ public class AudioManager : UdonSharpBehaviour [SerializeField] private AudioClip _TheLoot = null; [SerializeField] private AudioClip _TheWarrant = null; + [SerializeField] private AudioClip _FogHorn = null; + [SerializeField] private AudioClip _JailDoorSlam = null; [SerializeField] private AudioClip _MapCorrect = null; [SerializeField] private AudioClip _MapIncorrect = null; [SerializeField] private AudioClip _CarmenInJail = null; + [SerializeField] private AudioClip _CarmenEscape = null; [SerializeField] private AudioClip _LeverCartoon = null; [SerializeField] private AudioClip _Boing = null; [SerializeField] private AudioClip _Printer = null; [SerializeField] private AudioClip _Thunder = null; - [SerializeField] private AudioClip _FogHorn = null; - [SerializeField] private AudioClip _JailDoorSlam = null; + [SerializeField] private AudioClip _DistantFoghorn = null; + [SerializeField] private AudioClip _LightSwitch = null; [SerializeField] private AudioClip _PhoneRing = null; [SerializeField] private AudioClip _TimerEnd = null; - [SerializeField] private AudioClip _CarmenEscape = null; [Space][Header("Crook Themes")] [SerializeField] private AudioClip _CrookTheme_Contessa = null; @@ -278,20 +282,22 @@ public class AudioManager : UdonSharpBehaviour case SFXEventType.TheLoot: _SFXPlayer.clip = _TheLoot; break; case SFXEventType.TheWarrant: _SFXPlayer.clip = _TheWarrant; break; + case SFXEventType.FogHorn: _SFXPlayer.clip = _FogHorn; break; + case SFXEventType.JailDoorSlam: _SFXPlayer.clip = _JailDoorSlam; break; case SFXEventType.MapCorrect: _SFXPlayer.clip = _MapCorrect; break; case SFXEventType.MapIncorrect: _SFXPlayer.clip = _MapIncorrect; break; case SFXEventType.CarmenInJail: _SFXPlayer.clip = _CarmenInJail; break; + case SFXEventType.CarmenEscape: _SFXPlayer.clip = _CarmenEscape; break; case SFXEventType.LeverCartoon: _SFXPlayer.clip = _LeverCartoon; break; case SFXEventType.Boing: _SFXPlayer.clip = _Boing; break; case SFXEventType.Printer: _SFXPlayer.clip = _Printer; break; case SFXEventType.Thunder: _SFXPlayer.clip = _Thunder; break; - case SFXEventType.FogHorn: _SFXPlayer.clip = _FogHorn; break; - case SFXEventType.JailDoorSlam: _SFXPlayer.clip = _JailDoorSlam; break; + case SFXEventType.DistantFoghorn: _SFXPlayer.clip = _DistantFoghorn; break; + case SFXEventType.LightSwitch: _SFXPlayer.clip = _LightSwitch; break; case SFXEventType.PhoneRing: _SFXPlayer.clip = _PhoneRing; break; case SFXEventType.TimerEnd: _SFXPlayer.clip = _TimerEnd; break; - case SFXEventType.CarmenEscape: _SFXPlayer.clip = _CarmenEscape; break; default: _SFXPlayer.clip = null; break; } diff --git a/Assets/UdonSharp/DetectiveNoirEffect.asset b/Assets/UdonSharp/DetectiveNoirEffect.asset new file mode 100644 index 0000000..17bfe78 --- /dev/null +++ b/Assets/UdonSharp/DetectiveNoirEffect.asset @@ -0,0 +1,245 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: DetectiveNoirEffect + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 8cfb36b9d91a52144944b7b7483eca8a, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: f869d57eb7111c24faac6199a920b5e1, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 0 + hasInteractEvent: 0 + scriptID: 3329048536200152850 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _AudioManager + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudioManager + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: AudioManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Animator + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Animator + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|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: _Activate + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Activate + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 12 + - 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: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 14|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 15|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: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/DetectiveNoirEffect.asset.meta b/Assets/UdonSharp/DetectiveNoirEffect.asset.meta new file mode 100644 index 0000000..9199e87 --- /dev/null +++ b/Assets/UdonSharp/DetectiveNoirEffect.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da559b73fe438124eb755624f938f789 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/DetectiveNoirEffect.cs b/Assets/UdonSharp/DetectiveNoirEffect.cs new file mode 100644 index 0000000..49c5218 --- /dev/null +++ b/Assets/UdonSharp/DetectiveNoirEffect.cs @@ -0,0 +1,26 @@ + +using UdonSharp; +using UnityEngine; + + +public class DetectiveNoirEffect : UdonSharpBehaviour +{ + [SerializeField] private AudioManager _AudioManager; + + [SerializeField] private Animator _Animator; + + [UdonSynced, FieldChangeCallback(nameof(Activate))] private bool _Activate = false; + + + public bool Activate + { + set + { + _Activate = value; + _Animator.SetBool("Activate", _Activate); + if (!_Activate) _AudioManager.PlaySFX(SFXEventType.LightSwitch); + RequestSerialization(); + } + get => _Activate; + } +} diff --git a/Assets/UdonSharp/DetectiveNoirEffect.cs.meta b/Assets/UdonSharp/DetectiveNoirEffect.cs.meta new file mode 100644 index 0000000..d5a9b8e --- /dev/null +++ b/Assets/UdonSharp/DetectiveNoirEffect.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f869d57eb7111c24faac6199a920b5e1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 3997dcf..824f0e1 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -1675,13 +1675,13 @@ MonoBehaviour: Data: 107|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule + Data: DetectiveNoirEffect, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 107 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1854,11 +1854,17 @@ MonoBehaviour: Entry: 1 Data: _LightningRoundAnimator - Name: k__BackingField - Entry: 9 - Data: 107 + Entry: 7 + Data: 119|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 107 + Data: 119 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1873,14 +1879,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 119|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 120|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 121|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1889,7 +1895,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 121|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 122|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects @@ -1898,7 +1904,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 122|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 123|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index e080185..f027ced 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -49,7 +49,7 @@ public class GameManagerRound1 : GameManagerBase [SerializeField] private CaseVideoSyncPlayer _VideoPlayer; [SerializeField] private ACMECrimenetComputer _ACMECrimenetComputer; [SerializeField] private VideoMusicClueSkateboard _VideoMusicClueSkateboard; - [SerializeField] private Animator _DetectiveNoirEffect; + [SerializeField] private DetectiveNoirEffect _DetectiveNoirEffect; [SerializeField] private Modem _Modem; [SerializeField] private ArrivalDisplay _ArrivalDisplay; @@ -217,8 +217,6 @@ public class GameManagerRound1 : GameManagerBase ShowBetweenQuestionsInterface(); - _VideoPlayer.ShowScreen = ClueScreenType.Blank; - _GameHasBegun = true; } @@ -381,24 +379,24 @@ public class GameManagerRound1 : GameManagerBase private void InitialiseDetectiveNoirEffect(DataDictionary Presentation) { + _QuestionSubstage++; switch (_QuestionSubstage) { - case 0: - _DetectiveNoirEffect.SetBool("Activate", true); - EnableInteraction("Play Video"); - _QuestionSubstage++; - Debug.LogError("[GameManagerRound1] We should have just activated the noir effect."); - break; case 1: + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.DistantFoghorn); + EnableInteraction("Black And White"); + break; + case 2: + _DetectiveNoirEffect.Activate = true; + EnableInteraction("Play Video"); + break; + case 3: _VideoPlayer.PlayVideo = true; EnableInteraction("Back To Colour"); - _QuestionSubstage++; - Debug.LogError("[GameManagerRound1] We should have just started playing the video."); break; default: - _DetectiveNoirEffect.SetBool("Activate", false); + _DetectiveNoirEffect.Activate = false; MultipleChoiceRevealQuestion(); - Debug.LogError("[GameManagerRound1] The question is revealed."); break; } } @@ -1666,6 +1664,8 @@ public class GameManagerRound1 : GameManagerBase private HostCardBetweenRoundsInterface ShowBetweenQuestionsInterface() { + _VideoPlayer.ShowScreen = ClueScreenType.Blank; + HostCardBetweenRoundsInterface Interface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);