diff --git a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Blank.mat b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Blank.mat index e6370a6..0e56c03 100644 --- a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Blank.mat +++ b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Blank.mat @@ -8,14 +8,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_ClueVideoScreen_Blank - m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION + m_ValidKeywords: [] + m_InvalidKeywords: - _ENABLE_GEOMETRIC_SPECULAR_AA - m_InvalidKeywords: [] - m_LightmapFlags: 2 + m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -46,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: af700528afae4494395def34ee70846c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -85,6 +84,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat index 9d11511..b5ab161 100644 --- a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat +++ b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat @@ -8,14 +8,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_ClueVideoScreen_Maps - m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION + m_ValidKeywords: [] + m_InvalidKeywords: - _ENABLE_GEOMETRIC_SPECULAR_AA - m_InvalidKeywords: [] - m_LightmapFlags: 1 + m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -48,7 +47,7 @@ Material: - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 0.5, y: 0.33333334} - m_Offset: {x: 0, y: 0.6666667} + m_Offset: {x: 0.5, y: 0.33333334} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -85,6 +84,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/M_VideoPlayer.mat b/Assets/Materials/M_VideoPlayer.mat index 416f458..92ed2b0 100644 --- a/Assets/Materials/M_VideoPlayer.mat +++ b/Assets/Materials/M_VideoPlayer.mat @@ -8,14 +8,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_VideoPlayer - m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _EMISSION + m_ValidKeywords: [] + m_InvalidKeywords: - _ENABLE_GEOMETRIC_SPECULAR_AA - m_InvalidKeywords: [] - m_LightmapFlags: 2 + m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -46,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 8600000, guid: 4ddd9ec3c4599e14c8050a554582bc3e, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -85,6 +84,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 915f1fd..bdd80ff 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -113698,80 +113698,88 @@ MonoBehaviour: DynamicMaterials: - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} - - {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} - - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, 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: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, 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: 20293e1762c586648a0e8d1efc60b30b, 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: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} - - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} - - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, 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: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} + - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, 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: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} + - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} + - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} + - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, 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: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} + - {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: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, 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} @@ -113783,56 +113791,48 @@ MonoBehaviour: - {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: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} - - {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} - - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} - - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} - - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} - - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} - - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} - - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} - - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} - - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} - - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} - - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, 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: cad30d30c6413634891f1783211ed82b, type: 2} - - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} - - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} - - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, 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: a94d8fe1854504e47a64e023cecaa130, type: 2} + - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} + - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} + - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} + - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} + - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, 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: a60ee32d2ee008a419eafd03826f2584, 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: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} + - {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} + - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/Textures/RT_VideoPlayer.asset b/Assets/Textures/RT_VideoPlayer.asset index 1a7bdfd..97c8e51 100644 --- a/Assets/Textures/RT_VideoPlayer.asset +++ b/Assets/Textures/RT_VideoPlayer.asset @@ -18,12 +18,12 @@ CustomRenderTexture: m_Height: 360 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthStencilFormat: 94 + m_DepthStencilFormat: 0 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 m_SRGB: 0 - m_UseDynamicScale: 1 + m_UseDynamicScale: 0 m_BindMS: 0 m_EnableCompatibleFormat: 1 m_EnableRandomWrite: 0 diff --git a/Assets/Textures/T_ChainLink_Normal.png.meta b/Assets/Textures/T_ChainLink_Normal.png.meta index dbb0c44..498c4e1 100644 --- a/Assets/Textures/T_ChainLink_Normal.png.meta +++ b/Assets/Textures/T_ChainLink_Normal.png.meta @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 256 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 256 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/Textures/T_CityMural.png.meta b/Assets/Textures/T_CityMural.png.meta index 023cc82..6fd177f 100644 --- a/Assets/Textures/T_CityMural.png.meta +++ b/Assets/Textures/T_CityMural.png.meta @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/Textures/T_EntertainmentPosters.png.meta b/Assets/Textures/T_EntertainmentPosters.png.meta index c33e305..f72c7c8 100644 --- a/Assets/Textures/T_EntertainmentPosters.png.meta +++ b/Assets/Textures/T_EntertainmentPosters.png.meta @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/Textures/T_NationalGeographicWorldMagazineCovers.png.meta b/Assets/Textures/T_NationalGeographicWorldMagazineCovers.png.meta index dff2165..5ba61b7 100644 --- a/Assets/Textures/T_NationalGeographicWorldMagazineCovers.png.meta +++ b/Assets/Textures/T_NationalGeographicWorldMagazineCovers.png.meta @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/Textures/T_Round2Signs_SDF.png.meta b/Assets/Textures/T_Round2Signs_SDF.png.meta index 02de34e..247a817 100644 --- a/Assets/Textures/T_Round2Signs_SDF.png.meta +++ b/Assets/Textures/T_Round2Signs_SDF.png.meta @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/Textures/T_TileFloorPattern.png.meta b/Assets/Textures/T_TileFloorPattern.png.meta index 8a8d4ca..726d7c0 100644 --- a/Assets/Textures/T_TileFloorPattern.png.meta +++ b/Assets/Textures/T_TileFloorPattern.png.meta @@ -22,7 +22,7 @@ TextureImporter: normalMapFilter: 0 flipGreenChannel: 0 isReadable: 0 - streamingMipmaps: 0 + streamingMipmaps: 1 streamingMipmapsPriority: 0 vTOnly: 0 ignoreMipmapLimit: 0 @@ -56,7 +56,7 @@ TextureImporter: spriteTessellationDetail: -1 textureType: 0 textureShape: 1 - singleChannelComponent: 0 + singleChannelComponent: 1 flipbookRows: 1 flipbookColumns: 1 maxTextureSizeSet: 0 @@ -73,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 - compressionQuality: 50 + compressionQuality: 0 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 diff --git a/Assets/Textures/T_TileFloorPatternAO.bmp.meta b/Assets/Textures/T_TileFloorPatternAO.bmp.meta index 0cc7aca..2c78431 100644 --- a/Assets/Textures/T_TileFloorPatternAO.bmp.meta +++ b/Assets/Textures/T_TileFloorPatternAO.bmp.meta @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 64 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 64 + maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/Textures/T_TravelPosters.png.meta b/Assets/Textures/T_TravelPosters.png.meta index 8566b98..702f44f 100644 --- a/Assets/Textures/T_TravelPosters.png.meta +++ b/Assets/Textures/T_TravelPosters.png.meta @@ -95,7 +95,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: iPhone - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 @@ -108,7 +108,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 512 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: 50 textureCompression: 1 diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs index 407f136..ae059d5 100644 --- a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs @@ -285,7 +285,7 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour if (MapPage >= 0) { - _MapScreenMaterial.SetTexture("_EmissionMap", _MapImages[MapPage]); + _MapScreenMaterial.SetTexture("_MainTex", _MapImages[MapPage]); } } diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json index 3e0a82e..72b706d 100644 --- a/Packages/vpm-manifest.json +++ b/Packages/vpm-manifest.json @@ -6,14 +6,14 @@ "com.mmmaellon.lightsync": { "version": "1.5.0" }, - "com.vrchat.worlds": { - "version": "3.10.1" - }, "dev.onevr.vrworldtoolkit": { "version": "3.4.1" }, "vrckmart.easyplatformswitch": { "version": "1.0.1" + }, + "com.vrchat.worlds": { + "version": "3.10.3" } }, "locked": { @@ -27,16 +27,6 @@ "com.vrchat.worlds": "^3.5.2" } }, - "com.vrchat.worlds": { - "version": "3.10.1", - "dependencies": { - "com.vrchat.base": "3.10.1" - } - }, - "com.vrchat.base": { - "version": "3.10.1", - "dependencies": {} - }, "dev.onevr.vrworldtoolkit": { "version": "3.4.1", "dependencies": {} @@ -44,6 +34,16 @@ "vrckmart.easyplatformswitch": { "version": "1.0.1", "dependencies": {} + }, + "com.vrchat.worlds": { + "version": "3.10.3", + "dependencies": { + "com.vrchat.base": "3.10.3" + } + }, + "com.vrchat.base": { + "version": "3.10.3", + "dependencies": {} } } } \ No newline at end of file diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index 3a7c875..ab9cce8 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -80,6 +80,7 @@ + diff --git a/UniTask.Linq.csproj b/UniTask.Linq.csproj index 2d5a27b..9268939 100644 --- a/UniTask.Linq.csproj +++ b/UniTask.Linq.csproj @@ -100,6 +100,7 @@ + diff --git a/UniTask.csproj b/UniTask.csproj index 1bdff38..a26b515 100644 --- a/UniTask.csproj +++ b/UniTask.csproj @@ -67,6 +67,7 @@ + @@ -74,6 +75,7 @@ + @@ -89,6 +91,7 @@ + @@ -109,6 +112,7 @@ + diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index a328b99..2e389b3 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -118,6 +118,7 @@ +