diff --git a/Assets/Prefabs/Overlays/Jail Call Overlay.prefab b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab index 04fc77e..742843c 100644 --- a/Assets/Prefabs/Overlays/Jail Call Overlay.prefab +++ b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab @@ -92,7 +92,8 @@ MonoBehaviour: _OverlayElements: {fileID: 27227279282360470} _AspectRatio: 1.7777778 _OverlayFit: 1 - _CrookMaterial: {fileID: 2100000, guid: 33ddb8dc0417d7a46a7bacee4ef78781, type: 2} + _OverlayMesh: {fileID: 6364099165699617390} + _CrookMaterialSlot: 1 _CrookPortraits: - {fileID: 2800000, guid: a62e19c8949d6ff40b648cb64023eb59, type: 3} - {fileID: 2800000, guid: 867f4ce5530ce114ca449b7e1d916a17, type: 3} @@ -290,3 +291,9 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!23 &6364099165699617390 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 8786324576378969273, guid: f763c946e951c2540a7de2af1f8a5756, + type: 3} + m_PrefabInstance: {fileID: 2431550034009452247} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Phone.prefab b/Assets/Prefabs/Phone.prefab index 13aa4b5..2a8e9a9 100644 --- a/Assets/Prefabs/Phone.prefab +++ b/Assets/Prefabs/Phone.prefab @@ -287,9 +287,9 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 485089789795895798} _GameManager: {fileID: 0} - _PhoneObjectSync: {fileID: 6810253013611224781} + _PermissionsPanel: {fileID: 0} _PhonePickup: {fileID: 1223336681658523664} - _PhoneBoxCoverAnimator: {fileID: 46381774273635150} + _PhoneBoxCover: {fileID: 3310823961467377082} --- !u!114 &485089789795895798 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index d11a775..c8bb9ec 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -75733,7 +75733,7 @@ MonoBehaviour: _BlankScreenMesh: {fileID: 1123331149} _VideoScreenMesh: {fileID: 1123331146} _MapScreenMesh: {fileID: 1123331148} - _MapScreenMaterial: {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + _MapScreenMaterial: {fileID: 0} _PlaceholderMapTexture: {fileID: 2800000, guid: 44aab33f67dfa2949a8bd0a7e20d40e7, type: 3} _VideoLoadIndicators: @@ -87540,54 +87540,91 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} - - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} - - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} - - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} - - {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2} - - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: f0af75d9b9b8f914ba8665902d2e4ca2, type: 2} - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 7719e11364cd14941a3eadd7caca9a0e, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} - - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} + - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} + - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} + - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} + - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2} + - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} + - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} + - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} + - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} + - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} + - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} + - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} + - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} + - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} + - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} + - {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2} + - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} + - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2} + - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: f0af75d9b9b8f914ba8665902d2e4ca2, type: 2} + - {fileID: 10308, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} @@ -87595,90 +87632,53 @@ MonoBehaviour: - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2} - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} + - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} - - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} - - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} - - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} - - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} - - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} - - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} - - {fileID: 2100000, guid: 3de15bd11b713c0499f9c2087271ca20, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} - - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} - - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} - - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} - - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} - - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} - - {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2} - - {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2} - - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} - - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} - - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} - - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} + - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} + - {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2} + - {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2} - {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2} + - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} + - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} + - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} - {fileID: 2100000, guid: e633280d5439fd24cbf88344782787d3, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - - {fileID: 2100000, guid: 7719e11364cd14941a3eadd7caca9a0e, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} + - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/UdonSharp/Door.cs b/Assets/UdonSharp/Door.cs index 85cb2f0..b353ceb 100644 --- a/Assets/UdonSharp/Door.cs +++ b/Assets/UdonSharp/Door.cs @@ -52,6 +52,8 @@ public class Door : UdonSharpBehaviour public void CloseDoor() { + Networking.SetOwner(Networking.LocalPlayer, gameObject); + _OpenDoor = false; _OpenDoor_Synced(); RequestSerialization(); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 26beb31..1b9ee7e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -77,6 +77,8 @@ public class GameManagerRound2 : GameManagerBase _JailChain.Initialise(); _JailPhone.Initialise(); + _JailPlayer.PlayVideo = false; + foreach (ArrivalDisplay Display in _ArrivalDisplays) { Display.Activate(true); @@ -119,6 +121,8 @@ public class GameManagerRound2 : GameManagerBase _JailPhone.Activate(false); _JailChain.Show = false; + _JailPlayer.PlayVideo = false; + foreach (ArrivalDisplay Display in _ArrivalDisplays) { Display.Activate(false); diff --git a/Assets/UdonSharp/JailPhone.asset b/Assets/UdonSharp/JailPhone.asset index 21afa9f..84b8a0f 100644 --- a/Assets/UdonSharp/JailPhone.asset +++ b/Assets/UdonSharp/JailPhone.asset @@ -245,25 +245,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PhoneBoxCoverAnimator + Data: _PhoneBoxCover - Name: $v Entry: 7 Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PhoneBoxCoverAnimator + Data: _PhoneBoxCover - Name: k__BackingField Entry: 7 Data: 17|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule + Data: Door, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib diff --git a/Assets/UdonSharp/JailPhone.cs b/Assets/UdonSharp/JailPhone.cs index 7998c28..f9bc589 100644 --- a/Assets/UdonSharp/JailPhone.cs +++ b/Assets/UdonSharp/JailPhone.cs @@ -14,7 +14,7 @@ public class JailPhone : UdonSharpBehaviour [SerializeField] private PermissionsPanel _PermissionsPanel; [Space] [SerializeField] private VRCPickup _PhonePickup; - [SerializeField] private Animator _PhoneBoxCoverAnimator; + [SerializeField] private Door _PhoneBoxCover; [UdonSynced] private bool _Active = false; [UdonSynced] private string _CallRecipient = ""; @@ -33,6 +33,7 @@ public class JailPhone : UdonSharpBehaviour public override void OnOwnershipTransferred(VRCPlayerApi Player) { Networking.SetOwner(Player, _PhonePickup.gameObject); + Networking.SetOwner(Player, _PhoneBoxCover.gameObject); base.OnOwnershipTransferred(Player); } @@ -76,6 +77,9 @@ public class JailPhone : UdonSharpBehaviour _CallRecipient = CallRecipient; _Activate_Synced(); + Networking.SetOwner(Networking.LocalPlayer, _PhoneBoxCover.gameObject); + _PhoneBoxCover.CloseDoor(); + RequestSerialization(); } } @@ -91,8 +95,6 @@ public class JailPhone : UdonSharpBehaviour { _PhonePickup.transform.localPosition = Vector3.zero; _PhonePickup.transform.localRotation = Quaternion.identity; - - _PhoneBoxCoverAnimator.SetBool("Open", false); } } diff --git a/Assets/UdonSharp/Overlay/JailCallOverlay.asset b/Assets/UdonSharp/Overlay/JailCallOverlay.asset index 7a27fb3..d002cab 100644 --- a/Assets/UdonSharp/Overlay/JailCallOverlay.asset +++ b/Assets/UdonSharp/Overlay/JailCallOverlay.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 10 + Data: 11 - Name: Entry: 7 Data: @@ -485,19 +485,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookMaterial + Data: _OverlayMesh - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookMaterial + Data: _OverlayMesh - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Material, UnityEngine.CoreModule + Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -554,25 +554,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CrookPortraits + Data: _CrookMaterialSlot - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CrookPortraits + Data: _CrookMaterialSlot - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Texture[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 18 - Name: k__BackingField Entry: 9 - Data: 37 + Data: 18 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -587,13 +581,73 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CrookPortraits + - Name: $v + Entry: 7 + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookPortraits + - Name: k__BackingField + Entry: 7 + Data: 40|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Texture[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 40 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 42|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -602,7 +656,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -626,13 +680,13 @@ MonoBehaviour: Data: _AccusedCrook - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AccusedCrook - Name: k__BackingField Entry: 7 - Data: 42|System.RuntimeType, mscorlib + Data: 45|System.RuntimeType, mscorlib - Name: Entry: 1 Data: AccusedCrook, Assembly-CSharp @@ -656,13 +710,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 44|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Overlay/JailCallOverlay.cs b/Assets/UdonSharp/Overlay/JailCallOverlay.cs index c51a338..3a48aec 100644 --- a/Assets/UdonSharp/Overlay/JailCallOverlay.cs +++ b/Assets/UdonSharp/Overlay/JailCallOverlay.cs @@ -11,7 +11,8 @@ using VRC.Udon.Common; public class JailCallOverlay : CameraOverlay { [Space] - [SerializeField] private Material _CrookMaterial; + [SerializeField] private MeshRenderer _OverlayMesh; + [SerializeField] private int _CrookMaterialSlot; [Space] [SerializeField] private Texture[] _CrookPortraits; @@ -36,7 +37,7 @@ public class JailCallOverlay : CameraOverlay int Crook = (int)_AccusedCrook; if (Crook >= 0 && Crook < _CrookPortraits.Length) { - _CrookMaterial.SetTexture("_MainTex", _CrookPortraits[Crook]); + _OverlayMesh.materials[_CrookMaterialSlot].mainTexture = _CrookPortraits[Crook]; } } }