- Added a UI render texture material that has standard depth sorting.
- On-set newspaper display in round 3 no longer renders over everything.
This commit is contained in:
parent
92ff0bd7a1
commit
ff3449c39a
@ -159,6 +159,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Assets\TextMesh Pro\Shaders\TMPro.cginc" />
|
<None Include="Assets\TextMesh Pro\Shaders\TMPro.cginc" />
|
||||||
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile Overlay.shader" />
|
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile Overlay.shader" />
|
||||||
|
<None Include="Assets\Shaders\Render Texture UI ZTest Always.shader" />
|
||||||
<None Include="Assets\Shaders\SDF Map Borders.shader" />
|
<None Include="Assets\Shaders\SDF Map Borders.shader" />
|
||||||
<None Include="Assets\Shaders\SDF The Chase.shader" />
|
<None Include="Assets\Shaders\SDF The Chase.shader" />
|
||||||
<None Include="Assets\Shaders\Decal.shader" />
|
<None Include="Assets\Shaders\Decal.shader" />
|
||||||
|
|||||||
@ -8,7 +8,7 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: M_Counter
|
m_Name: M_Counter
|
||||||
m_Shader: {fileID: 4800000, guid: bdbecd808900b3a49963019f31a76291, type: 3}
|
m_Shader: {fileID: 4800000, guid: 213afe80d5f1c374ea290e02120114e4, type: 3}
|
||||||
m_Parent: {fileID: 0}
|
m_Parent: {fileID: 0}
|
||||||
m_ModifiedSerializedProperties: 0
|
m_ModifiedSerializedProperties: 0
|
||||||
m_ValidKeywords: []
|
m_ValidKeywords: []
|
||||||
@ -19,7 +19,7 @@ Material:
|
|||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 1
|
m_EnableInstancingVariants: 1
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: 3001
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_LockedProperties:
|
m_LockedProperties:
|
||||||
|
|||||||
@ -8,7 +8,7 @@ Material:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: M_Timer
|
m_Name: M_Timer
|
||||||
m_Shader: {fileID: 4800000, guid: bdbecd808900b3a49963019f31a76291, type: 3}
|
m_Shader: {fileID: 4800000, guid: 213afe80d5f1c374ea290e02120114e4, type: 3}
|
||||||
m_Parent: {fileID: 0}
|
m_Parent: {fileID: 0}
|
||||||
m_ModifiedSerializedProperties: 0
|
m_ModifiedSerializedProperties: 0
|
||||||
m_ValidKeywords: []
|
m_ValidKeywords: []
|
||||||
@ -17,7 +17,7 @@ Material:
|
|||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 1
|
m_EnableInstancingVariants: 1
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: 3001
|
m_CustomRenderQueue: -1
|
||||||
stringTagMap: {}
|
stringTagMap: {}
|
||||||
disabledShaderPasses: []
|
disabledShaderPasses: []
|
||||||
m_LockedProperties:
|
m_LockedProperties:
|
||||||
|
|||||||
@ -106762,104 +106762,104 @@ MonoBehaviour:
|
|||||||
useAssignedLayers: 0
|
useAssignedLayers: 0
|
||||||
DynamicPrefabs: []
|
DynamicPrefabs: []
|
||||||
DynamicMaterials:
|
DynamicMaterials:
|
||||||
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2}
|
- {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2}
|
||||||
|
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
|
||||||
|
- {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
|
||||||
|
- {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2}
|
||||||
|
- {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2}
|
||||||
|
- {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2}
|
||||||
- {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2}
|
- {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2}
|
||||||
- {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2}
|
- {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2}
|
||||||
- {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2}
|
- {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2}
|
||||||
- {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2}
|
|
||||||
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2}
|
|
||||||
- {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2}
|
|
||||||
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
- {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
|
|
||||||
- {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2}
|
|
||||||
- {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2}
|
|
||||||
- {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
|
|
||||||
- {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2}
|
- {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2}
|
||||||
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
|
- {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2}
|
||||||
- {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
|
|
||||||
- {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
|
|
||||||
- {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2}
|
|
||||||
- {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2}
|
|
||||||
- {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
|
|
||||||
- {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2}
|
- {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2}
|
||||||
- {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2}
|
- {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
|
||||||
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
|
- {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2}
|
||||||
|
- {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2}
|
||||||
|
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
|
||||||
- {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2}
|
- {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2}
|
||||||
|
- {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
|
||||||
|
- {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
|
||||||
|
- {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2}
|
||||||
|
- {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
|
||||||
|
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2}
|
||||||
|
- {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
|
||||||
|
- {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2}
|
||||||
|
- {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
|
||||||
|
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
|
||||||
|
- {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2}
|
||||||
|
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2}
|
||||||
|
- {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2}
|
||||||
|
- {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2}
|
||||||
- {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2}
|
- {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2}
|
||||||
- {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2}
|
- {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2}
|
||||||
- {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2}
|
- {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2}
|
||||||
- {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2}
|
- {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2}
|
||||||
- {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2}
|
- {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2}
|
||||||
- {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2}
|
- {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2}
|
||||||
- {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, 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: fa8f228d6d5f77d479bf970e355f4bc3, type: 2}
|
||||||
- {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2}
|
- {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2}
|
||||||
- {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2}
|
- {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2}
|
||||||
- {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2}
|
- {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2}
|
||||||
- {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2}
|
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
- {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2}
|
- {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2}
|
||||||
- {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2}
|
- {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2}
|
||||||
- {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2}
|
|
||||||
- {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2}
|
|
||||||
- {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, 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: d1b80c0437189d64bb20dc185f2a6797, type: 2}
|
|
||||||
- {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2}
|
|
||||||
- {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2}
|
|
||||||
- {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2}
|
|
||||||
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2}
|
|
||||||
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
|
|
||||||
- {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2}
|
|
||||||
- {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2}
|
- {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2}
|
||||||
- {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2}
|
- {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2}
|
||||||
|
- {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2}
|
||||||
- {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2}
|
- {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2}
|
||||||
- {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2}
|
- {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2}
|
||||||
- {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
|
- {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2}
|
||||||
- {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2}
|
- {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2}
|
||||||
- {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2}
|
- {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2}
|
||||||
- {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
|
- {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
|
||||||
- {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
|
- {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2}
|
||||||
|
- {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
|
||||||
|
- {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2}
|
||||||
|
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
|
||||||
|
- {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
|
||||||
|
- {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2}
|
||||||
|
- {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2}
|
||||||
|
- {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2}
|
||||||
|
- {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2}
|
||||||
- {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2}
|
- {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2}
|
||||||
- {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2}
|
- {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2}
|
||||||
- {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2}
|
- {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2}
|
||||||
- {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2}
|
- {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2}
|
||||||
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
|
|
||||||
LightMapsNear: []
|
LightMapsNear: []
|
||||||
LightMapsFar: []
|
LightMapsFar: []
|
||||||
LightMode: 0
|
LightMode: 0
|
||||||
|
|||||||
@ -1,51 +1,64 @@
|
|||||||
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
|
Shader "Carmen/Decal"
|
||||||
|
|
||||||
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
|
|
||||||
|
|
||||||
// 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/Decal"
|
|
||||||
{
|
{
|
||||||
Properties
|
Properties
|
||||||
{
|
{
|
||||||
_MainTex ("Decal", 2D) = "white" {}
|
_MainTex ("Decal", 2D) = "white" {}
|
||||||
_Colour ("Colour", Color) = (1.0, 1.0, 1.0, 1.0)
|
_Colour ("Colour", Color) = (1.0, 1.0, 1.0, 1.0)
|
||||||
}
|
_Metallic ("Metallic", Range(0.0, 1.0)) = 0.0
|
||||||
SubShader
|
_Smoothness ("Smoothness", Range(0.0, 1.0)) = 0.0
|
||||||
{
|
|
||||||
Tags { "Queue"="Transparent" "RenderType"="Transparent" "CanUseSpriteAtlas"="True" }
|
|
||||||
LOD 200
|
|
||||||
|
|
||||||
Cull Back
|
[NoScaleOffset] _DetailTex ("Detail Albedo", 2D) = "grey" {}
|
||||||
Blend SrcAlpha OneMinusSrcAlpha
|
_DetailNormal ("Detail Normal", 2D) = "bump" {}
|
||||||
|
}
|
||||||
|
SubShader
|
||||||
|
{
|
||||||
|
Tags { "Queue"="Overlay" "RenderType"="Fade" "CanUseSpriteAtlas"="True" }
|
||||||
|
LOD 200
|
||||||
|
|
||||||
|
Cull Back
|
||||||
|
Blend SrcAlpha OneMinusSrcAlpha
|
||||||
Offset -1, -1
|
Offset -1, -1
|
||||||
|
|
||||||
CGPROGRAM
|
CGPROGRAM
|
||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
#pragma target 4.5
|
#pragma target 4.5
|
||||||
#pragma surface surf Standard
|
#pragma surface surf Standard alpha:fade
|
||||||
|
|
||||||
UNITY_DECLARE_TEX2D(_MainTex);
|
|
||||||
|
|
||||||
|
|
||||||
struct Input
|
struct Input
|
||||||
{
|
{
|
||||||
float2 uv_MainTex;
|
float2 uv_MainTex;
|
||||||
|
float2 uv_DetailTex;
|
||||||
|
float2 uv_DetailNormal;
|
||||||
};
|
};
|
||||||
half4 _Colour;
|
|
||||||
|
|
||||||
|
UNITY_DECLARE_TEX2D(_MainTex);
|
||||||
|
half4 _Colour;
|
||||||
|
half _Metallic;
|
||||||
|
half _Smoothness;
|
||||||
|
|
||||||
|
UNITY_DECLARE_TEX2D(_DetailTex);
|
||||||
|
UNITY_DECLARE_TEX2D(_DetailNormal);
|
||||||
|
|
||||||
|
|
||||||
void surf (Input IN, inout SurfaceOutputStandard o)
|
void surf (Input IN, inout SurfaceOutputStandard o)
|
||||||
{
|
{
|
||||||
half4 TexSample = UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex);
|
half4 TexSample = UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex);
|
||||||
o.Albedo = TexSample.rgb * _Colour;
|
|
||||||
o.Alpha = TexSample.a;
|
o.Albedo = TexSample.rgb;
|
||||||
|
//o.Albedo *= UNITY_SAMPLE_TEX2D(_DetailTex, IN.uv_DetailNormal).rgb * 2.0;
|
||||||
|
o.Albedo *= _Colour;
|
||||||
|
|
||||||
|
o.Alpha = TexSample.a * _Colour.a;
|
||||||
|
|
||||||
|
o.Metallic = _Metallic;
|
||||||
|
o.Smoothness = _Smoothness;
|
||||||
|
|
||||||
|
o.Normal = UnpackNormal(UNITY_SAMPLE_TEX2D(_DetailNormal, IN.uv_DetailNormal));
|
||||||
}
|
}
|
||||||
ENDCG
|
ENDCG
|
||||||
}
|
}
|
||||||
FallBack "Diffuse"
|
FallBack "Diffuse"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
61
Assets/Shaders/Render Texture UI ZTest Always.shader
Normal file
61
Assets/Shaders/Render Texture UI ZTest Always.shader
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
Shader "Carmen/Render Texture UI/Always On Top"
|
||||||
|
{
|
||||||
|
Properties
|
||||||
|
{
|
||||||
|
_MainTex ("Logo Image", 2D) = "white" {}
|
||||||
|
_Color ("Colour", Color) = (1.0, 1.0, 1.0, 1.0)
|
||||||
|
}
|
||||||
|
SubShader
|
||||||
|
{
|
||||||
|
Tags { "Queue"="Overlay" "RenderType"="Transparent" "CanUseSpriteAtlas"="True" }
|
||||||
|
LOD 200
|
||||||
|
|
||||||
|
Pass {
|
||||||
|
Cull Back
|
||||||
|
Lighting Off
|
||||||
|
Blend SrcAlpha OneMinusSrcAlpha
|
||||||
|
ZWrite Off
|
||||||
|
ZTest Always
|
||||||
|
|
||||||
|
CGPROGRAM
|
||||||
|
#include "UnityCG.cginc"
|
||||||
|
#pragma target 4.5
|
||||||
|
#pragma vertex vert
|
||||||
|
#pragma fragment frag
|
||||||
|
|
||||||
|
UNITY_DECLARE_TEX2D(_MainTex);
|
||||||
|
float4 _MainTex_ST;
|
||||||
|
half4 _Color;
|
||||||
|
|
||||||
|
|
||||||
|
struct Data
|
||||||
|
{
|
||||||
|
float4 vertex : POSITION;
|
||||||
|
float2 uv : TEXCOORD0;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct V2F
|
||||||
|
{
|
||||||
|
float4 position : SV_POSITION;
|
||||||
|
float2 uv : TEXCOORD0;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
V2F vert(Data v)
|
||||||
|
{
|
||||||
|
V2F o;
|
||||||
|
o.position = UnityObjectToClipPos(v.vertex);
|
||||||
|
o.uv = TRANSFORM_TEX(v.uv, _MainTex);
|
||||||
|
return o;
|
||||||
|
}
|
||||||
|
|
||||||
|
fixed4 frag(V2F i) : SV_TARGET
|
||||||
|
{
|
||||||
|
return UNITY_SAMPLE_TEX2D(_MainTex, i.uv) * _Color;
|
||||||
|
}
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FallBack "Diffuse"
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 213afe80d5f1c374ea290e02120114e4
|
||||||
|
ShaderImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
defaultTextures: []
|
||||||
|
nonModifiableTextures: []
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -1,15 +1,4 @@
|
|||||||
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
|
Shader "Carmen/Render Texture UI/Standard"
|
||||||
|
|
||||||
// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
|
|
||||||
|
|
||||||
// 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/Render Texture UI"
|
|
||||||
{
|
{
|
||||||
Properties
|
Properties
|
||||||
{
|
{
|
||||||
@ -25,8 +14,6 @@ Shader "Carmen/Render Texture UI"
|
|||||||
Cull Back
|
Cull Back
|
||||||
Lighting Off
|
Lighting Off
|
||||||
Blend SrcAlpha OneMinusSrcAlpha
|
Blend SrcAlpha OneMinusSrcAlpha
|
||||||
ZWrite Off
|
|
||||||
ZTest Always
|
|
||||||
|
|
||||||
CGPROGRAM
|
CGPROGRAM
|
||||||
#include "UnityCG.cginc"
|
#include "UnityCG.cginc"
|
||||||
@ -38,6 +25,7 @@ Shader "Carmen/Render Texture UI"
|
|||||||
float4 _MainTex_ST;
|
float4 _MainTex_ST;
|
||||||
half4 _Color;
|
half4 _Color;
|
||||||
|
|
||||||
|
|
||||||
struct Data
|
struct Data
|
||||||
{
|
{
|
||||||
float4 vertex : POSITION;
|
float4 vertex : POSITION;
|
||||||
@ -50,6 +38,7 @@ Shader "Carmen/Render Texture UI"
|
|||||||
float2 uv : TEXCOORD0;
|
float2 uv : TEXCOORD0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
V2F vert(Data v)
|
V2F vert(Data v)
|
||||||
{
|
{
|
||||||
V2F o;
|
V2F o;
|
||||||
|
|||||||
@ -12,7 +12,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||||
m_Name: BoneFollower
|
m_Name: BoneFollower
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
|
serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
|
||||||
type: 2}
|
type: 2}
|
||||||
udonAssembly:
|
udonAssembly:
|
||||||
assemblyError:
|
assemblyError:
|
||||||
|
|||||||
@ -12,7 +12,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||||
m_Name: InteractToggle
|
m_Name: InteractToggle
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
|
serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
|
||||||
type: 2}
|
type: 2}
|
||||||
udonAssembly:
|
udonAssembly:
|
||||||
assemblyError:
|
assemblyError:
|
||||||
|
|||||||
@ -12,7 +12,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||||
m_Name: PlayerModSetter
|
m_Name: PlayerModSetter
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
|
serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
|
||||||
type: 2}
|
type: 2}
|
||||||
udonAssembly:
|
udonAssembly:
|
||||||
assemblyError:
|
assemblyError:
|
||||||
|
|||||||
@ -12,7 +12,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||||
m_Name: GlobalToggleObject
|
m_Name: GlobalToggleObject
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
|
serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
|
||||||
type: 2}
|
type: 2}
|
||||||
udonAssembly:
|
udonAssembly:
|
||||||
assemblyError:
|
assemblyError:
|
||||||
|
|||||||
@ -12,7 +12,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||||
m_Name: MasterToggleObject
|
m_Name: MasterToggleObject
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
|
serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
|
||||||
type: 2}
|
type: 2}
|
||||||
udonAssembly:
|
udonAssembly:
|
||||||
assemblyError:
|
assemblyError:
|
||||||
|
|||||||
@ -12,7 +12,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||||
m_Name: TrackingDataFollower
|
m_Name: TrackingDataFollower
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
|
serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
|
||||||
type: 2}
|
type: 2}
|
||||||
udonAssembly:
|
udonAssembly:
|
||||||
assemblyError:
|
assemblyError:
|
||||||
|
|||||||
@ -12,7 +12,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||||
m_Name: WorldAudioSettings
|
m_Name: WorldAudioSettings
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
|
serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
|
||||||
type: 2}
|
type: 2}
|
||||||
udonAssembly:
|
udonAssembly:
|
||||||
assemblyError:
|
assemblyError:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user