From 443e32bca24bdc530a9f68786b1d5fbebf53e231 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 09:13:22 +0300 Subject: [PATCH 01/38] Bump rexml from 3.2.6 to 3.2.8 (#717) Bumps [rexml](https://github.com/ruby/rexml) from 3.2.6 to 3.2.8. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.6...v3.2.8) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a308724a23..5d1b028290 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,7 +116,7 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - ffi (1.16.3-x64-mingw-ucrt) + ffi (1.16.3) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -179,7 +179,8 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (2.0.7) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -193,6 +194,7 @@ GEM CFPropertyList naturally sshkey (3.0.0) + strscan (3.1.0) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -218,7 +220,6 @@ GEM PLATFORMS x86_64-linux - x86_64-darwin-20 DEPENDENCIES fastlane From f6bae024e6d4d701ed4813d29685d9593ae1aaa0 Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Thu, 23 May 2024 09:28:23 +0300 Subject: [PATCH 02/38] Update the (very rarely used) Unity License Test action (#718) * Update unity version for test * Use vars.UNITY_EMAIL instead of secrets --- .github/workflows/test_unity_credentials.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_unity_credentials.yml b/.github/workflows/test_unity_credentials.yml index da1c8c18d9..3ee00c3f52 100644 --- a/.github/workflows/test_unity_credentials.yml +++ b/.github/workflows/test_unity_credentials.yml @@ -6,8 +6,8 @@ on: workflow_dispatch: env: - UNITY_VERSION: "2019.4.25f1" - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_VERSION: "2021.3.30f1" + UNITY_EMAIL: ${{ vars.UNITY_EMAIL }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} From 6d47627b1fd84e303186b1e6c0eaea6a7f908cd2 Mon Sep 17 00:00:00 2001 From: Mike Nisbet Date: Thu, 23 May 2024 21:19:35 +0100 Subject: [PATCH 03/38] Add Pico support to the generic OpenXR build (#719) --- Assets/Plugins/Android/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 93f8cb04f6..bd86cd7650 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -16,6 +16,7 @@ + From 013fe41e03081264c5afdb4e4006adfe530f9988 Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Wed, 5 Jun 2024 08:27:16 +0300 Subject: [PATCH 04/38] Retry build on license failure; retry pre-commit on dotnet-format failure (#716) * Use an action that will automatically retry builds on license failures * Also retry pre-commit dotnet-format, if it fails --- .github/workflows/build.yml | 78 ++++++++------------------------ .github/workflows/pre-commit.yml | 19 +++++++- 2 files changed, 38 insertions(+), 59 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd243d3bcb..60ff11bc07 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -453,8 +453,7 @@ jobs: done - name: Build project - id: unity_builder - uses: game-ci/unity-builder@v4 + uses: Wandalen/wretry.action@v3 env: VERSION: ${{ needs.configuration.outputs.version}} UNITY_EMAIL: ${{ fromJSON(format('["unitytest@mikeage.net", "{0}"]', vars.UNITY_EMAIL))[secrets.UNITY_SERIAL != null] }} @@ -462,62 +461,25 @@ jobs: UNITY_PASSWORD: ${{ fromJSON(format('["DoNotStealThis1", "{0}"]', secrets.UNITY_PASSWORD))[secrets.UNITY_SERIAL != null] }} UNITY_LICENSE: ${{ fromJSON('["\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n 9DZF11miRAzx7TIuCxih78B6CXU=weRQubqMNN61lSZtm/e7S+UDzTPNQjM5aQl/c4aKLH/b2khefpgLfdWneoxdnNopA6+rW6kBqxWt\nhMLdHY+oAOfDsfmMQRTnmQG0Y3G3xh6gjGP1RAIHoLDfFHf+0LQ3FakA2WehcFWPSYeVDrdxm3HW\nqMmdKWooD9i+J4s4rQFTDx9+/G6yjc5KGTyGxIz3c5kxTEkV2qsFPXsauomY9Z8YPKy+cZK7g+Ol\npO+LhtzetgTIlIN/qG8eByjlp6nOuVGdDOIrhNJW+vllNyx0qNWPREadVrhFViI4UXegMFRl5gJc\nrgcrlr/fD+NorDVLfcu7D863QXkkuriILUIq2Q==", null]')[secrets.UNITY_SERIAL != null] }} with: - allowDirtyBuild: true # Because of the OVR Update, the build tree might be dirty - unityVersion: ${{ env.UNITY_VERSION }} - targetPlatform: ${{ matrix.targetPlatform }} - customParameters: -btb-target ${{ matrix.targetPlatform }} -btb-display ${{ matrix.vrsdk }} -btb-out /github/workspace/build/${{ matrix.vrsdk }}/${{ matrix.targetPlatform }}/${{ env.filename }} ${{ needs.configuration.outputs.description}} ${{ env.stamp }} ${{ env.btbbopts }} ${{ matrix.extraoptions }} - versioning: Custom - androidVersionCode: "${{ needs.configuration.outputs.androidVersionCode }}${{ matrix.versionSuffix }}" - version: ${{ needs.configuration.outputs.version }} - buildName: ${{ needs.configuration.outputs.basename }} - buildsPath: build/${{ matrix.vrsdk }} - chownFilesTo: ${{ needs.configuration.outputs.uid }}:${{ needs.configuration.outputs.gid }} - buildMethod: BuildTiltBrush.CommandLine - androidKeystoreName: openbrush.keystore - androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 || '/u3+7QAAAAIAAAABAAAAAQAWb3BlbmJydXNoLW5vbi1vZmZpY2lhbAAAAX66M2FtAAAFATCCBP0wDgYKKwYBBAEqAhEBAQUABIIE6Wufa9OVstw7Bu/gdATKqoPafXGefygChsN1d4LGY0SMLPORjHXiryEVMKi2rt61kNeXzeLkiM4yIQAam4HZtNTxgjoFQ6KB7uzkqMJYKViBUgg1HCAl2e+QpYjqG+YNJT67CiPgjpsJHNE628CwKAvjJ85FhqFz+MKzNF8BOpS5g5waqFda67oxaE4qO8eAL+F9P7us+ziY5B4O3EJC9s7xpT2GV2ro0m0fZI2dr3OO9UdUO72CYTg5qs250JiSij26Haf4t8Vq28F2S8rTcMUVtN4FRtzeR/wjeeZ3laER+WoxYni4MrZEXhYYCGhfor8Zcfi3p5ka8TJCQxywTKpghpSwgykgMJLn1HksxB0vhIMGTb87c2CTqS4t5Js/OPdcYS4Jnr7mHdQtOGfJCvl3TJC7NJwzLLOzUTmVIogaZCA9GlRballbD7XYbR8mcPxs+jLq5HJJk8/3B8ojAz/YA9vp6ml3RSYDA+yv9fBIefxNniAredJeqAnmH4o9er3+n0rKmpoqiXdzFkp1ywYbDDxrsFTiPrTc0gEiLRbfCERBx8GZ/7zGv6exKW1mc1L7QcFRmT1PRuJo6vRfCOtjdAdp0Mj1bllGGe9oBSKOxqtxs/NFygaVZjMDqryRvObKaJaj5CDhNdwsa21EsQ3+YvQWBzlcs5FTi5S2zG3W4+tMb+HoyV36SEV4yBLtqqrczhVCuPMlZu2p1iFLyODJJOxrWnmZy49BlQiudmiR7wILJoYKIFFvGv1jCJnTl9cI6UGX8IwSHYjGJIdLxaQM6c/7tw15+h+3jPajzZqkIQ7r0fyBp2TxE+QXMCP/knYu/dVzzQoBe5CgnAr5Fj60eEF78mJZbU3m9EjuVglURCTs2hDiyl3eRENgJjTc8p9iho4aK5eT5BVF7v2TAsTkfm+AwOq78chbWfh7J5OYnycG+v6S76LE6T8Yy0Arkk4lOF5SC05SmrDQpFcbRC9B7pR8XwJx3rabt4jvFsdqQtqv7TRasNQs95oROSC8335tzsaQfPwL/sGH4wi4zsH3YZ6As2V9myMEytqVEX5DdGBtzRr1opkx0aisyG48Evtk1UHMR9ROoZmkbNOIFNDUxCBvw7CU20aJSri4GX7kahg8Lj670Lfpx1C9OMwH0xRGUHE4e2ZWaw6Smkjc0Rru7j4YFKel0KtJgQaei2fz2i+6wOv1uz+H4j6f98pVMsf3HODmnh4x+qlUXaJWbNILQEGwv3zVReY123TPHIzkwImNLej62BLaqnEgiPkKr/gp/2MdrgepUEGC8FN0MTPbazDR4aE5XqLtnehhq8/9EfIk3b5WzNh00IAELwFrWnabkob5xmSLORBH8SpS3J6NwWa4jJMADRAGPYOUH7tYUM1/GRUK1HuboNP9v3KAny/k30CrxLvNHwe/zkXgoU9+M+gXVXL8pJJLMawVe/Dg13XyqTTa00UX7TsQFJZGm6lHrgeFIejKBEMLsMXNAIccphZe6sDnycDm/GY8vqmfjg9R05GwJOhBd46vhDi7Ph8YbLjohEoT4KfE5o8+Norzc/VHbRv5Y+G6JCL6hRV72meb3LswLYGUzGYP4nh2Y/yixg+rAtre80xjbXFfdvXVF6CuibKn5gmjCmiRN31rvEfdwVPIQDCaqv19Do2cQYDN+yGCo7yDHAAAAAEABVguNTA5AAADhzCCA4MwggJroAMCAQICBGNtJJswDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDldlc3QgWW9ya3NoaXJlMQ4wDAYDVQQHEwVMZWVkczEOMAwGA1UEChMFSWNvc2ExEzARBgNVBAsTCk9wZW4gQnJ1c2gxFDASBgNVBAMTC01pa2UgTWlsbGVyMCAXDTIyMDIwMjExMzAyNVoYDzIwNzIwMTIxMTEzMDI1WjBxMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRzMQ4wDAYDVQQKEwVJY29zYTETMBEGA1UECxMKT3BlbiBCcnVzaDEUMBIGA1UEAxMLTWlrZSBNaWxsZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZOlUSd2Z9VSuVE1NK2AKiKCYR3ADh3f3PN6ipTtqUdxP44l5jJnPVXc5YXJ4DyBsXHGTqCSiL9wiqdRCNTMcRf6vrpcuRWxqwMMu4bid0eDiFBU+wModQl70N0VblMolYZzD/y0NpXWh7VKPSXyA22ZwygeOPQFzxR4j2jRvM/g+9HeJeVN1p5f+6pvceg/9FBSCEOQg5fbDtO+ytZfMiawcyhSSwwlOzEOGT0Dq6d9xIs1/zTA8LxAlGYHLSpQCT/n3X27LNgUMNrCpWgLTtxH/qQ61NU3juqTqBBWT4nzTXl1J9JyPaHH1yzC908YiI5PQSFehX80KTvsf0B65DAgMBAAGjITAfMB0GA1UdDgQWBBTThSJ0yfVNgUC4h3Sa9o8aUmLY3jANBgkqhkiG9w0BAQsFAAOCAQEAUqE9NJA+PaMBrCcVHkxmk32DsVNIVCM/eaTPCyjBM3V5COgxscven160OKGHRn6Xhplr/UDy+StphE9Hwk8MAwSJ4reBdPiNMQvIsDEQ/aXSAyTiKQeIU5Zc+cYuJvHcyxIOVektDe8Er2AITvpXQDK1JRvYU6lFKym3j/CZ4comUwjdolB1C6fzlTkhP3ZuuFMfv543WyuVtb3A1mioLzQ5kfFlbTO0uXqEm+gltkK8AMqU6B5RJDYtQXIJkjR//UzNgpaILVvQ4pyyS6VvBNbUbrHaUKabtP3daDtQ0AQw3gSkCJ+QPpY9joIq38LMcVY5/x5/nbcxTuYvUlHozn/+qtNvA7MtikSNPcblNpmifg4o' }} - androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS || 'FakeKey' }} - androidKeyaliasName: ${{ secrets.ANDROID_KEYALIAS_NAME || 'openbrush-non-official' }} - androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS || 'FakeKey' }} - continue-on-error: true - - - name: Check build state - if: ${{ steps.unity_builder.outputs.engineExitCode != 0 }} # not always() because if we cancel the job, this shouldn't run - run: | - # Check if the build exit code was a license failure or compilation error - if [[ ${{ steps.unity_builder.outputs.engineExitCode }} -eq 1 ]] - then - echo "::notice::License activation seems to have failed. Ignoring the failure and retrying the build step" - else - echo "The build failed with an exit code other than 1. Not going to retry. Check the 'Build project' step for details." - exit 255 - fi - - name: Build project rerun (if needed) - id: unity_builder_rerun - if: ${{ steps.unity_builder.outputs.engineExitCode == 1 }} - uses: game-ci/unity-builder@v4 - env: - VERSION: ${{ needs.configuration.outputs.version}} - UNITY_EMAIL: ${{ fromJSON(format('["unitytest@mikeage.net", "{0}"]', vars.UNITY_EMAIL))[secrets.UNITY_SERIAL != null] }} - UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }} - UNITY_PASSWORD: ${{ fromJSON(format('["DoNotStealThis1", "{0}"]', secrets.UNITY_PASSWORD))[secrets.UNITY_SERIAL != null] }} - UNITY_LICENSE: ${{ fromJSON('["\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n 9DZF11miRAzx7TIuCxih78B6CXU=weRQubqMNN61lSZtm/e7S+UDzTPNQjM5aQl/c4aKLH/b2khefpgLfdWneoxdnNopA6+rW6kBqxWt\nhMLdHY+oAOfDsfmMQRTnmQG0Y3G3xh6gjGP1RAIHoLDfFHf+0LQ3FakA2WehcFWPSYeVDrdxm3HW\nqMmdKWooD9i+J4s4rQFTDx9+/G6yjc5KGTyGxIz3c5kxTEkV2qsFPXsauomY9Z8YPKy+cZK7g+Ol\npO+LhtzetgTIlIN/qG8eByjlp6nOuVGdDOIrhNJW+vllNyx0qNWPREadVrhFViI4UXegMFRl5gJc\nrgcrlr/fD+NorDVLfcu7D863QXkkuriILUIq2Q==", null]')[secrets.UNITY_SERIAL != null] }} - with: - allowDirtyBuild: true # Because of the OVR Update, the build tree might be dirty - unityVersion: ${{ env.UNITY_VERSION }} - targetPlatform: ${{ matrix.targetPlatform }} - customParameters: -btb-target ${{ matrix.targetPlatform }} -btb-display ${{ matrix.vrsdk }} -btb-out /github/workspace/build/${{ matrix.vrsdk }}/${{ matrix.targetPlatform }}/${{ env.filename }} ${{ needs.configuration.outputs.description}} ${{ env.stamp }} ${{ env.btbbopts }} ${{ matrix.extraoptions }} - versioning: Custom - androidVersionCode: "${{ needs.configuration.outputs.androidVersionCode }}${{ matrix.versionSuffix }}" - version: ${{ needs.configuration.outputs.version }} - buildName: ${{ needs.configuration.outputs.basename }} - buildsPath: build/${{ matrix.vrsdk }} - chownFilesTo: ${{ needs.configuration.outputs.uid }}:${{ needs.configuration.outputs.gid }} - buildMethod: BuildTiltBrush.CommandLine - androidKeystoreName: openbrush.keystore - androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 || '/u3+7QAAAAIAAAABAAAAAQAWb3BlbmJydXNoLW5vbi1vZmZpY2lhbAAAAX66M2FtAAAFATCCBP0wDgYKKwYBBAEqAhEBAQUABIIE6Wufa9OVstw7Bu/gdATKqoPafXGefygChsN1d4LGY0SMLPORjHXiryEVMKi2rt61kNeXzeLkiM4yIQAam4HZtNTxgjoFQ6KB7uzkqMJYKViBUgg1HCAl2e+QpYjqG+YNJT67CiPgjpsJHNE628CwKAvjJ85FhqFz+MKzNF8BOpS5g5waqFda67oxaE4qO8eAL+F9P7us+ziY5B4O3EJC9s7xpT2GV2ro0m0fZI2dr3OO9UdUO72CYTg5qs250JiSij26Haf4t8Vq28F2S8rTcMUVtN4FRtzeR/wjeeZ3laER+WoxYni4MrZEXhYYCGhfor8Zcfi3p5ka8TJCQxywTKpghpSwgykgMJLn1HksxB0vhIMGTb87c2CTqS4t5Js/OPdcYS4Jnr7mHdQtOGfJCvl3TJC7NJwzLLOzUTmVIogaZCA9GlRballbD7XYbR8mcPxs+jLq5HJJk8/3B8ojAz/YA9vp6ml3RSYDA+yv9fBIefxNniAredJeqAnmH4o9er3+n0rKmpoqiXdzFkp1ywYbDDxrsFTiPrTc0gEiLRbfCERBx8GZ/7zGv6exKW1mc1L7QcFRmT1PRuJo6vRfCOtjdAdp0Mj1bllGGe9oBSKOxqtxs/NFygaVZjMDqryRvObKaJaj5CDhNdwsa21EsQ3+YvQWBzlcs5FTi5S2zG3W4+tMb+HoyV36SEV4yBLtqqrczhVCuPMlZu2p1iFLyODJJOxrWnmZy49BlQiudmiR7wILJoYKIFFvGv1jCJnTl9cI6UGX8IwSHYjGJIdLxaQM6c/7tw15+h+3jPajzZqkIQ7r0fyBp2TxE+QXMCP/knYu/dVzzQoBe5CgnAr5Fj60eEF78mJZbU3m9EjuVglURCTs2hDiyl3eRENgJjTc8p9iho4aK5eT5BVF7v2TAsTkfm+AwOq78chbWfh7J5OYnycG+v6S76LE6T8Yy0Arkk4lOF5SC05SmrDQpFcbRC9B7pR8XwJx3rabt4jvFsdqQtqv7TRasNQs95oROSC8335tzsaQfPwL/sGH4wi4zsH3YZ6As2V9myMEytqVEX5DdGBtzRr1opkx0aisyG48Evtk1UHMR9ROoZmkbNOIFNDUxCBvw7CU20aJSri4GX7kahg8Lj670Lfpx1C9OMwH0xRGUHE4e2ZWaw6Smkjc0Rru7j4YFKel0KtJgQaei2fz2i+6wOv1uz+H4j6f98pVMsf3HODmnh4x+qlUXaJWbNILQEGwv3zVReY123TPHIzkwImNLej62BLaqnEgiPkKr/gp/2MdrgepUEGC8FN0MTPbazDR4aE5XqLtnehhq8/9EfIk3b5WzNh00IAELwFrWnabkob5xmSLORBH8SpS3J6NwWa4jJMADRAGPYOUH7tYUM1/GRUK1HuboNP9v3KAny/k30CrxLvNHwe/zkXgoU9+M+gXVXL8pJJLMawVe/Dg13XyqTTa00UX7TsQFJZGm6lHrgeFIejKBEMLsMXNAIccphZe6sDnycDm/GY8vqmfjg9R05GwJOhBd46vhDi7Ph8YbLjohEoT4KfE5o8+Norzc/VHbRv5Y+G6JCL6hRV72meb3LswLYGUzGYP4nh2Y/yixg+rAtre80xjbXFfdvXVF6CuibKn5gmjCmiRN31rvEfdwVPIQDCaqv19Do2cQYDN+yGCo7yDHAAAAAEABVguNTA5AAADhzCCA4MwggJroAMCAQICBGNtJJswDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDldlc3QgWW9ya3NoaXJlMQ4wDAYDVQQHEwVMZWVkczEOMAwGA1UEChMFSWNvc2ExEzARBgNVBAsTCk9wZW4gQnJ1c2gxFDASBgNVBAMTC01pa2UgTWlsbGVyMCAXDTIyMDIwMjExMzAyNVoYDzIwNzIwMTIxMTEzMDI1WjBxMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRzMQ4wDAYDVQQKEwVJY29zYTETMBEGA1UECxMKT3BlbiBCcnVzaDEUMBIGA1UEAxMLTWlrZSBNaWxsZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZOlUSd2Z9VSuVE1NK2AKiKCYR3ADh3f3PN6ipTtqUdxP44l5jJnPVXc5YXJ4DyBsXHGTqCSiL9wiqdRCNTMcRf6vrpcuRWxqwMMu4bid0eDiFBU+wModQl70N0VblMolYZzD/y0NpXWh7VKPSXyA22ZwygeOPQFzxR4j2jRvM/g+9HeJeVN1p5f+6pvceg/9FBSCEOQg5fbDtO+ytZfMiawcyhSSwwlOzEOGT0Dq6d9xIs1/zTA8LxAlGYHLSpQCT/n3X27LNgUMNrCpWgLTtxH/qQ61NU3juqTqBBWT4nzTXl1J9JyPaHH1yzC908YiI5PQSFehX80KTvsf0B65DAgMBAAGjITAfMB0GA1UdDgQWBBTThSJ0yfVNgUC4h3Sa9o8aUmLY3jANBgkqhkiG9w0BAQsFAAOCAQEAUqE9NJA+PaMBrCcVHkxmk32DsVNIVCM/eaTPCyjBM3V5COgxscven160OKGHRn6Xhplr/UDy+StphE9Hwk8MAwSJ4reBdPiNMQvIsDEQ/aXSAyTiKQeIU5Zc+cYuJvHcyxIOVektDe8Er2AITvpXQDK1JRvYU6lFKym3j/CZ4comUwjdolB1C6fzlTkhP3ZuuFMfv543WyuVtb3A1mioLzQ5kfFlbTO0uXqEm+gltkK8AMqU6B5RJDYtQXIJkjR//UzNgpaILVvQ4pyyS6VvBNbUbrHaUKabtP3daDtQ0AQw3gSkCJ+QPpY9joIq38LMcVY5/x5/nbcxTuYvUlHozn/+qtNvA7MtikSNPcblNpmifg4o' }} - androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS || 'FakeKey' }} - androidKeyaliasName: ${{ secrets.ANDROID_KEYALIAS_NAME || 'openbrush-non-official' }} - androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS || 'FakeKey' }} + retry_condition: steps._this.outputs.engineExitCode == 1 + action: game-ci/unity-builder@v4 + with: | + allowDirtyBuild: true # Because of the OVR Update, the build tree might be dirty + unityVersion: ${{ env.UNITY_VERSION }} + targetPlatform: ${{ matrix.targetPlatform }} + customParameters: -btb-target ${{ matrix.targetPlatform }} -btb-display ${{ matrix.vrsdk }} -btb-out /github/workspace/build/${{ matrix.vrsdk }}/${{ matrix.targetPlatform }}/${{ env.filename }} ${{ needs.configuration.outputs.description}} ${{ env.stamp }} ${{ env.btbbopts }} ${{ matrix.extraoptions }} + versioning: Custom + androidVersionCode: "${{ needs.configuration.outputs.androidVersionCode }}${{ matrix.versionSuffix }}" + version: ${{ needs.configuration.outputs.version }} + buildName: ${{ needs.configuration.outputs.basename }} + buildsPath: build/${{ matrix.vrsdk }} + chownFilesTo: ${{ needs.configuration.outputs.uid }}:${{ needs.configuration.outputs.gid }} + buildMethod: BuildTiltBrush.CommandLine + androidKeystoreName: openbrush.keystore + androidKeystoreBase64: ${{ secrets.ANDROID_KEYSTORE_BASE64 || '/u3+7QAAAAIAAAABAAAAAQAWb3BlbmJydXNoLW5vbi1vZmZpY2lhbAAAAX66M2FtAAAFATCCBP0wDgYKKwYBBAEqAhEBAQUABIIE6Wufa9OVstw7Bu/gdATKqoPafXGefygChsN1d4LGY0SMLPORjHXiryEVMKi2rt61kNeXzeLkiM4yIQAam4HZtNTxgjoFQ6KB7uzkqMJYKViBUgg1HCAl2e+QpYjqG+YNJT67CiPgjpsJHNE628CwKAvjJ85FhqFz+MKzNF8BOpS5g5waqFda67oxaE4qO8eAL+F9P7us+ziY5B4O3EJC9s7xpT2GV2ro0m0fZI2dr3OO9UdUO72CYTg5qs250JiSij26Haf4t8Vq28F2S8rTcMUVtN4FRtzeR/wjeeZ3laER+WoxYni4MrZEXhYYCGhfor8Zcfi3p5ka8TJCQxywTKpghpSwgykgMJLn1HksxB0vhIMGTb87c2CTqS4t5Js/OPdcYS4Jnr7mHdQtOGfJCvl3TJC7NJwzLLOzUTmVIogaZCA9GlRballbD7XYbR8mcPxs+jLq5HJJk8/3B8ojAz/YA9vp6ml3RSYDA+yv9fBIefxNniAredJeqAnmH4o9er3+n0rKmpoqiXdzFkp1ywYbDDxrsFTiPrTc0gEiLRbfCERBx8GZ/7zGv6exKW1mc1L7QcFRmT1PRuJo6vRfCOtjdAdp0Mj1bllGGe9oBSKOxqtxs/NFygaVZjMDqryRvObKaJaj5CDhNdwsa21EsQ3+YvQWBzlcs5FTi5S2zG3W4+tMb+HoyV36SEV4yBLtqqrczhVCuPMlZu2p1iFLyODJJOxrWnmZy49BlQiudmiR7wILJoYKIFFvGv1jCJnTl9cI6UGX8IwSHYjGJIdLxaQM6c/7tw15+h+3jPajzZqkIQ7r0fyBp2TxE+QXMCP/knYu/dVzzQoBe5CgnAr5Fj60eEF78mJZbU3m9EjuVglURCTs2hDiyl3eRENgJjTc8p9iho4aK5eT5BVF7v2TAsTkfm+AwOq78chbWfh7J5OYnycG+v6S76LE6T8Yy0Arkk4lOF5SC05SmrDQpFcbRC9B7pR8XwJx3rabt4jvFsdqQtqv7TRasNQs95oROSC8335tzsaQfPwL/sGH4wi4zsH3YZ6As2V9myMEytqVEX5DdGBtzRr1opkx0aisyG48Evtk1UHMR9ROoZmkbNOIFNDUxCBvw7CU20aJSri4GX7kahg8Lj670Lfpx1C9OMwH0xRGUHE4e2ZWaw6Smkjc0Rru7j4YFKel0KtJgQaei2fz2i+6wOv1uz+H4j6f98pVMsf3HODmnh4x+qlUXaJWbNILQEGwv3zVReY123TPHIzkwImNLej62BLaqnEgiPkKr/gp/2MdrgepUEGC8FN0MTPbazDR4aE5XqLtnehhq8/9EfIk3b5WzNh00IAELwFrWnabkob5xmSLORBH8SpS3J6NwWa4jJMADRAGPYOUH7tYUM1/GRUK1HuboNP9v3KAny/k30CrxLvNHwe/zkXgoU9+M+gXVXL8pJJLMawVe/Dg13XyqTTa00UX7TsQFJZGm6lHrgeFIejKBEMLsMXNAIccphZe6sDnycDm/GY8vqmfjg9R05GwJOhBd46vhDi7Ph8YbLjohEoT4KfE5o8+Norzc/VHbRv5Y+G6JCL6hRV72meb3LswLYGUzGYP4nh2Y/yixg+rAtre80xjbXFfdvXVF6CuibKn5gmjCmiRN31rvEfdwVPIQDCaqv19Do2cQYDN+yGCo7yDHAAAAAEABVguNTA5AAADhzCCA4MwggJroAMCAQICBGNtJJswDQYJKoZIhvcNAQELBQAwcTELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDldlc3QgWW9ya3NoaXJlMQ4wDAYDVQQHEwVMZWVkczEOMAwGA1UEChMFSWNvc2ExEzARBgNVBAsTCk9wZW4gQnJ1c2gxFDASBgNVBAMTC01pa2UgTWlsbGVyMCAXDTIyMDIwMjExMzAyNVoYDzIwNzIwMTIxMTEzMDI1WjBxMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOV2VzdCBZb3Jrc2hpcmUxDjAMBgNVBAcTBUxlZWRzMQ4wDAYDVQQKEwVJY29zYTETMBEGA1UECxMKT3BlbiBCcnVzaDEUMBIGA1UEAxMLTWlrZSBNaWxsZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZOlUSd2Z9VSuVE1NK2AKiKCYR3ADh3f3PN6ipTtqUdxP44l5jJnPVXc5YXJ4DyBsXHGTqCSiL9wiqdRCNTMcRf6vrpcuRWxqwMMu4bid0eDiFBU+wModQl70N0VblMolYZzD/y0NpXWh7VKPSXyA22ZwygeOPQFzxR4j2jRvM/g+9HeJeVN1p5f+6pvceg/9FBSCEOQg5fbDtO+ytZfMiawcyhSSwwlOzEOGT0Dq6d9xIs1/zTA8LxAlGYHLSpQCT/n3X27LNgUMNrCpWgLTtxH/qQ61NU3juqTqBBWT4nzTXl1J9JyPaHH1yzC908YiI5PQSFehX80KTvsf0B65DAgMBAAGjITAfMB0GA1UdDgQWBBTThSJ0yfVNgUC4h3Sa9o8aUmLY3jANBgkqhkiG9w0BAQsFAAOCAQEAUqE9NJA+PaMBrCcVHkxmk32DsVNIVCM/eaTPCyjBM3V5COgxscven160OKGHRn6Xhplr/UDy+StphE9Hwk8MAwSJ4reBdPiNMQvIsDEQ/aXSAyTiKQeIU5Zc+cYuJvHcyxIOVektDe8Er2AITvpXQDK1JRvYU6lFKym3j/CZ4comUwjdolB1C6fzlTkhP3ZuuFMfv543WyuVtb3A1mioLzQ5kfFlbTO0uXqEm+gltkK8AMqU6B5RJDYtQXIJkjR//UzNgpaILVvQ4pyyS6VvBNbUbrHaUKabtP3daDtQ0AQw3gSkCJ+QPpY9joIq38LMcVY5/x5/nbcxTuYvUlHozn/+qtNvA7MtikSNPcblNpmifg4o' }} + androidKeystorePass: ${{ secrets.ANDROID_KEYSTORE_PASS || 'FakeKey' }} + androidKeyaliasName: ${{ secrets.ANDROID_KEYALIAS_NAME || 'openbrush-non-official' }} + androidKeyaliasPass: ${{ secrets.ANDROID_KEYALIAS_PASS || 'FakeKey' }} - name: Prepare for packaging (permissions and compression, OSX only) if: matrix.targetPlatform == 'StandaloneOSX' diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 355c221699..4a5f64a602 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -19,4 +19,21 @@ jobs: - uses: actions/setup-dotnet@v4.0.0 with: dotnet-version: '8.0.x' - - uses: pre-commit/action@v3.0.1 + - name: Install pre-commit + run: python -m pip install pre-commit + shell: bash + - name: Cache pre-commit environments + uses: actions/cache@v4 + with: + path: ~/.cache/pre-commit + key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }} + - name: Setup pre-commit environments + run: pre-commit run + - name: Run pre-commit dotnet-format, with retries + uses: Wandalen/wretry.action@v3 + with: + command: pre-commit run dotnet-format --show-diff-on-failure --color=always --all-files || { git checkout -- . ; exit 1 ; } # In case dotnet-format fails, reset the changes it made. This way, we can differentiate between a NuGet failure and a real formatting issue + - name: Remove dotnet-format from the list of pre-commit jobs to run (since we already ran it) + run: yq eval 'del(.repos[] | select(.hooks[].id == "dotnet-format"))' -i .pre-commit-config.yaml + - name: Run the rest of pre-commit + run: pre-commit run --show-diff-on-failure --color=always --all-files From 6c0d56ee83bd69df2393f3c86e6ff8be70ce4053 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Wed, 5 Jun 2024 18:58:01 +0100 Subject: [PATCH 05/38] m_ColorSaturationMax had accidentally been set to 0 breaking color picker (#724) --- Assets/Resources/Brushes/Basic/Flat/Flat.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Resources/Brushes/Basic/Flat/Flat.asset b/Assets/Resources/Brushes/Basic/Flat/Flat.asset index a2dba1fb74..be4b7eaa09 100644 --- a/Assets/Resources/Brushes/Basic/Flat/Flat.asset +++ b/Assets/Resources/Brushes/Basic/Flat/Flat.asset @@ -56,7 +56,7 @@ MonoBehaviour: m_Opacity: 1 m_PressureOpacityRange: {x: 1, y: 1} m_ColorLuminanceMin: 0 - m_ColorSaturationMax: 0 + m_ColorSaturationMax: 1 m_ParticleSpeed: 0 m_ParticleRate: 1 m_ParticleInitialRotationRange: 0 From f6bcc9e1e340800a1e1283d2ac50d7eef73fe27d Mon Sep 17 00:00:00 2001 From: Eero Pomell <97628152+eeropomell@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:47:22 +0300 Subject: [PATCH 06/38] Fix issue where images too large fail to load without an informative message (#722) Fixes #688 --- .../ReferencePanelIconBackgroundImage.prefab | 9 + .../ReferencePanelTabImage.prefab | 162 ++++++++++++++++++ .../Scripts/GUI/LoadBackgroundImageButton.cs | 19 +- .../Scripts/GUI/LoadReferenceImageButton.cs | 19 +- Assets/Scripts/ReferenceImage.cs | 34 +++- .../Strings/Strings Shared Data.asset | 12 ++ .../Localization/Strings/Strings_en.asset | 14 +- 7 files changed, 263 insertions(+), 6 deletions(-) diff --git a/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelIconBackgroundImage.prefab b/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelIconBackgroundImage.prefab index 03cd6dfe23..8ebc10ae21 100644 --- a/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelIconBackgroundImage.prefab +++ b/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelIconBackgroundImage.prefab @@ -144,6 +144,15 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238935604850335744 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] diff --git a/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelTabImage.prefab b/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelTabImage.prefab index 07682e8512..c827c25db0 100644 --- a/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelTabImage.prefab +++ b/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelTabImage.prefab @@ -121,6 +121,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] @@ -207,6 +225,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] @@ -262,6 +298,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] @@ -317,6 +371,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] @@ -372,6 +444,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] @@ -427,6 +517,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] @@ -482,6 +590,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] @@ -537,6 +663,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] @@ -592,6 +736,24 @@ MonoBehaviour: m_HoverScale: 1.2 m_HoverBoxColliderGrow: 0.2 m_AddOverlay: 0 + m_LoadHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238555522805800960 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ErrorHelpText: + m_TableReference: + m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 + m_TableEntryReference: + m_KeyId: 238556149774557184 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] references: version: 2 RefIds: [] diff --git a/Assets/Scripts/GUI/LoadBackgroundImageButton.cs b/Assets/Scripts/GUI/LoadBackgroundImageButton.cs index e4af884b2e..d5c0e46b85 100644 --- a/Assets/Scripts/GUI/LoadBackgroundImageButton.cs +++ b/Assets/Scripts/GUI/LoadBackgroundImageButton.cs @@ -13,6 +13,8 @@ // limitations under the License. using UnityEngine; +using UnityEngine.Localization; + namespace TiltBrush { @@ -24,10 +26,21 @@ public void RefreshDescription() { if (ReferenceImage != null) { - SetDescriptionText(ReferenceImage.FileName); + + // null if image doesn't have error + string errorMessage = ReferenceImage.ImageErrorExtraDescription(); + + if (errorMessage != null) + { + SetDescriptionText(App.ShortenForDescriptionText(ReferenceImage.FileName), errorMessage); + } + else + { + SetDescriptionText(App.ShortenForDescriptionText(ReferenceImage.FileName)); + } + } } - override protected void OnButtonPressed() { if (ReferenceImage == null) @@ -52,6 +65,8 @@ override public void ResetState() { SetButtonAvailable(available); } + + RefreshDescription(); } public void Set360ButtonTexture(Texture2D rTexture, float aspect = -1) diff --git a/Assets/Scripts/GUI/LoadReferenceImageButton.cs b/Assets/Scripts/GUI/LoadReferenceImageButton.cs index cbc222bfb3..6c0aa2da30 100644 --- a/Assets/Scripts/GUI/LoadReferenceImageButton.cs +++ b/Assets/Scripts/GUI/LoadReferenceImageButton.cs @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +using UnityEngine.Localization; +using UnityEngine; + namespace TiltBrush { @@ -23,7 +26,19 @@ public void RefreshDescription() { if (ReferenceImage != null) { - SetDescriptionText(ReferenceImage.FileName); + + // null if image doesn't have error + string errorMessage = ReferenceImage.ImageErrorExtraDescription(); + + if (errorMessage != null) + { + SetDescriptionText(App.ShortenForDescriptionText(ReferenceImage.FileName), errorMessage); + } + else + { + SetDescriptionText(App.ShortenForDescriptionText(ReferenceImage.FileName)); + } + } } @@ -68,6 +83,8 @@ override public void ResetState() { SetButtonAvailable(available); } + + RefreshDescription(); } } } // namespace TiltBrush diff --git a/Assets/Scripts/ReferenceImage.cs b/Assets/Scripts/ReferenceImage.cs index 420b4fa2d8..75afa786fe 100644 --- a/Assets/Scripts/ReferenceImage.cs +++ b/Assets/Scripts/ReferenceImage.cs @@ -19,6 +19,8 @@ using Unity.VectorGraphics; using Superla.RadianceHDR; using UnityEngine; +using UnityEngine.Localization; +using UnityEngine.Localization.Settings; namespace TiltBrush { @@ -37,6 +39,10 @@ private enum ImageState // Same meaning as Future.State.Error // Invariant: m_coroutine == null Error, + // This is the only specific error message right now. ("Image too large to load") + // For other errors (e.g unknown format), we set Error state and display a generic error message "Image failed to load" + // ImageUtils.cs throws more specific errors, and we could implement them here as well in the future. + ErrorImageTooLarge = 31000 } // See ImageState for invariants @@ -49,6 +55,10 @@ private enum ImageState private string m_Path; private SVGParser.SceneInfo _SvgSceneInfo; + private LocalizedString m_ErrorImageTooLargeHelpText = new LocalizedString("Strings", "PANEL_REFERENCE_ICONIMAGE_LOADERRORTEXT"); + private LocalizedString m_ErrorGenericHelpText = new LocalizedString("Strings", "PANEL_REFERENCE_ICONIMAGE_GENERICERRORTEXT"); + + // public bool IsComposite => _SvgSceneInfo.Scene.Root.getsh public string FileName { get { return Path.GetFileName(m_Path); } } @@ -71,6 +81,23 @@ public float ImageAspect } } + // returns null if no error in image + public string ImageErrorExtraDescription() + { + if (m_State != ImageState.Error && m_State != ImageState.ErrorImageTooLarge) + { + return null; + } + else if (m_State == ImageState.Error) + { + return m_ErrorGenericHelpText.GetLocalizedStringAsync().Result; + } + else + { + return m_ErrorImageTooLargeHelpText.GetLocalizedStringAsync().Result; + } + } + public bool NotLoaded { get { return m_State == ImageState.Uninitialized || m_State == ImageState.NotReady; } @@ -93,7 +120,8 @@ public Texture2D Icon switch (m_State) { case ImageState.Ready: return m_Icon; - case ImageState.Error: return ReferenceImageCatalog.m_Instance.ErrorImage; + case ImageState.Error: + case ImageState.ErrorImageTooLarge: return ReferenceImageCatalog.m_Instance.ErrorImage; default: case ImageState.Uninitialized: case ImageState.NotReady: return null; @@ -290,7 +318,7 @@ public bool RequestLoad(bool allowMainThread = false) // If this file is too large for the platform, don't load it. if (!ValidateFileSize()) { - m_State = ImageState.Error; + m_State = ImageState.ErrorImageTooLarge; ControllerConsoleScript.m_Instance.AddNewLine( FileName + " is too large and could not be loaded.", true); @@ -550,6 +578,8 @@ IEnumerable RequestLoadCoroutine() else { // Problem reading the file? + // images with state ImageState.Error display a generic error message 'Image failed to load' when hovering over them in the reference panel + // TODO: use more specific error messages (e.g "Too large dimensions", "Unknown format") that are set in ImageUtils.cs? (that is called by ThreadedImageReader.cs) m_State = ImageState.Error; reader = null; yield break; diff --git a/Assets/Settings/Localization/Strings/Strings Shared Data.asset b/Assets/Settings/Localization/Strings/Strings Shared Data.asset index 82bf2e5130..c60ef0817e 100644 --- a/Assets/Settings/Localization/Strings/Strings Shared Data.asset +++ b/Assets/Settings/Localization/Strings/Strings Shared Data.asset @@ -3315,6 +3315,18 @@ MonoBehaviour: m_Key: DirectoryChooserPopupButton m_Metadata: m_Items: [] + - m_Id: 238556149774557184 + m_Key: PANEL_REFERENCE_ICONIMAGE_LOADERRORTEXT + m_Metadata: + m_Items: [] + - m_Id: 238935604850335744 + m_Key: PANEL_REFERENCE_ICONBACKGROUNDIMAGE_LOADERRORTEXT + m_Metadata: + m_Items: [] + - m_Id: 242372529028341760 + m_Key: PANEL_REFERENCE_ICONIMAGE_GENERICERRORTEXT + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Settings/Localization/Strings/Strings_en.asset b/Assets/Settings/Localization/Strings/Strings_en.asset index f85b1273b4..dc601834e7 100644 --- a/Assets/Settings/Localization/Strings/Strings_en.asset +++ b/Assets/Settings/Localization/Strings/Strings_en.asset @@ -11,7 +11,7 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e9620f8c34305754d8cc9a7e49e852d9, type: 3} m_Name: Strings_en - m_EditorClassIdentifier: + m_EditorClassIdentifier: m_LocaleId: m_Code: en m_SharedData: {fileID: 11400000, guid: c84355079ab3f3e4f8f3812258805f86, type: 2} @@ -3512,6 +3512,18 @@ MonoBehaviour: m_Localized: Pick a Subfolder m_Metadata: m_Items: [] + - m_Id: 238556149774557184 + m_Localized: Image too large to load + m_Metadata: + m_Items: [] + - m_Id: 238935604850335744 + m_Localized: Image too large to load + m_Metadata: + m_Items: [] + - m_Id: 242372529028341760 + m_Localized: Image failed to load + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] From 5a50f048cd0c3dbd555815ea04c2719275fdc3e0 Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Thu, 13 Jun 2024 20:06:53 +0300 Subject: [PATCH 07/38] Run ovr-platform-util on Linux instead of Mac (#727) --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60ff11bc07..98c13e4e3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1065,7 +1065,7 @@ jobs: publish_oculus_quest: name: Publish Oculus Quest 2+ Release needs: [configuration, build] - runs-on: macos-latest # the ovr-platform-util tool is only available for Mac and Windows + runs-on: ubuntu-latest if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -1091,7 +1091,7 @@ jobs: cd releases unzip symbols.zip - curl -L 'https://www.oculus.com/download_app/?id=1462426033810370' -o ovr-platform-util + curl -L 'https://www.oculus.com/download_app/?id=5159709737372459' -o ovr-platform-util chmod 755 ovr-platform-util if [ "$PRERELEASE" == "false" ] @@ -1105,7 +1105,7 @@ jobs: publish_oculus_quest1: name: Publish Oculus Quest 1 Release needs: [configuration, build] - runs-on: macos-latest # the ovr-platform-util tool is only available for Mac and Windows + runs-on: ubuntu-latest if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -1131,7 +1131,7 @@ jobs: cd releases1 unzip symbols.zip - curl -L 'https://www.oculus.com/download_app/?id=1462426033810370' -o ovr-platform-util + curl -L 'https://www.oculus.com/download_app/?id=5159709737372459' -o ovr-platform-util chmod 755 ovr-platform-util if [ "$PRERELEASE" == "false" ] @@ -1145,7 +1145,7 @@ jobs: publish_oculus_rift: name: Publish Oculus Rift Release needs: [configuration, build] - runs-on: macos-latest # the ovr-platform-util tool is only available for Mac and Windows + runs-on: ubuntu-latest if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -1169,7 +1169,7 @@ jobs: mv build_windows_rift/StandaloneWindows64/ releases/OpenBrush_Rift_$VERSION/ cd releases zip -r OpenBrush_Rift_$VERSION.zip OpenBrush_Rift_$VERSION/ - curl -L 'https://www.oculus.com/download_app/?id=1462426033810370' -o ovr-platform-util + curl -L 'https://www.oculus.com/download_app/?id=5159709737372459' -o ovr-platform-util chmod 755 ovr-platform-util if [ "$PRERELEASE" == "false" ] From bf3b4dde96926a545affb80577e9c20c2ea4cb84 Mon Sep 17 00:00:00 2001 From: Mike Nisbet Date: Tue, 25 Jun 2024 09:34:27 +0100 Subject: [PATCH 08/38] Unity 2022 LTS (#708) * initial upgrade * new oculus version * pipeline * bug in xr core utils * standardize on XROrigin * Possible fix for the OSD standard shader cribbed from UnityGLTF repo * Run the "free disk space" step before building Linux * try fix offset * patch version * readme and packages --------- Co-authored-by: Andy Baker Co-authored-by: Mike Miller --- .github/workflows/build.yml | 4 +- Assets/InputSystem.inputsettings.asset | 3 +- Assets/Oculus/OculusProjectConfig.asset | 8 +- .../{VrSystem.prefab => XRRig.prefab} | 36 +- ...VrSystem.prefab.meta => XRRig.prefab.meta} | 0 Assets/Resources/OculusRuntimeSettings.asset | 7 +- Assets/Scenes/Loading.unity | 84 +- Assets/Scenes/Main.unity | 1737 ++++++++++------- Assets/Scripts/Input/UnityXRInputAction.cs | 9 +- .../UnityODS/TiltBrushStandardSpecular.shader | 16 +- Assets/XR/Settings/Oculus Settings.asset | 2 +- .../Settings/Open XR Package Settings.asset | 123 +- Packages/manifest.json | 27 +- Packages/packages-lock.json | 97 +- ProjectSettings/EditorBuildSettings.asset | 2 + ProjectSettings/ProjectSettings.asset | 332 ++-- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/ShaderGraphSettings.asset | 1 + ProjectSettings/boot.config | 0 README.md | 2 +- 20 files changed, 1551 insertions(+), 943 deletions(-) rename Assets/Prefabs/VrSystems/{VrSystem.prefab => XRRig.prefab} (98%) rename Assets/Prefabs/VrSystems/{VrSystem.prefab.meta => XRRig.prefab.meta} (100%) delete mode 100644 ProjectSettings/boot.config diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98c13e4e3d..68e4e31ec6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: # yamllint disable-line rule:truthy - "v*" env: - UNITY_VERSION: "2021.3.30f1" + UNITY_VERSION: "2022.3.34f1" PHOTON_PAT: ${{ secrets.PHOTON_PAT }} # This needs to be here, since you can't use a ${{ secrets }} within an if: condition jobs: configuration: @@ -260,7 +260,7 @@ jobs: run: echo "::add-mask::DoNotStealThis1" - name: Free extra space # This takes several minutes, so we only do it where required. As of 12/10/2023, this increases free space from 18GB to 41GB - if: matrix.targetPlatform == 'Android' || matrix.targetPlatform == 'StandaloneWindows64' + if: matrix.targetPlatform == 'Android' || matrix.targetPlatform == 'StandaloneWindows64' || matrix.targetPlatform == 'StandaloneLinux64' run: | echo "Initial free space" df -h / diff --git a/Assets/InputSystem.inputsettings.asset b/Assets/InputSystem.inputsettings.asset index 5e1336d661..6678a1928e 100644 --- a/Assets/InputSystem.inputsettings.asset +++ b/Assets/InputSystem.inputsettings.asset @@ -19,9 +19,10 @@ MonoBehaviour: m_CompensateForScreenOrientation: 1 m_BackgroundBehavior: 0 m_EditorInputBehaviorInPlayMode: 0 + m_InputActionPropertyDrawerMode: 0 m_DefaultDeadzoneMin: 0.125 m_DefaultDeadzoneMax: 0.925 - m_DefaultButtonPressPoint: 0.125 + m_DefaultButtonPressPoint: 0.05 m_ButtonReleaseThreshold: 1 m_DefaultTapTime: 0.2 m_DefaultSlowTapTime: 0.5 diff --git a/Assets/Oculus/OculusProjectConfig.asset b/Assets/Oculus/OculusProjectConfig.asset index 4280c0f504..00dffa2972 100644 --- a/Assets/Oculus/OculusProjectConfig.asset +++ b/Assets/Oculus/OculusProjectConfig.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 05d394ae2a81edd4cbc3c51917e766e3, type: 3} m_Name: OculusProjectConfig m_EditorClassIdentifier: - targetDeviceTypes: 0100000002000000 + targetDeviceTypes: 01000000020000000300000004000000 allowOptional3DofHeadTracking: 0 handTrackingSupport: 0 handTrackingFrequency: 0 @@ -36,7 +36,9 @@ MonoBehaviour: experimentalFeaturesEnabled: 0 insightPassthroughEnabled: 0 _insightPassthroughSupport: 1 + _processorFavor: 0 systemSplashScreen: {fileID: 0} systemSplashScreenType: 0 - ovrPluginMd5Win64: 67e58deb5b905ae742512bbee3e06a70 - ovrPluginMd5Android: 017d859ada160e45b27588f910d5d8d8 + _systemLoadingScreenBackground: 0 + ovrPluginMd5Win64: c48997b21953ed048a386c4b9048abd8 + ovrPluginMd5Android: 65acd2172a25fc3c956f0376ec0704c4 diff --git a/Assets/Prefabs/VrSystems/VrSystem.prefab b/Assets/Prefabs/VrSystems/XRRig.prefab similarity index 98% rename from Assets/Prefabs/VrSystems/VrSystem.prefab rename to Assets/Prefabs/VrSystems/XRRig.prefab index ff73a4c84d..828d395bf6 100644 --- a/Assets/Prefabs/VrSystems/VrSystem.prefab +++ b/Assets/Prefabs/VrSystems/XRRig.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010219327108} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071067} m_LocalPosition: {x: 0, y: 0.462, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32,7 +33,6 @@ Transform: m_Children: - {fileID: 4000011228812650} m_Father: {fileID: 4000010144042572} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!33 &33000010840905478 MeshFilter: @@ -109,13 +109,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010254519032} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000011324248280} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000012258378548 MeshFilter: @@ -192,13 +192,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000010385036888} + serializedVersion: 2 m_LocalRotation: {x: 0.5000001, y: 0.5, z: 0.5, w: 0.49999994} m_LocalPosition: {x: -0.03059292, y: 0.448, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000010144042572} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 90} --- !u!33 &33000012547590530 MeshFilter: @@ -275,13 +275,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000011506486898} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025000002, y: 1, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000011324248280} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000012561961602 MeshFilter: @@ -357,6 +357,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000012204676996} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.0375, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} @@ -366,7 +367,6 @@ Transform: - {fileID: 4000013792758412} - {fileID: 4000014014947668} m_Father: {fileID: 4000013585580318} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114000010779486394 MonoBehaviour: @@ -426,13 +426,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000013132276250} + 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: [] m_Father: {fileID: 4173200421728563766} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &20000011692615516 Camera: @@ -448,9 +448,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -627,6 +635,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000013151840476} + 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} @@ -635,7 +644,6 @@ Transform: - {fileID: 4000013520283516} - {fileID: 4000013305184532} m_Father: {fileID: 4000011324248280} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1000014097608168 GameObject: @@ -662,13 +670,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000014097608168} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.07, z: -0.03} m_LocalScale: {x: 0.88, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4000013520283516} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &33000010530549276 MeshFilter: @@ -732,7 +740,7 @@ GameObject: - component: {fileID: 6299537005687282328} - component: {fileID: 2050387273726649813} m_Layer: 0 - m_Name: VrSystem + m_Name: XRRig m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -745,6 +753,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000014130305538} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} @@ -753,7 +762,6 @@ Transform: - {fileID: 4173200421728563766} - {fileID: 4000011324248280} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6299537005687282328 MonoBehaviour: @@ -770,8 +778,8 @@ MonoBehaviour: m_Camera: {fileID: 20000011692615516} m_OriginBaseGameObject: {fileID: 1000014130305538} m_CameraFloorOffsetObject: {fileID: 528820638706216730} - m_RequestedTrackingOriginMode: 2 - m_CameraYOffset: 1.36144 + m_RequestedTrackingOriginMode: 0 + m_CameraYOffset: 1.5 --- !u!114 &2050387273726649813 MonoBehaviour: m_ObjectHideFlags: 0 @@ -823,6 +831,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 528820638706216730} + 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} @@ -830,5 +839,4 @@ Transform: m_Children: - {fileID: 4000011853176074} m_Father: {fileID: 4000013585580318} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/VrSystems/VrSystem.prefab.meta b/Assets/Prefabs/VrSystems/XRRig.prefab.meta similarity index 100% rename from Assets/Prefabs/VrSystems/VrSystem.prefab.meta rename to Assets/Prefabs/VrSystems/XRRig.prefab.meta diff --git a/Assets/Resources/OculusRuntimeSettings.asset b/Assets/Resources/OculusRuntimeSettings.asset index 0dde6eca9a..c3170b5cf6 100644 --- a/Assets/Resources/OculusRuntimeSettings.asset +++ b/Assets/Resources/OculusRuntimeSettings.asset @@ -12,7 +12,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3863570e7e6387a40ae4f323d83291e5, type: 3} m_Name: OculusRuntimeSettings m_EditorClassIdentifier: - colorSpace: 4 + colorSpace: 7 + requestsVisualFaceTracking: 0 + requestsAudioFaceTracking: 0 hasSentConsentEvent: 1 hasSetTelemetryEnabled: 1 telemetryEnabled: 0 + telemetryProjectGuid: d2819a94-2022-4c64-af65-82f34c4eb115 + bodyTrackingFidelity: 1 + bodyTrackingJointSet: 0 diff --git a/Assets/Scenes/Loading.unity b/Assets/Scenes/Loading.unity index 3118b0fd1d..866416a479 100644 --- a/Assets/Scenes/Loading.unity +++ b/Assets/Scenes/Loading.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.3708985, g: 0.3783704, b: 0.35722548, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -132,7 +132,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 111505460} - - component: {fileID: 111505459} + - component: {fileID: 111505461} m_Layer: 0 m_Name: XRRig m_TagString: Untagged @@ -140,23 +140,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &111505459 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 111505458} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2483b9bd782f9449a5972b61b7d51a9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_CameraFloorOffsetObject: {fileID: 1715502379} - m_RequestedTrackingMode: 2 - m_TrackingOriginMode: 1 - m_TrackingSpace: 1 - m_CameraYOffset: 1.36144 --- !u!4 &111505460 Transform: m_ObjectHideFlags: 0 @@ -164,6 +147,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 111505458} + 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} @@ -171,8 +155,24 @@ Transform: m_Children: - {fileID: 1715502380} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &111505461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 111505458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Camera: {fileID: 1815664868} + m_OriginBaseGameObject: {fileID: 111505458} + m_CameraFloorOffsetObject: {fileID: 1715502379} + m_RequestedTrackingOriginMode: 0 + m_CameraYOffset: 1.1176 --- !u!1 &326031494 GameObject: m_ObjectHideFlags: 0 @@ -234,6 +234,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 326031494} + 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} @@ -241,7 +242,6 @@ Transform: m_Children: - {fileID: 2033527394} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!850595691 &1436392272 LightingSettings: @@ -250,7 +250,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 4 + serializedVersion: 6 m_GIWorkflowMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 @@ -259,7 +259,7 @@ LightingSettings: m_AlbedoBoost: 1 m_IndirectOutputScale: 1 m_UsingShadowmask: 1 - m_BakeBackend: 0 + m_BakeBackend: 1 m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 @@ -284,13 +284,13 @@ LightingSettings: m_PVRCulling: 1 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVREnvironmentSampleCount: 500 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentMIS: 0 + m_PVREnvironmentImportanceSampling: 0 m_PVRFilteringMode: 2 m_PVRDenoiserTypeDirect: 0 m_PVRDenoiserTypeIndirect: 0 @@ -305,11 +305,14 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1001 &1684060408 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 326031496} m_Modifications: - target: {fileID: 1519074236726350, guid: 770ce3c2e018d6242be0bad3df133810, type: 3} @@ -405,6 +408,9 @@ PrefabInstance: value: objectReference: {fileID: 1815664868} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 770ce3c2e018d6242be0bad3df133810, type: 3} --- !u!114 &1684060409 stripped MonoBehaviour: @@ -441,14 +447,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1715502379} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1.1176, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1815664865} m_Father: {fileID: 111505460} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1815664864 GameObject: @@ -476,13 +482,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1815664864} + 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: [] m_Father: {fileID: 1715502380} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1815664866 MonoBehaviour: @@ -524,9 +530,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -559,3 +573,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1684060408} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 326031496} + - {fileID: 111505460} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index ff1c3ae572..5996424c73 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -105,7 +105,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -118,7 +118,7 @@ NavMeshSettings: cellSize: 0.16666666 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -148,6 +148,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 826663} + serializedVersion: 2 m_LocalRotation: {x: -0.12786615, y: 0, z: 0, w: 0.9917915} m_LocalPosition: {x: 0.311, y: 0.038, z: -0.627} m_LocalScale: {x: 1, y: 1, z: 1} @@ -155,7 +156,6 @@ Transform: m_Children: - {fileID: 1276754368} m_Father: {fileID: 694338411} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -14.6926, y: 0, z: 0} --- !u!114 &826665 MonoBehaviour: @@ -219,13 +219,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2547237} + 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: [] m_Father: {fileID: 295861952} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2547239 MonoBehaviour: @@ -315,9 +315,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -401,7 +409,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1360641967} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -614,13 +621,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9360108} + 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: [] m_Father: {fileID: 1820754937} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &9360110 MonoBehaviour: @@ -762,9 +769,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -967,6 +982,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 15449107} + 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} @@ -975,7 +991,6 @@ Transform: - {fileID: 420987294} - {fileID: 1726887558} m_Father: {fileID: 1479115558} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &17776369 stripped Transform: @@ -1030,6 +1045,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 19916009} + 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} @@ -1037,7 +1053,6 @@ Transform: m_Children: - {fileID: 259943803} m_Father: {fileID: 119184282} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &28639694 GameObject: @@ -1064,13 +1079,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 28639694} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.7928318, y: 0.366, z: -0.013999969} m_LocalScale: {x: 0.24668743, y: 0.24668723, z: 0.2055728} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1043378877} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &28639696 MeshRenderer: @@ -1145,19 +1160,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 28704757} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.75, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1498770773} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &40303959 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 169562, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -1175,24 +1189,22 @@ GameObject: --- !u!4 &40303960 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 493834, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 40303959} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000016292068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 898180898} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} --- !u!23 &40303961 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2379448, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 40303959} @@ -1234,8 +1246,7 @@ MeshRenderer: --- !u!33 &40303962 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3335888, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 40303959} @@ -1269,6 +1280,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 46829156} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.1999996, z: 1} @@ -1276,7 +1288,6 @@ Transform: m_Children: - {fileID: 1058885038} m_Father: {fileID: 1043378877} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &50260520 GameObject: @@ -1302,13 +1313,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 50260520} + 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: [] m_Father: {fileID: 1796800572} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &50260522 MonoBehaviour: @@ -1362,6 +1373,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52827660} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -1370,7 +1382,6 @@ Transform: - {fileID: 2103185552} - {fileID: 1589753391} m_Father: {fileID: 593121476} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &52827662 MonoBehaviour: @@ -1410,8 +1421,7 @@ MonoBehaviour: --- !u!1 &53960730 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126712, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -1430,8 +1440,7 @@ GameObject: --- !u!114 &53960732 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11410358, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 53960730} @@ -1525,8 +1534,7 @@ MonoBehaviour: --- !u!23 &53960734 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2385760, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 53960730} @@ -1609,13 +1617,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 57187089} + 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: [] m_Father: {fileID: 200920502} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &57187091 MonoBehaviour: @@ -1707,7 +1715,7 @@ MonoBehaviour: outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 0 + m_RotationOrder: 4 m_AlwaysOn: 1 m_OverrideDividors: 2,2,2,2,2 m_savedBloom: [] @@ -1745,9 +1753,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1851,6 +1867,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59629308} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -1863,7 +1880,6 @@ Transform: - {fileID: 2028137323} - {fileID: 1754488244} m_Father: {fileID: 593121476} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &59629310 MonoBehaviour: @@ -1925,7 +1941,6 @@ RectTransform: m_Children: - {fileID: 2032315650} m_Father: {fileID: 2084734315} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2050,6 +2065,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 73820440} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.4, y: 0, z: -0.4} m_LocalScale: {x: 1, y: 1, z: 1} @@ -2059,7 +2075,6 @@ Transform: - {fileID: 609413039} - {fileID: 947102788} m_Father: {fileID: 835580260} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &85296817 stripped Transform: @@ -2078,6 +2093,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -2161,6 +2177,9 @@ PrefabInstance: value: objectReference: {fileID: 4300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &85798463 stripped Transform: @@ -2212,8 +2231,7 @@ MonoBehaviour: --- !u!23 &91691385 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1162750468} @@ -2255,8 +2273,7 @@ MeshRenderer: --- !u!1 &91819547 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 104670, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -2274,24 +2291,22 @@ GameObject: --- !u!4 &91819548 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 412152, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 91819547} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.67099994, y: 0.48900005, z: -0.005000039} m_LocalScale: {x: 2, y: 0.025000002, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1578975889} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &91819549 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2344758, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 91819547} @@ -2333,8 +2348,7 @@ MeshRenderer: --- !u!33 &91819550 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3393828, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 91819547} @@ -2344,6 +2358,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796800572} m_Modifications: - target: {fileID: 100000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} @@ -2413,6 +2428,17 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2300000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} - {fileID: 3300000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400000, guid: b71c23914bd4e0a4290d3fc1dd01f027, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1773345480} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: b71c23914bd4e0a4290d3fc1dd01f027, + type: 3} + insertIndex: -1 + addedObject: {fileID: 94678610} m_SourcePrefab: {fileID: 100100000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} --- !u!4 &94678608 stripped Transform: @@ -2479,13 +2505,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 102819258} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.0283041, y: -0.4882004, z: 0.0008780956} m_LocalScale: {x: 1, y: 0.02, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1057179853} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &102819260 MeshRenderer: @@ -2540,8 +2566,7 @@ MeshFilter: --- !u!1 &103787545 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126712, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -2559,8 +2584,7 @@ GameObject: --- !u!23 &103787546 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2385760, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 103787545} @@ -2623,13 +2647,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 106206545} + 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: [] m_Father: {fileID: 0} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &106206548 MonoBehaviour: @@ -2682,13 +2706,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 111450610} + 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: [] m_Father: {fileID: 1373217987} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &111450612 MonoBehaviour: @@ -2705,8 +2729,7 @@ MonoBehaviour: --- !u!224 &116898358 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22461458, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 512959151} @@ -2716,7 +2739,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1043378877} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2747,6 +2769,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 119184281} + 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} @@ -2754,7 +2777,6 @@ Transform: m_Children: - {fileID: 19916010} m_Father: {fileID: 1952144537} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &119184283 MonoBehaviour: @@ -2791,6 +2813,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 125235750} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 14, z: 7.85} m_LocalScale: {x: 1, y: 1, z: 1} @@ -2798,7 +2821,6 @@ Transform: m_Children: - {fileID: 130529556} m_Father: {fileID: 1796800572} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &128143212 GameObject: @@ -2825,13 +2847,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 128143212} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: 0, y: 0.1, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022889491} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &128143214 MeshRenderer: @@ -2886,24 +2908,22 @@ MeshFilter: --- !u!4 &129267558 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 976470539} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.725, y: 0, z: -0.025} m_LocalScale: {x: 0.025, y: 0.62499976, z: 0.009999996} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1701452755} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &129869458 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11410358, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 103787545} @@ -3170,6 +3190,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 130529555} + 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} @@ -3177,7 +3198,6 @@ Transform: m_Children: - {fileID: 1981107084} m_Father: {fileID: 125235751} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &135695199 GameObject: @@ -3202,6 +3222,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 135695199} + 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} @@ -3210,7 +3231,6 @@ Transform: - {fileID: 6962742248766418969} - {fileID: 6963085946548418065} m_Father: {fileID: 307985707} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &140066842 GameObject: @@ -3243,7 +3263,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1158145242} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3352,6 +3371,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1648044078} m_Modifications: - target: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, type: 3} @@ -3431,6 +3451,17 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, + type: 3} + insertIndex: -1 + addedObject: {fileID: 151850540} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, + type: 3} + insertIndex: -1 + addedObject: {fileID: 151850539} m_SourcePrefab: {fileID: 100100000, guid: 535a5aa7349085e42b210f7d2bdbe548, type: 3} --- !u!4 &151850537 stripped Transform: @@ -3599,13 +3630,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 152983283} + 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: [] m_Father: {fileID: 652605545} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &152983285 MonoBehaviour: @@ -3694,6 +3725,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154338411} + 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} @@ -3701,13 +3733,13 @@ Transform: m_Children: - {fileID: 409849877} m_Father: {fileID: 1972541291} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &156369961 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 431944651} m_Modifications: - target: {fileID: 168588, guid: a264e3603b3b743179f8db614f6b56f9, type: 3} @@ -3759,6 +3791,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 111702, guid: a264e3603b3b743179f8db614f6b56f9, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: a264e3603b3b743179f8db614f6b56f9, type: 3} --- !u!4 &156369962 stripped Transform: @@ -3769,8 +3808,7 @@ Transform: --- !u!1 &160917793 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000013713693234, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -3788,11 +3826,11 @@ GameObject: --- !u!4 &160917794 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000011081234314, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 160917793} + 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} @@ -3802,7 +3840,6 @@ Transform: - {fileID: 474023890} - {fileID: 503021778} m_Father: {fileID: 1504500865} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &160917795 MonoBehaviour: @@ -3958,6 +3995,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161836534} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.837, y: -0.5300001, z: 0.00080020854} m_LocalScale: {x: 1, y: 1, z: 1} @@ -3965,7 +4003,6 @@ Transform: m_Children: - {fileID: 1866615727} m_Father: {fileID: 1530736239} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &165291216 GameObject: @@ -3992,13 +4029,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 165291216} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 14, z: 8} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1796800572} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &165291218 Camera: @@ -4014,9 +4051,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -4084,6 +4129,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168645622} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.5, y: 0, z: -0.4000001} m_LocalScale: {x: 1, y: 1, z: 1} @@ -4092,13 +4138,13 @@ Transform: - {fileID: 1128511511} - {fileID: 198111411} m_Father: {fileID: 268266638} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &177030158 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -4182,6 +4228,9 @@ PrefabInstance: value: objectReference: {fileID: 4300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &177030159 stripped Transform: @@ -4194,6 +4243,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 202624784} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -4273,7 +4323,16 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} +--- !u!4 &194012494 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, + type: 3} + m_PrefabInstance: {fileID: 194012493} + m_PrefabAsset: {fileID: 0} --- !u!1 &195311862 GameObject: m_ObjectHideFlags: 0 @@ -4299,13 +4358,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 195311862} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.8, y: 0.7999998, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950669211} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &195311864 MeshRenderer: @@ -4382,13 +4441,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 195463944} + serializedVersion: 2 m_LocalRotation: {x: -0.000000029802326, y: -0, z: 0.7071068, w: 0.70710677} m_LocalPosition: {x: -0.004400015, y: 0, z: 0} m_LocalScale: {x: 0.65999943, y: 0.65999985, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2013539807} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!23 &195463946 MeshRenderer: @@ -4463,13 +4522,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 198111410} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.4, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 168645623} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &200920501 GameObject: @@ -4494,6 +4553,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 200920501} + 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} @@ -4501,7 +4561,6 @@ Transform: m_Children: - {fileID: 57187090} m_Father: {fileID: 1788392445} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &201946758 stripped Transform: @@ -4520,6 +4579,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1038705377} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -4601,6 +4661,13 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} - {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 194012494} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &202624784 stripped Transform: @@ -4611,8 +4678,7 @@ Transform: --- !u!1 &208230167 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100002, guid: d608be9302146ef49895815cde7ddc3e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -4630,11 +4696,11 @@ GameObject: --- !u!4 &208230168 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400002, guid: d608be9302146ef49895815cde7ddc3e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 208230167} + serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -4642,13 +4708,11 @@ Transform: m_Children: - {fileID: 1828584199} m_Father: {fileID: 160917794} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} --- !u!23 &208230169 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300002, guid: d608be9302146ef49895815cde7ddc3e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 208230167} @@ -4690,8 +4754,7 @@ MeshRenderer: --- !u!33 &208230170 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300002, guid: d608be9302146ef49895815cde7ddc3e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 208230167} @@ -4720,6 +4783,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 220573284} + 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} @@ -4730,7 +4794,6 @@ Transform: - {fileID: 1139965982} - {fileID: 1952144537} m_Father: {fileID: 1796800572} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &220573287 MonoBehaviour: @@ -4821,8 +4884,7 @@ MonoBehaviour: --- !u!1 &221423020 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 198838, guid: 02a990acdec085648b3836f8aa2a3ed7, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -4840,24 +4902,22 @@ GameObject: --- !u!4 &221423021 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 429348, guid: 02a990acdec085648b3836f8aa2a3ed7, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221423020} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.0019999743, y: 0.042763684, z: -0.0027027167} m_LocalScale: {x: 1.908394, y: 0.24175715, z: 1.007322} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1043378877} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &221423022 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300232, guid: 02a990acdec085648b3836f8aa2a3ed7, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221423020} @@ -4899,8 +4959,7 @@ MeshRenderer: --- !u!33 &221423023 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3328480, guid: 02a990acdec085648b3836f8aa2a3ed7, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221423020} @@ -4928,6 +4987,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223402014} + 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} @@ -4935,7 +4995,6 @@ Transform: m_Children: - {fileID: 9123593761565215834} m_Father: {fileID: 307985707} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &230973831 GameObject: @@ -4960,6 +5019,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 230973831} + 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} @@ -4969,13 +5029,11 @@ Transform: - {fileID: 1625682717} - {fileID: 1052118968} m_Father: {fileID: 1382397703} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &236572995 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: 30fb3a9a2d452c247b6915b31b31dd3d, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -4993,8 +5051,7 @@ GameObject: --- !u!33 &236572996 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 30fb3a9a2d452c247b6915b31b31dd3d, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 236572995} @@ -5004,6 +5061,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972976745} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -5083,7 +5141,16 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} +--- !u!4 &241392955 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, + type: 3} + m_PrefabInstance: {fileID: 241392954} + m_PrefabAsset: {fileID: 0} --- !u!1 &242310919 GameObject: m_ObjectHideFlags: 0 @@ -5107,6 +5174,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242310919} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -5116,7 +5184,6 @@ Transform: - {fileID: 862254889} - {fileID: 1892328828} m_Father: {fileID: 1796800572} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &259943802 GameObject: @@ -5150,13 +5217,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 259943802} + 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: [] m_Father: {fileID: 19916010} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &259943804 MonoBehaviour: @@ -5260,9 +5327,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -5330,8 +5405,7 @@ MonoBehaviour: --- !u!1 &261597283 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126712, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -5349,8 +5423,7 @@ GameObject: --- !u!23 &261597284 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2385760, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261597283} @@ -5392,8 +5465,7 @@ MeshRenderer: --- !u!224 &261597287 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22461458, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261597283} @@ -5403,7 +5475,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 581738633} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5415,6 +5486,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 338825206} m_Modifications: - target: {fileID: 189998, guid: ec47a0eb6f23a504392d40013c413be5, type: 3} @@ -5551,6 +5623,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 189998, guid: ec47a0eb6f23a504392d40013c413be5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1063174774} m_SourcePrefab: {fileID: 100100000, guid: ec47a0eb6f23a504392d40013c413be5, type: 3} --- !u!224 &264429768 stripped RectTransform: @@ -5581,6 +5660,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268266637} + 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} @@ -5588,7 +5668,6 @@ Transform: m_Children: - {fileID: 168645623} m_Father: {fileID: 694338411} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &269484831 GameObject: @@ -5613,6 +5692,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 269484831} + 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} @@ -5621,7 +5701,6 @@ Transform: - {fileID: 860279053} - {fileID: 1743774623} m_Father: {fileID: 1796800572} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &271027825 GameObject: @@ -5802,6 +5881,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 281700269} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 2.775, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -5810,7 +5890,6 @@ Transform: - {fileID: 464138293} - {fileID: 915411672} m_Father: {fileID: 1796800572} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &281700271 MonoBehaviour: @@ -5958,9 +6037,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -5994,13 +6081,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 283890785} + 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: [] m_Father: {fileID: 409849877} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &283890792 MonoBehaviour: @@ -6044,6 +6131,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1059014182} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -6123,7 +6211,16 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} +--- !u!4 &286380319 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, + type: 3} + m_PrefabInstance: {fileID: 286380318} + m_PrefabAsset: {fileID: 0} --- !u!1 &287115355 GameObject: m_ObjectHideFlags: 0 @@ -6149,13 +6246,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 287115355} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00399971} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1149162873} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &287115357 MeshRenderer: @@ -6232,13 +6329,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 294061574} + 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: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &294061576 MonoBehaviour: @@ -6398,6 +6495,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 295861951} + 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} @@ -6405,7 +6503,6 @@ Transform: m_Children: - {fileID: 2547238} m_Father: {fileID: 2026420163} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &300601874 stripped MonoBehaviour: @@ -6424,6 +6521,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1575833613} m_Modifications: - target: {fileID: 100000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3} @@ -6487,6 +6585,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3} --- !u!4 &302687284 stripped Transform: @@ -6517,13 +6618,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 305196943} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.837, y: 0, z: 0} m_LocalScale: {x: 1.5023552, y: 1.5023553, z: 1.5023553} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1736869949} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &307985706 GameObject: @@ -6548,6 +6649,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 307985706} + 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} @@ -6559,7 +6661,6 @@ Transform: - {fileID: 1665480353} - {fileID: 1824805490} m_Father: {fileID: 1956944149} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &309623948 GameObject: @@ -6586,13 +6687,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 309623948} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.10000001, y: 1, z: 0.10000001} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &309623950 MeshRenderer: @@ -6668,6 +6769,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 318986406} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -6676,7 +6778,6 @@ Transform: - {fileID: 1093897235} - {fileID: 382819199} m_Father: {fileID: 593121476} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &318986409 MonoBehaviour: @@ -6717,8 +6818,7 @@ MonoBehaviour: --- !u!1 &336090774 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -6736,8 +6836,7 @@ GameObject: --- !u!23 &336090775 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 336090774} @@ -6779,8 +6878,7 @@ MeshRenderer: --- !u!33 &336090776 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 336090774} @@ -6808,6 +6906,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 336322069} + 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} @@ -6817,7 +6916,6 @@ Transform: - {fileID: 1273454078} - {fileID: 898180898} m_Father: {fileID: 431944651} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &338825205 GameObject: @@ -6843,6 +6941,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 338825205} + 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} @@ -6850,7 +6949,6 @@ Transform: m_Children: - {fileID: 264429768} m_Father: {fileID: 1671124695} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &338825207 MonoBehaviour: @@ -6869,8 +6967,7 @@ MonoBehaviour: --- !u!1 &338896206 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -6888,8 +6985,7 @@ GameObject: --- !u!23 &338896207 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 338896206} @@ -6931,8 +7027,7 @@ MeshRenderer: --- !u!33 &338896208 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 338896206} @@ -6950,7 +7045,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1736869949} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6982,6 +7076,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 346299035} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.49999997, y: 0.5, z: 0.5} @@ -6989,10 +7084,10 @@ Transform: m_Children: - {fileID: 1575833613} m_Father: {fileID: 593121476} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!120 &346299037 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -7089,16 +7184,20 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 1 m_Loop: 0 + m_ApplyActiveColorSpace: 0 --- !u!114 &346299038 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7161,13 +7260,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 376306370} + 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: [] m_Father: {fileID: 1479434790} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &376306372 MonoBehaviour: @@ -7291,6 +7390,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 318986407} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -7350,6 +7450,9 @@ PrefabInstance: value: Eraser objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!4 &382819199 stripped Transform: @@ -7397,7 +7500,6 @@ RectTransform: - {fileID: 617891838} - {fileID: 756087798} m_Father: {fileID: 652605545} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -7461,7 +7563,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -7490,13 +7594,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 402231710} + serializedVersion: 2 m_LocalRotation: {x: 0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0.013499916, y: 0.07851559, z: 0.6285945} m_LocalScale: {x: 0.5, y: 0.50000155, z: 0.50000155} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1360641967} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!102 &402231712 TextMesh: @@ -7586,6 +7690,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 402490429} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -7594,7 +7699,6 @@ Transform: - {fileID: 587566168} - {fileID: 562640338} m_Father: {fileID: 593121476} - m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &402490431 MonoBehaviour: @@ -7644,6 +7748,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 409849876} + 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} @@ -7651,13 +7756,11 @@ Transform: m_Children: - {fileID: 283890791} m_Father: {fileID: 154338412} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &413759583 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11410358, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 512959151} @@ -7771,13 +7874,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 415778229} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025000002, y: 0.025000002, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &415778231 MeshRenderer: @@ -7834,6 +7937,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 15449108} m_Modifications: - target: {fileID: 100000, guid: c5b13a325dcfe59499262db3cebd9b07, type: 3} @@ -7915,6 +8019,9 @@ PrefabInstance: value: 0.02 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c5b13a325dcfe59499262db3cebd9b07, type: 3} --- !u!4 &420987294 stripped Transform: @@ -7947,13 +8054,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428015980} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.004400015, y: 0, z: 0} m_LocalScale: {x: 1.92, y: 1.0799991, z: 1.2025236} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2013539807} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &428015982 MeshRenderer: @@ -8028,6 +8135,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 431944650} + 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} @@ -8038,7 +8146,6 @@ Transform: - {fileID: 336322070} - {fileID: 2110589930} m_Father: {fileID: 681890008} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &436990580 GameObject: @@ -8064,13 +8171,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 436990580} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.015, z: 0.05} m_LocalScale: {x: 0.45, y: 0.3, z: 0.15} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 465982406} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &436990583 MonoBehaviour: @@ -8129,6 +8236,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 438170968} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -8140,7 +8248,6 @@ Transform: - {fileID: 96421876} - {fileID: 483699805} m_Father: {fileID: 593121476} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &438170970 MonoBehaviour: @@ -8189,6 +8296,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 443192439} + 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} @@ -8196,7 +8304,6 @@ Transform: m_Children: - {fileID: 1498770773} m_Father: {fileID: 694338411} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &447194422 GameObject: @@ -8221,6 +8328,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 447194422} + 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} @@ -8228,7 +8336,6 @@ Transform: m_Children: - {fileID: 1736869949} m_Father: {fileID: 694338411} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &447472065 GameObject: @@ -8261,7 +8368,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 756087798} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8331,13 +8437,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 452823822} + serializedVersion: 2 m_LocalRotation: {x: 7.1054274e-15, y: 1, z: -0, w: -0.00000016292068} m_LocalPosition: {x: -0.004400015, y: 0, z: 0.05} m_LocalScale: {x: 1.92, y: 1.0799991, z: 1.5023549} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2013539807} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} --- !u!23 &452823824 MeshRenderer: @@ -8412,6 +8518,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 464138292} + 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} @@ -8419,7 +8526,6 @@ Transform: m_Children: - {fileID: 672193424} m_Father: {fileID: 281700270} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &465982406 stripped Transform: @@ -8430,8 +8536,7 @@ Transform: --- !u!1 &474023889 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100002, guid: 549bf0076152433479c46ff3d0648118, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -8449,11 +8554,11 @@ GameObject: --- !u!4 &474023890 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400002, guid: 549bf0076152433479c46ff3d0648118, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 474023889} + serializedVersion: 2 m_LocalRotation: {x: -0.27059805, y: 0.6532815, z: 0.27059805, w: 0.6532815} m_LocalPosition: {x: 0.253, y: 0.253, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} @@ -8461,13 +8566,11 @@ Transform: m_Children: - {fileID: 605405043} m_Father: {fileID: 160917794} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!23 &474023891 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300002, guid: 549bf0076152433479c46ff3d0648118, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 474023889} @@ -8510,8 +8613,7 @@ MeshRenderer: --- !u!33 &474023892 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300002, guid: 549bf0076152433479c46ff3d0648118, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 474023889} @@ -8529,7 +8631,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1326422920} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8593,6 +8694,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} @@ -8648,6 +8750,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: d153b453067a0724889fb677fef801a1, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} --- !u!4 &487241188 stripped Transform: @@ -8660,6 +8765,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 160917794} m_Modifications: - target: {fileID: 100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} @@ -8735,6 +8841,9 @@ PrefabInstance: value: objectReference: {fileID: 4300000, guid: 9c85be13d3f1fd84f94cc7551c16c7cd, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} --- !u!4 &503021778 stripped Transform: @@ -8751,8 +8860,7 @@ MeshRenderer: --- !u!114 &511823185 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11410358, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843353004} @@ -8844,8 +8952,7 @@ MonoBehaviour: --- !u!1 &512959151 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126712, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -8863,8 +8970,7 @@ GameObject: --- !u!23 &512959152 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2385760, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 512959151} @@ -8906,8 +9012,7 @@ MeshRenderer: --- !u!1 &556925729 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 198300, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -8925,24 +9030,22 @@ GameObject: --- !u!4 &556925730 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 457262, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 556925729} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.50000006, z: -0.0025000647} m_LocalScale: {x: 2, y: 0.012499999, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 336322070} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &556925731 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2347316, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 556925729} @@ -8984,8 +9087,7 @@ MeshRenderer: --- !u!33 &556925732 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3363948, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 556925729} @@ -9013,19 +9115,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 562640337} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: 0.341, y: -0.196, z: -0.663} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 402490430} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &567059209 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100002, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -9043,24 +9144,22 @@ GameObject: --- !u!4 &567059210 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400002, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567059209} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 438170969} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &567059211 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567059209} @@ -9102,8 +9201,7 @@ MeshRenderer: --- !u!33 &567059212 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567059209} @@ -9113,6 +9211,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 996567219} m_Modifications: - target: {fileID: 100000, guid: 954c67d0e13c2594e808082b9bc1bb07, type: 3} @@ -9180,6 +9279,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 8145c7e1ab2e5f14693c854f953484c1, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 954c67d0e13c2594e808082b9bc1bb07, type: 3} --- !u!4 &574509159 stripped Transform: @@ -9196,8 +9298,7 @@ MeshRenderer: --- !u!224 &581738633 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22461458, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1877187482} @@ -9208,7 +9309,6 @@ RectTransform: m_Children: - {fileID: 261597287} m_Father: {fileID: 1000870168} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9218,8 +9318,7 @@ RectTransform: --- !u!114 &581738634 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11410358, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1877187482} @@ -9339,7 +9438,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1382731250} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9448,6 +9546,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 804059267} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -9507,6 +9606,9 @@ PrefabInstance: value: Eraser objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!4 &584147935 stripped Transform: @@ -9523,8 +9625,7 @@ MeshRenderer: --- !u!224 &586145411 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22461458, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 613080582} @@ -9534,7 +9635,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1038705377} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -9564,6 +9664,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 587566167} + 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} @@ -9572,7 +9673,6 @@ Transform: - {fileID: 957799542} - {fileID: 1372392205} m_Father: {fileID: 402490430} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &593121473 GameObject: @@ -9598,6 +9698,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 593121473} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 14, z: 8} m_LocalScale: {x: 2, y: 2, z: 2} @@ -9625,7 +9726,6 @@ Transform: - {fileID: 402490430} - {fileID: 1804317401} m_Father: {fileID: 1796800572} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &593121477 MonoBehaviour: @@ -9703,6 +9803,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 73820441} m_Modifications: - target: {fileID: 100000, guid: c9258c3859a1a014984cbcec5f4950ae, type: 3} @@ -9770,6 +9871,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c9258c3859a1a014984cbcec5f4950ae, type: 3} --- !u!4 &609413039 stripped Transform: @@ -9780,8 +9884,7 @@ Transform: --- !u!1 &613080582 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126712, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -9830,7 +9933,6 @@ RectTransform: m_Children: - {fileID: 1295357951} m_Father: {fileID: 383974627} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -9899,6 +10001,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 59629309} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -9958,6 +10061,9 @@ PrefabInstance: value: Selection objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1 &622940447 GameObject: @@ -9983,6 +10089,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 622940447} + 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} @@ -9990,7 +10097,6 @@ Transform: m_Children: - {fileID: 1916224248} m_Father: {fileID: 1796800572} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &622940449 MonoBehaviour: @@ -10115,6 +10221,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 652605543} + 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} @@ -10127,7 +10234,6 @@ Transform: - {fileID: 1052269831} - {fileID: 691032546} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &652605546 MonoBehaviour: @@ -10887,6 +10993,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1479115558} m_Modifications: - target: {fileID: 100000, guid: c5b13a325dcfe59499262db3cebd9b07, type: 3} @@ -10966,12 +11073,14 @@ PrefabInstance: value: 0.02 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c5b13a325dcfe59499262db3cebd9b07, type: 3} --- !u!23 &671684244 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 30fb3a9a2d452c247b6915b31b31dd3d, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352798529} @@ -11034,6 +11143,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 672193423} + 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} @@ -11041,7 +11151,6 @@ Transform: m_Children: - {fileID: 1820754937} m_Father: {fileID: 464138293} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &672193425 MonoBehaviour: @@ -11080,13 +11189,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 681012518} + 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: [] m_Father: {fileID: 1479434790} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &681012520 MonoBehaviour: @@ -11217,8 +11326,7 @@ MonoBehaviour: --- !u!1 &681890007 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 179338, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -11235,11 +11343,11 @@ GameObject: --- !u!4 &681890008 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 459226, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 681890007} + 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} @@ -11248,7 +11356,6 @@ Transform: - {fileID: 431944651} - {fileID: 1583667640} m_Father: {fileID: 1671124695} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &681890009 MonoBehaviour: @@ -11296,6 +11403,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 652605545} m_Modifications: - target: {fileID: 167830897998540590, guid: cb0a1a7968495024690ad9a1c0d38548, @@ -11359,6 +11467,9 @@ PrefabInstance: value: BrushBaker objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb0a1a7968495024690ad9a1c0d38548, type: 3} --- !u!4 &691032546 stripped Transform: @@ -11390,6 +11501,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 694338410} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -11401,7 +11513,6 @@ Transform: - {fileID: 268266638} - {fileID: 447194423} m_Father: {fileID: 593121476} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &694338412 MonoBehaviour: @@ -11544,13 +11655,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 697818377} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025000002, y: 0.025000002, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &697818379 MeshRenderer: @@ -11607,6 +11718,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 59629309} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -11670,12 +11782,14 @@ PrefabInstance: value: .0350000001 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1 &745882610 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126712, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -11693,8 +11807,7 @@ GameObject: --- !u!23 &745882611 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2385760, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 745882610} @@ -11738,6 +11851,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1648044078} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -11797,6 +11911,9 @@ PrefabInstance: value: Eraser objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!4 &747007959 stripped Transform: @@ -11842,7 +11959,6 @@ RectTransform: - {fileID: 447472066} - {fileID: 1839658908} m_Father: {fileID: 383974627} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11886,6 +12002,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756778886} + 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} @@ -11894,13 +12011,13 @@ Transform: - {fileID: 1441901678} - {fileID: 1642039300} m_Father: {fileID: 1038705377} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &783914798 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 59629309} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -11964,12 +12081,14 @@ PrefabInstance: value: .0350000001 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1 &802990453 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100002, guid: c7b7cc4a484c08346994ecd243d0ee0e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -11987,11 +12106,11 @@ GameObject: --- !u!4 &802990454 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400002, guid: c7b7cc4a484c08346994ecd243d0ee0e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 802990453} + 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} @@ -11999,13 +12118,11 @@ Transform: m_Children: - {fileID: 1398432882} m_Father: {fileID: 1541150095} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &802990455 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300002, guid: c7b7cc4a484c08346994ecd243d0ee0e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 802990453} @@ -12047,8 +12164,7 @@ MeshRenderer: --- !u!33 &802990456 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300002, guid: c7b7cc4a484c08346994ecd243d0ee0e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 802990453} @@ -12077,6 +12193,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804059266} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -12085,7 +12202,6 @@ Transform: - {fileID: 1399244134} - {fileID: 584147935} m_Father: {fileID: 593121476} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &804059268 MonoBehaviour: @@ -12127,6 +12243,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 862254889} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -12206,6 +12323,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: c24efc63f57c5ca498ac64615f77448c, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &811950158 stripped Transform: @@ -12218,6 +12338,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1780237820} m_Modifications: - target: {fileID: 100000, guid: e9f6b2b4945183b47aad48325a73331e, type: 3} @@ -12269,12 +12390,20 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9f6b2b4945183b47aad48325a73331e, type: 3} +--- !u!4 &812391452 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: e9f6b2b4945183b47aad48325a73331e, + type: 3} + m_PrefabInstance: {fileID: 812391451} + m_PrefabAsset: {fileID: 0} --- !u!1 &814737686 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -12292,8 +12421,7 @@ GameObject: --- !u!23 &814737687 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 814737686} @@ -12335,8 +12463,7 @@ MeshRenderer: --- !u!33 &814737688 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 814737686} @@ -12344,8 +12471,7 @@ MeshFilter: --- !u!224 &815137833 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22461458, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 53960730} @@ -12355,7 +12481,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1038705377} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12433,7 +12558,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1590074097} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12561,6 +12685,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 835580259} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -12568,7 +12693,6 @@ Transform: m_Children: - {fileID: 73820441} m_Father: {fileID: 593121476} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &835580262 MonoBehaviour: @@ -12620,6 +12744,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 837908357} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -12627,7 +12752,6 @@ Transform: m_Children: - {fileID: 1220385419} m_Father: {fileID: 593121476} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &837908359 MonoBehaviour: @@ -12681,6 +12805,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1038705377} m_Modifications: - target: {fileID: 100000, guid: c66bc97f220594cf386c9de55c8b3743, type: 3} @@ -12740,6 +12865,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: be79d9fedfcf14f25938ee78e3893a4a, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c66bc97f220594cf386c9de55c8b3743, type: 3} --- !u!1 &860279052 GameObject: @@ -12766,13 +12894,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 860279052} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 269484832} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &860279054 MeshRenderer: @@ -12866,6 +12994,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 862254887} + 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} @@ -12876,7 +13005,6 @@ Transform: - {fileID: 1394743798} - {fileID: 1011848216} m_Father: {fileID: 242310920} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &869652887 stripped MonoBehaviour: @@ -12915,13 +13043,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 874159528} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025000002, y: 0.025000002, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &874159530 MeshRenderer: @@ -12998,13 +13126,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 879359715} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.004400015, y: 0, z: 0} m_LocalScale: {x: 1.92, y: 1.0799991, z: 1.2025236} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1043378877} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &879359717 MeshRenderer: @@ -13061,6 +13189,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -13144,6 +13273,9 @@ PrefabInstance: value: objectReference: {fileID: 4300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &886857241 stripped Transform: @@ -13154,8 +13286,7 @@ Transform: --- !u!224 &892450094 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22461458, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 745882610} @@ -13165,7 +13296,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1043378877} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13175,8 +13305,7 @@ RectTransform: --- !u!1 &898180897 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 129118, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -13194,11 +13323,11 @@ GameObject: --- !u!4 &898180898 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 498424, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 898180897} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 1, z: 1} @@ -13206,13 +13335,11 @@ Transform: m_Children: - {fileID: 40303960} m_Father: {fileID: 336322070} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &898180899 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2370610, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 898180897} @@ -13254,8 +13381,7 @@ MeshRenderer: --- !u!33 &898180900 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3379912, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 898180897} @@ -13285,6 +13411,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915411671} + 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} @@ -13292,7 +13419,6 @@ Transform: m_Children: - {fileID: 2013539807} m_Father: {fileID: 281700270} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &915411673 BoxCollider: @@ -13302,9 +13428,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915411671} 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: 2 + serializedVersion: 3 m_Size: {x: 2.4, y: 1.6, z: 0.5} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &915411674 @@ -13372,13 +13506,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915975460} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.0283041, y: -0.4882004, z: 0.0008780956} m_LocalScale: {x: 1, y: 0.02, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 59629309} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &915975462 MeshRenderer: @@ -13435,6 +13569,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1057179853} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -13498,6 +13633,9 @@ PrefabInstance: value: .0350000001 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1 &947102787 GameObject: @@ -13524,13 +13662,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 947102787} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.398, y: -0, z: -0.003} m_LocalScale: {x: 0.75, y: 0.75, z: 0.01} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 73820441} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &947102789 MeshRenderer: @@ -13613,7 +13751,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560708731} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -13703,6 +13840,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952277096} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: 0.341, y: -0.196, z: -0.663} m_LocalScale: {x: 1, y: 1, z: 1} @@ -13711,13 +13849,13 @@ Transform: - {fileID: 1360641967} - {fileID: 1578975889} m_Father: {fileID: 2088774267} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &957799541 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 587566168} m_Modifications: - target: {fileID: 100000, guid: 954c67d0e13c2594e808082b9bc1bb07, type: 3} @@ -13785,6 +13923,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 8145c7e1ab2e5f14693c854f953484c1, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 954c67d0e13c2594e808082b9bc1bb07, type: 3} --- !u!4 &957799542 stripped Transform: @@ -13801,8 +13942,7 @@ MeshRenderer: --- !u!1 &958316517 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000012141846220, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -13819,11 +13959,11 @@ GameObject: --- !u!4 &958316518 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000013812720954, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 958316517} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -13832,13 +13972,11 @@ Transform: - {fileID: 1541150095} - {fileID: 1687766713} m_Father: {fileID: 593121476} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &958316519 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114000011649797438, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 958316517} @@ -13888,8 +14026,7 @@ MonoBehaviour: --- !u!1 &976470539 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -13907,8 +14044,7 @@ GameObject: --- !u!23 &976470540 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 976470539} @@ -13950,8 +14086,7 @@ MeshRenderer: --- !u!33 &976470541 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 976470539} @@ -13959,8 +14094,7 @@ MeshFilter: --- !u!1 &981572757 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -13978,24 +14112,22 @@ GameObject: --- !u!4 &981572758 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 981572757} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000016292068} m_LocalPosition: {x: 0, y: 0, z: 0.05} m_LocalScale: {x: 1.5, y: 0.89, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 230973832} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &981572759 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 981572757} @@ -14037,8 +14169,7 @@ MeshRenderer: --- !u!33 &981572760 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 981572757} @@ -14083,7 +14214,6 @@ RectTransform: m_Children: - {fileID: 1344159570} m_Father: {fileID: 2084734315} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -14208,6 +14338,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 996567218} + 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} @@ -14216,7 +14347,6 @@ Transform: - {fileID: 574509159} - {fileID: 1346788930} m_Father: {fileID: 1804317401} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1000870167 GameObject: @@ -14244,6 +14374,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000870167} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.88040006, y: -0.91199976, z: 0} m_LocalScale: {x: 0.3720003, y: 0.37199983, z: 0.31000003} @@ -14251,7 +14382,6 @@ Transform: m_Children: - {fileID: 581738633} m_Father: {fileID: 1043378877} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1000870169 MonoBehaviour: @@ -14391,7 +14521,6 @@ RectTransform: m_Children: - {fileID: 2084734315} m_Father: {fileID: 8282789105019930893} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -14455,7 +14584,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -14464,6 +14595,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 862254889} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -14543,6 +14675,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: c24efc63f57c5ca498ac64615f77448c, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1011848216 stripped Transform: @@ -14575,13 +14710,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1029841511} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025000002, y: 1, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1029841513 MeshRenderer: @@ -14658,13 +14793,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1031535212} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1671124695} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1031535214 MeshRenderer: @@ -14740,6 +14875,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1038705376} + serializedVersion: 2 m_LocalRotation: {x: -0.000000034190858, y: 0.97773105, z: -0.209862, w: -0.0000001592926} m_LocalPosition: {x: 0, y: 16.67, z: 8.45} m_LocalScale: {x: 1, y: 1, z: 1} @@ -14757,7 +14893,6 @@ Transform: - {fileID: 756778887} - {fileID: 1572529038} m_Father: {fileID: 1796800572} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 24.228498, y: -180, z: 0} --- !u!114 &1038705378 MonoBehaviour: @@ -14842,6 +14977,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1043378876} + 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} @@ -14860,13 +14996,11 @@ Transform: - {fileID: 1530736239} - {fileID: 46829157} m_Father: {fileID: 1952144537} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1049589667 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100002, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -14884,24 +15018,22 @@ GameObject: --- !u!4 &1049589668 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400002, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1049589667} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1057179853} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1049589669 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1049589667} @@ -14943,8 +15075,7 @@ MeshRenderer: --- !u!33 &1049589670 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1049589667} @@ -14974,13 +15105,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1052118967} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.42222, y: 0.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 230973832} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1052118969 MeshRenderer: @@ -15056,13 +15187,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1052269830} + 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: [] m_Father: {fileID: 652605545} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1052269832 MonoBehaviour: @@ -15101,6 +15232,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1057179852} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -15113,7 +15245,6 @@ Transform: - {fileID: 1067067055} - {fileID: 2117489748} m_Father: {fileID: 593121476} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1057179854 MonoBehaviour: @@ -15166,13 +15297,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1058885037} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.176, y: -0.311, z: -0.014} m_LocalScale: {x: 0.20557286, y: 0.20557284, z: 0.20557286} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 46829157} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1058885039 MeshRenderer: @@ -15229,6 +15360,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1038705377} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -15310,6 +15442,13 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} - {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 286380319} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1059014182 stripped Transform: @@ -15341,6 +15480,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1062510328} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 15, z: 3} m_LocalScale: {x: 1, y: 1, z: 1} @@ -15348,7 +15488,6 @@ Transform: m_Children: - {fileID: 1798914841} m_Father: {fileID: 1796800572} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1062510330 MonoBehaviour: @@ -15402,6 +15541,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1065755965} + 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} @@ -15409,7 +15549,6 @@ Transform: m_Children: - {fileID: 1815866265} m_Father: {fileID: 1370550523} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1067067055 stripped Transform: @@ -15453,6 +15592,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1087863898} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 3, y: 3, z: 3} @@ -15461,7 +15601,6 @@ Transform: - {fileID: 1479115558} - {fileID: 950303574} m_Father: {fileID: 1671124695} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1087863900 MonoBehaviour: @@ -15483,6 +15622,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 318986407} m_Modifications: - target: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, type: 3} @@ -15558,6 +15698,17 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1093897236} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, + type: 3} + insertIndex: -1 + addedObject: {fileID: 90463642} m_SourcePrefab: {fileID: 100100000, guid: 535a5aa7349085e42b210f7d2bdbe548, type: 3} --- !u!4 &1093897235 stripped Transform: @@ -15666,6 +15817,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -15745,6 +15897,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: bba6542fb9d3b0542bf769ba0299bed7, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1095157234 stripped Transform: @@ -15777,13 +15932,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101305684} + 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: [] m_Father: {fileID: 1479434790} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1101305686 MonoBehaviour: @@ -15926,13 +16081,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1115040662} + 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: [] m_Father: {fileID: 1373217987} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1115040664 MonoBehaviour: @@ -15955,18 +16110,17 @@ MonoBehaviour: --- !u!4 &1120903174 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 336090774} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.725, y: 0, z: 0} m_LocalScale: {x: 0.025, y: 0.62499964, z: 0.009999996} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1701452755} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &1128511511 RectTransform: @@ -15981,7 +16135,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 168645623} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -16033,6 +16186,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -16112,6 +16266,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: bba6542fb9d3b0542bf769ba0299bed7, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1132826852 stripped Transform: @@ -16142,6 +16299,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1139965981} + 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} @@ -16150,7 +16308,6 @@ Transform: - {fileID: 1701452755} - {fileID: 2026420163} m_Father: {fileID: 220573285} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1149162872 GameObject: @@ -16175,6 +16332,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1149162872} + 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} @@ -16183,7 +16341,6 @@ Transform: - {fileID: 1553199670} - {fileID: 287115356} m_Father: {fileID: 1417006053} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1149556738 stripped GameObject: @@ -16240,7 +16397,7 @@ MonoBehaviour: outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 - m_RotationOrder: 0 + m_RotationOrder: 4 m_AlwaysOn: 0 m_OverrideDividors: m_savedBloom: [] @@ -16269,13 +16426,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1151093196} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.10000001, y: 1, z: 0.10000001} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1151093198 MeshRenderer: @@ -16330,8 +16487,7 @@ MeshFilter: --- !u!1 &1156849588 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 116230, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -16349,11 +16505,11 @@ GameObject: --- !u!4 &1156849589 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 462126, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156849588} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.85, y: -0.346, z: -0.0049256} m_LocalScale: {x: 1.4879142, y: 1.4879154, z: 1.4879154} @@ -16361,13 +16517,11 @@ Transform: m_Children: - {fileID: 1647667819} m_Father: {fileID: 1578975889} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1156849590 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2364852, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156849588} @@ -16409,8 +16563,7 @@ MeshRenderer: --- !u!33 &1156849591 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3353322, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156849588} @@ -16449,7 +16602,6 @@ RectTransform: m_Children: - {fileID: 140066843} m_Father: {fileID: 2084734315} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -16554,8 +16706,7 @@ MonoBehaviour: --- !u!1 &1162750468 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -16573,8 +16724,7 @@ GameObject: --- !u!33 &1162750469 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1162750468} @@ -16602,13 +16752,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1175138879} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.4, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1326422920} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1180012220 GameObject: @@ -16633,6 +16783,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1180012220} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.36812007, y: -0.6371995, z: 0} m_LocalScale: {x: 0.06865145, y: 0.06865134, z: 0.05720948} @@ -16641,7 +16792,6 @@ Transform: - {fileID: 1911562971} - {fileID: 1383707973} m_Father: {fileID: 1043378877} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1184748110 GameObject: @@ -16667,6 +16817,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1184748110} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -16675,7 +16826,6 @@ Transform: - {fileID: 284466581} - {fileID: 1382710676} m_Father: {fileID: 593121476} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1184748112 MonoBehaviour: @@ -16734,6 +16884,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1213600507} + 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} @@ -16743,7 +16894,6 @@ Transform: - {fileID: 110196262} - {fileID: 1455148275} m_Father: {fileID: 1796800572} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1213600511 MonoBehaviour: @@ -16767,6 +16917,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 837908358} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -16834,6 +16985,9 @@ PrefabInstance: value: Free Paint objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!4 &1220385419 stripped Transform: @@ -16846,16 +17000,17 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1671124695} m_Modifications: + - target: {fileID: 1000014130305538, guid: dedd7823645ca60468aca5f2ff1b9a7f, type: 3} + propertyPath: m_Name + value: XRRig + objectReference: {fileID: 0} - target: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 4000013585580318, guid: dedd7823645ca60468aca5f2ff1b9a7f, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 4000013585580318, guid: dedd7823645ca60468aca5f2ff1b9a7f, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -16950,6 +17105,57 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 0dfc862a0e6de274ba2e73ff1c3abd51, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4000011853176074, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1560708731} + - targetCorrespondingSourceObject: {fileID: 4000011853176074, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 436990581} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 309623949} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1029841512} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1151093197} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1712388237} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1979422287} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 697818378} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 874159529} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 415778230} + - targetCorrespondingSourceObject: {fileID: 4000011324248280, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1883778813} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1000013132276250, guid: dedd7823645ca60468aca5f2ff1b9a7f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1149556740} m_SourcePrefab: {fileID: 100100000, guid: dedd7823645ca60468aca5f2ff1b9a7f, type: 3} --- !u!4 &1226230319 stripped Transform: @@ -16960,8 +17166,7 @@ Transform: --- !u!1 &1251041023 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000012141846220, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -16978,18 +17183,17 @@ GameObject: --- !u!4 &1251041024 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000013812720954, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1251041023} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 4.337, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 593121476} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1251041025 MonoBehaviour: @@ -17012,6 +17216,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -17091,6 +17296,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: bba6542fb9d3b0542bf769ba0299bed7, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1272031698 stripped Transform: @@ -17101,8 +17309,7 @@ Transform: --- !u!1 &1273454077 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126856, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -17120,24 +17327,22 @@ GameObject: --- !u!4 &1273454078 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 445322, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1273454077} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: -0.5000001, z: -0.002499953} m_LocalScale: {x: 2, y: 0.012499999, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 336322070} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1273454079 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2391622, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1273454077} @@ -17179,8 +17384,7 @@ MeshRenderer: --- !u!33 &1273454080 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3397554, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1273454077} @@ -17217,7 +17421,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 826664} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 104.693, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -17472,7 +17675,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 617891838} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17604,13 +17806,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1299255304} + 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: [] m_Father: {fileID: 1373217987} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1299255306 MonoBehaviour: @@ -17869,6 +18071,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1316587487} + 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} @@ -17876,13 +18079,11 @@ Transform: m_Children: - {fileID: 1326422920} m_Father: {fileID: 694338411} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1317145829 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 160918, guid: 3491f4f01ba6cac47b1633f36d7c6c84, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -17900,8 +18101,7 @@ GameObject: --- !u!23 &1317145831 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2334362, guid: 3491f4f01ba6cac47b1633f36d7c6c84, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1317145829} @@ -17945,6 +18145,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 73820441} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -18016,6 +18217,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1318348488 stripped Transform: @@ -18046,6 +18250,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1326422919} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.5, y: 0, z: -0.4000001} m_LocalScale: {x: 1, y: 1, z: 1} @@ -18054,7 +18259,6 @@ Transform: - {fileID: 482334190} - {fileID: 1175138880} m_Father: {fileID: 1316587488} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1344159569 GameObject: @@ -18087,7 +18291,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 993616877} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18194,18 +18397,17 @@ CanvasRenderer: --- !u!4 &1346235334 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1539029383} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.05} m_LocalScale: {x: 0.8, y: 0.7999998, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950669211} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1346788929 GameObject: @@ -18232,13 +18434,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1346788929} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00399971} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 996567219} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1346788931 MeshRenderer: @@ -18293,8 +18495,7 @@ MeshFilter: --- !u!1 &1352798529 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: 30fb3a9a2d452c247b6915b31b31dd3d, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -18312,8 +18513,7 @@ GameObject: --- !u!33 &1352798530 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 30fb3a9a2d452c247b6915b31b31dd3d, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352798529} @@ -18321,8 +18521,7 @@ MeshFilter: --- !u!23 &1359923452 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 30fb3a9a2d452c247b6915b31b31dd3d, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 236572995} @@ -18384,6 +18583,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1360641966} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.029, y: -0.377, z: -0.004} m_LocalScale: {x: 1, y: 1, z: 1} @@ -18395,7 +18595,6 @@ Transform: - {fileID: 1731474006} - {fileID: 5821005} m_Father: {fileID: 952277097} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &1370550522 GameObject: @@ -18421,6 +18620,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1370550522} + 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} @@ -18431,7 +18631,6 @@ Transform: - {fileID: 1843608204} - {fileID: 1830711222} m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1370550524 MonoBehaviour: @@ -18472,13 +18671,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372392204} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.00399971} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 587566168} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1372392206 MeshRenderer: @@ -18595,6 +18794,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373217984} + 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} @@ -18605,7 +18805,6 @@ Transform: - {fileID: 111450611} - {fileID: 1479434790} m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1375069022 GameObject: @@ -18632,13 +18831,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1375069022} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.614, y: -0.040984385, z: 0.41759455} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1360641967} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!23 &1375069024 MeshRenderer: @@ -18713,6 +18912,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382397702} + 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} @@ -18721,7 +18921,6 @@ Transform: - {fileID: 230973832} - {fileID: 1788392445} m_Father: {fileID: 220573285} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1382710675 stripped GameObject: @@ -18769,7 +18968,6 @@ RectTransform: m_Children: - {fileID: 582806602} m_Father: {fileID: 2084734315} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -18874,8 +19072,7 @@ MonoBehaviour: --- !u!224 &1383707973 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22431242, guid: 3491f4f01ba6cac47b1633f36d7c6c84, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1317145829} @@ -18885,7 +19082,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1180012221} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -18897,6 +19093,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1886338617} m_Modifications: - target: {fileID: 100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} @@ -18968,6 +19165,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} --- !u!224 &1392524033 RectTransform: @@ -18982,7 +19182,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1498770773} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -19034,6 +19233,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 862254889} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -19113,6 +19313,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: c24efc63f57c5ca498ac64615f77448c, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1394743798 stripped Transform: @@ -19143,6 +19346,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 804059267} m_Modifications: - target: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, type: 3} @@ -19222,6 +19426,17 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 7a8548efbc741469d932a1fca2487ca7, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1399244137} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1399244136} m_SourcePrefab: {fileID: 100100000, guid: 535a5aa7349085e42b210f7d2bdbe548, type: 3} --- !u!4 &1399244134 stripped Transform: @@ -19432,13 +19647,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1412532061} + 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: [] m_Father: {fileID: 652605545} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1414582882 GameObject: @@ -19465,13 +19680,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1414582882} + 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: [] m_Father: {fileID: 1701452755} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1414582884 MeshRenderer: @@ -19526,8 +19741,7 @@ MeshFilter: --- !u!1 &1415257757 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -19545,8 +19759,7 @@ GameObject: --- !u!23 &1415257758 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1415257757} @@ -19588,8 +19801,7 @@ MeshRenderer: --- !u!33 &1415257759 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1415257757} @@ -19618,6 +19830,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1416165959} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -19626,7 +19839,6 @@ Transform: - {fileID: 619747320} - {fileID: 1396641318} m_Father: {fileID: 593121476} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1416165961 MonoBehaviour: @@ -19668,6 +19880,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1417006052} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -19676,7 +19889,6 @@ Transform: - {fileID: 2088774267} - {fileID: 1149162873} m_Father: {fileID: 593121476} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1417006054 MonoBehaviour: @@ -19734,13 +19946,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1418603509} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.0283041, y: -0.48820043, z: 0.00087833405} m_LocalScale: {x: 1, y: 0.02, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 438170969} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1418603511 MeshRenderer: @@ -19797,6 +20009,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1038705377} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -19878,6 +20091,13 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} - {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2124612095} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1427708067 stripped Transform: @@ -19890,6 +20110,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 438170969} m_Modifications: - target: {fileID: 100000, guid: c3d5a45675f419f449ca706dc9a0d5d4, type: 3} @@ -19957,12 +20178,16 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3d5a45675f419f449ca706dc9a0d5d4, type: 3} --- !u!1001 &1441901677 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 756778887} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -20042,6 +20267,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1441901678 stripped Transform: @@ -20052,8 +20280,7 @@ Transform: --- !u!224 &1453509482 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22461458, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843353004} @@ -20063,7 +20290,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1496874101} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20073,8 +20299,7 @@ RectTransform: --- !u!23 &1454494319 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2385760, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 613080582} @@ -20303,7 +20528,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20315,6 +20539,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 59629309} m_Modifications: - target: {fileID: 100000, guid: c3d5a45675f419f449ca706dc9a0d5d4, type: 3} @@ -20382,6 +20607,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3d5a45675f419f449ca706dc9a0d5d4, type: 3} --- !u!1 &1479115557 GameObject: @@ -20407,6 +20635,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1479115557} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.4, y: 0.8, z: 3} m_LocalScale: {x: 2, y: 1, z: 1} @@ -20415,7 +20644,6 @@ Transform: - {fileID: 1073431682} - {fileID: 15449108} m_Father: {fileID: 1087863899} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1479115562 MonoBehaviour: @@ -20455,6 +20683,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1479434789} + 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} @@ -20465,7 +20694,6 @@ Transform: - {fileID: 1101305685} - {fileID: 1801237612} m_Father: {fileID: 1373217987} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1487059271 GameObject: @@ -20491,13 +20719,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1487059271} + 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: [] m_Father: {fileID: 1038705377} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1487059273 BoxCollider: @@ -20507,9 +20735,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1487059271} 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: 2 + serializedVersion: 3 m_Size: {x: 0.8, y: 1.45, z: 0.5} m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &1491772650 @@ -20517,6 +20753,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1057179853} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -20576,6 +20813,9 @@ PrefabInstance: value: Selection objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1 &1496874100 GameObject: @@ -20602,6 +20842,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1496874100} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.7828, y: -0.34199983, z: -0.020000428} m_LocalScale: {x: 0.24668743, y: 0.24668722, z: 0.20557278} @@ -20609,7 +20850,6 @@ Transform: m_Children: - {fileID: 1453509482} m_Father: {fileID: 1043378877} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1496874102 MeshRenderer: @@ -20664,8 +20904,7 @@ MeshFilter: --- !u!114 &1498237885 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11410358, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 613080582} @@ -20819,6 +21058,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1498770772} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.4, y: 0, z: -0.4000001} m_LocalScale: {x: 1, y: 1, z: 1} @@ -20827,13 +21067,11 @@ Transform: - {fileID: 1392524033} - {fileID: 28704758} m_Father: {fileID: 443192440} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1504500864 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000012141846220, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -20850,11 +21088,11 @@ GameObject: --- !u!4 &1504500865 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000013812720954, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1504500864} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 4.337, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -20863,7 +21101,6 @@ Transform: - {fileID: 160917794} - {fileID: 2106961885} m_Father: {fileID: 593121476} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1504500866 MonoBehaviour: @@ -20919,6 +21156,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 474023890} m_Modifications: - target: {fileID: 100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} @@ -20998,6 +21236,9 @@ PrefabInstance: value: objectReference: {fileID: 4300000, guid: 418b52b3f280df2429cec7d2fac11644, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} --- !u!23 &1509816932 stripped MeshRenderer: @@ -21028,6 +21269,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1527246407} + 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} @@ -21035,7 +21277,6 @@ Transform: m_Children: - {fileID: 1915334738} m_Father: {fileID: 1671124695} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1530736238 GameObject: @@ -21060,6 +21301,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1530736238} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.1999996, z: 1} @@ -21068,13 +21310,11 @@ Transform: - {fileID: 161836535} - {fileID: 1913054463} m_Father: {fileID: 1043378877} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1539029383 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -21092,8 +21332,7 @@ GameObject: --- !u!23 &1539029384 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1539029383} @@ -21135,8 +21374,7 @@ MeshRenderer: --- !u!33 &1539029385 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1539029383} @@ -21144,8 +21382,7 @@ MeshFilter: --- !u!1 &1541150094 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000013713693234, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -21163,11 +21400,11 @@ GameObject: --- !u!4 &1541150095 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000011081234314, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1541150094} + 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} @@ -21177,7 +21414,6 @@ Transform: - {fileID: 802990454} - {fileID: 2052658243} m_Father: {fileID: 958316518} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1541150096 MonoBehaviour: @@ -21315,6 +21551,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1149162873} m_Modifications: - target: {fileID: 100000, guid: 954c67d0e13c2594e808082b9bc1bb07, type: 3} @@ -21382,6 +21619,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 8145c7e1ab2e5f14693c854f953484c1, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 954c67d0e13c2594e808082b9bc1bb07, type: 3} --- !u!4 &1553199670 stripped Transform: @@ -21424,7 +21664,6 @@ RectTransform: - {fileID: 948093180} - {fileID: 1605183599} m_Father: {fileID: 465982406} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -21488,7 +21727,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -21530,13 +21771,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1572529037} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1038705377} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1575833612 GameObject: @@ -21561,6 +21802,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1575833612} + 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} @@ -21569,13 +21811,11 @@ Transform: - {fileID: 302687284} - {fileID: 1612665328} m_Father: {fileID: 346299036} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1577979162 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11410358, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 745882610} @@ -21687,6 +21927,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1578975888} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.49999976, z: 1} @@ -21697,7 +21938,6 @@ Transform: - {fileID: 1965098503} - {fileID: 1156849589} m_Father: {fileID: 952277097} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1582764822 stripped GameObject: @@ -21734,6 +21974,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1583667639} + 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} @@ -21741,13 +21982,13 @@ Transform: m_Children: - {fileID: 1656768204} m_Father: {fileID: 681890008} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1587318046 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1416165960} m_Modifications: - target: {fileID: 100000, guid: c9258c3859a1a014984cbcec5f4950ae, type: 3} @@ -21815,12 +22056,16 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c9258c3859a1a014984cbcec5f4950ae, type: 3} --- !u!1001 &1589600387 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -21900,6 +22145,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: bba6542fb9d3b0542bf769ba0299bed7, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1589600388 stripped Transform: @@ -21912,6 +22160,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 52827661} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -21971,6 +22220,9 @@ PrefabInstance: value: Eraser objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!4 &1589753391 stripped Transform: @@ -22017,7 +22269,6 @@ RectTransform: m_Children: - {fileID: 822889419} m_Father: {fileID: 2128862033} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -22123,6 +22374,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1057179853} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -22186,6 +22438,9 @@ PrefabInstance: value: .0350000001 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1 &1605183598 GameObject: @@ -22218,7 +22473,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1560708731} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22303,16 +22557,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1612665327} + 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: [] m_Father: {fileID: 1575833613} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!120 &1612665329 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -22409,21 +22664,26 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 0 + m_ApplyActiveColorSpace: 0 --- !u!1001 &1619108291 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1057179853} m_Modifications: - target: {fileID: 100000, guid: c3d5a45675f419f449ca706dc9a0d5d4, type: 3} @@ -22491,12 +22751,16 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3d5a45675f419f449ca706dc9a0d5d4, type: 3} --- !u!1001 &1619403413 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1184748111} m_Modifications: - target: {fileID: 100000, guid: d4b498ac8389aaf45ab9ae548c46abc2, type: 3} @@ -22572,12 +22836,14 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4b498ac8389aaf45ab9ae548c46abc2, type: 3} --- !u!1 &1625682716 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: c3d5a45675f419f449ca706dc9a0d5d4, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -22595,24 +22861,22 @@ GameObject: --- !u!4 &1625682717 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: c3d5a45675f419f449ca706dc9a0d5d4, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625682716} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071067} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.48563868, y: 0.792983, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 230973832} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1625682718 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: c3d5a45675f419f449ca706dc9a0d5d4, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625682716} @@ -22654,8 +22918,7 @@ MeshRenderer: --- !u!33 &1625682719 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: c3d5a45675f419f449ca706dc9a0d5d4, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625682716} @@ -22795,8 +23058,7 @@ MonoBehaviour: --- !u!1 &1637135394 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 116230, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -22814,11 +23076,11 @@ GameObject: --- !u!4 &1637135395 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 462126, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637135394} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.85199994, y: -0.522, z: 0} m_LocalScale: {x: 1.6473918, y: 2, z: 1} @@ -22826,13 +23088,11 @@ Transform: m_Children: - {fileID: 1929489349} m_Father: {fileID: 1578975889} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1637135396 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2364852, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637135394} @@ -22874,8 +23134,7 @@ MeshRenderer: --- !u!33 &1637135397 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3353322, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637135394} @@ -22885,6 +23144,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 756778887} m_Modifications: - target: {fileID: 100000, guid: 3d90bab56d1113e44ba10ed45b5ba954, type: 3} @@ -22960,6 +23220,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d90bab56d1113e44ba10ed45b5ba954, type: 3} --- !u!4 &1642039300 stripped Transform: @@ -22970,24 +23233,22 @@ Transform: --- !u!4 &1645718236 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1924292604} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.625, y: 0.62499976, z: 0.62499976} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1701452755} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1645718237 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1924292604} @@ -23029,8 +23290,7 @@ MeshRenderer: --- !u!1 &1647667818 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 116230, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -23048,24 +23308,22 @@ GameObject: --- !u!4 &1647667819 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 462126, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1647667818} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.005} m_LocalScale: {x: 0.9710151, y: 0.9710149, z: 0.9710149} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1156849589} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1647667820 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2364852, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1647667818} @@ -23107,8 +23365,7 @@ MeshRenderer: --- !u!33 &1647667821 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3353322, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1647667818} @@ -23137,6 +23394,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648044077} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -23145,7 +23403,6 @@ Transform: - {fileID: 151850537} - {fileID: 747007959} m_Father: {fileID: 593121476} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1648044079 MonoBehaviour: @@ -23541,13 +23798,15 @@ ParticleSystemRenderer: m_RenderAlignment: 2 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -23775,6 +24034,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23804,6 +24064,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -24125,6 +24386,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 5 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -24912,6 +25174,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -24941,6 +25204,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -27161,6 +27425,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -27190,6 +27455,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -27579,6 +27845,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -27621,6 +27888,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -27650,6 +27918,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -27737,6 +28006,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -27766,6 +28036,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -27804,6 +28075,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -27833,6 +28105,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -28086,6 +28359,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28115,6 +28389,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -28341,19 +28616,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1656768201} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -0.16, z: 0.03} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1583667640} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1001 &1664565351 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1892328828} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -28437,6 +28713,9 @@ PrefabInstance: value: objectReference: {fileID: 4300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1664565352 stripped Transform: @@ -28467,6 +28746,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1665480352} + 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} @@ -28475,7 +28755,6 @@ Transform: - {fileID: 6259153095351143567} - {fileID: 1518196148397455185} m_Father: {fileID: 307985707} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1671124693 GameObject: @@ -28518,6 +28797,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671124693} + 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} @@ -28530,7 +28810,6 @@ Transform: - {fileID: 681890008} - {fileID: 17776369} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1680057394 stripped MeshRenderer: @@ -28541,24 +28820,22 @@ MeshRenderer: --- !u!4 &1682815313 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 338896206} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.49999988, z: 0.49999988} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950669211} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1687766712 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000010505990224, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -28576,25 +28853,23 @@ GameObject: --- !u!4 &1687766713 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000013193470730, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1687766712} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.51000506, y: 0.5964265, z: -0.005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 958316518} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!102 &1687766714 TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 102000014043959416, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1687766712} @@ -28615,8 +28890,7 @@ TextMesh: --- !u!23 &1687766715 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 23000013732431034, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1687766712} @@ -28658,18 +28932,17 @@ MeshRenderer: --- !u!4 &1693194698 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: 30fb3a9a2d452c247b6915b31b31dd3d, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 236572995} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0.05} m_LocalScale: {x: 0.59999996, y: 0.6000002, z: 0.60000026} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1701452755} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1701452754 GameObject: @@ -28694,6 +28967,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1701452754} + 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} @@ -28707,7 +28981,6 @@ Transform: - {fileID: 1805280918} - {fileID: 1414582883} m_Father: {fileID: 1139965982} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1712388236 GameObject: @@ -28734,13 +29007,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1712388236} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025000002, y: 1, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1712388238 MeshRenderer: @@ -28795,8 +29068,7 @@ MeshFilter: --- !u!1 &1726887557 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 104670, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -28814,24 +29086,22 @@ GameObject: --- !u!4 &1726887558 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 412152, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726887557} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: -0.100000024, z: -0.009999752} m_LocalScale: {x: 0.9, y: 0.20000002, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 15449108} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1726887559 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2344758, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726887557} @@ -28873,8 +29143,7 @@ MeshRenderer: --- !u!33 &1726887560 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3393828, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726887557} @@ -28904,13 +29173,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1731474005} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.083, y: 0.026, z: 0.681} m_LocalScale: {x: 0.015000029, y: 0.01, z: 0.21246411} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1360641967} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!23 &1731474007 MeshRenderer: @@ -28985,6 +29254,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1736869948} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.5, y: 0, z: -0.4000001} m_LocalScale: {x: 1, y: 1, z: 1} @@ -28993,7 +29263,6 @@ Transform: - {fileID: 345564295} - {fileID: 305196944} m_Father: {fileID: 447194423} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 89.980194, y: 0, z: 0} --- !u!1 &1743774622 GameObject: @@ -29020,13 +29289,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1743774622} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 269484832} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1743774624 MeshRenderer: @@ -29093,8 +29362,7 @@ MeshRenderer: --- !u!1 &1757889434 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 181774, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -29112,25 +29380,23 @@ GameObject: --- !u!4 &1757889435 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 461396, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1757889434} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1, y: 0.751, z: -0.002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 431944651} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!102 &1757889436 TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 10238338, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1757889434} @@ -29151,8 +29417,7 @@ TextMesh: --- !u!23 &1757889437 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2361126, guid: ce38d621843cf5e4594ce5dd4a54e5a6, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1757889434} @@ -29196,6 +29461,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1184748111} m_Modifications: - target: {fileID: 100000, guid: 0cdb400f34c32dd4496b674c4004ccef, type: 3} @@ -29267,6 +29533,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0cdb400f34c32dd4496b674c4004ccef, type: 3} --- !u!23 &1764411095 stripped MeshRenderer: @@ -29299,13 +29568,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773345479} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071067} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 94678608} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!23 &1773345481 MeshRenderer: @@ -29362,6 +29631,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796800572} m_Modifications: - target: {fileID: 100000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} @@ -29435,6 +29705,17 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2300000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} - {fileID: 3300000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400000, guid: b71c23914bd4e0a4290d3fc1dd01f027, + type: 3} + insertIndex: -1 + addedObject: {fileID: 812391452} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: b71c23914bd4e0a4290d3fc1dd01f027, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1780237822} m_SourcePrefab: {fileID: 100100000, guid: b71c23914bd4e0a4290d3fc1dd01f027, type: 3} --- !u!4 &1780237820 stripped Transform: @@ -29467,18 +29748,17 @@ MonoBehaviour: --- !u!4 &1784255695 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1162750468} + serializedVersion: 2 m_LocalRotation: {x: -0.000000029802326, y: -0, z: 0.7071068, w: 0.70710677} m_LocalPosition: {x: -0.004400015, y: 0, z: 0} m_LocalScale: {x: 0.65999943, y: 0.65999985, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1043378877} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!1 &1787818131 GameObject: @@ -29503,6 +29783,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1787818131} + 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} @@ -29510,7 +29791,6 @@ Transform: m_Children: - {fileID: 5080288855832605660} m_Father: {fileID: 307985707} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1788392444 GameObject: @@ -29535,6 +29815,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788392444} + 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} @@ -29542,13 +29823,13 @@ Transform: m_Children: - {fileID: 200920502} m_Father: {fileID: 1382397703} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1793534456 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1213600508} m_Modifications: - target: {fileID: 100000, guid: d6b0c4fb3312a2b478110813b1ed3d69, type: 3} @@ -29620,6 +29901,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: de820d6c359414a428683682cb374e38, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d6b0c4fb3312a2b478110813b1ed3d69, type: 3} --- !u!1 &1796800567 GameObject: @@ -29778,6 +30062,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1796800567} + 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} @@ -29799,7 +30084,6 @@ Transform: - {fileID: 1780237820} - {fileID: 242310920} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1796800573 MonoBehaviour: @@ -30259,13 +30543,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801237611} + 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: [] m_Father: {fileID: 1479434790} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1801237613 MonoBehaviour: @@ -30437,7 +30721,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -30455,7 +30741,6 @@ RectTransform: m_Children: - {fileID: 2128862033} m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -30499,6 +30784,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1804317400} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -30507,7 +30793,6 @@ Transform: - {fileID: 996567219} - {fileID: 1839718901} m_Father: {fileID: 593121476} - m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1804317402 MonoBehaviour: @@ -30537,8 +30822,7 @@ MonoBehaviour: --- !u!224 &1805280918 RectTransform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 22461458, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 103787545} @@ -30548,7 +30832,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1701452755} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -30576,8 +30859,7 @@ MeshRenderer: --- !u!1 &1815866264 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000013868773076, guid: 7419af3af080373429e015bbec55cefa, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -30594,11 +30876,11 @@ GameObject: --- !u!4 &1815866265 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000013621605756, guid: 7419af3af080373429e015bbec55cefa, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1815866264} + 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} @@ -30606,13 +30888,11 @@ Transform: m_Children: - {fileID: 2104863929} m_Father: {fileID: 1065755966} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1815866266 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114000014103955348, guid: 7419af3af080373429e015bbec55cefa, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1815866264} @@ -30646,18 +30926,17 @@ MonoBehaviour: --- !u!4 &1820659017 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: 30fb3a9a2d452c247b6915b31b31dd3d, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352798529} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -0.05} m_LocalScale: {x: 0.59999996, y: 0.6000002, z: 0.60000026} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1950669211} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1820754936 GameObject: @@ -30682,6 +30961,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1820754936} + 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} @@ -30689,7 +30969,6 @@ Transform: m_Children: - {fileID: 9360109} m_Father: {fileID: 672193424} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1821579993 GameObject: @@ -30716,13 +30995,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1821579993} + 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: 0.04029682, z: 0.03461494} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1866615727} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1821579995 MeshRenderer: @@ -30797,6 +31076,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1824805489} + 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} @@ -30804,13 +31084,13 @@ Transform: m_Children: - {fileID: 3025550148921037596} m_Father: {fileID: 307985707} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1828317226 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1213600508} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -30866,12 +31146,16 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 8f9299b6a989bfd489e1effe614ec975, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!1001 &1828584198 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 208230168} m_Modifications: - target: {fileID: 100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} @@ -30959,6 +31243,9 @@ PrefabInstance: value: objectReference: {fileID: 4300000, guid: 418b52b3f280df2429cec7d2fac11644, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} --- !u!4 &1828584199 stripped Transform: @@ -31010,19 +31297,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830711220} + 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: [] m_Father: {fileID: 1370550523} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1833140486 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 802990454} m_Modifications: - target: {fileID: 100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} @@ -31098,6 +31386,9 @@ PrefabInstance: value: objectReference: {fileID: 4300002, guid: d9a819b110348604f86f3d21f36f86a8, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} --- !u!1 &1839658907 GameObject: @@ -31130,7 +31421,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 756087798} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -31198,19 +31488,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1839718900} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: 0.341, y: -0.196, z: -0.663} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1804317401} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1843353004 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126712, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -31230,8 +31519,7 @@ GameObject: --- !u!23 &1843353005 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2385760, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843353004} @@ -31281,8 +31569,7 @@ CanvasRenderer: --- !u!33 &1843353007 MeshFilter: m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 3316878, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843353004} @@ -31292,6 +31579,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1843608204} m_Modifications: - target: {fileID: 1151265645430167889, guid: 7c4b8fb0825ff204aae3d64acd012276, @@ -31365,6 +31653,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c4b8fb0825ff204aae3d64acd012276, type: 3} --- !u!4 &1843608106 stripped Transform: @@ -31396,6 +31687,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843608203} + 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} @@ -31403,7 +31695,6 @@ Transform: m_Children: - {fileID: 1843608106} m_Father: {fileID: 1370550523} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1843608206 MonoBehaviour: @@ -31458,13 +31749,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848773837} + 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: [] m_Father: {fileID: 0} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1848773841 MonoBehaviour: @@ -31530,6 +31821,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1866615726} + 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} @@ -31537,13 +31829,11 @@ Transform: m_Children: - {fileID: 1821579994} m_Father: {fileID: 161836535} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1877187482 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 126712, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -31561,8 +31851,7 @@ GameObject: --- !u!23 &1877187485 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2385760, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1877187482} @@ -31626,13 +31915,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1879427010} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.61399984, y: 0.026015647, z: 0.41759455} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1360641967} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!23 &1879427012 MeshRenderer: @@ -31709,13 +31998,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1883778812} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025000002, y: 0.025000002, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1883778814 MeshRenderer: @@ -31770,8 +32059,7 @@ MeshFilter: --- !u!1 &1886338616 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100002, guid: d608be9302146ef49895815cde7ddc3e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -31789,11 +32077,11 @@ GameObject: --- !u!4 &1886338617 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400002, guid: d608be9302146ef49895815cde7ddc3e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1886338616} + 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} @@ -31801,13 +32089,11 @@ Transform: m_Children: - {fileID: 85296817} m_Father: {fileID: 1541150095} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1886338618 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300002, guid: d608be9302146ef49895815cde7ddc3e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1886338616} @@ -31849,8 +32135,7 @@ MeshRenderer: --- !u!33 &1886338619 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300002, guid: d608be9302146ef49895815cde7ddc3e, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1886338616} @@ -31901,6 +32186,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1892328826} + 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} @@ -31916,13 +32202,11 @@ Transform: - {fileID: 886857241} - {fileID: 177030159} m_Father: {fileID: 242310920} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1903256355 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100002, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -31940,24 +32224,22 @@ GameObject: --- !u!4 &1903256356 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400002, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1903256355} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 59629309} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1903256357 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2300000, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1903256355} @@ -31999,8 +32281,7 @@ MeshRenderer: --- !u!33 &1903256358 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: 20b1c3d24ef5d584196d13565a56bc67, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1903256355} @@ -32030,13 +32311,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1911562970} + serializedVersion: 2 m_LocalRotation: {x: 0.7071066, y: 0, z: 0, w: -0.70710695} m_LocalPosition: {x: -1.68, y: 0.017486684, z: 0.007001342} m_LocalScale: {x: 1.25, y: 0.17479616, z: 1.25} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1180012221} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -89.980194, y: 0, z: 0} --- !u!23 &1911562972 MeshRenderer: @@ -32113,13 +32394,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1913054462} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4940264, y: 0.305, z: -0.014} m_LocalScale: {x: 0.20557286, y: 0.20557284, z: 0.20557286} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1530736239} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1913054464 MeshRenderer: @@ -32196,13 +32477,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1915334737} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 25, y: 25, z: 25} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1527246408} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1915334739 MeshRenderer: @@ -32259,6 +32540,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 622940448} m_Modifications: - target: {fileID: 160918, guid: 3491f4f01ba6cac47b1633f36d7c6c84, type: 3} @@ -32375,6 +32657,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3491f4f01ba6cac47b1633f36d7c6c84, type: 3} --- !u!224 &1916224248 stripped RectTransform: @@ -32385,8 +32670,7 @@ RectTransform: --- !u!1 &1924292604 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 100000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -32404,8 +32688,7 @@ GameObject: --- !u!33 &1924292605 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3300000, guid: c9258c3859a1a014984cbcec5f4950ae, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1924292604} @@ -32413,8 +32696,7 @@ MeshFilter: --- !u!1 &1929489348 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 116230, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -32432,24 +32714,22 @@ GameObject: --- !u!4 &1929489349 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 462126, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929489348} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000016292068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1637135395} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1929489350 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 2364852, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929489348} @@ -32491,8 +32771,7 @@ MeshRenderer: --- !u!33 &1929489351 MeshFilter: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 3353322, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1929489348} @@ -32520,6 +32799,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1950669210} + 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} @@ -32530,7 +32810,6 @@ Transform: - {fileID: 1820659017} - {fileID: 195311863} m_Father: {fileID: 1972541291} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1952144536 GameObject: @@ -32555,6 +32834,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1952144536} + 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} @@ -32563,7 +32843,6 @@ Transform: - {fileID: 1043378877} - {fileID: 119184282} m_Father: {fileID: 220573285} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1956944148 GameObject: @@ -32589,6 +32868,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1956944148} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 4.337, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} @@ -32596,7 +32876,6 @@ Transform: m_Children: - {fileID: 307985707} m_Father: {fileID: 593121476} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1956944150 MonoBehaviour: @@ -32644,13 +32923,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957386537} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.051, y: 0, z: 0} m_LocalScale: {x: 0.125, y: 0.125, z: 0.125} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2110589930} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1957386539 MeshRenderer: @@ -32734,7 +33013,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1578975889} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -32938,6 +33216,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1972541290} + 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} @@ -32946,13 +33225,13 @@ Transform: - {fileID: 1950669211} - {fileID: 154338412} m_Father: {fileID: 220573285} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1972976744 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1038705377} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -33034,6 +33313,13 @@ PrefabInstance: m_RemovedComponents: - {fileID: 2300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} - {fileID: 3300000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 241392955} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1972976745 stripped Transform: @@ -33066,13 +33352,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1979422286} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.025000002, y: 0.025000002, z: 0.025000002} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1226230319} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1979422288 MeshRenderer: @@ -33152,13 +33438,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981107083} + 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: [] m_Father: {fileID: 130529556} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1981107085 MonoBehaviour: @@ -33194,9 +33480,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -33300,13 +33594,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1985146462} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.05, z: 0} m_LocalScale: {x: 0.8, y: 0.01, z: 0.79999995} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2022889491} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1985146464 MeshRenderer: @@ -33363,6 +33657,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 438170969} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -33426,12 +33721,16 @@ PrefabInstance: value: .0350000001 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1001 &1992085610 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 862254889} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -33511,6 +33810,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: c24efc63f57c5ca498ac64615f77448c, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!4 &1992085611 stripped Transform: @@ -33521,18 +33823,17 @@ Transform: --- !u!4 &2012107618 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1415257757} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 1, w: 0.00000028088027} m_LocalPosition: {x: 0, y: 0, z: 0.05} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1701452755} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 179.99998} --- !u!1 &2013539806 GameObject: @@ -33557,6 +33858,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2013539806} + 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} @@ -33567,13 +33869,13 @@ Transform: - {fileID: 1188089478511377667} - {fileID: 428015981} m_Father: {fileID: 915411672} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2020398954 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1213600508} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -33629,6 +33931,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: b3d635d35b7de504287428906f571f16, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} --- !u!1 &2022889490 GameObject: @@ -33653,6 +33958,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2022889490} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 5, y: 5, z: 5} @@ -33661,7 +33967,6 @@ Transform: - {fileID: 128143213} - {fileID: 1985146463} m_Father: {fileID: 242310920} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2026420162 GameObject: @@ -33686,6 +33991,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026420162} + 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} @@ -33693,7 +33999,6 @@ Transform: m_Children: - {fileID: 295861952} m_Father: {fileID: 1139965982} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2028137323 stripped Transform: @@ -33738,7 +34043,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 66695121} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33845,8 +34149,7 @@ CanvasRenderer: --- !u!114 &2040347685 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11410358, guid: f636b2bdcf1c7f5498e324d362ac1ba8, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 261597283} @@ -33940,6 +34243,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1541150095} m_Modifications: - target: {fileID: 100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} @@ -34015,6 +34319,9 @@ PrefabInstance: value: objectReference: {fileID: 4300000, guid: 9c85be13d3f1fd84f94cc7551c16c7cd, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25ba8134f2fcdc447aa836e22af16c68, type: 3} --- !u!4 &2052658243 stripped Transform: @@ -34061,9 +34368,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -34097,13 +34412,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2073328682} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.222, z: 0} m_LocalScale: {x: 61.633102, y: 75.625175, z: 98.944595} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1038705377} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2073328686 MonoBehaviour: @@ -34146,18 +34461,17 @@ MonoBehaviour: --- !u!4 &2079380888 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 814737686} + serializedVersion: 2 m_LocalRotation: {x: 7.1054274e-15, y: 1, z: -0, w: -0.00000016292068} m_LocalPosition: {x: -0.004400015, y: 0, z: 0.05} m_LocalScale: {x: 1.92, y: 1.0799991, z: 1.5023549} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1043378877} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} --- !u!1 &2084734314 GameObject: @@ -34192,7 +34506,6 @@ RectTransform: - {fileID: 993616877} - {fileID: 1158145242} m_Father: {fileID: 1008953366} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -34202,8 +34515,7 @@ RectTransform: --- !u!1 &2088774266 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 188184, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -34219,11 +34531,11 @@ GameObject: --- !u!4 &2088774267 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 424194, guid: 76b3ecc33907b1b4b91030295064da9f, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2088774266} + 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} @@ -34231,13 +34543,13 @@ Transform: m_Children: - {fileID: 952277097} m_Father: {fileID: 1417006053} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2094189263 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1370550523} m_Modifications: - target: {fileID: 1192532175522718, guid: f158162c2f61e2142b099443643a1f93, type: 3} @@ -34277,6 +34589,9 @@ PrefabInstance: value: -0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f158162c2f61e2142b099443643a1f93, type: 3} --- !u!1 &2094189264 stripped GameObject: @@ -34301,6 +34616,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 52827661} m_Modifications: - target: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, type: 3} @@ -34384,6 +34700,17 @@ PrefabInstance: value: objectReference: {fileID: 4300002, guid: 9a7ac5a112a3789458ba0fcab782eaf4, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2103185555} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 535a5aa7349085e42b210f7d2bdbe548, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2103185554} m_SourcePrefab: {fileID: 100100000, guid: 535a5aa7349085e42b210f7d2bdbe548, type: 3} --- !u!4 &2103185552 stripped Transform: @@ -34531,8 +34858,7 @@ AudioSource: --- !u!1 &2104863928 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000012434683988, guid: 7419af3af080373429e015bbec55cefa, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -34549,38 +34875,43 @@ GameObject: --- !u!4 &2104863929 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000010479630786, guid: 7419af3af080373429e015bbec55cefa, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2104863928} + 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: [] m_Father: {fileID: 1815866265} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2104863930 BoxCollider: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 65000012682375026, guid: 7419af3af080373429e015bbec55cefa, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2104863928} 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: 2 + serializedVersion: 3 m_Size: {x: 2, y: 2, z: 2} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2106961884 GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1000010505990224, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 @@ -34598,25 +34929,23 @@ GameObject: --- !u!4 &2106961885 Transform: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4000013193470730, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2106961884} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.51000506, y: 0.5964265, z: -0.005} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1504500865} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!102 &2106961886 TextMesh: serializedVersion: 3 m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 102000014043959416, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2106961884} @@ -34637,8 +34966,7 @@ TextMesh: --- !u!23 &2106961887 MeshRenderer: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 23000013732431034, guid: 4c99f9d5c19e3b14c9dbcb48e0184971, - type: 2} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2106961884} @@ -34700,6 +35028,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2110589929} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1, y: -0.555, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34707,7 +35036,6 @@ Transform: m_Children: - {fileID: 1957386538} m_Father: {fileID: 431944651} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2117489748 stripped Transform: @@ -34726,6 +35054,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 438170969} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -34785,12 +35114,16 @@ PrefabInstance: value: Selection objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1001 &2124612094 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1427708067} m_Modifications: - target: {fileID: 100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} @@ -34870,7 +35203,16 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 32562375f01c8c845a494d700c4ef48d, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, type: 3} +--- !u!4 &2124612095 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 5ef960ddf11c1fd4983638f56f6a8be0, + type: 3} + m_PrefabInstance: {fileID: 2124612094} + m_PrefabAsset: {fileID: 0} --- !u!1 &2128862032 GameObject: m_ObjectHideFlags: 0 @@ -34901,7 +35243,6 @@ RectTransform: m_Children: - {fileID: 1590074097} m_Father: {fileID: 1802399861} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -34911,8 +35252,7 @@ RectTransform: --- !u!114 &2129205351 MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 11420356, guid: 3491f4f01ba6cac47b1633f36d7c6c84, - type: 3} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1317145829} @@ -35006,6 +35346,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1416165960} m_Modifications: - target: {fileID: 100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} @@ -35065,12 +35406,16 @@ PrefabInstance: value: Sketch Origin objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 95a90b84ee174bd489f097b871d49986, type: 3} --- !u!1001 &2138344838 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1062510329} m_Modifications: - target: {fileID: 100000, guid: 54db8f5fcfbb46e44956444a27d43b5a, type: 3} @@ -35142,6 +35487,9 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: ef09b1e8273f72d44b8735b72e97f91a, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 54db8f5fcfbb46e44956444a27d43b5a, type: 3} --- !u!1 &840441684424189793 GameObject: @@ -35186,13 +35534,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1188089478511272227} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.6, z: 0} m_LocalScale: {x: 0.2, y: 0.02, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2013539807} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1188089478513278947 MeshRenderer: @@ -35249,6 +35597,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1087863899} m_Modifications: - target: {fileID: 1448111865499013753, guid: 834f4ac71ec35d148acacfca28f04405, @@ -35327,6 +35676,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 834f4ac71ec35d148acacfca28f04405, type: 3} --- !u!4 &1518196148397455185 Transform: @@ -35335,13 +35687,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 840441684424189793} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.08, z: 0} m_LocalScale: {x: 0.064045005, y: 0.064045005, z: 0.064045005} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1665480353} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &2914250020364798883 MeshRenderer: @@ -35392,13 +35744,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3025550148921331516} + 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: [] m_Father: {fileID: 1824805490} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3025550148921331516 GameObject: @@ -35475,19 +35827,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5983820992036084963} + serializedVersion: 2 m_LocalRotation: {x: -0.0000020600341, y: -0.70710975, z: -0.70710385, w: 0.0000020414589} m_LocalPosition: {x: -0.062484335, y: -0.060005188, z: -2.15} m_LocalScale: {x: 1, y: 0.75, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5080288855832605660} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: -180.00002} --- !u!1001 &4492044766644994641 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 652605545} m_Modifications: - target: {fileID: 1717152978, guid: 382dabebd59956d499aefb54b02f804d, type: 3} @@ -35555,6 +35908,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 382dabebd59956d499aefb54b02f804d, type: 3} --- !u!4 &5080288855832605660 Transform: @@ -35563,6 +35919,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5082975857908328810} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} @@ -35571,7 +35928,6 @@ Transform: - {fileID: 6136141720566941911} - {fileID: 3873296417163464587} m_Father: {fileID: 1787818132} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5082975857908328810 GameObject: @@ -35614,13 +35970,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6138648616711585317} + serializedVersion: 2 m_LocalRotation: {x: 0.7050106, y: -0, z: -0, w: 0.70919687} m_LocalPosition: {x: 0, y: -0.14, z: 0.31} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5080288855832605660} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 89.662, y: 0, z: 0} --- !u!33 &6138272646664952207 MeshFilter: @@ -35773,13 +36129,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6255327374863432541} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1665480353} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &6508902497776864165 MeshRenderer: @@ -35830,13 +36186,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6969259033834047247} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 135695200} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &6963085946548418065 Transform: @@ -35845,13 +36201,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6968628729307456687} + serializedVersion: 2 m_LocalRotation: {x: 1, y: 0, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0.3, z: 0} m_LocalScale: {x: 1, y: 0.5000007, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 135695200} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} --- !u!1 &6968628729307456687 GameObject: @@ -36055,9 +36411,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8282789105004247308} 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: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!4 &8282789105004247307 @@ -36067,13 +36431,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8282789105004247308} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.017} m_LocalScale: {x: 0.06947163, y: 0.06947163, z: 0.06947163} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8282789105211234563} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8282789105004247308 GameObject: @@ -36121,6 +36485,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8282789105019930894} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.49999997, y: 0.5, z: 0.5} @@ -36129,7 +36494,6 @@ Transform: - {fileID: 8282789105211234563} - {fileID: 1008953366} m_Father: {fileID: 593121476} - m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8282789105019930894 GameObject: @@ -36155,6 +36519,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8282789105211234564} + 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} @@ -36163,7 +36528,6 @@ Transform: - {fileID: 8282789105846159727} - {fileID: 8282789105004247307} m_Father: {fileID: 8282789105019930893} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8282789105211234564 GameObject: @@ -36183,6 +36547,7 @@ GameObject: m_IsActive: 1 --- !u!120 &8282789105846159726 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -36279,16 +36644,20 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 0 m_Loop: 0 + m_ApplyActiveColorSpace: 0 --- !u!4 &8282789105846159727 Transform: m_ObjectHideFlags: 0 @@ -36296,13 +36665,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8282789105846159728} + 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: [] m_Father: {fileID: 8282789105211234563} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8282789105846159728 GameObject: @@ -36326,6 +36695,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796800572} m_Modifications: - target: {fileID: 8373124986442555541, guid: e26dd31bb70849e4da9f0b1230a62278, @@ -36394,6 +36764,17 @@ PrefabInstance: value: objectReference: {fileID: 94678610} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8373124984978532359, guid: e26dd31bb70849e4da9f0b1230a62278, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 8373124984786508974, guid: e26dd31bb70849e4da9f0b1230a62278, + type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: e26dd31bb70849e4da9f0b1230a62278, type: 3} --- !u!4 &9123593761565215834 Transform: @@ -36402,13 +36783,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9123593761565642874} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 223402015} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9123593761565642874 GameObject: @@ -36478,3 +36859,17 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 652605545} + - {fileID: 1476953176} + - {fileID: 1796800572} + - {fileID: 294061575} + - {fileID: 1370550523} + - {fileID: 1671124695} + - {fileID: 1373217987} + - {fileID: 1802399861} + - {fileID: 106206546} + - {fileID: 1848773840} diff --git a/Assets/Scripts/Input/UnityXRInputAction.cs b/Assets/Scripts/Input/UnityXRInputAction.cs index 9ee1597b42..33d3515f01 100644 --- a/Assets/Scripts/Input/UnityXRInputAction.cs +++ b/Assets/Scripts/Input/UnityXRInputAction.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.7.0 +// version 1.8.2 // from Assets/Scripts/Input/UnityXRInput.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -14,6 +14,7 @@ using System.Collections.Generic; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Utilities; +using UnityEngine; namespace TiltBrush { @@ -1165,6 +1166,12 @@ public @UnityXRInputAction() m_Wand_SecondaryButton = m_Wand.FindAction("SecondaryButton", throwIfNotFound: true); } + ~@UnityXRInputAction() + { + Debug.Assert(!m_Brush.enabled, "This will cause a leak and performance issues, UnityXRInputAction.Brush.Disable() has not been called."); + Debug.Assert(!m_Wand.enabled, "This will cause a leak and performance issues, UnityXRInputAction.Wand.Disable() has not been called."); + } + public void Dispose() { UnityEngine.Object.Destroy(asset); diff --git a/Assets/ThirdParty/UnityODS/TiltBrushStandardSpecular.shader b/Assets/ThirdParty/UnityODS/TiltBrushStandardSpecular.shader index c1a3cd56f6..15be9983d6 100644 --- a/Assets/ThirdParty/UnityODS/TiltBrushStandardSpecular.shader +++ b/Assets/ThirdParty/UnityODS/TiltBrushStandardSpecular.shader @@ -57,6 +57,15 @@ Shader "TiltBrush/Standard (Specular setup)" #else #define TB_VERT_BASE VertexOutputForwardBase #define TB_VERT_ADD VertexOutputForwardAdd +#endif + +// Has a non-empty shadow caster output struct (it's an error to have empty structs on some platforms...) +#if !defined(V2F_SHADOW_CASTER_NOPOS_IS_EMPTY) || defined(UNITY_STANDARD_USE_SHADOW_UVS) +#define UNITY_STANDARD_USE_SHADOW_OUTPUT_STRUCT 1 +#endif + +#ifdef UNITY_STEREO_INSTANCING_ENABLED +#define UNITY_STANDARD_USE_STEREO_SHADOW_OUTPUT_STRUCT 1 #endif ENDCG @@ -176,7 +185,7 @@ Shader "TiltBrush/Standard (Specular setup)" #include "UnityStandardShadow.cginc" void vertShadowCasterTB(VertexInput v - , out float4 opos : SV_POSITION + #ifdef UNITY_STANDARD_USE_SHADOW_OUTPUT_STRUCT , out VertexOutputShadowCaster o #endif @@ -186,7 +195,7 @@ Shader "TiltBrush/Standard (Specular setup)" ) { PrepForOds(v.vertex); - vertShadowCaster(v, opos + vertShadowCaster(v #ifdef UNITY_STANDARD_USE_SHADOW_OUTPUT_STRUCT ,o #endif @@ -417,7 +426,6 @@ Shader "TiltBrush/Standard (Specular setup)" #include "UnityStandardShadow.cginc" void vertShadowCasterTB(VertexInput v - , out float4 opos : SV_POSITION #ifdef UNITY_STANDARD_USE_SHADOW_OUTPUT_STRUCT , out VertexOutputShadowCaster o #endif @@ -427,7 +435,7 @@ Shader "TiltBrush/Standard (Specular setup)" ) { PrepForOds(v.vertex); - vertShadowCaster(v, opos + vertShadowCaster(v #ifdef UNITY_STANDARD_USE_SHADOW_OUTPUT_STRUCT ,o #endif diff --git a/Assets/XR/Settings/Oculus Settings.asset b/Assets/XR/Settings/Oculus Settings.asset index 9a3b15a9ec..f69e30bf5a 100644 --- a/Assets/XR/Settings/Oculus Settings.asset +++ b/Assets/XR/Settings/Oculus Settings.asset @@ -27,7 +27,7 @@ MonoBehaviour: LateLatchingDebug: 0 EnableTrackingOriginStageMode: 0 SpaceWarp: 0 - TargetQuest: 1 TargetQuest2: 1 TargetQuestPro: 1 + TargetQuest3: 1 SystemSplashScreen: {fileID: 0} diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset index ba48aff798..524f77734b 100644 --- a/Assets/XR/Settings/Open XR Package Settings.asset +++ b/Assets/XR/Settings/Open XR Package Settings.asset @@ -239,6 +239,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-5585190116095795567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4710975c7840e7d499bbb3757c22b0a5, type: 3} + m_Name: MetaXRSubsampledLayout Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta XR Subsampled Layout + version: 0.0.1 + featureIdInternal: com.meta.openxr.feature.subsampledLayout + openxrExtensionStrings: XR_META_vulkan_swapchain_create_info + company: Meta + priority: 0 + required: 0 --- !u!114 &-5453487588099642660 MonoBehaviour: m_ObjectHideFlags: 0 @@ -468,6 +488,27 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-2581017241881390745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e573a2aed6698b047aff95224499b722, type: 3} + m_Name: MetaXREyeTrackedFoveationFeature Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta XR Eye Tracked Foveation + version: 0.0.1 + featureIdInternal: com.meta.openxr.feature.eyetrackedfoveation + openxrExtensionStrings: XR_META_foveation_eye_tracked XR_FB_eye_tracking_social + XR_META_vulkan_swapchain_create_info + company: Meta + priority: 0 + required: 0 --- !u!114 &-2021925341700479113 MonoBehaviour: m_ObjectHideFlags: 0 @@ -549,7 +590,9 @@ MonoBehaviour: - {fileID: -4431914812882349843} - {fileID: 3405362293045848653} - {fileID: 7875633773414566808} + - {fileID: 3409825189635461668} - {fileID: -7871932882014305355} + - {fileID: 6457187213107907505} - {fileID: -1562417761177608366} - {fileID: -568313750252970699} - {fileID: -238312934105289492} @@ -559,6 +602,8 @@ MonoBehaviour: - {fileID: 4073621059260807014} m_renderMode: 0 m_depthSubmissionMode: 1 + m_optimizeBufferDiscards: 0 + m_symmetricProjection: 0 --- !u!114 &-792796085665928788 MonoBehaviour: m_ObjectHideFlags: 0 @@ -674,6 +719,23 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-147410222034222949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} + m_Name: VisionOS + m_EditorClassIdentifier: + features: [] + m_renderMode: 1 + m_depthSubmissionMode: 0 + m_optimizeBufferDiscards: 0 + m_symmetricProjection: 0 --- !u!114 &-57994259809233075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -706,13 +768,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3} m_Name: Open XR Package Settings m_EditorClassIdentifier: - Keys: 01000000070000000d0000000e00000004000000 + Keys: 01000000070000000d0000000e0000000400000024000000 Values: - {fileID: 7381656899648225167} - {fileID: -1294329756112899549} - {fileID: 9061466112958658113} - {fileID: 5710753191044472963} - {fileID: 2540959591261858297} + - {fileID: -147410222034222949} --- !u!114 &574840683824583675 MonoBehaviour: m_ObjectHideFlags: 0 @@ -888,6 +951,8 @@ MonoBehaviour: features: [] m_renderMode: 1 m_depthSubmissionMode: 0 + m_optimizeBufferDiscards: 0 + m_symmetricProjection: 0 --- !u!114 &2554124788269052071 MonoBehaviour: m_ObjectHideFlags: 0 @@ -900,7 +965,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3} m_Name: KHRSimpleControllerProfile Standalone m_EditorClassIdentifier: - m_enabled: 0 + m_enabled: 1 nameUi: Khronos Simple Controller Profile version: 0.0.1 featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile @@ -959,6 +1024,32 @@ MonoBehaviour: manifestName: cambria enabled: 1 forceRemoveInternetPermission: 1 + symmetricProjection: 0 + systemSplashScreen: {fileID: 0} + optimizeBufferDiscards: 1 + lateLatchingMode: 0 + lateLatchingDebug: 0 +--- !u!114 &3409825189635461668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e573a2aed6698b047aff95224499b722, type: 3} + m_Name: MetaXREyeTrackedFoveationFeature Android + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta XR Eye Tracked Foveation + version: 0.0.1 + featureIdInternal: com.meta.openxr.feature.eyetrackedfoveation + openxrExtensionStrings: XR_META_foveation_eye_tracked XR_FB_eye_tracking_social + XR_META_vulkan_swapchain_create_info + company: Meta + priority: 0 + required: 0 --- !u!114 &3442458366111397828 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1132,6 +1223,8 @@ MonoBehaviour: - {fileID: -8850364997158714336} m_renderMode: 0 m_depthSubmissionMode: 1 + m_optimizeBufferDiscards: 0 + m_symmetricProjection: 0 --- !u!114 &6163247034252501667 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1172,6 +1265,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &6457187213107907505 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4710975c7840e7d499bbb3757c22b0a5, type: 3} + m_Name: MetaXRSubsampledLayout Android + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta XR Subsampled Layout + version: 0.0.1 + featureIdInternal: com.meta.openxr.feature.subsampledLayout + openxrExtensionStrings: XR_META_vulkan_swapchain_create_info + company: Meta + priority: 0 + required: 0 --- !u!114 &6781313199298781951 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1245,7 +1358,9 @@ MonoBehaviour: - {fileID: 1827103528056647146} - {fileID: 2554124788269052071} - {fileID: 7755255244189431342} + - {fileID: -2581017241881390745} - {fileID: 1104377150978337437} + - {fileID: -5585190116095795567} - {fileID: -6490217007365981742} - {fileID: -6553496117388817208} - {fileID: 3442458366111397828} @@ -1256,6 +1371,8 @@ MonoBehaviour: - {fileID: -177044242218828340} m_renderMode: 0 m_depthSubmissionMode: 2 + m_optimizeBufferDiscards: 0 + m_symmetricProjection: 0 --- !u!114 &7584001526195082204 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1351,6 +1468,8 @@ MonoBehaviour: features: [] m_renderMode: 0 m_depthSubmissionMode: 0 + m_optimizeBufferDiscards: 0 + m_symmetricProjection: 0 --- !u!114 &9128593777916537170 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index a9581a0223..32570762f5 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,8 +1,8 @@ { "dependencies": { "com.ixxy.unitysymmetry": "https://github.com/IxxyXR/unity-symmetry.git?nocache=7#upm", - "com.meta.xr.sdk.platform": "56.0.0-preview", - "com.meta.xr.sdk.utilities": "https://github.com/icosa-mirror/com.meta.xr.sdk.core.git#56.0.0-openbrush", + "com.meta.xr.sdk.core": "https://github.com/icosa-mirror/com.meta.xr.sdk.core.git#60.0.0-openbrush", + "com.meta.xr.sdk.platform": "60.0.0", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.cloud.draco": "5.1.3", @@ -11,22 +11,23 @@ "com.unity.editorcoroutines": "1.0.0", "com.unity.formats.usd": "1.0.3-preview.2", "com.unity.ide.rider": "3.0.28", - "com.unity.ide.visualstudio": "2.0.20", - "com.unity.inputsystem": "https://github.com/icosa-mirror/com.unity.inputsystem.git#open-brush", - "com.unity.localization": "1.4.2", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.inputsystem": "https://github.com/icosa-mirror/com.unity.inputsystem.git#1.8.2-openbrush", + "com.unity.localization": "1.5.2", "com.unity.meshopt.decompress": "0.1.0-preview.6", - "com.unity.mobile.android-logcat": "1.3.2", - "com.unity.nuget.mono-cecil": "1.10.2", + "com.unity.mobile.android-logcat": "1.4.2", + "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.performance.profile-analyzer": "1.2.2", + "com.unity.recorder": "4.0.3", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.5", + "com.unity.textmeshpro": "3.0.9", + "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.vectorgraphics": "https://github.com/icosa-mirror/com.unity.vectorgraphics.git#open-brush", - "com.unity.xr.core-utils": "2.2.3", - "com.unity.xr.management": "4.3.3", - "com.unity.xr.oculus": "3.3.0", - "com.unity.xr.openxr": "1.8.2", + "com.unity.xr.core-utils": "2.3.0", + "com.unity.xr.management": "4.4.1", + "com.unity.xr.oculus": "4.2.0", + "com.unity.xr.openxr": "1.10.0", "com.zappar.xr.zapbox": "https://github.com/zappar-xr/zapbox-xr-sdk.git#3296cbf5046369801027a821fe9ff6082431a605", "org.khronos.unitygltf": "https://github.com/icosa-mirror/UnityGLTF.git", "org.nuget.google.apis": "1.64.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 11d7a818cf..8d2ce749e8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -13,23 +13,23 @@ "dependencies": {}, "hash": "4f87195d54ccefe076678cb83a296b3f0428fc53" }, + "com.meta.xr.sdk.core": { + "version": "https://github.com/icosa-mirror/com.meta.xr.sdk.core.git#60.0.0-openbrush", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "0feb415034b094e4622efa4e5b3f2c87ded2d2f3" + }, "com.meta.xr.sdk.platform": { - "version": "56.0.0-preview", + "version": "60.0.0", "depth": 0, "source": "registry", "dependencies": { - "com.meta.xr.sdk.utilities": "56.0.0-preview", + "com.meta.xr.sdk.core": "60.0.0", "com.unity.ugui": "1.0.0" }, "url": "https://npm.developer.oculus.com" }, - "com.meta.xr.sdk.utilities": { - "version": "https://github.com/icosa-mirror/com.meta.xr.sdk.core.git#56.0.0-openbrush", - "depth": 0, - "source": "git", - "dependencies": {}, - "hash": "57bad66c67cd72a31898a1d29dae4d4201ef36c1" - }, "com.unity.2d.sprite": { "version": "1.0.0", "depth": 0, @@ -40,14 +40,17 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } }, "com.unity.addressables": { - "version": "1.20.5", + "version": "1.21.21", "depth": 1, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.20.2", + "com.unity.scriptablebuildpipeline": "1.21.23", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -57,11 +60,12 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.11", + "version": "1.8.15", "depth": 1, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -129,7 +133,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.20", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -138,20 +142,20 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "https://github.com/icosa-mirror/com.unity.inputsystem.git#open-brush", + "version": "https://github.com/icosa-mirror/com.unity.inputsystem.git#1.8.2-openbrush", "depth": 0, "source": "git", "dependencies": { "com.unity.modules.uielements": "1.0.0" }, - "hash": "94931e6b1511c1e0bc5f9cc6571e3b3e87582f08" + "hash": "c47c0d12ee0afaabbed5ed1572470d881097dc18" }, "com.unity.localization": { - "version": "1.4.2", + "version": "1.5.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.addressables": "1.20.5", + "com.unity.addressables": "1.21.9", "com.unity.nuget.newtonsoft-json": "3.0.2" }, "url": "https://packages.unity.com" @@ -174,14 +178,14 @@ "url": "https://packages.unity.com" }, "com.unity.mobile.android-logcat": { - "version": "1.3.2", + "version": "1.4.2", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.nuget.mono-cecil": { - "version": "1.10.2", + "version": "1.11.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -201,37 +205,47 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.recorder": { + "version": "4.0.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.timeline": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.render-pipelines.core": { - "version": "12.1.12", + "version": "14.0.11", "depth": 2, "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.scriptablebuildpipeline": { - "version": "1.20.2", + "version": "1.21.23", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.searcher": { - "version": "4.9.1", + "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.12", + "version": "14.0.11", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.12", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.11", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { @@ -246,7 +260,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.9", "depth": 0, "source": "registry", "dependencies": { @@ -255,7 +269,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -295,7 +309,7 @@ "hash": "214037a894f7e292687b8ba331f5c959c2bcdd8b" }, "com.unity.xr.core-utils": { - "version": "2.2.3", + "version": "2.3.0", "depth": 0, "source": "registry", "dependencies": { @@ -314,7 +328,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.3.3", + "version": "4.4.1", "depth": 0, "source": "registry", "dependencies": { @@ -326,22 +340,22 @@ "url": "https://packages.unity.com" }, "com.unity.xr.oculus": { - "version": "3.3.0", + "version": "4.2.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.management": "4.2.0" + "com.unity.xr.management": "4.4.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.openxr": { - "version": "1.8.2", + "version": "1.10.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.management": "4.0.1", + "com.unity.xr.management": "4.4.0", "com.unity.xr.legacyinputhelpers": "2.1.2", - "com.unity.inputsystem": "1.4.4", + "com.unity.inputsystem": "1.6.3", "com.unity.xr.core-utils": "2.1.1" }, "url": "https://packages.unity.com" @@ -559,17 +573,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index aa34b37606..8726971b51 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -20,6 +20,8 @@ EditorBuildSettings: type: 2} com.unity.input.settings: {fileID: 11400000, guid: 62987a061b20ae345a45e835010db90d, type: 2} + com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 482f183e0a6aac94da9c4a526325285e, + type: 3} com.unity.localization.settings: {fileID: 11400000, guid: feef587f0ac641c4ab7d9e44e7eea888, type: 2} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 07092d12b03adbd49b1ade5f5742e72e, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1c4b9ab0ad..5f01f77f81 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 24 + serializedVersion: 26 productGUID: 0b046a3af5488455a9031c2c6c6e9f1d AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -51,14 +51,16 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -77,6 +79,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -88,6 +91,7 @@ PlayerSettings: hideHomeButton: 1 submitAnalytics: 0 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -122,8 +126,11 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 @@ -132,12 +139,9 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 1.0.0 preloadedAssets: - {fileID: 11400000, guid: 62987a061b20ae345a45e835010db90d, type: 2} @@ -155,8 +159,9 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -173,6 +178,7 @@ PlayerSettings: tvOS: com.yourcompany.yourproduct buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 @@ -180,7 +186,7 @@ PlayerSettings: AndroidMinSdkVersion: 29 AndroidTargetSdkVersion: 32 AndroidPreferredInstallLocation: 0 - aotOptions: + aotOptions: stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 @@ -190,12 +196,15 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -220,7 +229,7 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 1 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: + iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -228,9 +237,9 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSLaunchScreenCustomStoryboardPath: - iOSLaunchScreeniPadCustomStoryboardPath: + iOSLaunchScreeniPadCustomXibPath: + iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] macOSURLSchemes: [] @@ -238,34 +247,39 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 1 iosCopyPluginsCodeInsteadOfSymlink: 0 - appleDeveloperTeamID: - iOSManualSigningProvisioningProfileID: - tvOSManualSigningProvisioningProfileID: + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 shaderPrecisionModel: 0 clonedFromGUID: 00000000000000000000000000000000 - templatePackageId: - templateDefaultScene: + templatePackageId: + templateDefaultScene: useCustomMainManifest: 0 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: + AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -279,13 +293,12 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: - - m_BuildTarget: + - m_BuildTarget: m_Icons: - serializedVersion: 2 m_Icon: {fileID: 2800000, guid: 819e7471e6f639f4da51f3b379351b19, type: 3} @@ -299,92 +312,92 @@ PlayerSettings: m_Width: 432 m_Height: 432 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 324 m_Height: 324 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 216 m_Height: 216 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 162 m_Height: 162 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 108 m_Height: 108 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 81 m_Height: 81 m_Kind: 2 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 144 m_Height: 144 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 96 m_Height: 96 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 72 m_Height: 72 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 48 m_Height: 48 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 36 m_Height: 36 m_Kind: 0 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 192 m_Height: 192 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 144 m_Height: 144 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 96 m_Height: 96 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 72 m_Height: 72 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 48 m_Height: 48 m_Kind: 1 - m_SubKind: + m_SubKind: - m_Textures: [] m_Width: 36 m_Height: 36 m_Kind: 1 - m_SubKind: + m_SubKind: - m_BuildTarget: iPhone m_Icons: - m_Textures: [] @@ -482,6 +495,13 @@ PlayerSettings: m_Height: 1024 m_Kind: 4 m_SubKind: App Store + - m_BuildTarget: VisionOS + m_Icons: + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 0 @@ -608,7 +628,9 @@ PlayerSettings: m_EncodingQuality: 1 - m_BuildTarget: PS4 m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: - m_BuildTarget: Android @@ -620,52 +642,54 @@ PlayerSettings: logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 cameraUsageDescription: Not Used - locationUsageDescription: + locationUsageDescription: microphoneUsageDescription: Not Used - bluetoothUsageDescription: - switchNMETAOverride: - switchNetLibKey: + bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 + switchNMETAOverride: + switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x0005000C10000001 - switchNSODependencies: - switchTitleNames_0: - switchTitleNames_1: - switchTitleNames_2: - switchTitleNames_3: - switchTitleNames_4: - switchTitleNames_5: - switchTitleNames_6: - switchTitleNames_7: - switchTitleNames_8: - switchTitleNames_9: - switchTitleNames_10: - switchTitleNames_11: - switchTitleNames_12: - switchTitleNames_13: - switchTitleNames_14: - switchTitleNames_15: - switchPublisherNames_0: - switchPublisherNames_1: - switchPublisherNames_2: - switchPublisherNames_3: - switchPublisherNames_4: - switchPublisherNames_5: - switchPublisherNames_6: - switchPublisherNames_7: - switchPublisherNames_8: - switchPublisherNames_9: - switchPublisherNames_10: - switchPublisherNames_11: - switchPublisherNames_12: - switchPublisherNames_13: - switchPublisherNames_14: - switchPublisherNames_15: + switchNSODependencies: + switchCompilerFlags: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchTitleNames_15: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -698,9 +722,9 @@ PlayerSettings: switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} switchSmallIcons_15: {fileID: 0} - switchManualHTML: - switchAccessibleURLs: - switchLegalInformation: + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: switchMainThreadStackSize: 1048576 switchPresenceGroupId: 0x0005000C10000001 switchLogoHandling: 0 @@ -709,7 +733,7 @@ PlayerSettings: switchStartupUserAccount: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 - switchApplicationErrorCodeCategory: + switchApplicationErrorCodeCategory: switchUserAccountSaveDataSize: 0 switchUserAccountSaveDataJournalSize: 0 switchApplicationAttribute: 0 @@ -730,13 +754,13 @@ PlayerSettings: switchRatingsInt_11: 0 switchRatingsInt_12: 0 switchLocalCommunicationIds_0: 0x0005000C10000001 - switchLocalCommunicationIds_1: - switchLocalCommunicationIds_2: - switchLocalCommunicationIds_3: - switchLocalCommunicationIds_4: - switchLocalCommunicationIds_5: - switchLocalCommunicationIds_6: - switchLocalCommunicationIds_7: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: switchParentalControl: 0 switchAllowsScreenshot: 1 switchAllowsVideoCapturing: 1 @@ -759,7 +783,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 @@ -767,35 +790,35 @@ PlayerSettings: switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 - ps4NPTitleSecret: - ps4NPTrophyPackPath: + ps4NPTitleSecret: + ps4NPTrophyPackPath: ps4ParentalLevel: 1 ps4ContentID: ED1633-NPXX51362_00-0000000000000000 ps4Category: 0 ps4MasterVersion: 01.00 ps4AppVersion: 01.00 ps4AppType: 0 - ps4ParamSfxPath: + ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 ps4VideoOutInitialWidth: 1920 ps4VideoOutBaseModeInitialWidth: 1920 ps4VideoOutReprojectionRate: 120 - ps4PronunciationXMLPath: - ps4PronunciationSIGPath: - ps4BackgroundImagePath: - ps4StartupImagePath: - ps4StartupImagesFolder: - ps4IconImagesFolder: - ps4SaveDataImagePath: - ps4SdkOverride: - ps4BGMPath: - ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: - ps4ExtraSceSysFile: - ps4NPtitleDatPath: + ps4PronunciationXMLPath: + ps4PronunciationSIGPath: + ps4BackgroundImagePath: + ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: + ps4SaveDataImagePath: + ps4SdkOverride: + ps4BGMPath: + ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: + ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: + ps4RemotePlayKeyMappingDir: ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 @@ -823,9 +846,9 @@ PlayerSettings: ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 - ps4PatchPkgPath: - ps4PatchLatestPkgPath: - ps4PatchChangeinfoPath: + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 @@ -841,18 +864,19 @@ PlayerSettings: ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 - monoEnv: + monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} blurSplashScreenBackground: 1 - spritePackerPolicy: + spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 0 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 0 webGLDebugSymbols: 0 - webGLEmscriptenArgs: - webGLModulesDirectory: + webGLEmscriptenArgs: + webGLModulesDirectory: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 @@ -861,6 +885,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: Android: TILT_BRUSH @@ -878,6 +908,7 @@ PlayerSettings: Windows Store Apps: 2 iPhone: 1 il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} managedStrippingLevel: Android: 4 EmbeddedLinux: 1 @@ -898,11 +929,9 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 1 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - additionalIl2CppArgs: + additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Android: 3 @@ -911,10 +940,10 @@ PlayerSettings: m_MobileRenderingPath: 1 metroPackageName: com.yourcompany.yourproduct metroPackageVersion: 1.0.0.0 - metroCertificatePath: - metroCertificatePassword: - metroCertificateSubject: - metroCertificateIssuer: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: Virtual Reality Painting wsaImages: {} @@ -930,6 +959,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: WindowsStoreApps: VideosLibrary: False @@ -960,23 +990,23 @@ PlayerSettings: XboxOne: enus: true metroTargetDeviceFamilies: {} - metroFTAName: + metroFTAName: metroFTAFileTypes: [] - metroProtocolName: - vcxProjDefaultLanguage: - XboxOneProductId: - XboxOneUpdateKey: - XboxOneSandboxId: - XboxOneContentId: - XboxOneTitleId: - XboxOneSCId: - XboxOneGameOsOverridePath: - XboxOnePackagingOverridePath: - XboxOneAppManifestOverridePath: + metroProtocolName: + vcxProjDefaultLanguage: + XboxOneProductId: + XboxOneUpdateKey: + XboxOneSandboxId: + XboxOneContentId: + XboxOneTitleId: + XboxOneSCId: + XboxOneGameOsOverridePath: + XboxOnePackagingOverridePath: + XboxOneAppManifestOverridePath: XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 - XboxOneDescription: + XboxOneDescription: XboxOneLanguage: - enus XboxOneCapability: [] @@ -989,8 +1019,8 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - XboxOneOverrideIdentityName: - XboxOneOverrideIdentityPublisher: + XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: {} cloudServicesEnabled: Analytics: 0 @@ -1003,26 +1033,32 @@ PlayerSettings: UNet: 0 Unity_Ads: 0 luminIcon: - m_Name: - m_ModelFolderPath: - m_PortalFolderPath: + m_Name: + m_ModelFolderPath: + m_PortalFolderPath: luminCert: - m_CertPath: + m_CertPath: m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 - m_VersionName: + m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 1 windowsGamepadBackendHint: 0 - cloudProjectId: + cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: - organizationId: + projectName: + organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 1 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index cd32c2982a..9b59632723 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.30f1 -m_EditorVersionWithRevision: 2021.3.30f1 (b4360d7cdac4) +m_EditorVersion: 2022.3.34f1 +m_EditorVersionWithRevision: 2022.3.34f1 (4886f5360533) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 9b28428b92..3250b068e8 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/README.md b/README.md index ddfc389844..3b7687d1d6 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Get the Open Brush open-source application running on your own devices. ### Prerequisites -* [Unity 2021.3.30f1](unityhub://2021.3.30f1/b4360d7cdac4) +* [Unity 2022.3.34f1](unityhub://2022.3.34f1/4886f5360533) * [Python 3](https://www.python.org/downloads/) (Optional — needed only if you wish to run the scripts in the `Support/bin` directory) Tested with Python 3.8. From 474598905c3e85b7a592c3b7e439fd96d9ad8bb6 Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Tue, 25 Jun 2024 21:09:07 +0300 Subject: [PATCH 09/38] Fix Q1 upload (#732) Remove READ_PHONE_STATE permission --- Assets/Plugins/Android/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index bd86cd7650..179339006b 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -19,6 +19,7 @@ + From 0cd60ffa6cdd6f25c5ba8dbb81ff0abdc5476390 Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Wed, 26 Jun 2024 09:40:37 +0300 Subject: [PATCH 10/38] Fix iOS builds after the unity upgrade (#733) Set -ld_classic via fastfile Online sources suggest that the following change should also work, but I saw that it wasn't being passed to the link call. So we'll do it this way. diff --git a/Assets/Editor/BuildTiltBrush.cs b/Assets/Editor/BuildTiltBrush.cs index 8e5652fc..314d0eba 100644 --- a/Assets/Editor/BuildTiltBrush.cs +++ b/Assets/Editor/BuildTiltBrush.cs @@ -1824,6 +1824,9 @@ static class BuildTiltBrush // TODO:Mikesky - I've disabled this disable, does bitcode work now? //project.SetBuildProperty(pbxTarget, "ENABLE_BITCODE", "false"); + // Starting with the upgrade to Unity 2023, this seems to be required + project.AddBuildProperty(pbxTarget, "OTHER_LDFLAGS", "-ld_classic"); + File.WriteAllText(pbxPath, project.WriteToString()); string plistPath = path + "/Info.plist"; --- .github/workflows/build.yml | 19 ++++++++-- Gemfile.lock | 70 ++++++++++++++++++++----------------- fastlane/Fastfile | 2 +- 3 files changed, 55 insertions(+), 36 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68e4e31ec6..fa941a9470 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1230,7 +1230,7 @@ jobs: publish_ios_zapbox: name: Publish Zapbox iOS needs: [configuration, build] - runs-on: macos-13 # As of 2024-03-01, macos-latest still points to Mac OS 12, which has an older XCode and gives ITMS-90725: SDK version issue when we submit. + runs-on: macos-14 # ARM64 workers. Change this back to -latest when they get promoted if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -1251,7 +1251,14 @@ jobs: name: iOS Zapbox path: build - - name: Fix File Permissions and Run fastlane + - name: Fix File Permissions + run: | + export FILENAME=$(basename $(readlink -f build/iOS/OpenBrush*)) + export IOS_BUILD_PATH=$(pwd)/build/iOS/${FILENAME} + + find $IOS_BUILD_PATH -type f -name "*.sh" -exec chmod +x {} \; + + - name: Run fastlane env: APPLE_CONNECT_EMAIL: ${{ secrets.APPLE_CONNECT_EMAIL }} APPLE_DEVELOPER_EMAIL: ${{ secrets.APPLE_DEVELOPER_EMAIL }} @@ -1274,6 +1281,12 @@ jobs: export FILENAME=$(basename $(readlink -f build/iOS/OpenBrush*)) export IOS_BUILD_PATH=$(pwd)/build/iOS/${FILENAME} - find $IOS_BUILD_PATH -type f -name "**.sh" -exec chmod +x {} \; bundle install bundle exec fastlane ios ${FASTLANE_LANE} + + - name: Save logs + uses: actions/upload-artifact@v4 + if: ${{ failure() }} + with: + name: fastlane logs + path: /Users/runner/Library/Logs/gym/ diff --git a/Gemfile.lock b/Gemfile.lock index 5d1b028290..e9157162bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,29 +11,32 @@ GIT GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) - artifactory (3.0.15) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.889.0) - aws-sdk-core (3.191.1) + aws-partitions (1.947.0) + aws-sdk-core (3.199.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.77.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.87.0) + aws-sdk-core (~> 3, >= 3.199.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.143.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-s3 (1.153.0) + aws-sdk-core (~> 3, >= 3.198.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) + base64 (0.2.0) claide (1.1.0) colored (1.2) colored2 (3.1.2) @@ -45,7 +48,7 @@ GEM domain_name (0.6.20240107) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.109.0) + excon (0.110.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -74,15 +77,15 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.3.0) - fastlane (2.219.0) + fastimage (2.3.1) + fastlane (2.221.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored + colored (~> 1.2) commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) @@ -103,10 +106,10 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (>= 0.1.1) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (~> 3) @@ -115,7 +118,7 @@ GEM word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) ffi (1.16.3) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) @@ -134,12 +137,12 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.1) + google-cloud-core (1.7.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) + google-cloud-errors (1.4.0) google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -155,23 +158,25 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.5) + http-cookie (1.0.6) domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.7.1) - jwt (2.7.1) - mini_magick (4.12.0) + json (2.7.2) + jwt (2.8.2) + base64 + mini_magick (4.13.1) mini_mime (1.1.5) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) nanaimo (0.3.0) naturally (2.2.1) - optparse (0.4.0) + nkf (0.2.0) + optparse (0.5.0) os (1.1.4) plist (3.7.1) - public_suffix (5.0.4) - rake (13.1.0) + public_suffix (6.0.0) + rake (13.2.1) rbnacl (7.1.1) ffi representable (3.2.0) @@ -179,13 +184,13 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.2.9) + strscan rouge (2.0.7) ruby2_keywords (0.0.5) rubyzip (2.3.2) - security (0.1.3) - signet (0.18.0) + security (0.1.5) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) @@ -219,6 +224,7 @@ GEM xcpretty (~> 0.2, >= 0.0.7) PLATFORMS + x86_64-darwin-23 x86_64-linux DEPENDENCIES @@ -226,4 +232,4 @@ DEPENDENCIES fastlane-plugin-github_action! BUNDLED WITH - 2.5.6 + 2.5.13 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 8a6c0fe667..e5167951b3 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -79,7 +79,7 @@ platform :ios do build_app( #alias: gym project: "#{ENV['IOS_BUILD_PATH']}/Unity-iPhone.xcodeproj", scheme: 'Unity-iPhone', - xcargs: '-allowProvisioningUpdates' + xcargs: '-allowProvisioningUpdates OTHER_LDFLAGS="-ld_classic"' ) end From 09c7015da9c0bcdc3d712d59d1bb89c1587d5fde Mon Sep 17 00:00:00 2001 From: Eero Pomell <97628152+eeropomell@users.noreply.github.com> Date: Sat, 6 Jul 2024 16:37:32 +0300 Subject: [PATCH 11/38] Improve image loading (#729) * Improvement to the background image loading: it loads them from the cache now and it's at least 2x faster. * If the dimensions are exceeded, then the user will also see "image too large to load", as previously it was only for images with too large of a file size --- .../Scripts/GUI/LoadBackgroundImageButton.cs | 9 +++- Assets/Scripts/ReferenceImage.cs | 53 ++++++++++++++++++- Assets/Scripts/SceneSettings.cs | 27 ++++++++++ Assets/Scripts/Util/ImageUtils.cs | 21 +++++++- 4 files changed, 106 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/GUI/LoadBackgroundImageButton.cs b/Assets/Scripts/GUI/LoadBackgroundImageButton.cs index d5c0e46b85..4998b7e65f 100644 --- a/Assets/Scripts/GUI/LoadBackgroundImageButton.cs +++ b/Assets/Scripts/GUI/LoadBackgroundImageButton.cs @@ -47,7 +47,14 @@ override protected void OnButtonPressed() { return; } - SceneSettings.m_Instance.LoadCustomSkybox(ReferenceImage.FileName); + if (ReferenceImage.NotLoaded) + { + // Load-on-demand. + ReferenceImage.SynchronousLoad(); + } + + + SceneSettings.m_Instance.LoadCustomSkyboxFromCache(ReferenceImage.FilePath); } override public void ResetState() diff --git a/Assets/Scripts/ReferenceImage.cs b/Assets/Scripts/ReferenceImage.cs index 75afa786fe..251e3bdf5c 100644 --- a/Assets/Scripts/ReferenceImage.cs +++ b/Assets/Scripts/ReferenceImage.cs @@ -344,6 +344,14 @@ public bool RequestLoad(bool allowMainThread = false) // TODO Move into the async code path? var importer = new RuntimeSVGImporter(); var tex = importer.ImportAsTexture(FilePath); + + if (!ValidateDimensions(tex.width, tex.height, App.PlatformConfig.ReferenceImagesMaxDimension)) + { + m_State = ImageState.ErrorImageTooLarge; + Object.Destroy(tex); + return true; + } + ImageCache.SaveImageCache(tex, FilePath); m_ImageAspect = (float)tex.width / tex.height; int resizeLimit = App.PlatformConfig.ReferenceImagesResizeDimension; @@ -370,6 +378,14 @@ public bool RequestLoad(bool allowMainThread = false) RadianceHDRTexture hdr = new RadianceHDRTexture(fileData); Texture2D tex = new Texture2D(2, 2, TextureFormat.RGB24, false); tex = hdr.texture; + + if (!ValidateDimensions(tex.width, tex.height, App.PlatformConfig.ReferenceImagesMaxDimension)) + { + m_State = ImageState.ErrorImageTooLarge; + Object.Destroy(tex); + return true; + } + ImageCache.SaveImageCache(tex, FilePath); m_ImageAspect = (float)tex.width / tex.height; int resizeLimit = App.PlatformConfig.ReferenceImagesResizeDimension; @@ -495,6 +511,14 @@ IEnumerator RequestLoadCoroutineMainThread() // from WWW.LoadImageIntoTexture Texture2D inTex = new Texture2D(2, 2, TextureFormat.RGBA32, true); loader.LoadImageIntoTexture(inTex); + + if (!ValidateDimensions(inTex.width, inTex.height, App.PlatformConfig.ReferenceImagesMaxDimension)) + { + m_State = ImageState.ErrorImageTooLarge; + Object.Destroy(inTex); + yield break; + } + DownsizeTexture(inTex, ref m_Icon, ReferenceImageCatalog.MAX_ICON_TEX_DIMENSION); m_Icon.wrapMode = TextureWrapMode.Clamp; m_ImageAspect = (float)inTex.width / inTex.height; @@ -548,6 +572,18 @@ IEnumerable RequestLoadCoroutine() if (imageLoad != null) { ControllerConsoleScript.m_Instance.AddNewLine(imageLoad.Message, true); + if (imageLoad.imageLoadErrorCode == ImageLoadError.ImageLoadErrorCode.ImageTooLargeError) + { + m_State = ImageState.ErrorImageTooLarge; + } + else + { + m_State = ImageState.Error; + } + + reader = null; + yield break; + } } @@ -578,8 +614,6 @@ IEnumerable RequestLoadCoroutine() else { // Problem reading the file? - // images with state ImageState.Error display a generic error message 'Image failed to load' when hovering over them in the reference panel - // TODO: use more specific error messages (e.g "Too large dimensions", "Unknown format") that are set in ImageUtils.cs? (that is called by ThreadedImageReader.cs) m_State = ImageState.Error; reader = null; yield break; @@ -595,6 +629,21 @@ private bool ValidateFileSize() return info.Length <= App.PlatformConfig.ReferenceImagesMaxFileSize; } + private bool ValidateDimensions(int imageWidth, int imageHeight, int maxDimension) + { + + // Cast to long as maxDimension is big enough on desktop to overflow + if (imageWidth * imageHeight > ((long)maxDimension * (long)maxDimension)) + { + return false; + } + else + { + return true; + } + + } + public string GetExportName() { return Path.GetFileNameWithoutExtension(FileName); diff --git a/Assets/Scripts/SceneSettings.cs b/Assets/Scripts/SceneSettings.cs index 7a4bdfc615..cf9b37716d 100644 --- a/Assets/Scripts/SceneSettings.cs +++ b/Assets/Scripts/SceneSettings.cs @@ -250,6 +250,33 @@ public void LoadCustomSkybox(string filename) } } + // note: this takes in the full file path, instead of just the name + public void LoadCustomSkyboxFromCache(string filepath) + { + Texture2D tex = ImageCache.LoadImageCache(filepath); + + if (tex == null) + { + LoadCustomSkybox(Path.GetFileName(filepath)); + } + else + { + float aspectRatio = tex.width / tex.height; + if (aspectRatio > 1.5) + { + m_CustomSkyboxMaterial = Resources.Load("Environments/CustomSkybox"); + } + else + { + m_CustomSkyboxMaterial = Resources.Load("Environments/CustomStereoSkybox"); + } + m_CustomSkyboxMaterial.mainTexture = tex; + m_CustomSkyboxMaterial.SetColor("_Tint", Color.gray); + RenderSettings.skybox = m_CustomSkyboxMaterial; + RenderSettings.ambientMode = AmbientMode.Skybox; + } + } + public Quaternion GradientOrientation { get { return m_GradientSkew; } diff --git a/Assets/Scripts/Util/ImageUtils.cs b/Assets/Scripts/Util/ImageUtils.cs index 926e8459fb..6fa81a9bf7 100644 --- a/Assets/Scripts/Util/ImageUtils.cs +++ b/Assets/Scripts/Util/ImageUtils.cs @@ -20,8 +20,22 @@ namespace TiltBrush { + + + public class ImageLoadError : Exception { + + public enum ImageLoadErrorCode + { + // This is the default one; errors like unknown format, corruption, etc. + ImageGenericError, + // too large dimensions + ImageTooLargeError + } + + public ImageLoadErrorCode imageLoadErrorCode = ImageLoadErrorCode.ImageGenericError; + public ImageLoadError(string message) : base(message) { } public ImageLoadError(string fmt, params System.Object[] args) : base(string.Format(fmt, args)) @@ -31,6 +45,11 @@ public ImageLoadError(Exception inner, string fmt, params System.Object[] args) : base(string.Format(fmt, args), inner) { } + + public ImageLoadError(string message, ImageLoadErrorCode imageLoadErrorCode) : base(message) + { + this.imageLoadErrorCode = imageLoadErrorCode; + } } static public class ImageUtils @@ -92,7 +111,7 @@ static public void ValidateDimensions(byte[] data, int maxDimension) { throw new ImageLoadError( String.Format("Image dimensions {0}x{1} are greater than max dimensions of {2}x{2}!", - imageWidth, imageHeight, maxDimension)); + imageWidth, imageHeight, maxDimension), ImageLoadError.ImageLoadErrorCode.ImageTooLargeError); } } From f46d55e14df0724bb14cf6281ffbb607158b740c Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Sat, 6 Jul 2024 21:43:07 +0300 Subject: [PATCH 12/38] Always run "Free Disk Space" on all platforms (#734) --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa941a9470..e22b9087cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -259,8 +259,7 @@ jobs: - name: Set masking run: echo "::add-mask::DoNotStealThis1" - name: Free extra space - # This takes several minutes, so we only do it where required. As of 12/10/2023, this increases free space from 18GB to 41GB - if: matrix.targetPlatform == 'Android' || matrix.targetPlatform == 'StandaloneWindows64' || matrix.targetPlatform == 'StandaloneLinux64' + # As of 06/07/2024, this increases free space from 21GB to 38GB run: | echo "Initial free space" df -h / From 567882884f5635617fc2e214d7e1e8409bcb236a Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Mon, 8 Jul 2024 07:47:47 +0100 Subject: [PATCH 13/38] Disable boundary when passthrough is active (#735) --- Assets/Plugins/Android/AndroidManifest.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 179339006b..0b84c975b1 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -22,4 +22,7 @@ + From f30c440ccf70cb81a29910eecdc08aaeb3bc8c6c Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Tue, 9 Jul 2024 09:00:21 +0300 Subject: [PATCH 14/38] Revert "Run ovr-platform-util on Linux instead of Mac (#727)" (#738) This reverts commit 5a50f048cd0c3dbd555815ea04c2719275fdc3e0. While it appears to be fully functional, it turns out that the Linux version doesn't handle the --age-group parameter correctly. Until this is resolved, revert to Mac --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e22b9087cc..e7a0cc2725 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1064,7 +1064,7 @@ jobs: publish_oculus_quest: name: Publish Oculus Quest 2+ Release needs: [configuration, build] - runs-on: ubuntu-latest + runs-on: macos-latest # the ovr-platform-util tool is only available for Mac and Windows if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -1090,7 +1090,7 @@ jobs: cd releases unzip symbols.zip - curl -L 'https://www.oculus.com/download_app/?id=5159709737372459' -o ovr-platform-util + curl -L 'https://www.oculus.com/download_app/?id=1462426033810370' -o ovr-platform-util chmod 755 ovr-platform-util if [ "$PRERELEASE" == "false" ] @@ -1104,7 +1104,7 @@ jobs: publish_oculus_quest1: name: Publish Oculus Quest 1 Release needs: [configuration, build] - runs-on: ubuntu-latest + runs-on: macos-latest # the ovr-platform-util tool is only available for Mac and Windows if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -1130,7 +1130,7 @@ jobs: cd releases1 unzip symbols.zip - curl -L 'https://www.oculus.com/download_app/?id=5159709737372459' -o ovr-platform-util + curl -L 'https://www.oculus.com/download_app/?id=1462426033810370' -o ovr-platform-util chmod 755 ovr-platform-util if [ "$PRERELEASE" == "false" ] @@ -1144,7 +1144,7 @@ jobs: publish_oculus_rift: name: Publish Oculus Rift Release needs: [configuration, build] - runs-on: ubuntu-latest + runs-on: macos-latest # the ovr-platform-util tool is only available for Mac and Windows if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -1168,7 +1168,7 @@ jobs: mv build_windows_rift/StandaloneWindows64/ releases/OpenBrush_Rift_$VERSION/ cd releases zip -r OpenBrush_Rift_$VERSION.zip OpenBrush_Rift_$VERSION/ - curl -L 'https://www.oculus.com/download_app/?id=5159709737372459' -o ovr-platform-util + curl -L 'https://www.oculus.com/download_app/?id=1462426033810370' -o ovr-platform-util chmod 755 ovr-platform-util if [ "$PRERELEASE" == "false" ] From 97b3680210295052cbc9b13e79a9413c78856c22 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Tue, 9 Jul 2024 08:39:01 +0100 Subject: [PATCH 15/38] Fix/quest sdk no boundary (#737) * Update com.meta.xr.sdk.core to v66 * Remove hardcoded manifest entry * Logic for selective manifest entry * A second go at Unity deciding what it wants to modify * Correct arguments * Exclude com.meta.xr.sdk.core from MacOS builds --- .github/workflows/build.yml | 3 +- Assets/Editor/BuildTiltBrushPostProcess.cs | 13 +++++ Assets/Oculus/OculusProjectConfig.asset | 7 +-- Assets/Plugins/Android/AndroidManifest.xml | 3 -- .../Settings/Open XR Package Settings.asset | 51 +++++++++++++++---- Packages/manifest.json | 2 +- Packages/packages-lock.json | 4 +- 7 files changed, 63 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7a0cc2725..4d8a5c8dcc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -205,6 +205,7 @@ jobs: targetPlatform: StandaloneOSX vrsdk: Monoscopic cache: MacOS + packages_to_remove: com.meta.xr.sdk.core - name: Android OpenXR targetPlatform: Android @@ -228,7 +229,7 @@ jobs: cache: Android_Vulkan extraoptions: -btb-il2cpp versionSuffix: 1 - extra_defines: OCULUS_SUPPORTED USE_QUEST_PACKAGE_NAME + extra_defines: OCULUS_SUPPORTED USE_QUEST_PACKAGE_NAME ENABLE_CONTEXTUAL_BOUNDARYLESS_APP - name: Android Pico targetPlatform: Android diff --git a/Assets/Editor/BuildTiltBrushPostProcess.cs b/Assets/Editor/BuildTiltBrushPostProcess.cs index 56d39c32a5..780f0c2dad 100644 --- a/Assets/Editor/BuildTiltBrushPostProcess.cs +++ b/Assets/Editor/BuildTiltBrushPostProcess.cs @@ -69,6 +69,19 @@ public void OnPostGenerateGradleAndroidProject(string path) ); #endif +#if ENABLE_CONTEXTUAL_BOUNDARYLESS_APP + UnityEngine.Debug.Log("Add com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP"); + AddOrRemoveTag(doc, + androidNamespaceURI, + "/manifest", + "uses-feature", + "com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP", + true, + true, + "required", "true" + ); +#endif + #if FORCE_HEADTRACKING UnityEngine.Debug.Log("Add android.hardware.vr.headtracking"); AddOrRemoveTag(doc, diff --git a/Assets/Oculus/OculusProjectConfig.asset b/Assets/Oculus/OculusProjectConfig.asset index 00dffa2972..5390d56858 100644 --- a/Assets/Oculus/OculusProjectConfig.asset +++ b/Assets/Oculus/OculusProjectConfig.asset @@ -17,7 +17,6 @@ MonoBehaviour: handTrackingSupport: 0 handTrackingFrequency: 0 handTrackingVersion: 0 - multimodalHandsControllersSupport: 0 anchorSupport: 1 sharedAnchorSupport: 1 renderModelSupport: 0 @@ -27,10 +26,12 @@ MonoBehaviour: eyeTrackingSupport: 0 virtualKeyboardSupport: 0 sceneSupport: 1 + boundaryVisibilitySupport: 0 disableBackups: 0 enableNSCConfig: 0 securityXmlPath: skipUnneededShaders: 0 + enableIL2CPPLTO: 0 focusAware: 1 requiresSystemKeyboard: 0 experimentalFeaturesEnabled: 0 @@ -40,5 +41,5 @@ MonoBehaviour: systemSplashScreen: {fileID: 0} systemSplashScreenType: 0 _systemLoadingScreenBackground: 0 - ovrPluginMd5Win64: c48997b21953ed048a386c4b9048abd8 - ovrPluginMd5Android: 65acd2172a25fc3c956f0376ec0704c4 + ovrPluginMd5Win64: 33685b25e1b4f2b6c1632069bc88783632496c19eda9b55641c321c119bdf68c + ovrPluginMd5Android: b9e59102e373e2d7a97cd1dbe38cac15e89ec54c0a32b98491b3d09d93ccda7d diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 0b84c975b1..179339006b 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -22,7 +22,4 @@ - diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset index 524f77734b..b3d0d591ec 100644 --- a/Assets/XR/Settings/Open XR Package Settings.asset +++ b/Assets/XR/Settings/Open XR Package Settings.asset @@ -239,6 +239,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-6188679329620277984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81954520b8bbd2f458104fe69f5a7680, type: 3} + m_Name: MetaXRSpaceWarp Android + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta XR Space Warp + version: 1.0.0 + featureIdInternal: com.meta.openxr.feature.spacewarp + openxrExtensionStrings: XR_FB_space_warp + company: Meta + priority: 0 + required: 0 --- !u!114 &-5585190116095795567 MonoBehaviour: m_ObjectHideFlags: 0 @@ -419,12 +439,17 @@ MonoBehaviour: XR_FB_swapchain_update_state_vulkan XR_FB_composition_layer_alpha_blend XR_KHR_composition_layer_depth XR_KHR_composition_layer_cylinder XR_KHR_composition_layer_cube XR_KHR_composition_layer_equirect2 XR_KHR_convert_timespec_time XR_KHR_visibility_mask XR_FB_render_model XR_FB_spatial_entity - XR_FB_spatial_entity_query XR_FB_spatial_entity_storage XR_META_performance_metrics - XR_FB_scene XR_FB_spatial_entity_container XR_FB_scene_capture XR_FB_face_tracking - XR_FB_eye_tracking XR_FB_keyboard_tracking XR_FB_passthrough XR_FB_triangle_mesh + XR_FB_spatial_entity_user XR_FB_spatial_entity_query XR_FB_spatial_entity_storage + XR_FB_spatial_entity_storage_batch XR_META_spatial_entity_mesh XR_META_performance_metrics + XR_FB_spatial_entity_sharing XR_FB_scene XR_FB_spatial_entity_container XR_FB_scene_capture + XR_FB_face_tracking XR_FB_face_tracking2 XR_FB_eye_tracking XR_FB_eye_tracking_social + XR_FB_body_tracking XR_META_body_tracking_full_body XR_META_body_tracking_calibration + XR_META_body_tracking_fidelity XR_FB_keyboard_tracking XR_FB_passthrough XR_FB_triangle_mesh XR_FB_passthrough_keyboard_hands XR_OCULUS_audio_device_guid XR_FB_common_events - XR_FB_space_warp XR_FB_hand_tracking_capsules XR_FB_hand_tracking_mesh XR_FB_hand_tracking_aim - XR_FB_touch_controller_pro XR_FB_touch_controller_proximity ' + XR_FB_hand_tracking_capsules XR_FB_hand_tracking_mesh XR_FB_hand_tracking_aim + XR_FB_touch_controller_pro XR_FB_touch_controller_proximity XR_FB_composition_layer_depth_test + XR_FB_haptic_amplitude_envelope XR_FB_haptic_pcm XR_META_spatial_entity_persistence + XR_META_spatial_entity_discovery XR_META_boundary_visibility XR_META_headset_id ' company: Meta priority: 0 required: 0 @@ -592,6 +617,7 @@ MonoBehaviour: - {fileID: 7875633773414566808} - {fileID: 3409825189635461668} - {fileID: -7871932882014305355} + - {fileID: -6188679329620277984} - {fileID: 6457187213107907505} - {fileID: -1562417761177608366} - {fileID: -568313750252970699} @@ -627,12 +653,17 @@ MonoBehaviour: XR_FB_swapchain_update_state_vulkan XR_FB_composition_layer_alpha_blend XR_KHR_composition_layer_depth XR_KHR_composition_layer_cylinder XR_KHR_composition_layer_cube XR_KHR_composition_layer_equirect2 XR_KHR_convert_timespec_time XR_KHR_visibility_mask XR_FB_render_model XR_FB_spatial_entity - XR_FB_spatial_entity_query XR_FB_spatial_entity_storage XR_META_performance_metrics - XR_FB_scene XR_FB_spatial_entity_container XR_FB_scene_capture XR_FB_face_tracking - XR_FB_eye_tracking XR_FB_keyboard_tracking XR_FB_passthrough XR_FB_triangle_mesh + XR_FB_spatial_entity_user XR_FB_spatial_entity_query XR_FB_spatial_entity_storage + XR_FB_spatial_entity_storage_batch XR_META_spatial_entity_mesh XR_META_performance_metrics + XR_FB_spatial_entity_sharing XR_FB_scene XR_FB_spatial_entity_container XR_FB_scene_capture + XR_FB_face_tracking XR_FB_face_tracking2 XR_FB_eye_tracking XR_FB_eye_tracking_social + XR_FB_body_tracking XR_META_body_tracking_full_body XR_META_body_tracking_calibration + XR_META_body_tracking_fidelity XR_FB_keyboard_tracking XR_FB_passthrough XR_FB_triangle_mesh XR_FB_passthrough_keyboard_hands XR_OCULUS_audio_device_guid XR_FB_common_events - XR_FB_space_warp XR_FB_hand_tracking_capsules XR_FB_hand_tracking_mesh XR_FB_hand_tracking_aim - XR_FB_touch_controller_pro XR_FB_touch_controller_proximity ' + XR_FB_hand_tracking_capsules XR_FB_hand_tracking_mesh XR_FB_hand_tracking_aim + XR_FB_touch_controller_pro XR_FB_touch_controller_proximity XR_FB_composition_layer_depth_test + XR_FB_haptic_amplitude_envelope XR_FB_haptic_pcm XR_META_spatial_entity_persistence + XR_META_spatial_entity_discovery XR_META_boundary_visibility XR_META_headset_id ' company: Meta priority: 0 required: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 32570762f5..daa299657b 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { "com.ixxy.unitysymmetry": "https://github.com/IxxyXR/unity-symmetry.git?nocache=7#upm", - "com.meta.xr.sdk.core": "https://github.com/icosa-mirror/com.meta.xr.sdk.core.git#60.0.0-openbrush", + "com.meta.xr.sdk.core": "https://github.com/icosa-mirror/com.meta.xr.sdk.core.git#66.0.0-openbrush", "com.meta.xr.sdk.platform": "60.0.0", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8d2ce749e8..d86bace3d6 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -14,11 +14,11 @@ "hash": "4f87195d54ccefe076678cb83a296b3f0428fc53" }, "com.meta.xr.sdk.core": { - "version": "https://github.com/icosa-mirror/com.meta.xr.sdk.core.git#60.0.0-openbrush", + "version": "https://github.com/icosa-mirror/com.meta.xr.sdk.core.git#66.0.0-openbrush", "depth": 0, "source": "git", "dependencies": {}, - "hash": "0feb415034b094e4622efa4e5b3f2c87ded2d2f3" + "hash": "25b32e5b6dacc484be3eed179ea3d2d21d55b9d1" }, "com.meta.xr.sdk.platform": { "version": "60.0.0", From 41a08b6a70216c25c9cfcd0ad5b6a864985d4fb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 08:48:19 +0300 Subject: [PATCH 16/38] Bump actions/setup-dotnet from 4.0.0 to 4.0.1 (#740) Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/actions/setup-dotnet/releases) - [Commits](https://github.com/actions/setup-dotnet/compare/v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: actions/setup-dotnet dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pre-commit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 4a5f64a602..33694e06ff 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v5.1.0 with: python-version: '3.12' - - uses: actions/setup-dotnet@v4.0.0 + - uses: actions/setup-dotnet@v4.0.1 with: dotnet-version: '8.0.x' - name: Install pre-commit From 3649736543ad00fb745cbf29a38b50c58dec9fd3 Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Wed, 10 Jul 2024 09:57:36 +0300 Subject: [PATCH 17/38] Fake version 2.7.50 From e46762103979411e769c72b14e754ce3b5a81d53 Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Wed, 10 Jul 2024 09:57:39 +0300 Subject: [PATCH 18/38] Fake version 2.7.51 From 0982c23b8d548af9e9e7835b7e2bea68ddc40d42 Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Wed, 10 Jul 2024 09:57:41 +0300 Subject: [PATCH 19/38] Fake version 2.7.52 From 2f83e395f42d844efa9572e6b690676b8a912d5b Mon Sep 17 00:00:00 2001 From: Mike Miller Date: Wed, 10 Jul 2024 09:57:43 +0300 Subject: [PATCH 20/38] Fake version 2.7.53 From fe8a3ee2bed63596ded308f1edebbd31c59b0cee Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Wed, 10 Jul 2024 12:49:11 +0300 Subject: [PATCH 21/38] Move the config.vdf secret (for Steam) to an Organization level secret (#741) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d8a5c8dcc..fd7ac27ad3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -945,7 +945,7 @@ jobs: CHANNEL: beta - name: Update steam login secret run: | - base64 -i /home/runner/Steam/config/config.vdf | gh secret set -R icosa-foundation/open-brush STEAM_CONFIG_VDF + base64 -i /home/runner/Steam/config/config.vdf | gh secret set --visibility all --org icosa-foundation STEAM_CONFIG_VDF md5sum /home/runner/Steam/config/config.vdf env: GITHUB_TOKEN: ${{ secrets.SECRET_UPDATER_PAT }} From ffab94f1970105cff20c29e43f510c5dbb9020c3 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Wed, 10 Jul 2024 11:46:51 +0100 Subject: [PATCH 22/38] Rename Quest Boundary Property (#739) Rename to match the official property name --- .github/workflows/build.yml | 2 +- Assets/Editor/BuildTiltBrushPostProcess.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd7ac27ad3..17b25b2e10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -229,7 +229,7 @@ jobs: cache: Android_Vulkan extraoptions: -btb-il2cpp versionSuffix: 1 - extra_defines: OCULUS_SUPPORTED USE_QUEST_PACKAGE_NAME ENABLE_CONTEXTUAL_BOUNDARYLESS_APP + extra_defines: OCULUS_SUPPORTED USE_QUEST_PACKAGE_NAME ENABLE_BOUNDARYLESS_APP - name: Android Pico targetPlatform: Android diff --git a/Assets/Editor/BuildTiltBrushPostProcess.cs b/Assets/Editor/BuildTiltBrushPostProcess.cs index 780f0c2dad..b674298e86 100644 --- a/Assets/Editor/BuildTiltBrushPostProcess.cs +++ b/Assets/Editor/BuildTiltBrushPostProcess.cs @@ -69,13 +69,13 @@ public void OnPostGenerateGradleAndroidProject(string path) ); #endif -#if ENABLE_CONTEXTUAL_BOUNDARYLESS_APP - UnityEngine.Debug.Log("Add com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP"); +#if ENABLE_BOUNDARYLESS_APP + UnityEngine.Debug.Log("Add com.oculus.feature.BOUNDARYLESS_APP"); AddOrRemoveTag(doc, androidNamespaceURI, "/manifest", "uses-feature", - "com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP", + "com.oculus.feature.BOUNDARYLESS_APP", true, true, "required", "true" From 840a7c3f95188c68fc916a4adf1de415dbcc84fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 08:55:06 +0300 Subject: [PATCH 23/38] Bump actions/setup-python from 5.1.0 to 5.1.1 (#742) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.1.0...v5.1.1) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pre-commit.yml | 2 +- .github/workflows/third_party_notices.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 33694e06ff..3e5caca4a2 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5.1.0 + - uses: actions/setup-python@v5.1.1 with: python-version: '3.12' - uses: actions/setup-dotnet@v4.0.1 diff --git a/.github/workflows/third_party_notices.yml b/.github/workflows/third_party_notices.yml index 24f63715d7..f60fe8c2d2 100644 --- a/.github/workflows/third_party_notices.yml +++ b/.github/workflows/third_party_notices.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5.1.0 + - uses: actions/setup-python@v5.1.1 with: python-version: '3.12' - name: Run the generator From 655f3a347fe69675e57038e3ba5c5b2a3dac293f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 09:19:56 +0300 Subject: [PATCH 24/38] Bump rexml from 3.2.9 to 3.3.2 and update fastlane (#748) Bump rexml from 3.2.9 to 3.3.2 in the bundler group across 1 directory Bumps the bundler group with 1 update in the / directory: [rexml](https://github.com/ruby/rexml). Updates `rexml` from 3.2.9 to 3.3.2 - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.9...v3.3.2) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect dependency-group: bundler ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e9157162bf..5e126b0f7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.3.1) - fastlane (2.221.1) + fastlane (2.222.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -184,7 +184,7 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.9) + rexml (3.3.2) strscan rouge (2.0.7) ruby2_keywords (0.0.5) @@ -211,13 +211,12 @@ GEM uber (0.1.0) unicode-display_width (2.5.0) word_wrap (1.0.0) - xcodeproj (1.24.0) + xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) - rexml (~> 3.2.4) xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1) From 71cf74ceba84414772ceb5aa0f27acf5b4196823 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 13:38:43 +0300 Subject: [PATCH 25/38] Bump mikepenz/release-changelog-builder-action from 4 to 5 (#747) Bumps [mikepenz/release-changelog-builder-action](https://github.com/mikepenz/release-changelog-builder-action) from 4 to 5. - [Release notes](https://github.com/mikepenz/release-changelog-builder-action/releases) - [Commits](https://github.com/mikepenz/release-changelog-builder-action/compare/v4...v5) --- updated-dependencies: - dependency-name: mikepenz/release-changelog-builder-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mike Miller <87874+mikeage@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17b25b2e10..ccd06a60cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -695,7 +695,7 @@ jobs: steps: - name: "Build Changelog" id: changelog - uses: mikepenz/release-changelog-builder-action@v4 + uses: mikepenz/release-changelog-builder-action@v5 with: fromTag: "${{ needs.configuration.outputs.previousrelease }}" toTag: "${{ needs.configuration.outputs.currentrelease }}" @@ -818,7 +818,7 @@ jobs: steps: - name: "Build Changelog" id: changelog - uses: mikepenz/release-changelog-builder-action@v4 + uses: mikepenz/release-changelog-builder-action@v5 with: fromTag: "${{ needs.configuration.outputs.previousfullrelease }}" toTag: "${{ needs.configuration.outputs.currentrelease }}" From 6783cf662109b2628ab0a5e3dcab39192556e6f7 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Tue, 30 Jul 2024 16:07:39 +0100 Subject: [PATCH 26/38] Fix input system errors when running in the editor (#745) We shouldn't have project wide assets set --- ProjectSettings/EditorBuildSettings.asset | 2 -- 1 file changed, 2 deletions(-) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8726971b51..aa34b37606 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -20,8 +20,6 @@ EditorBuildSettings: type: 2} com.unity.input.settings: {fileID: 11400000, guid: 62987a061b20ae345a45e835010db90d, type: 2} - com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 482f183e0a6aac94da9c4a526325285e, - type: 3} com.unity.localization.settings: {fileID: 11400000, guid: feef587f0ac641c4ab7d9e44e7eea888, type: 2} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 07092d12b03adbd49b1ade5f5742e72e, From a029f0c07205e24746eb69ed9abfa5a92d4b7f6f Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Tue, 30 Jul 2024 20:29:26 +0100 Subject: [PATCH 27/38] Shift the preview down so it doesn't overlap the hint (#750) --- Assets/Scenes/Main.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 5996424c73..a244127cfd 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -2067,7 +2067,7 @@ Transform: m_GameObject: {fileID: 73820440} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} - m_LocalPosition: {x: -0.4, y: 0, z: -0.4} + m_LocalPosition: {x: -0.4, y: 0, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: From c59f696e80d811dc567c011cd3ed569af7e92de2 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Wed, 31 Jul 2024 10:19:53 +0100 Subject: [PATCH 28/38] Fix background image seams by bypassing cache for now (#749) Disable the cache for now --- Assets/Scripts/GUI/LoadBackgroundImageButton.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/GUI/LoadBackgroundImageButton.cs b/Assets/Scripts/GUI/LoadBackgroundImageButton.cs index 4998b7e65f..05aa19eaa7 100644 --- a/Assets/Scripts/GUI/LoadBackgroundImageButton.cs +++ b/Assets/Scripts/GUI/LoadBackgroundImageButton.cs @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System.IO; using UnityEngine; using UnityEngine.Localization; @@ -54,7 +55,10 @@ override protected void OnButtonPressed() } - SceneSettings.m_Instance.LoadCustomSkyboxFromCache(ReferenceImage.FilePath); + // TODO we had problems with seams when using the cached image. + // Likely related to mipmaps but I couldn't track down the cause. + // SceneSettings.m_Instance.LoadCustomSkyboxFromCache(ReferenceImage.FilePath); + SceneSettings.m_Instance.LoadCustomSkybox(Path.GetFileName(ReferenceImage.FilePath)); } override public void ResetState() From 362cf51e84cab3205cec7ed2e7e05dd8aa6e9c0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 05:45:45 +0300 Subject: [PATCH 29/38] Bump rexml from 3.3.2 to 3.3.3 in the bundler group across 1 directory (#752) Bumps the bundler group with 1 update in the / directory: [rexml](https://github.com/ruby/rexml). Updates `rexml` from 3.3.2 to 3.3.3 - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.2...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect dependency-group: bundler ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5e126b0f7d..ab4078e0aa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,7 +184,7 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.3.2) + rexml (3.3.3) strscan rouge (2.0.7) ruby2_keywords (0.0.5) From 8b010d3fe92872ff36e0794785e3a73a435a2e7f Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:18:21 +0300 Subject: [PATCH 30/38] Remove more unneeded files to free more disk space (#753) Also update measurements as of Aug 2 2024 --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ccd06a60cd..8ff1686f9b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -260,27 +260,27 @@ jobs: - name: Set masking run: echo "::add-mask::DoNotStealThis1" - name: Free extra space - # As of 06/07/2024, this increases free space from 21GB to 38GB + # As of 02/08/2024, this increases free space from 21GB to 47GB run: | echo "Initial free space" df -h / echo "Removing all pre-loaded docker images" - docker rmi $(docker image ls -aq) # Removes ~6GB + docker rmi $(docker image ls -aq) # Removes ~3GB df -h / echo "Listing 100 largest packages" dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -rn | head -n 100 echo "Removing unneeded large packages" sudo apt update - sudo apt remove -y '^ghc-.*' '^dotnet-.*' azure-cli powershell google-chrome-stable firefox microsoft-edge-stable 'mongodb-*' 'mysql-*' 'mariadb-*' 'temurin-*' 'openjdk-*' default-jre-headless # Removes ~7GB # Adding 'google-cloud-*' removes another 750MB but takes about a minute; not worth it + sudo apt remove -y '^ghc-.*' '^dotnet-.*' azure-cli powershell google-chrome-stable firefox microsoft-edge-stable 'mongodb-*' 'mysql-*' 'mariadb-*' 'temurin-*' 'openjdk-*' default-jre-headless mono-devel libgl1-mesa-dri # Removes ~6GB sudo apt autoremove -y sudo apt clean df -h / - echo "Listing 100 largest remaining packages" - dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -rn | head -n 100 - echo "Removing remaining large directories" + echo "Removing Android" + sudo rm -rf /usr/local/lib/android # Removes ~9GB df -h / + echo "Removing remaining large directories" rm -rf /usr/share/dotnet/ # Removes ~1GB - rm -rf "$AGENT_TOOLSDIRECTORY" # Removes ~6GB + rm -rf "$AGENT_TOOLSDIRECTORY" # Removes ~7GB echo "Disk space after cleanup" df -h / From 6fd685f1416207ebf92b3cd2345538bbc804b888 Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Fri, 2 Aug 2024 09:16:31 +0300 Subject: [PATCH 31/38] Run the build on 'main' periodically to keep the caches alive (#754) Notes from Github: * In a public repository, scheduled workflows are automatically disabled when no repository activity has occurred in 60 days. For information on re-enabling a disabled workflow, see "Disabling and enabling a workflow." * When the last user to commit to the cron schedule of a workflow is removed from the organization, the scheduled workflow will be disabled. If a user with write permissions to the repository makes a commit that changes the cron schedule, the scheduled workflow will be reactivated. Note that, in this situation, the workflow is not reactivated by any change to the workflow file; you must alter the cron value and commit this change. --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8ff1686f9b..75479a7597 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,8 @@ on: # yamllint disable-line rule:truthy - "**" tags: - "v*" + schedule: + - cron: "34 19 * * sat" # Weekly, Saturday at 19:34 UTC env: UNITY_VERSION: "2022.3.34f1" @@ -17,6 +19,7 @@ env: jobs: configuration: if: | + (github.event_name == 'schedule') || (github.event_name == 'pull_request') || ( github.event_name == 'push' && From cdaaa811914e851fa4be87a62c4eb780704047f7 Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:23:29 +0300 Subject: [PATCH 32/38] Fix missing version in DMG, Signed .app, and Steam upload (#755) --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75479a7597..da4c2909e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -553,7 +553,7 @@ jobs: signmacos: name: Sign the MacOS .app - needs: [build] + needs: [configuration, build] if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -631,7 +631,7 @@ jobs: createdmg: name: Create and Notarize DMG - needs: [signmacos] + needs: [configuration, signmacos] if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -888,7 +888,7 @@ jobs: publish_steam: name: Publish Steam Release - needs: [build, signmacos] + needs: [configuration, build, signmacos] if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && From 37ec520ca3c604da0379cdd68125bd8144b4eedb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:28:18 +0300 Subject: [PATCH 33/38] Bump rexml from 3.3.3 to 3.3.6 in the bundler group across 1 directory (#758) Bumps the bundler group with 1 update in the / directory: [rexml](https://github.com/ruby/rexml). Updates `rexml` from 3.3.3 to 3.3.6 - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.3...v3.3.6) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect dependency-group: bundler ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ab4078e0aa..dcc162e489 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,7 +184,7 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.3.3) + rexml (3.3.6) strscan rouge (2.0.7) ruby2_keywords (0.0.5) From 2ee490f12cfcd42af2d1f2b8d73008668c6cb17c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 08:59:27 +0300 Subject: [PATCH 34/38] Bump actions/setup-python from 5.1.1 to 5.2.0 (#759) Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.1.1...v5.2.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/pre-commit.yml | 2 +- .github/workflows/third_party_notices.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 3e5caca4a2..72f0c4f5b1 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5.1.1 + - uses: actions/setup-python@v5.2.0 with: python-version: '3.12' - uses: actions/setup-dotnet@v4.0.1 diff --git a/.github/workflows/third_party_notices.yml b/.github/workflows/third_party_notices.yml index f60fe8c2d2..a5958d92db 100644 --- a/.github/workflows/third_party_notices.yml +++ b/.github/workflows/third_party_notices.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v5.1.1 + - uses: actions/setup-python@v5.2.0 with: python-version: '3.12' - name: Run the generator From 709a3586ed282c5d841b146cbe5b6a26b23da34a Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Mon, 9 Sep 2024 19:19:59 +0100 Subject: [PATCH 35/38] Fix contextual boundary (#761) * Revert "rename to match the new property name" This reverts commit 66831bcc4a5a594fbc5fcbe76dbedb15a7b9cc38. * Enable/disable boundary when passthrough is active * Defer to oculus project * Revert "Defer to oculus project" This reverts commit 5d61e2826fa54ed3bdb6977e320ff441ab70f6b3. --- .github/workflows/build.yml | 2 +- Assets/Editor/BuildTiltBrushPostProcess.cs | 6 +++--- Assets/Scripts/PassthroughManager.cs | 8 ++++++++ Assets/Scripts/VrSdk.cs | 12 +++++++----- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da4c2909e3..9522b3ffe7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -232,7 +232,7 @@ jobs: cache: Android_Vulkan extraoptions: -btb-il2cpp versionSuffix: 1 - extra_defines: OCULUS_SUPPORTED USE_QUEST_PACKAGE_NAME ENABLE_BOUNDARYLESS_APP + extra_defines: OCULUS_SUPPORTED USE_QUEST_PACKAGE_NAME ENABLE_CONTEXTUAL_BOUNDARYLESS_APP - name: Android Pico targetPlatform: Android diff --git a/Assets/Editor/BuildTiltBrushPostProcess.cs b/Assets/Editor/BuildTiltBrushPostProcess.cs index b674298e86..780f0c2dad 100644 --- a/Assets/Editor/BuildTiltBrushPostProcess.cs +++ b/Assets/Editor/BuildTiltBrushPostProcess.cs @@ -69,13 +69,13 @@ public void OnPostGenerateGradleAndroidProject(string path) ); #endif -#if ENABLE_BOUNDARYLESS_APP - UnityEngine.Debug.Log("Add com.oculus.feature.BOUNDARYLESS_APP"); +#if ENABLE_CONTEXTUAL_BOUNDARYLESS_APP + UnityEngine.Debug.Log("Add com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP"); AddOrRemoveTag(doc, androidNamespaceURI, "/manifest", "uses-feature", - "com.oculus.feature.BOUNDARYLESS_APP", + "com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP", true, true, "required", "true" diff --git a/Assets/Scripts/PassthroughManager.cs b/Assets/Scripts/PassthroughManager.cs index 3663d5c0a6..ca61695e0e 100644 --- a/Assets/Scripts/PassthroughManager.cs +++ b/Assets/Scripts/PassthroughManager.cs @@ -23,7 +23,15 @@ void Start() #if OCULUS_SUPPORTED var passthrough = gameObject.AddComponent(); passthrough.overlayType = OVROverlay.OverlayType.Underlay; + App.VrSdk.m_OvrManager.shouldBoundaryVisibilityBeSuppressed = true; #endif // OCULUS_SUPPORTED } + + void OnDestroy() + { +#if OCULUS_SUPPORTED + App.VrSdk.m_OvrManager.shouldBoundaryVisibilityBeSuppressed = false; +#endif + } } } diff --git a/Assets/Scripts/VrSdk.cs b/Assets/Scripts/VrSdk.cs index faa874e792..16953fe571 100644 --- a/Assets/Scripts/VrSdk.cs +++ b/Assets/Scripts/VrSdk.cs @@ -93,7 +93,9 @@ public class VrSdk : MonoBehaviour // out of date for a frame when controllers change. private VrControllers m_VrControls; public VrControllers VrControls { get { return m_VrControls; } } - +#if OCULUS_SUPPORTED + [NonSerialized] public OVRManager m_OvrManager; +#endif private bool m_HasVrFocus = true; private Bounds? m_RoomBoundsAabbCached; @@ -204,10 +206,10 @@ void Awake() // ---------------------------------------------------------------------------------------- // // OculusVR // ---------------------------------------------------------------------------------------- // - OVRManager manager = gameObject.AddComponent(); - manager.trackingOriginType = OVRManager.TrackingOrigin.Stage; - manager.useRecommendedMSAALevel = false; - manager.isInsightPassthroughEnabled = true; + m_OvrManager = gameObject.AddComponent(); + m_OvrManager.trackingOriginType = OVRManager.TrackingOrigin.Stage; + m_OvrManager.useRecommendedMSAALevel = false; + m_OvrManager.isInsightPassthroughEnabled = true; // adding components to the VR Camera needed for fading view and getting controller poses. m_VrCamera.gameObject.AddComponent(); From 0c89e4c2bb6d5b8f60061d36989fce41742f06d0 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Tue, 10 Sep 2024 14:07:24 +0100 Subject: [PATCH 36/38] Disable ENABLE_CONTEXTUAL_BOUNDARYLESS_APP as it's still experimental (#762) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9522b3ffe7..42ba5398ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -232,7 +232,7 @@ jobs: cache: Android_Vulkan extraoptions: -btb-il2cpp versionSuffix: 1 - extra_defines: OCULUS_SUPPORTED USE_QUEST_PACKAGE_NAME ENABLE_CONTEXTUAL_BOUNDARYLESS_APP + extra_defines: OCULUS_SUPPORTED USE_QUEST_PACKAGE_NAME - name: Android Pico targetPlatform: Android From de64fc6431bc4826b00f2056c7b4820d0946a904 Mon Sep 17 00:00:00 2001 From: Mike Nisbet Date: Tue, 10 Sep 2024 22:11:00 +0100 Subject: [PATCH 37/38] Update README.md (#760) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3b7687d1d6..2979a01eab 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ As the original repo is archived we cannot submit PRs, so feel free to submit th ## Downloads ### Stores - [SideQuest](https://sidequestvr.com/app/2852/open-brush) -- [Oculus App Lab](https://www.oculus.com/experiences/quest/3600360710032222) +- [Meta Horizon (Quest)](https://www.oculus.com/experiences/quest/3600360710032222) - [Steam](https://store.steampowered.com/app/1634870/Open_Brush) - [Oculus Rift](https://www.oculus.com/experiences/rift/5227489953989768) - [Viveport Desktop](https://www.viveport.com/f1f3d00b-cf8a-443f-825e-4fea2dd3b005) From e14f94c881f7f55ae503406bc6fac457ef2fe0ca Mon Sep 17 00:00:00 2001 From: Mike Miller <87874+mikeage@users.noreply.github.com> Date: Wed, 11 Sep 2024 12:02:18 +0300 Subject: [PATCH 38/38] Fix fastlane build by freeing extra space (#764) Run "free extra space" when building iOS via fastlane --- .github/workflows/build.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42ba5398ed..0fd83a93fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1233,7 +1233,7 @@ jobs: publish_ios_zapbox: name: Publish Zapbox iOS needs: [configuration, build] - runs-on: macos-14 # ARM64 workers. Change this back to -latest when they get promoted + runs-on: macos-latest if: | github.event_name == 'push' && github.repository == 'icosa-foundation/open-brush' && @@ -1248,6 +1248,19 @@ jobs: Gemfile.lock fastlane + - name: Free extra space + # As of 02/08/2024, this increases free space from 21GB to 47GB + run: | + echo "Initial free space" + df -h + rm -rf "$AGENT_TOOLSDIRECTORY" + echo "Disk space after cleanup of \$AGENT_TOOLSDIRECTORY" + df -h + echo "Deleting all Xcode versions except 15.4" + find /Applications/Xcode_* -maxdepth 0 -type d ! -name 'Xcode_15.4.app' -exec rm -rf {} \; + df -h + find /Applications/Xcode* -name "*.app" -exec du -mcsh {} \; # Shows Xcode app sizes + - name: Download iOS Artifact uses: actions/download-artifact@v4 with: