diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ac427f6..1c3c904 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -196,6 +196,7 @@ + diff --git a/Assets/Materials/Assorted/M_TileFloor.mat b/Assets/Materials/Assorted/M_TileFloor.mat index 592f1d2..aee5c31 100644 --- a/Assets/Materials/Assorted/M_TileFloor.mat +++ b/Assets/Materials/Assorted/M_TileFloor.mat @@ -19,7 +19,7 @@ Material: - _NORMALMAP m_LightmapFlags: 4 m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] diff --git a/Assets/Materials/Gradients.meta b/Assets/Materials/Gradients.meta new file mode 100644 index 0000000..008a93e --- /dev/null +++ b/Assets/Materials/Gradients.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef35332b74679ef46a2282da73bf3460 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Gradients/M_JailCall_Background.mat b/Assets/Materials/Gradients/M_JailCall_Background.mat new file mode 100644 index 0000000..791bef1 --- /dev/null +++ b/Assets/Materials/Gradients/M_JailCall_Background.mat @@ -0,0 +1,85 @@ +%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_JailCall_Background + m_Shader: {fileID: 4800000, guid: ae367da677f462b469824fb90f3e4192, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + 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: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _BottomColour: {r: 0.19607843, g: 0.078431375, b: 0.078431375, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TopColour: {r: 0.47058824, g: 0.39215687, b: 0.078431375, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Gradients/M_JailCall_Background.mat.meta b/Assets/Materials/Gradients/M_JailCall_Background.mat.meta new file mode 100644 index 0000000..085d9a8 --- /dev/null +++ b/Assets/Materials/Gradients/M_JailCall_Background.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6924ed010b86e02488fa9173e5405519 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_JailCallOverlay_CrookPortrait.mat b/Assets/Materials/M_JailCallOverlay_CrookPortrait.mat new file mode 100644 index 0000000..f930e50 --- /dev/null +++ b/Assets/Materials/M_JailCallOverlay_CrookPortrait.mat @@ -0,0 +1,83 @@ +%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_JailCallOverlay_CrookPortrait + m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + 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: 2800000, guid: b7d40cf644879564d96d55edaeadf418, type: 3} + 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: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/M_JailCallOverlay_CrookPortrait.mat.meta b/Assets/Materials/M_JailCallOverlay_CrookPortrait.mat.meta new file mode 100644 index 0000000..197f58e --- /dev/null +++ b/Assets/Materials/M_JailCallOverlay_CrookPortrait.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33ddb8dc0417d7a46a7bacee4ef78781 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_CrookCallOverlay.fbx b/Assets/Models/SM_CrookCallOverlay.fbx new file mode 100644 index 0000000..b2231b4 Binary files /dev/null and b/Assets/Models/SM_CrookCallOverlay.fbx differ diff --git a/Assets/Models/SM_CrookCallOverlay.fbx.meta b/Assets/Models/SM_CrookCallOverlay.fbx.meta new file mode 100644 index 0000000..896c100 --- /dev/null +++ b/Assets/Models/SM_CrookCallOverlay.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: f763c946e951c2540a7de2af1f8a5756 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Location Board.prefab b/Assets/Prefabs/Location Board.prefab index 3248d3e..1087bb5 100644 --- a/Assets/Prefabs/Location Board.prefab +++ b/Assets/Prefabs/Location Board.prefab @@ -1305,95 +1305,7 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 5696832292153495865} - - targetCorrespondingSourceObject: {fileID: -3973107660126017756, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 612364352716398234} - - targetCorrespondingSourceObject: {fileID: 6471496338278676438, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 5744208278916391295} - - targetCorrespondingSourceObject: {fileID: -3556817346404478780, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2905360891365740744} - - targetCorrespondingSourceObject: {fileID: 2238249416642749085, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 6337830862885040051} - - targetCorrespondingSourceObject: {fileID: 2909334989756356583, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 6211890679309056881} - - targetCorrespondingSourceObject: {fileID: -1840680963563420374, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 6861921612984706490} - - targetCorrespondingSourceObject: {fileID: 6117044130540447792, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2612544195994494416} - - targetCorrespondingSourceObject: {fileID: 3493207879455990265, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 3962810847674610344} - - targetCorrespondingSourceObject: {fileID: 8376888327017635834, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 9197562149497935882} - - targetCorrespondingSourceObject: {fileID: 3337295398627588303, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1369459349979372607} - - targetCorrespondingSourceObject: {fileID: 7754964794730939599, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 3806178411280181953} - - targetCorrespondingSourceObject: {fileID: -3528278965460299338, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 5000583433381671636} - - targetCorrespondingSourceObject: {fileID: 896008932461208034, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 6198850068686851816} - - targetCorrespondingSourceObject: {fileID: -7460263180954297088, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1139615799674869236} - - targetCorrespondingSourceObject: {fileID: 1402163078210095186, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - insertIndex: -1 - addedObject: {fileID: 5405473332693468637} m_SourcePrefab: {fileID: 100100000, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} ---- !u!1 &8630436604248795 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 896008932461208034, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &6198850068686851816 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8630436604248795} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 3185973594663407288, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &31612434180235886 stripped GameObject: m_CorrespondingSourceObject: {fileID: 865154439716831575, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -1636,62 +1548,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &1404614878502027684 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2238249416642749085, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &6337830862885040051 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1404614878502027684} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 3185973594663407288, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} ---- !u!1 &1442902439277362745 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -7460263180954297088, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1139615799674869236 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1442902439277362745} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -1562275218897716241, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &1511768504779359164 stripped GameObject: m_CorrespondingSourceObject: {fileID: -7454852369631698811, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -1722,68 +1578,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &2235071648007023467 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1402163078210095186, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &5405473332693468637 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2235071648007023467} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 3185973594663407288, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &2287881859441124649 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1419155444574488080, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &2459420928616881142 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3337295398627588303, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1369459349979372607 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2459420928616881142} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -1562275218897716241, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &2465704447043972103 stripped GameObject: m_CorrespondingSourceObject: {fileID: -5888989676642447554, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -1796,34 +1596,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &2599107998373262558 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2909334989756356583, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &6211890679309056881 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2599107998373262558} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 7502377544057204969, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &2666790110604602615 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2986939127493840846, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -1932,34 +1704,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &4326750022171427520 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3493207879455990265, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &3962810847674610344 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4326750022171427520} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 7502377544057204969, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &4385144699980483201 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3506830667132889528, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -1978,96 +1722,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &4814998094527460349 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3556817346404478780, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &2905360891365740744 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4814998094527460349} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -1562275218897716241, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} ---- !u!1 &4861885176728351375 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3528278965460299338, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &5000583433381671636 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4861885176728351375} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -1562275218897716241, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &4869001312024741485 stripped GameObject: m_CorrespondingSourceObject: {fileID: -3466715275594455724, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &4948688068668212253 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3973107660126017756, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &612364352716398234 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4948688068668212253} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -1562275218897716241, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &4972669745588601587 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5292735614792557002, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -2134,68 +1794,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &6178575401941964015 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6471496338278676438, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &5744208278916391295 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6178575401941964015} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 3185973594663407288, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &6216678512539777420 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6500943988115921589, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &6383273081894374153 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6117044130540447792, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &2612544195994494416 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6383273081894374153} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 7502377544057204969, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &6545201814537221249 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6243344133778003896, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -2250,34 +1854,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &7489135791541184502 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7754964794730939599, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &3806178411280181953 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7489135791541184502} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -6250710606382680247, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &7618210905816584185 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7334314590468353216, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -2290,34 +1866,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &7639649077870355987 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -1840680963563420374, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &6861921612984706490 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7639649077870355987} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 7502377544057204969, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &7908806454334490001 stripped GameObject: m_CorrespondingSourceObject: {fileID: -2184153841995585880, guid: 505c0fb5a04a07649b0afc0e005950cb, @@ -2378,34 +1926,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 896755320265696057} m_PrefabAsset: {fileID: 0} ---- !u!1 &8660780226090925251 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8376888327017635834, guid: 505c0fb5a04a07649b0afc0e005950cb, - type: 3} - m_PrefabInstance: {fileID: 896755320265696057} - m_PrefabAsset: {fileID: 0} ---- !u!64 &9197562149497935882 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8660780226090925251} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -6250710606382680247, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} --- !u!1 &9162272996073656261 stripped GameObject: m_CorrespondingSourceObject: {fileID: -912255411300651780, guid: 505c0fb5a04a07649b0afc0e005950cb, diff --git a/Assets/Prefabs/Overlays/Jail Call Overlay.prefab b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab new file mode 100644 index 0000000..4a9bcec --- /dev/null +++ b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab @@ -0,0 +1,209 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &27227279282360470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5469398094120495767} + m_Layer: 23 + m_Name: Overlay Elements + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5469398094120495767 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 27227279282360470} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2752861152387369276} + m_Father: {fileID: 2547552435459685462} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1215114096519939564 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2547552435459685462} + - component: {fileID: 4428283700046431671} + - component: {fileID: 6848885185798096049} + m_Layer: 23 + m_Name: Jail Call Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2547552435459685462 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215114096519939564} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5469398094120495767} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4428283700046431671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215114096519939564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 6848885185798096049} + _Animator: {fileID: 0} + _OverlayElements: {fileID: 27227279282360470} + _AspectRatio: 1.7777778 + _OverlayFit: 1 +--- !u!114 &6848885185798096049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1215114096519939564} + 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: 6e1c5cb02e885ca42ba9cbe7b5796eaf, + type: 2} + programSource: {fileID: 11400000, guid: 2923fcd444bb991459686ced4864c9bf, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1001 &2431550034009452247 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5469398094120495767} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 6924ed010b86e02488fa9173e5405519, type: 2} + - target: {fileID: -7511558181221131132, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 33ddb8dc0417d7a46a7bacee4ef78781, type: 2} + - target: {fileID: 919132149155446097, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Name + value: SM_CrookCallOverlay + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + propertyPath: m_Layer + value: 23 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f763c946e951c2540a7de2af1f8a5756, type: 3} +--- !u!4 &2752861152387369276 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + m_PrefabInstance: {fileID: 2431550034009452247} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Overlays/Jail Call Overlay.prefab.meta b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab.meta new file mode 100644 index 0000000..efba42e --- /dev/null +++ b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9c9a05ebcbdcf91469287ad048d5341d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Overlays/Newspaper Overlay.prefab b/Assets/Prefabs/Overlays/Newspaper Overlay.prefab index 5bf2b05..045b8a9 100644 --- a/Assets/Prefabs/Overlays/Newspaper Overlay.prefab +++ b/Assets/Prefabs/Overlays/Newspaper Overlay.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7241432374676536911 Transform: m_ObjectHideFlags: 0 @@ -111,7 +111,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.3333334, y: 1, z: 1} + m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7241432374676536911} @@ -142,6 +142,7 @@ MonoBehaviour: _Animator: {fileID: 0} _OverlayElements: {fileID: 2396313974114816115} _AspectRatio: 1.3333334 + _OverlayFit: 0 --- !u!114 &1742954083948632810 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Overlays/Timer Overlay.prefab b/Assets/Prefabs/Overlays/Timer Overlay.prefab index 04e3587..c12dfa4 100644 --- a/Assets/Prefabs/Overlays/Timer Overlay.prefab +++ b/Assets/Prefabs/Overlays/Timer Overlay.prefab @@ -229,7 +229,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.7777776, y: 1, z: 1} + m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8368919687487440337} @@ -281,6 +281,7 @@ MonoBehaviour: _Animator: {fileID: 8727178232818392669} _OverlayElements: {fileID: 2305955422126925254} _AspectRatio: 1.7777778 + _OverlayFit: 0 --- !u!114 &7056734146676153633 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player Pedestal.prefab b/Assets/Prefabs/Player Pedestal.prefab index 03c6c37..4d1699c 100644 --- a/Assets/Prefabs/Player Pedestal.prefab +++ b/Assets/Prefabs/Player Pedestal.prefab @@ -460,6 +460,16 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - target: {fileID: -1068877986683080187, guid: a6a608f7995dbbd4a85564a2feec0dc5, + type: 3} + propertyPath: m_ScaleInLightmap + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -1068877986683080187, guid: a6a608f7995dbbd4a85564a2feec0dc5, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: a6a608f7995dbbd4a85564a2feec0dc5, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 6447f7d..2be4264 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -2984,7 +2984,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + insertIndex: 0 + addedObject: {fileID: 1155978247} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} --- !u!114 &70805494 stripped @@ -3142,41 +3146,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1983062414} m_Modifications: - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11504,7 +11473,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - target: {fileID: 2650885240108079928, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -12145,7 +12114,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - target: {fileID: 8179098042276782212, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -25357,11 +25326,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} - - target: {fileID: 6952203793641790032, guid: 5066b3b269b691d458beae6cb7911193, - type: 3} - propertyPath: m_StitchLightmapSeams - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6952203793641790032, guid: 5066b3b269b691d458beae6cb7911193, type: 3} propertyPath: m_Materials.Array.data[0] @@ -28137,38 +28101,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 547548764} m_CullTransparentMesh: 1 ---- !u!1 &548075169 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 548075170} - m_Layer: 0 - m_Name: Alternate Switchers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &548075170 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 548075169} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.4617485, z: -0, w: 0.88701093} - m_LocalPosition: {x: 8.8890085, y: 0, z: -3.5950058} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 671628781} - m_Father: {fileID: 1882024111} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &549602626 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9213222445483219211, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -33094,97 +33026,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} ---- !u!1 &671628780 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 671628781} - - component: {fileID: 671628783} - - component: {fileID: 671628782} - m_Layer: 0 - m_Name: ACME Crimenet Computer Switcher - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &671628781 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 671628780} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} - m_LocalPosition: {x: -2.153672, y: 0, z: 9.343459} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 548075170} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &671628782 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 671628780} - 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: b84f3dc1edf53b846a172badddd49737, - type: 2} - programSource: {fileID: 11400000, guid: 1fc8e4389a71e5640b656e2c7fbabeed, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!114 &671628783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 671628780} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7c74cc2036e37f74b874180a8ad0235f, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 671628782} - _CameraController: {fileID: 1524477936} - _SwitchFunctions: - - SwitchToACMECrimenetComputerCamera - _TimeBetweenCuts: - - 5 - _AlwaysReactivate: 0 - _Loop: 1 - _LoopPoint: 0 - _FirstLoopCallbackObject: {fileID: 0} - _FirstLoopCallbackFunction: --- !u!1 &671964993 GameObject: m_ObjectHideFlags: 0 @@ -33680,6 +33521,21 @@ PrefabInstance: value: objectReference: {fileID: 4137502481405882845, guid: bfad626e12b63a5498032479904068c7, type: 3} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -36988,6 +36844,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1390751085} m_Modifications: + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} propertyPath: m_LocalPosition.x @@ -37568,6 +37439,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 364742167} m_Modifications: + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} propertyPath: m_LocalPosition.x @@ -40373,10 +40259,10 @@ MonoBehaviour: _MultiRoundVideoPlayer: {fileID: 1582487351} _WantedPosters: - {fileID: 925493523} - - {fileID: 1984717374} _MissingPosters: - {fileID: 1673503615} - - {fileID: 1049045429} + _JailCallOverlay_CrookMaterial: {fileID: 2100000, guid: 33ddb8dc0417d7a46a7bacee4ef78781, + type: 2} _LocationBoard: {fileID: 1748199014} _CaseManagerList: {fileID: 1145254423} _HostTeleportButton: {fileID: 600640153} @@ -41312,6 +41198,7 @@ MonoBehaviour: _ArrivalDisplays: - {fileID: 2013644315} - {fileID: 1776587609} + _JailCallCameraOverlay: {fileID: 1155978249} _JailPlayer: {fileID: 115578771} --- !u!1001 &867006604 PrefabInstance: @@ -43274,7 +43161,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - target: {fileID: 2650885240108079928, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -43920,7 +43807,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - target: {fileID: 8179098042276782212, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -51729,68 +51616,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1049045427 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1984717372} - m_Modifications: - - target: {fileID: 2241642981387614460, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - propertyPath: m_Name - value: Missing Poster - objectReference: {fileID: 0} - - target: {fileID: 5147662362501183343, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 5147662362501183343, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - - target: {fileID: 8536775565006915994, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8536775565006915994, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8536775565006915994, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 8536775565006915994, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, type: 3} ---- !u!4 &1049045428 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8536775565006915994, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - m_PrefabInstance: {fileID: 1049045427} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1049045429 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5147662362501183343, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - m_PrefabInstance: {fileID: 1049045427} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1207461763} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9dbc428660f6be947ae7f321d52af250, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1049086448 GameObject: m_ObjectHideFlags: 0 @@ -54423,6 +54248,21 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1832440712} m_Modifications: + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} propertyPath: m_LocalPosition.x @@ -54809,7 +54649,12 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 10 + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 3 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -56321,6 +56166,30 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1155978246 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1215114096519939564, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + m_PrefabInstance: {fileID: 3420206679586331503} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1155978247 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2547552435459685462, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + m_PrefabInstance: {fileID: 3420206679586331503} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1155978249 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4428283700046431671, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + m_PrefabInstance: {fileID: 3420206679586331503} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1155978246} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1156256174 stripped GameObject: m_CorrespondingSourceObject: {fileID: 482070654436160817, guid: be33bc7f6c414e6409becfa348b9310d, @@ -57690,12 +57559,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} ---- !u!1 &1207461763 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2241642981387614460, guid: c9ecdcf01af255c4c9bdbdca5b5b6929, - type: 3} - m_PrefabInstance: {fileID: 1049045427} - m_PrefabAsset: {fileID: 0} --- !u!1 &1209211706 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4172106258822866717, guid: 126991d511ca61841a0ef899b6c038a6, @@ -66005,7 +65868,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FOV - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -66017,6 +65880,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 10 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: CameraSystemManager @@ -66036,7 +65904,7 @@ PrefabInstance: - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.99959785 + value: 0.99939084 objectReference: {fileID: 0} - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -66046,7 +65914,7 @@ PrefabInstance: - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: 0.028357802 + value: 0.03489949 objectReference: {fileID: 0} - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -66056,7 +65924,7 @@ PrefabInstance: - target: {fileID: 4789832517991542133, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 3.25 + value: 4 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -68158,16 +68026,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - target: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, - type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, - type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, type: 3} propertyPath: m_LocalPosition.x @@ -68660,10 +68518,6 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 6044205050412544513} - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1737232024} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2508e31fad449364f8b5919392c5d343, type: 3} @@ -74361,7 +74215,6 @@ MonoBehaviour: IncorrectToHostAndAllPlayersTimerToggle: {fileID: 1574468604} ThinkAboutItTimerToggle: {fileID: 1129163084} BuzzedInPlayerTimerToggle: {fileID: 1238250497} - ACMECrimenetComputerTimerToggle: {fileID: 671628783} _CameraAnimator: {fileID: 1115429856} Player1CameraAnchor: {fileID: 1564239176} Player2CameraAnchor: {fileID: 1858619632} @@ -80758,6 +80611,7 @@ Transform: - {fileID: 295257087} - {fileID: 1230983058} - {fileID: 1468229609714695595} + - {fileID: 1737232024} - {fileID: 1470660571} m_Father: {fileID: 1451322102} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -87459,12 +87313,12 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1470660571} + m_TransformParent: {fileID: 1583513123} m_Modifications: - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalPosition.x - value: -0.9163 + value: -0.91629994 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} @@ -87479,12 +87333,12 @@ PrefabInstance: - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.70710677 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} @@ -87494,7 +87348,7 @@ PrefabInstance: - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 583779592686493652, guid: c0e6ac64e5e4b49469f640d83b81c9f7, type: 3} @@ -90152,6 +90006,21 @@ PrefabInstance: value: objectReference: {fileID: 4137502481405882845, guid: bfad626e12b63a5498032479904068c7, type: 3} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -92866,7 +92735,6 @@ Transform: m_Children: - {fileID: 1289569932} - {fileID: 400783451} - - {fileID: 548075170} m_Father: {fileID: 2110808113} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1882069443 stripped @@ -95344,12 +95212,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} ---- !u!1 &1945450557 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 860989952984718177, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - m_PrefabInstance: {fileID: 1984717371} - m_PrefabAsset: {fileID: 0} --- !u!1 &1946810433 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3453428563443069573, guid: be33bc7f6c414e6409becfa348b9310d, @@ -97805,102 +97667,6 @@ Transform: - {fileID: 341561120} m_Father: {fileID: 938262255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1984717371 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 2119386630} - m_Modifications: - - target: {fileID: 860989952984718177, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_Name - value: Wanted Poster - objectReference: {fileID: 0} - - target: {fileID: 1247484022146431936, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 1247484022146431936, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.647 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.032 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1049045428} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6bf5a3bce57127941812f36d3213a10a, type: 3} ---- !u!4 &1984717372 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8970684604787613923, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - m_PrefabInstance: {fileID: 1984717371} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1984717374 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1247484022146431936, guid: 6bf5a3bce57127941812f36d3213a10a, - type: 3} - m_PrefabInstance: {fileID: 1984717371} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1945450557} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6a8f4fbc54d645d4089278b495c28ab6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1986596420 GameObject: m_ObjectHideFlags: 0 @@ -104014,10 +103780,6 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2b5f22e139915474a9f2e20c3fd5f092, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1984717372} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2b5f22e139915474a9f2e20c3fd5f092, type: 3} insertIndex: -1 @@ -107305,6 +107067,45 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgQAAAAAAAAAAi8CAAAAAUoAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAgAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABCwAAAGoAdQBtAHAASQBtAHAAdQBsAHMAZQAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAB8BBQAAAFYAYQBsAHUAZQAAAEBABwUCMAIAAAADAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEJAAAAdwBhAGwAawBTAHAAZQBlAGQAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwBpAG4AZwBsAGUALAAgAG0AcwBjAG8AcgBsAGkAYgAfAQUAAABWAGEAbAB1AGUAAABAQAcFAjACAAAABAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABCAAAAHIAdQBuAFMAcABlAGUAZAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAB8BBQAAAFYAYQBsAHUAZQAAAKBABwUCMAIAAAAFAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAELAAAAcwB0AHIAYQBmAGUAUwBwAGUAZQBkACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAaQBuAGcAbABlACwAIABtAHMAYwBvAHIAbABpAGIAHwEFAAAAVgBhAGwAdQBlAAAAQEAHBQcFBwU= publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 +--- !u!1001 &3420206679586331503 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 70805495} + m_Modifications: + - target: {fileID: 1215114096519939564, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + propertyPath: m_Name + value: Jail Call Overlay + objectReference: {fileID: 0} + - target: {fileID: 2547552435459685462, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2547552435459685462, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2547552435459685462, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4428283700046431671, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4428283700046431671, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9c9a05ebcbdcf91469287ad048d5341d, type: 3} --- !u!4 &3480278762663400089 Transform: m_ObjectHideFlags: 0 @@ -109674,7 +109475,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - target: {fileID: 2650885240108079928, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -110315,7 +110116,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + objectReference: {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - target: {fileID: 8179098042276782212, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -113759,11 +113560,6 @@ PrefabInstance: value: objectReference: {fileID: 4347778107872516377, guid: 52955b31807a19a44ba9450bd8317720, type: 3} - - target: {fileID: 6952203793641790032, guid: 5066b3b269b691d458beae6cb7911193, - type: 3} - propertyPath: m_StitchLightmapSeams - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6952203793641790032, guid: 5066b3b269b691d458beae6cb7911193, type: 3} propertyPath: m_Materials.Array.data[0] @@ -119493,18 +119289,10 @@ MonoBehaviour: ID: 1300 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1945450557} - ID: 1301 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1673503612} ID: 1302 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1207461763} - ID: 1303 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 59893113} ID: 1307 SerializedTypeNames: @@ -119713,7 +119501,7 @@ MonoBehaviour: ID: 1370 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 671628780} + - gameObject: {fileID: 1155978246} ID: 1371 SerializedTypeNames: - VRC.Udon.UdonBehaviour @@ -120710,6 +120498,21 @@ PrefabInstance: value: objectReference: {fileID: 4137502481405882845, guid: bfad626e12b63a5498032479904068c7, type: 3} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5001696690852369563, guid: bfad626e12b63a5498032479904068c7, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 4185d4f..2745d48 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png index 9e7a40c..0605e8e 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index dca39e3..cdfbb47 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index ed957d8..ea9770e 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index bd26a58..6cd65d9 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-10.exr b/Assets/Scenes/witwics/ReflectionProbe-10.exr index 0160f8d..65b38db 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-10.exr and b/Assets/Scenes/witwics/ReflectionProbe-10.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-11.exr b/Assets/Scenes/witwics/ReflectionProbe-11.exr index ee107ef..5b94886 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-11.exr and b/Assets/Scenes/witwics/ReflectionProbe-11.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-12.exr b/Assets/Scenes/witwics/ReflectionProbe-12.exr index a56d33d..eff16f9 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-12.exr and b/Assets/Scenes/witwics/ReflectionProbe-12.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-13.exr b/Assets/Scenes/witwics/ReflectionProbe-13.exr index c45dcf0..0fe41cf 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-13.exr and b/Assets/Scenes/witwics/ReflectionProbe-13.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-14.exr b/Assets/Scenes/witwics/ReflectionProbe-14.exr index befa852..3032e13 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-14.exr and b/Assets/Scenes/witwics/ReflectionProbe-14.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 7eea2ff..c6db0ff 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 668d512..ee2e0aa 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index d7ebd31..3e4115f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index 95bc519..4846fb6 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-6.exr b/Assets/Scenes/witwics/ReflectionProbe-6.exr index 245f0aa..9930f9e 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-6.exr and b/Assets/Scenes/witwics/ReflectionProbe-6.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-7.exr b/Assets/Scenes/witwics/ReflectionProbe-7.exr index 80c392d..47362a0 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-7.exr and b/Assets/Scenes/witwics/ReflectionProbe-7.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-8.exr b/Assets/Scenes/witwics/ReflectionProbe-8.exr index 4d84d17..ed90b40 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-8.exr and b/Assets/Scenes/witwics/ReflectionProbe-8.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-9.exr b/Assets/Scenes/witwics/ReflectionProbe-9.exr index 9571429..f479fee 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-9.exr and b/Assets/Scenes/witwics/ReflectionProbe-9.exr differ diff --git a/Assets/Shaders/UVGradient.shader b/Assets/Shaders/UVGradient.shader new file mode 100644 index 0000000..801d6c4 --- /dev/null +++ b/Assets/Shaders/UVGradient.shader @@ -0,0 +1,68 @@ +// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) + +// Simplified Diffuse shader. Differences from regular Diffuse one: +// - no Main Color +// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH. + +Shader "Carmen/UVGradient" +{ + Properties + { + _TopColour ("Top Colour", Color) = (1,1,1,1) + _BottomColour ("Bottom Colour", Color) = (0,0,0,1) + } + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 200 + + Pass { + Cull Back + + CGPROGRAM + #include "UnityCG.cginc" + + #pragma vertex vert + #pragma fragment frag + + sampler2D _MainTex; + float4 _MainTex_ST; + fixed4 _TopColour; + fixed4 _BottomColour; + + CBUFFER_START(UnityPerMaterial) + uniform float4 _Emission; + CBUFFER_END + + struct Data + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct V2F + { + float2 uv : TEXCOORD0; + float4 position : SV_POSITION; + }; + + + V2F vert(Data v) + { + V2F o; + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + o.position = UnityObjectToClipPos(v.vertex); + return o; + } + + fixed4 frag(V2F i) : SV_TARGET + { + return fixed4(lerp(_BottomColour.rgb, _TopColour.rgb, i.uv.y).rgb, 1.0); + } + + ENDCG + } + } + + FallBack "VRChat/Mobile/Standard Lite" +} diff --git a/Assets/Shaders/UVGradient.shader.meta b/Assets/Shaders/UVGradient.shader.meta new file mode 100644 index 0000000..cb7dad7 --- /dev/null +++ b/Assets/Shaders/UVGradient.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ae367da677f462b469824fb90f3e4192 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Game Managers/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset index 26209d2..deb044a 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 30 + Data: 31 - Name: Entry: 7 Data: @@ -707,25 +707,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LocationBoard + Data: _JailCallOverlay_CrookMaterial - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LocationBoard + Data: _JailCallOverlay_CrookMaterial - Name: k__BackingField Entry: 7 Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: LocationBoard, Assembly-CSharp + Data: UnityEngine.Material, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 9 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -767,19 +767,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseManagerList + Data: _LocationBoard - Name: $v Entry: 7 Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseManagerList + Data: _LocationBoard - Name: k__BackingField Entry: 7 Data: 54|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CaseManagerListView, Assembly-CSharp + Data: LocationBoard, Assembly-CSharp - Name: Entry: 8 Data: @@ -803,28 +803,10 @@ MonoBehaviour: Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 56|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 57|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Host UI - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -845,25 +827,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _HostTeleportButton + Data: _CaseManagerList - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _HostTeleportButton + Data: _CaseManagerList - Name: k__BackingField Entry: 7 - Data: 60|System.RuntimeType, mscorlib + Data: 58|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.UI.Button, UnityEngine.UI + Data: CaseManagerListView, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 60 + Data: 9 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -878,10 +860,28 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 60|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 61|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Host UI + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -905,19 +905,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileCluesURL + Data: _HostTeleportButton - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileCluesURL + Data: _HostTeleportButton - Name: k__BackingField Entry: 7 Data: 64|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCUrl, VRCSDKBase + Data: UnityEngine.UI.Button, UnityEngine.UI - Name: Entry: 8 Data: @@ -928,14 +928,14 @@ MonoBehaviour: Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -944,7 +944,7 @@ MonoBehaviour: Data: 1 - Name: Entry: 7 - Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -965,19 +965,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileLootImage + Data: _CaseFileCluesURL - Name: $v Entry: 7 Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileLootImage + Data: _CaseFileCluesURL - Name: k__BackingField - Entry: 9 - Data: 64 + Entry: 7 + Data: 68|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl, VRCSDKBase + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 64 + Data: 68 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -992,13 +998,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1019,25 +1025,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileMaps + Data: _CaseFileLootImage - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileMaps + Data: _CaseFileLootImage - Name: k__BackingField - Entry: 7 - Data: 71|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDKBase.VRCUrl[], VRCSDKBase - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 68 - Name: k__BackingField Entry: 9 - Data: 71 + Data: 68 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1079,19 +1079,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileVideos + Data: _CaseFileMaps - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileMaps + - Name: k__BackingField + Entry: 7 + Data: 75|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl[], VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 75 + - 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: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 77|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: _CaseFileVideos + - Name: $v + Entry: 7 + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileVideos - Name: k__BackingField Entry: 9 - Data: 71 + Data: 75 - Name: k__BackingField Entry: 9 - Data: 71 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1106,13 +1166,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1136,16 +1196,16 @@ MonoBehaviour: Data: _CaseFileVideosFallback - Name: $v Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileVideosFallback - Name: k__BackingField Entry: 9 - Data: 71 + Data: 75 - Name: k__BackingField Entry: 9 - Data: 71 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1160,13 +1220,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1190,76 +1250,16 @@ MonoBehaviour: Data: _CaseFileClueImages - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileClueImages - Name: k__BackingField Entry: 9 - Data: 71 + Data: 75 - Name: k__BackingField Entry: 9 - Data: 71 - - 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: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 82|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: _CaseTitle - - Name: $v - Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseTitle - - Name: k__BackingField - Entry: 7 - Data: 84|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 84 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1301,19 +1301,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseDescription + Data: _CaseTitle - Name: $v Entry: 7 Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseDescription + Data: _CaseTitle - Name: k__BackingField - Entry: 9 - Data: 84 + Entry: 7 + Data: 88|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 84 + Data: 88 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1328,13 +1334,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 89|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1355,25 +1361,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseIntroVideo + Data: _CaseDescription - Name: $v Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseIntroVideo + Data: _CaseDescription - Name: k__BackingField - Entry: 7 - Data: 91|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 88 - Name: k__BackingField Entry: 9 - Data: 91 + Data: 88 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1415,19 +1415,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseIntroVideoTranscript + Data: _CaseIntroVideo - Name: $v Entry: 7 Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseIntroVideo + - Name: k__BackingField + Entry: 7 + Data: 95|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 95 + - 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: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 97|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: _CaseIntroVideoTranscript + - Name: $v + Entry: 7 + Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseIntroVideoTranscript - Name: k__BackingField Entry: 9 - Data: 84 + Data: 88 - Name: k__BackingField Entry: 9 - Data: 84 + Data: 88 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1442,13 +1502,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 96|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 100|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1472,76 +1532,16 @@ MonoBehaviour: Data: _StolenLoot - Name: $v Entry: 7 - Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StolenLoot - Name: k__BackingField Entry: 9 - Data: 84 + Data: 88 - Name: k__BackingField Entry: 9 - Data: 84 - - 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: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 99|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: _AccusedCrook - - Name: $v - Entry: 7 - Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AccusedCrook - - Name: k__BackingField - Entry: 7 - Data: 101|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: AccusedCrook, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 91 + Data: 88 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1584,25 +1584,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FinalRoundContinent + Data: _AccusedCrook - Name: $v Entry: 7 Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FinalRoundContinent + Data: _AccusedCrook - Name: k__BackingField Entry: 7 Data: 105|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ContinentMap, Assembly-CSharp + Data: AccusedCrook, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 91 + Data: 95 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1645,25 +1645,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentWinningPlayers + Data: _FinalRoundContinent - Name: $v Entry: 7 Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentWinningPlayers + Data: _FinalRoundContinent - Name: k__BackingField Entry: 7 Data: 109|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.String[], mscorlib + Data: ContinentMap, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 109 + Data: 95 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1706,19 +1706,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileDictionary + Data: _CurrentWinningPlayers - Name: $v Entry: 7 Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileDictionary + Data: _CurrentWinningPlayers - Name: k__BackingField Entry: 7 Data: 113|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + Data: System.String[], mscorlib - Name: Entry: 8 Data: @@ -1729,8 +1729,8 @@ MonoBehaviour: Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -1741,6 +1741,67 @@ MonoBehaviour: Entry: 7 Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 115|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: _CaseFileDictionary + - Name: $v + Entry: 7 + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileDictionary + - Name: k__BackingField + Entry: 7 + Data: 117|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 117 + - 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: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 0 @@ -1764,13 +1825,13 @@ MonoBehaviour: Data: _LootImageDownloader - Name: $v Entry: 7 - Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LootImageDownloader - Name: k__BackingField Entry: 7 - Data: 116|System.RuntimeType, mscorlib + Data: 120|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 @@ -1779,7 +1840,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 116 + Data: 120 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1794,7 +1855,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 121|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1819,13 +1880,13 @@ MonoBehaviour: Data: _LootImageTexture - Name: $v Entry: 7 - Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 122|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LootImageTexture - Name: k__BackingField Entry: 7 - Data: 119|System.RuntimeType, mscorlib + Data: 123|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Texture2D, UnityEngine.CoreModule @@ -1834,7 +1895,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 119 + Data: 123 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1849,7 +1910,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 124|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 8c28cd5..9f3be1b 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -44,6 +44,7 @@ public class CaseManager : UdonSharpBehaviour [SerializeField] private MultiRoundVideoPlayer _MultiRoundVideoPlayer; [SerializeField] private WantedPoster[] _WantedPosters; [SerializeField] private MissingPoster[] _MissingPosters; + [SerializeField] private Material _JailCallOverlay_CrookMaterial; [SerializeField] private LocationBoard _LocationBoard; [Space, Header("Host UI")] [SerializeField] private CaseManagerListView _CaseManagerList; @@ -243,6 +244,8 @@ public class CaseManager : UdonSharpBehaviour Poster.SetNewCrook(_AccusedCrook, GetCrookName()); } + _JailCallOverlay_CrookMaterial.SetTexture("_MainTex", CrookPortraits[(int)_AccusedCrook]); + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(DownloadLootImage), _CaseFileLootImage); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 66f4d61..4d80fa2 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: 31 + Data: 32 - Name: Entry: 7 Data: @@ -1148,19 +1148,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailPlayer + Data: _JailCallCameraOverlay - Name: $v Entry: 7 Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailPlayer + Data: _JailCallCameraOverlay - Name: k__BackingField Entry: 7 Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: RandomVideoPlayer, Assembly-CSharp + Data: CameraOverlay, Assembly-CSharp - Name: Entry: 8 Data: @@ -1208,16 +1208,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Location + Data: _JailPlayer - Name: $v Entry: 7 Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Location + Data: _JailPlayer - Name: k__BackingField Entry: 7 Data: 80|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: RandomVideoPlayer, 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: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 82|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: _Location + - Name: $v + Entry: 7 + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Location + - Name: k__BackingField + Entry: 7 + Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -1226,7 +1286,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 80 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1241,19 +1301,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 83|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1275,78 +1335,18 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _Landmarks - - Name: $v - Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _Landmarks - - Name: k__BackingField - Entry: 7 - Data: 85|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String[], mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 85 - - 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: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 87|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: _StageIndex - Name: $v Entry: 7 Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _StageIndex + Data: _Landmarks - Name: k__BackingField Entry: 7 Data: 89|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: System.String[], mscorlib - Name: Entry: 8 Data: @@ -1394,19 +1394,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentPlayerCounter + Data: _StageIndex - Name: $v Entry: 7 Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 7 + Data: 93|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 93 + - 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: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 95|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: _CurrentPlayerCounter + - Name: $v + Entry: 7 + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 89 + Data: 93 - Name: k__BackingField Entry: 9 - Data: 89 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1421,13 +1481,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 94|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 98|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1451,7 +1511,7 @@ MonoBehaviour: Data: _RoundIsOver - Name: $v Entry: 7 - Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RoundIsOver @@ -1473,73 +1533,19 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 97|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _CameraControllerRound2 - - Name: $v - Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraControllerRound2 - - Name: k__BackingField - Entry: 7 - Data: 99|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraControllerRound2, 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: false - Name: _fieldAttributes Entry: 7 Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 101|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1557,68 +1563,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayingJailCall + Data: _CameraControllerRound2 - Name: $v Entry: 7 - Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayingJailCall + Data: _CameraControllerRound2 - Name: k__BackingField - Entry: 9 - Data: 42 + Entry: 7 + Data: 103|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraControllerRound2, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 42 - - 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: 102|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: _PanelToReveal_Cache - - Name: $v - Entry: 7 - Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PanelToReveal_Cache - - Name: k__BackingField - Entry: 9 - Data: 89 - - Name: k__BackingField - Entry: 9 - Data: 89 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1655,16 +1618,114 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_STANDARD + Data: _PlayingJailCall - Name: $v Entry: 7 Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayingJailCall + - Name: k__BackingField + Entry: 9 + Data: 42 + - Name: k__BackingField + Entry: 9 + Data: 42 + - 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: 106|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: _PanelToReveal_Cache + - Name: $v + Entry: 7 + Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PanelToReveal_Cache + - Name: k__BackingField + Entry: 9 + Data: 93 + - Name: k__BackingField + Entry: 9 + Data: 93 + - 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: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: COLOR_STANDARD + - Name: $v + Entry: 7 + Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: COLOR_STANDARD - Name: k__BackingField Entry: 7 - Data: 106|System.RuntimeType, mscorlib + Data: 110|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Color, UnityEngine.CoreModule @@ -1673,105 +1734,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 106 - - 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: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: COLOR_RED - - Name: $v - Entry: 7 - Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_RED - - Name: k__BackingField - Entry: 9 - Data: 106 - - Name: k__BackingField - Entry: 9 - Data: 106 - - 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: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: COLOR_YELLOW - - Name: $v - Entry: 7 - Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_YELLOW - - Name: k__BackingField - Entry: 9 - Data: 106 - - Name: k__BackingField - Entry: 9 - Data: 106 + Data: 110 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1808,19 +1771,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_GREEN + Data: COLOR_RED - Name: $v Entry: 7 Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_GREEN + Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 106 + Data: 110 - Name: k__BackingField Entry: 9 - Data: 106 + Data: 110 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1852,6 +1815,104 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: COLOR_YELLOW + - Name: $v + Entry: 7 + Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_YELLOW + - Name: k__BackingField + Entry: 9 + Data: 110 + - Name: k__BackingField + Entry: 9 + Data: 110 + - 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: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: COLOR_GREEN + - Name: $v + Entry: 7 + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_GREEN + - Name: k__BackingField + Entry: 9 + Data: 110 + - Name: k__BackingField + Entry: 9 + Data: 110 + - 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: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 8a112ef..765105a 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -32,6 +32,7 @@ public class GameManagerRound2 : GameManagerBase [SerializeField] private ArrivalDisplay[] _ArrivalDisplays; + [SerializeField] private CameraOverlay _JailCallCameraOverlay; [SerializeField] private RandomVideoPlayer _JailPlayer; [UdonSynced, FieldChangeCallback(nameof(Location))] private string _Location = ""; @@ -67,6 +68,7 @@ public class GameManagerRound2 : GameManagerBase { _StageIndex = 0; _PlayingJailCall = false; + _JailCallCameraOverlay.EnableOverlayElements(false); InitialiseLocationBoard(); @@ -109,6 +111,7 @@ public class GameManagerRound2 : GameManagerBase public override void DeinitialiseGameMode() { _PlayingJailCall = false; + _JailCallCameraOverlay.EnableOverlayElements(false); _JailPhone.Activate(false); _JailChain.Show = false; @@ -141,6 +144,7 @@ public class GameManagerRound2 : GameManagerBase Networking.SetOwner(NewOwner, _JailChain.gameObject); Networking.SetOwner(NewOwner, _JailPlayer.gameObject); Networking.SetOwner(NewOwner, _JailPhone.gameObject); + Networking.SetOwner(NewOwner, _JailCallCameraOverlay.gameObject); foreach(ArrivalDisplay Display in _ArrivalDisplays) { @@ -585,6 +589,8 @@ public class GameManagerRound2 : GameManagerBase { _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.PhoneRing); + _JailCallCameraOverlay.EnableOverlayElements(true); + _CameraControllerRound2.DeactivateHostWinnerCameraTrigger(); _CameraControllerRound2.DisableAllSwitchers(); _CameraControllerRound2.SwitchToHostAndWinnerCamera(); diff --git a/Assets/UdonSharp/Overlay/CameraOverlay.asset b/Assets/UdonSharp/Overlay/CameraOverlay.asset index 71e017f..eb50754 100644 --- a/Assets/UdonSharp/Overlay/CameraOverlay.asset +++ b/Assets/UdonSharp/Overlay/CameraOverlay.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 6 + Data: 7 - Name: Entry: 7 Data: @@ -251,16 +251,82 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _OverlayElementsEnabled + Data: _OverlayFit - Name: $v Entry: 7 Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _OverlayElementsEnabled + Data: _OverlayFit - Name: k__BackingField Entry: 7 Data: 17|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: OverlayFit, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 18|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - 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: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 20|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: _OverlayElementsEnabled + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _OverlayElementsEnabled + - Name: k__BackingField + Entry: 7 + Data: 22|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -269,7 +335,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -284,13 +350,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 19|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 24|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -314,16 +380,16 @@ MonoBehaviour: Data: _FadeOutAnimation - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FadeOutAnimation - Name: k__BackingField Entry: 9 - Data: 17 + Data: 22 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -338,13 +404,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 27|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -368,13 +434,13 @@ MonoBehaviour: Data: _Camera - Name: $v Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Camera - Name: k__BackingField Entry: 7 - Data: 24|System.RuntimeType, mscorlib + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Camera, UnityEngine.CoreModule @@ -383,7 +449,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 24 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -398,7 +464,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Overlay/CameraOverlay.cs b/Assets/UdonSharp/Overlay/CameraOverlay.cs index bdedf2b..754fff5 100644 --- a/Assets/UdonSharp/Overlay/CameraOverlay.cs +++ b/Assets/UdonSharp/Overlay/CameraOverlay.cs @@ -4,6 +4,13 @@ using UnityEngine; using VRC.Udon.Common; +public enum OverlayFit +{ + Stretch, + Equal +}; + + [ExecuteInEditMode] [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class CameraOverlay : UdonSharpBehaviour @@ -12,6 +19,7 @@ public class CameraOverlay : UdonSharpBehaviour [SerializeField] private GameObject _OverlayElements; [Space] [SerializeField, Range(0.0f, 2.5f)] private float _AspectRatio = 1.7777777777777777777777777777777777777f; + [SerializeField] private OverlayFit _OverlayFit = OverlayFit.Stretch; [UdonSynced] private bool _OverlayElementsEnabled = false; [UdonSynced] private bool _FadeOutAnimation = false; @@ -92,7 +100,15 @@ public class CameraOverlay : UdonSharpBehaviour Vector3 Scale = Vector3.one; Scale.y = 2.0f * Position.z * Mathf.Tan(_Camera.fieldOfView * 0.5f * Mathf.Deg2Rad); - Scale.x = Scale.y * _AspectRatio; + switch (_OverlayFit) + { + case OverlayFit.Stretch: + Scale.x = Scale.y * _AspectRatio; + break; + case OverlayFit.Equal: + Scale.x = Scale.y; + break; + } transform.localScale = Scale; } }