diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000..ddb6ff85a3 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000000..da60e25ae2 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..80a23734cd --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,60 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.vs": true, + "**/.gitmodules": true, + "**/.vsconfig": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "Logs/": true, + "logs/": true, + "ProjectSettings/": true, + "UserSettings/": true, + "temp/": true, + "Temp/": true + }, + "dotnet.defaultSolution": "2D-Platformer-Game.sln" +} \ No newline at end of file diff --git a/Assets/Editor.meta b/Assets/Editor.meta new file mode 100644 index 0000000000..df9ed30c5c --- /dev/null +++ b/Assets/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9991120060b14804a8e19ac446904ba8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/MediationAdapterDependencies.xml b/Assets/Editor/MediationAdapterDependencies.xml new file mode 100644 index 0000000000..04c75e80a5 --- /dev/null +++ b/Assets/Editor/MediationAdapterDependencies.xml @@ -0,0 +1,20 @@ + + + + + https://unity3ddist.jfrog.io/artifactory/unity-mediation-mvn-prod-local/ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Editor/MediationAdapterDependencies.xml.meta b/Assets/Editor/MediationAdapterDependencies.xml.meta new file mode 100644 index 0000000000..a7cbed8281 --- /dev/null +++ b/Assets/Editor/MediationAdapterDependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2b29bf081a51d0946b696757b1b713e2 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas index b4ee00222b..ee5cd57194 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas @@ -31,6 +31,7 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: @@ -48,6 +49,207 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - e4381a10685b28d4f906cc686ecbc2c7: 21300000 + - d366315072065fc4891bc2f5281daca4: 21300000 + - b2d03960805e00146a93e7a607cc5f72: 21300000 + - 87e29b609bb169245a2df3d89266630c: 21300000 + - 63543f60a4c70d546a5c4a0f63a2ad29: 21300000 + - 967004704d0400c45945b1dc74fc5eb6: 21300000 + - 8fc33c704bf75524facc770a491ffd2f: 21300000 + - 7ab12a808aa8d054aaf50c2741246de0: 21300000 + - e679c4902023e7a48b2cf79741a51fda: 21300000 + - f3b094a028c28604382b41bfab29604a: 21300000 + - dfd2eca0b8de7a443a0b28c6466f55ba: 21300000 + - 591e3ea0fd60a1442bfbe969a16d4d74: 21300000 + - a53475b08393802498550588cf70ef5e: 21300000 + - 129972c0ed661da47bd600512df59822: 21300000 + - e7f298e049bf3bb41bca4bbd8ceee9ad: 21300000 + - 28b55e113ed8d2e499533bc878cf9c3e: 21300000 + - b38254315edf5904d987dbca58a71ca0: 21300000 + - 5d25d9e1de070994db63a462e89932d7: 21300000 + - d3c1e30225625c14e9bf351c35be2fd9: 21300000 + - cb80a3123f378f743841b1f9fda37c83: 21300000 + - fffa3e12c34c2ee448d46f5c9db142e6: 21300000 + - 37547022c0607c544915b3089832635d: 21300000 + - a4cfd522aaaa4ac45980e1828c8dea2c: 21300000 + - 7d008f32d5ec4f444bf86f436666060d: 21300000 + - 5b1c7342d6504e3448979307c3f6a639: 21300000 + - 2350b442f31bb1741b68a6b77d09d40b: 21300000 + - 4d25e8426524e5d43a92fe2d594e4912: 21300000 + - 28e829622ce5c974bbf154a278a2be22: 21300000 + - 190f2e72bd4df1945b2d504efccde46c: 21300000 + - 55e66892de31d424885bc2c774f07ef7: 21300000 + - 51ba71b24b0a67641b799a9e958697b0: 21300000 + - 5edee3b2ea56ae64881eacb7f58be021: 21300000 + - 80583dd2d497d144b8d2282bf2184cc2: 21300000 + - 7568b5e22ac6e1b4687bb661ac8f0d74: 21300000 + - 658639e2f4d2568479631f3a888fc691: 21300000 + - 301fc9f2a0405ee45ad84f7b550051d5: 21300000 + - 453c8803862e72b43ad3652b8fe03437: 21300000 + - 575f490323d76254ab8d5d4cd472a3ea: 21300000 + - 7dcbef0330b37354dae1c1071956813a: 21300000 + - a9f05e230fdd41b4f99ac0e0b7c4fa2b: 21300000 + - 12ea17332fa174442af48960686e1769: 21300000 + - 4b74c95301673024c9dbf47514f2cb5b: 21300000 + - 6f8b0a53ff8c9e94f9d4af829e2ad6f3: 21300000 + - c93003632dfb3f346ae28336c8748cc1: 21300000 + - ed4c6463819f7cb4b85a6a44dc35c9cf: 21300000 + - baa7eb63e6b2764408c3c44ea0b180ac: 21300000 + - 27bc49736a5db6d44b8ae392a1ee34dd: 21300000 + - 3bcc6973de396d247a99745a0c323d38: 21300000 + - e701f6d3a4296e040ad8604e7ceaad2a: 21300000 + - 1877f93426f7f3848a2d0ec5ec6ee4a1: 21300000 + - 3fc8ba344d4587942a0b607b47985569: 21300000 + - ae6184443cb4d0f439bab73e9e76df4a: 21300000 + - affa4f4470b317440b7cb5187df710ef: 21300000 + - 83fab85494452284baf4ef65fc8b0273: 21300000 + - 774282641b60d9d4daddad7c6ad7ae69: 21300000 + - 78a64664c88ec60478ced92e86dbb784: 21300000 + - fe80dd64b9b2e1647b367fe8da273bf7: 21300000 + - 19b07ba4ccec70d4ebe4ed5e538cd326: 21300000 + - eef4c8c406166bd4c848e87480efa2bd: 21300000 + - 665bd6d4ae06fea488861b4bdad2f04d: 21300000 + - 929a47e4f89792c4aa28ae41634348c3: 21300000 + - 6469e4f4bdda7e8488924cf6ef74c464: 21300000 + - 32713ff48a4e8dc42a32b9d4d19ea5fe: 21300000 + - c195730543b85df41953d682fee276b3: 21300000 + - 92fbfb056ce42c940aa543cf14a9084a: 21300000 + - 7fb83f0538f2eaf4a9c6f3b08b60cab4: 21300000 + - 46fc6025308929d4b878bfb4b81ead12: 21300000 + - 05df8025a12814d46b434681a6989133: 21300000 + - 92f985257d4b81740b246818800efccd: 21300000 + - 57585d65d25175a4b82cdcd9092545ca: 21300000 + - bce1db75cf9f0c7448eb419ad2e38c8a: 21300000 + - 0adb3b85a77225b42823314ce0caedd3: 21300000 + - 1d7a01952b6b7e4409c83ade1ead91db: 21300000 + - 0b26c4d5c6b04e940932afa1ffa8284f: 21300000 + - 1fa29ad54380226498c2250e612fec93: 21300000 + - fcec6de5f73f3b74480aa66ffac97f43: 21300000 + - 97b570f5218f6d94cadf8a8d195dd50d: 21300000 + - 9391e70638fb9084ebf61e843059fdf1: 21300000 + - ca897d165bbb9094584da008d90d3df5: 21300000 + - 41c27046edf6d694e875b5766f672a8f: 21300000 + - 69997956b171bc04495e5a4782e4669f: 21300000 + - 5f800286e4f0550478208c51d0a48d0f: 21300000 + - 89339a864e8d9994ea7c9531ae92e67e: 21300000 + - 8def3b866cd238f4a928439e0a5a8907: 21300000 + - d4e307e6ea003de4bbc0d28256e6a032: 21300000 + - 221d99e63cd1a414bad8cd6c93cb95c2: 21300000 + - 5f51f8f690669d84cacaeab399fce579: 21300000 + - 5cdf5107efb2e8c4d980153f752a57c1: 21300000 + - b0cff70733e6b0b41a5ad812ead6cd8b: 21300000 + - bb6a891737c56e6438e808fb4e716321: 21300000 + - 9528c4275cc1a114f9e755b4d9084936: 21300000 + - 881250471e7213f42819ba1d7bb1d4e0: 21300000 + - c4d7d6470acd7bf45971042161c6e018: 21300000 + - f3e9585781fa62242a3018cd3dd529dd: 21300000 + - c6b584771aee7a148bcf2885a6f347ba: 21300000 + - 49594577334bdee479b8dd58aedf1d60: 21300000 + - ec7d0c8717f6c3b428b3f277de956cea: 21300000 + - 45ed26a75477df843a013176e95192a9: 21300000 + - cb0f74b7e0e21ee47b09fdb24a83094f: 21300000 + - 686160c7c3cfd5040a8ea08b867ff56c: 21300000 + - b0acf1d76f96df547a6135841ee354f8: 21300000 + - 1eb8ffe712da55942b19d29be7a6e5da: 21300000 + - fe5165f702e35144684bf593203a031c: 21300000 + - 63290ff7381eab84eb49e7b9345c809f: 21300000 + - 455b6008820c4b143bdc7ed7c6cd29c4: 21300000 + - 5767e2180fcbb7a4d9980e9a37e3d588: 21300000 + - 88f2ac18ae0c71845bc1d47bd924f8a8: 21300000 + - dcc9002875a3a244eacb72418d292f8e: 21300000 + - bcd729389571a684eb0951d69a67af73: 21300000 + - 2eaa4938329e1204ca267982a8cdb3fa: 21300000 + - a9c37448b62c0d149aced6ded9e44e4a: 21300000 + - b5b9f448600b9aa4daa1d9fd5069a764: 21300000 + - c995874838013244cac3056d42ced345: 21300000 + - d0505258bec70ac40b68ec355beaff76: 21300000 + - 3a5b7c781691c8642af63e9c1e6c14de: 21300000 + - 5c8d87881ea3aca4c9cea0978e1867ba: 21300000 + - 6b594b886c601ff4db79a8ffa0673177: 21300000 + - 753548c84e6e0264da62aca9c26f94c4: 21300000 + - 690102d87edd7d047824362d73a02788: 21300000 + - 0f341be85736cdc4bba911e059e0d16a: 21300000 + - 4ad59af83f2bcde4681baeba9d0d90c8: 21300000 + - 76089009971280441963c2a3a55b5071: 21300000 + - e9154409f452b244b9db4c7de97dff28: 21300000 + - 4214a14962bcf4943baf9e184b9b928e: 21300000 + - a9e9e74909b5a0947a093069d6a017cc: 21300000 + - 59b767590592a9e4685835a20cf41d69: 21300000 + - 82bf8779d3330604c9cec1bf2f219329: 21300000 + - 8feedb9983dae0d49a492dae5bbbf6d6: 21300000 + - e62f4ca9760884b4cb9ff0c3025838db: 21300000 + - c63c69d9fdf411147aede23769d5fcfc: 21300000 + - bb0dc30aba14f084b9f20cd11d7f59d8: 21300000 + - 852dea1a4d9a29a45b32e544647320ad: 21300000 + - c865be1abede9a048a20b6904ee2219a: 21300000 + - 13aa9a4a1bc68064c9e5e17a86df2666: 21300000 + - 3db4a46ab9121ab4c82e33ae0f3d8710: 21300000 + - b38d007a84ef48c45b4026b9be16e76b: 21300000 + - d2d936bae69c599429ee1a386892a9f0: 21300000 + - f645b6da0a4688d4288e29bcffabc941: 21300000 + - e94248daa5c32774fbf35a1cb4ecc4de: 21300000 + - 35322bfa3901c9145821274537244b1d: 21300000 + - 6b460d0b7c81b4d4cb5f131f7eeda623: 21300000 + - ec69df1b25263e844aa6c00cbb388ea6: 21300000 + - bf9cb13b45f6dfe41970b547e98bb782: 21300000 + - 6dcde73b5ddc21d4582ec3468a22cda5: 21300000 + - 438b3b4b88bde4f4c9770d84b50b772b: 21300000 + - 634ae46b18d6e8e42a8359e8219fa81c: 21300000 + - 5b13d17b360e2a64cbc7b4a2ac4cd375: 21300000 + - e67c667b7a6a3664a8f22db00d76ad38: 21300000 + - aacc218bfa62aef41920035f78af31e8: 21300000 + - 86106dab9033ac7448f28ca19c407c2a: 21300000 + - b53b9dcb8117dfe4ab1c5a250703548c: 21300000 + - cf749edb05d158d47a3e523439809960: 21300000 + - c66090fb301d69046ba811b94979feab: 21300000 + - 365443fb827749b4db671a5038ff79b1: 21300000 + - 64afd51ca9828034f8c64a261e4b99b9: 21300000 + - 898a532c97728b244b14ffccd83b6f7e: 21300000 + - a1c0872c2cf7825428b1f301727f4e1b: 21300000 + - 9346fa5c7f34ca845954029ac6857a12: 21300000 + - 7f64c56c59a2fd7429f7ec776a4213a2: 21300000 + - 0a78267c907b61449a0367178cabe70c: 21300000 + - c39af18c1c6c80841b32ec80316d1e87: 21300000 + - cd65a99c817869946969cd216cab2115: 21300000 + - 79d7163dfd26ad748bf88cdc6b98d2f5: 21300000 + - 8f8e5b3d53a0deb4d88a6a25a3db5ac4: 21300000 + - 049cab3d3a32a3a45856ca44f223ced1: 21300000 + - dfa5e44dcbacc1b4794ca05e7f7e3478: 21300000 + - aa9e3d4d344a1c548a75a061ab69c3fb: 21300000 + - 31d88d4dbed3d9546898b42447a63e77: 21300000 + - 9989c37dedfecfa4591fd9f1821713cb: 21300000 + - ff33d6adfeac52e419af23fad2d0abfd: 21300000 + - 60a2cfad92429cc4b9d2f6ce7148c37a: 21300000 + - df6f54cd95dfdf148a5c4cc0aca6d49f: 21300000 + - 614b90dda34ee634893a6168082923be: 21300000 + - e79c55edf28318b44b614f2eaf6cbb45: 21300000 + - c7cf710ee57c1ae45aac513a85fcff07: 21300000 + - 904a520e37320ab4aa482b623e1d52f4: 21300000 + - a4d1991ea98b3684c99f8728d28ec652: 21300000 + - 2d24972ef326cbf4d95898e1bee82f8e: 21300000 + - 0b69f35e166d1704f987340b84eaefe6: 21300000 + - 6b56e26ee92b18e4aa775af7975a9b17: 21300000 + - 5b31577ecf5954448b0d92a2c8a0501b: 21300000 + - 5a1cef7e9c9ed034da742d0e08ea786a: 21300000 + - 9d98f19e89667e84fa99ae2d2c01ad66: 21300000 + - af68c0be2e67f3846bcdf33841f8312b: 21300000 + - d9c068be09f82944db652218d2ef1c52: 21300000 + - 1ffccabe7b991aa4283e4106fca8f9bb: 21300000 + - 0b6c45ce7a9a03d4d8f457818ab57430: 21300000 + - 39f2b1de192463d41a4339ee2b5f2074: 21300000 + - eb350ede4895d6d418689eb126b772cb: 21300000 + - 1b0ea6ee3d93339468688584fa8f3bb9: 21300000 + - 657c921f612637e4f8ba1c8c4123d11d: 21300000 + - 8a9b494f275a2954aba6b318fc17d9bd: 21300000 + - f7f3915fcb9a6744a9a147ed3ee26ebe: 21300000 + - a3b4037f6cee2ac4fb949a47aa4a4d76: 21300000 + - d6e05ebf12ef9164c9b792b7088c0bdd: 21300000 + - 261da5cf99e3c864e9079de55f67a437: 21300000 + - aefc8fcf439e0ae40bab5098679276b5: 21300000 + - 7d37e1dfeba60ea4a8803c12675079b6: 21300000 + - 3b3834ff0aab3d849bca2adc0c0d5f84: 21300000 + - b5a42cffd70ab6441a230c8e772f3c56: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas index 95d25b4102..1dd13439fa 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas @@ -31,6 +31,7 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: @@ -48,6 +49,64 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - a5bd89109aa6b2040899eb517d4ff269: 21300000 + - 150834209dce0f04fbc80ba1c047862d: 21300000 + - d8066b3064c94ec418e624a9d42a7e9a: 21300000 + - 338b7ab050147cd4ba8dae8c5b192d06: 21300000 + - b7f0bbb0377ad59428edfb2ad7bb9c8b: 21300000 + - 6ca890c0d46aed24b9dc2b295bc00f66: 21300000 + - 4404ac2103491534c9e5846328919d85: 21300000 + - ffc84872fb897ac48ba785abe986ce5f: 21300000 + - 1df4990374184a74881ac6025bf44892: 21300000 + - f6f6b1436c8ac2f40b4772ae71e66616: 21300000 + - ec512da32fc72e341aaf998346dd918d: 21300000 + - c7b60a04d72144e4abc50f83229c24b8: 21300000 + - 89d60a14446e0e64d9fbc78d4f56f0e0: 21300000 + - 37b0ac0507a75e74b8463a66400768b6: 21300000 + - 4bfe2265e55eabc4e8661f4b53459a61: 21300000 + - 13da4665845ba7048a430c77c0c2e710: 21300000 + - 82e2dad5538a7b94fb7d4a2ec5892fc4: 21300000 + - 92afb8e693ef0bd479a9fbcca9cd4407: 21300000 + - 848f66f6aef71f5439b3f54a71fdfbb0: 21300000 + - 94506df6af9336d498bc4b125fec2bf5: 21300000 + - b21a4c07951e2a741ab6e18f67c5cd69: 21300000 + - 68451d277d2abba46a8ce6bf03ca7e0e: 21300000 + - ec2fd10884c649646bd87eeb6da8fbdc: 21300000 + - bf215208f75c7b942b1605483667f8e4: 21300000 + - 88e8dc18ca587db4dbf5748520fbc374: 21300000 + - 641c1968aa0040a43a5a56dcb15c37c1: 21300000 + - 8823d9880fbc90642a4778e42a762580: 21300000 + - d12400b8f60eb534489d29d74595c74c: 21300000 + - ac55bcb8f5e1e714e8dbc94eaa8b2476: 21300000 + - 4b8d7ee8c014eca44bac43ebc62ff54a: 21300000 + - a94191f83905200448f763e26e38b1f0: 21300000 + - 9055a2f863bb219428f97595a861d3ae: 21300000 + - fc020019f252cdb46a61d9796ded3e11: 21300000 + - e8917069f3e34da42b21d686fabc7edf: 21300000 + - 00e06269702d7004eb9a7c0e6bd22426: 21300000 + - 82a1256975469ad449c19d749f79d183: 21300000 + - 4db7de89bec7d9241b6f8f9a9149ea12: 21300000 + - 240b042a2678c13429cb0a31094f929d: 21300000 + - 411cf84ac65191c4bb59a562f6ff00d5: 21300000 + - 430a778a5e873dd47b839ef9c835fe65: 21300000 + - 970d88aa5a19ea34f966f654dba3c40a: 21300000 + - 667322eabce35e54782b9a44a073a105: 21300000 + - e025cbdb4e2ba0c4da395d1f388932dd: 21300000 + - c0c34b3ce5f3bad4a92ae2ace64ea54b: 21300000 + - f2f48b5c6d23a094ab94c8c2a222706d: 21300000 + - a2a0016c152367442b171d0cd3dee9f6: 21300000 + - 6a9d269c995597949912371419d0e37c: 21300000 + - 93e3d0ece463bdd4f8de3a5e13640f52: 21300000 + - 0eb4fabd70cb42c4e853c56d1227a3fd: 21300000 + - f4d973fde270bf646989674f9883ff37: 21300000 + - 951eaffdc3e0af047968b7ab9cd39b79: 21300000 + - ff6abd3e3a894514cb908c7048a19d4d: 21300000 + - 0aa4758e6a5fb5548b825f9b9f30d7c6: 21300000 + - c526eeae045772a4d864b60d1a1d5296: 21300000 + - febb0f6fef5a4a047a1acf99e84d9fb8: 21300000 + - 2ddda87f253edea40a6f886160952413: 21300000 + - e8dea0af68b70944d9a787becfc0689a: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: a5bd89109aa6b2040899eb517d4ff269, type: 3} diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas index e3bd26f855..e299423bbf 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas @@ -31,6 +31,7 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: @@ -48,6 +49,70 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - ab415a003dc7634428737e396fb6b118: 21300000 + - 5ff5b330714abac42a0db7b827b418a6: 21300000 + - ae7c3e30807a6b14ea27333b478b7159: 21300000 + - 22f7a3407a0448d438b85694136896c1: 21300000 + - 62e4d070156482a4995f75774447f83d: 21300000 + - c10ee680b45acec46af60e470d8c1930: 21300000 + - 2682d6b08082e2f49b748e74174a8e87: 21300000 + - 1d094e315b7be8444ab6502f9dcca260: 21300000 + - 8ae4d681ab837c64796c0b72ee2584a0: 21300000 + - 8b571ba119e277145b0b92cd8fd42067: 21300000 + - ef846db2d56c3124b8f82467a163ebdf: 21300000 + - 483490e295d65ea45b0ca6ec50a93382: 21300000 + - a003b41375f47594a9d754a4e55dc568: 21300000 + - d3ae7713c92135644b592b6979acbcfc: 21300000 + - e1faa5d36f8d3e843b5367af93176284: 21300000 + - ac9307145261eee499a455ddeb80db4b: 21300000 + - 9e540f44219d80243bec5e2191787a0c: 21300000 + - b801fd8404ee341479f2a795c6dd8ab5: 21300000 + - 41ee8205a421b1643824c4bd4c9b12b0: 21300000 + - aeb8b905156a5164ea3f260ddc951efd: 21300000 + - c00121950f177f84092fd15f53c6ac66: 21300000 + - 8b5d6d95c402e6e479a2528aceb461c1: 21300000 + - 882f64064bde2e64db7df2086bc259df: 21300000 + - a5cc0836f318e7d47928222a8a8c6bd5: 21300000 + - 980a4b66b0a2bba42a9a3b50f4da76d6: 21300000 + - 9405a54793ed1b74bb19ee929c860b0d: 21300000 + - 72182c4737bc6a242be25cda1beacbf4: 21300000 + - a3ee41879a5dc174f9767e2bfdcde909: 21300000 + - 0ce1ce8775d04c04091f4c852f4f4ec5: 21300000 + - b6e64dd7555a5fc44b98d71cb5c0d43c: 21300000 + - f0657c0811c44934ba275af9b1aa5c85: 21300000 + - 75a36c8886a27f54b833c41de3d11d24: 21300000 + - 38c40e88299ccf042b83f09b5c3fd89b: 21300000 + - 2db361d87da36334cb20db2ebf74e3c1: 21300000 + - 1e12a6098ecee9a47b8b65f259c08991: 21300000 + - dae848790acd29544a951ec295aecf71: 21300000 + - f7636f79f29fce1469dfb21774e2b9d7: 21300000 + - 02d12d99a7d9fc24fa0f9e2472426c7b: 21300000 + - 26aea5a92fc76f648bb6522f06a0af58: 21300000 + - d720e2d90151e91479a4d3d4287bb61b: 21300000 + - 924e830a0c9d55a4bbe5afdc9729d55f: 21300000 + - 4843081a76a173a468369f4fab334928: 21300000 + - c3bc842a37054c74bbc28d1f34c9847a: 21300000 + - a25859ca3789d8a469bdd28a7d38daf2: 21300000 + - 312a5bfa1cd438440b81906da98959f9: 21300000 + - b3da84ebb4d3f0748b47f5cf58ae9d40: 21300000 + - f14aa10c3b4eb5b47860e729e2144c28: 21300000 + - 8398530cb9366974ca3cb94c16af54f7: 21300000 + - 6e07004c8f0965d4ab66a275e02b77a0: 21300000 + - b6737a6c649b5664baa6b0e1f942a9e9: 21300000 + - a0740f7c6b0a21346b139ff42dc3cb17: 21300000 + - 54bda8bcfb03f4345aafea5fe8271478: 21300000 + - a64b8a0d006d7b744b431b7cd3e59096: 21300000 + - f49c41dd300e6f6439fb3dafb10f4e9d: 21300000 + - 6c05bc2e66e3ff342abf6c6128d48be8: 21300000 + - 3d64a15e480cc6847bc34f715f1999fa: 21300000 + - 3b35fd7e10ffa5a4886deb9a7fe973be: 21300000 + - 030bf29ece336fa4590a0d4039eb5a00: 21300000 + - b789f21f154a3744592f10328f51d9b9: 21300000 + - c476985fb9af3ff4aafceffed501e06a: 21300000 + - 6de87e9f00722e74d9fc96304b8f1a3d: 21300000 + - 1c64f7cfb7bf99d48abddaeb45da9704: 21300000 + - 94f6e6ef133c2fc4d978f8e13f22331e: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: ab415a003dc7634428737e396fb6b118, type: 3} diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas index 5e96e715f8..3993568672 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas @@ -31,6 +31,7 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: @@ -48,6 +49,60 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - 8adfa5608930ca2439e971779195e6d5: 21300000 + - 32dc08a018447f543976c94bf9491196: 21300000 + - a607bd01a7a4db74d8db6d947dcbc875: 21300000 + - b380a2116ae89cf468d48830ec7d79c2: 21300000 + - 7355c851fc65ff849b5df7c47140e9d8: 21300000 + - 63fc7cb115139c848995a4ae9ac9dacb: 21300000 + - 835211e15123ac143bd33f517fb7a006: 21300000 + - 52e91402b85ab7b4da1289c8f9a70393: 21300000 + - c8cbc822ff1ea224fa14efed547a1962: 21300000 + - 585a6432587c7c147b3d5e9df9f422c4: 21300000 + - 10136a82fe95130409081e398fe24178: 21300000 + - 08a08ba28e247a640b93b2069105d119: 21300000 + - dda1ecc29988c874bbc23937de1f6e5e: 21300000 + - bfc349e2425296543a5c8a12bdf4df11: 21300000 + - e91b4143d098bed4c9e823cdcbea18b2: 21300000 + - c413889380ba9bc48a815e80b274fffd: 21300000 + - 9f5b1b248f1d42b45b4907efad9af9ae: 21300000 + - a2bf0c84810352345928f875e9722574: 21300000 + - f09178b404a32834883bc08597522d22: 21300000 + - bdebbaf48377ad346a0dad337aceea94: 21300000 + - 914c7ff4b2e03254f8fca375221689a5: 21300000 + - 850fcf2571df67c4ea7f94f407d1a42c: 21300000 + - 10871335f574c994891877ebab0be6ac: 21300000 + - ddcad965dfaadd94393dcc3cec52b3ce: 21300000 + - 6016bca53a5cef1449c5464da0fd040c: 21300000 + - d090c51669b3435449d4a2d4819b4261: 21300000 + - 48948d469c03d1146ad3d7026a482156: 21300000 + - e33ab0866768e0149af41c52aaa4359c: 21300000 + - 9cc3fcf61bd66d34c996a561899716bb: 21300000 + - 1db1cf67e678da1489caff40f4149421: 21300000 + - dfc824d7751687d4ab5c25b40b7cfd9a: 21300000 + - 22953dd7b1cd95b4c9b5ddf9ac346037: 21300000 + - 04ba3238e0770214cb44ec04498eaf41: 21300000 + - eadcf2981659a764c86bafbe6ce6f044: 21300000 + - 702fbb19c7d7d684b8ce058404284c70: 21300000 + - c169f3a975c97764392837f81a84c249: 21300000 + - 70036f2bc0a3c1641bcfcdfe41364ebf: 21300000 + - dd0430cb00274c1489be6b617ee81916: 21300000 + - e59f64eb7bc6fec48a686c2831a477ac: 21300000 + - 09cbcc2cfc7f96f41904a753c589c3bb: 21300000 + - 8354564cdfb17ef47929b25a0c696be4: 21300000 + - 7c80543db09a5ec4cbf32e6ebd148879: 21300000 + - 18b6ab4d386ee2a4c8907ac47974884b: 21300000 + - ea75f18dd428482458ec6b1ea19ae71b: 21300000 + - c873423e7212f3b469150de37075a8db: 21300000 + - 7b195ceea64132d40bb2a215dd26b903: 21300000 + - 4397030f9e6fb174ea079b632727d6f8: 21300000 + - 93dbc21f8c967174d9724ded23bcaa46: 21300000 + - ba45ea1ff3eb95d4bb7ace3022705886: 21300000 + - e797a63f8ec23e84e94f4d6b25cf69a9: 21300000 + - ed03b24fc6d38dc4094f2bf8830f9df2: 21300000 + - 1360f45f3eea5294fad01a0d4dacd624: 21300000 + - 8d4804cf4e8b18246a0b9de4bb5f7887: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 8adfa5608930ca2439e971779195e6d5, type: 3} diff --git a/Assets/MobileDependencyResolver.meta b/Assets/MobileDependencyResolver.meta new file mode 100644 index 0000000000..0a89788f90 --- /dev/null +++ b/Assets/MobileDependencyResolver.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 333d24e71d12446ba5c77815e64b0ca8 +folderAsset: yes +timeCreated: 1448926447 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MobileDependencyResolver/Editor.meta b/Assets/MobileDependencyResolver/Editor.meta new file mode 100644 index 0000000000..457843c6e3 --- /dev/null +++ b/Assets/MobileDependencyResolver/Editor.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e105e00cdce8456482d26b1fcd1ca47d +folderAsset: yes +timeCreated: 1448926516 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll b/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll new file mode 100644 index 0000000000..144bd42a6e Binary files /dev/null and b/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll differ diff --git a/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll.meta b/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll.meta new file mode 100644 index 0000000000..ec586f8e1f --- /dev/null +++ b/Assets/MobileDependencyResolver/Editor/Google.IOSResolver.dll.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: a1e8415cfe85469f9aa0aea941166031 +labels: +- gvh +- gvh_targets-editor +- gvh_version-1.2.135.0 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 0 + platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: AnyCPU + DefaultValueInitialized: true + OS: OSX + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll b/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll new file mode 100644 index 0000000000..3e42ca5b7e Binary files /dev/null and b/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll differ diff --git a/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll.meta b/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll.meta new file mode 100644 index 0000000000..22e9d7b5db --- /dev/null +++ b/Assets/MobileDependencyResolver/Editor/Google.JarResolver.dll.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 97738b29c18143b0a469277b09d35889 +labels: +- gvh +- gvh_targets-editor +- gvh_version-1.2.135.0 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll b/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll new file mode 100644 index 0000000000..4e5862f978 Binary files /dev/null and b/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll differ diff --git a/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll.meta b/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll.meta new file mode 100644 index 0000000000..61eb5f26c5 --- /dev/null +++ b/Assets/MobileDependencyResolver/Editor/Google.VersionHandler.dll.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: bb6999c8a5ce4ba99688ec579babe5b7 +labels: +- gvh +- gvh_targets-editor +- gvh_version-1.2.135.0 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll b/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll new file mode 100644 index 0000000000..b3fbe0347d Binary files /dev/null and b/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll differ diff --git a/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll.meta b/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll.meta new file mode 100644 index 0000000000..83d8867f8d --- /dev/null +++ b/Assets/MobileDependencyResolver/Editor/Google.VersionHandlerImpl.dll.meta @@ -0,0 +1,37 @@ +fileFormatVersion: 2 +guid: 369cd88e7aa04bd98e0f6c229f7c1510 +labels: +- gvh +- gvh_targets-editor +- gvh_version-1.2.135.0 +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt b/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt new file mode 100644 index 0000000000..cfadf579b2 --- /dev/null +++ b/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt @@ -0,0 +1,4 @@ +Assets/PlayServicesResolver/Editor/Google.IOSResolver.dll +Assets/PlayServicesResolver/Editor/Google.JarResolver.dll +Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll +Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl.dll diff --git a/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt.meta b/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt.meta new file mode 100644 index 0000000000..3e82ef444a --- /dev/null +++ b/Assets/MobileDependencyResolver/Editor/mobile-dependency-resolver.txt.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 85ae9201cbc641ffa2fa8aab6c5e9093 +labels: +- gvh +- gvh_manifest +- gvh_version-1.2.135.0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Player/Player.controller b/Assets/Prefab/Player/Player.controller index 4e4f2253fe..7c7f5b1bd4 100644 --- a/Assets/Prefab/Player/Player.controller +++ b/Assets/Prefab/Player/Player.controller @@ -48,7 +48,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -81,6 +81,62 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-4024227237795399404 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsCrouch + m_EventTreshold: 0 + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.25 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5649426252167513143} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.42307693 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-877725169392864658 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0.25 + - m_ConditionMode: 2 + m_ConditionEvent: IsCrouch + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5529617936538040658} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.42307693 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -92,16 +148,22 @@ AnimatorController: m_AnimatorParameters: - m_Name: Speed m_Type: 1 - m_DefaultFloat: 0.3 + m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsJump m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} + - m_Name: IsCrouch + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -178,7 +240,10 @@ AnimatorState: m_Name: Player_crouch m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -4024227237795399404} + - {fileID: 5320939686832533729} + - {fileID: -877725169392864658} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -194,6 +259,59 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4297558997896594304 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsCrouch + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4113416669491443638} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5320939686832533729 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsCrouch + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsJump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8803191903412117881} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.42307693 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5529617936538040658 AnimatorState: serializedVersion: 6 @@ -265,19 +383,20 @@ AnimatorStateMachine: m_Position: {x: 530, y: 80, z: 0} - serializedVersion: 1 m_State: {fileID: -8803191903412117881} - m_Position: {x: 420, y: 250, z: 0} + m_Position: {x: 530, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: 4113416669491443638} - m_Position: {x: 455, y: 315, z: 0} + m_Position: {x: 160, y: 350, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: -8486186136869165007} + - {fileID: 4297558997896594304} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 80, y: 250, z: 0} + m_AnyStatePosition: {x: 80, y: 230, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_ExitPosition: {x: 540, y: 380, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 5649426252167513143} --- !u!1101 &6845976001339657853 diff --git a/Assets/Prefab/Player/Player.prefab b/Assets/Prefab/Player/Player.prefab index db1eebf8fd..da79ff28f8 100644 --- a/Assets/Prefab/Player/Player.prefab +++ b/Assets/Prefab/Player/Player.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 1201430245866775938} - component: {fileID: 7894923954649684004} - component: {fileID: 6900886237888737789} + - component: {fileID: 3545855248091886352} + - component: {fileID: 753209669686786339} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -106,3 +108,50 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!61 &3545855248091886352 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3690047765547104160} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.016489267, y: 1.0489373} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.42, y: 0.1} + oldSize: {x: 3.7534883, y: 2.8325582} + newSize: {x: 3.7534883, y: 2.8325582} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.57924724, y: 1.9496565} + m_EdgeRadius: 0 +--- !u!50 &753209669686786339 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3690047765547104160} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 6a33b49c5f..5514b0c0e4 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,12 +117,142 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &209983663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 209983666} + - component: {fileID: 209983665} + - component: {fileID: 209983664} + m_Layer: 0 + m_Name: Platform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &209983664 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209983663} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &209983665 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209983663} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300096, guid: 6e1db66fc7e57884380659e0a55351f0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &209983666 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209983663} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.5, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &592884322 GameObject: m_ObjectHideFlags: 0 @@ -163,9 +293,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 @@ -199,19 +337,579 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 592884322} + 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: 0} - m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &683299677 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3690047765547104160, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + m_PrefabInstance: {fileID: 1311293295106438672} + m_PrefabAsset: {fileID: 0} +--- !u!95 &683299680 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 6900886237888737789, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + m_PrefabInstance: {fileID: 1311293295106438672} + m_PrefabAsset: {fileID: 0} +--- !u!114 &683299683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683299677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e826a9a50ef755f439c762ee643c9cde, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 683299680} + boxCollider2D: {fileID: 683299685} + spr: {fileID: 683299686} +--- !u!61 &683299685 stripped +BoxCollider2D: + m_CorrespondingSourceObject: {fileID: 3545855248091886352, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + m_PrefabInstance: {fileID: 1311293295106438672} + m_PrefabAsset: {fileID: 0} +--- !u!212 &683299686 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 7894923954649684004, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + m_PrefabInstance: {fileID: 1311293295106438672} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1002215249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1002215252} + - component: {fileID: 1002215251} + - component: {fileID: 1002215250} + m_Layer: 0 + m_Name: Platform (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1002215250 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002215249} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1002215251 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002215249} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300004, guid: 6e1db66fc7e57884380659e0a55351f0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1002215252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002215249} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.5, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1220312024 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1220312027} + - component: {fileID: 1220312026} + - component: {fileID: 1220312025} + m_Layer: 0 + m_Name: Platform (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1220312025 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1220312024} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1220312026 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1220312024} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300012, guid: 6e1db66fc7e57884380659e0a55351f0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1220312027 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1220312024} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.5, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1722809266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1722809269} + - component: {fileID: 1722809268} + - component: {fileID: 1722809267} + m_Layer: 0 + m_Name: Platform (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1722809267 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722809266} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1722809268 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722809266} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300076, guid: 6e1db66fc7e57884380659e0a55351f0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1722809269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722809266} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.5, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1876400612 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1876400615} + - component: {fileID: 1876400614} + - component: {fileID: 1876400613} + m_Layer: 0 + m_Name: Platform (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1876400613 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876400612} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1876400614 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876400612} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300002, guid: 6e1db66fc7e57884380659e0a55351f0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1876400615 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1876400612} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.5, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1311293295106438672 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, @@ -227,7 +925,7 @@ PrefabInstance: - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.08 objectReference: {fileID: 0} - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} @@ -274,5 +972,43 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 3690047765547104160, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 7894923954649684004, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7894923954649684004, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7894923954649684004, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3690047765547104160, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + insertIndex: -1 + addedObject: {fileID: 683299683} m_SourcePrefab: {fileID: 100100000, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 592884325} + - {fileID: 1311293295106438672} + - {fileID: 209983666} + - {fileID: 1876400615} + - {fileID: 1722809269} + - {fileID: 1002215252} + - {fileID: 1220312027} diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000000..9233228198 --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f97a0a17a174b074b8b999b836590c63 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/playerController.cs b/Assets/Scripts/playerController.cs new file mode 100644 index 0000000000..c0c45bedd9 --- /dev/null +++ b/Assets/Scripts/playerController.cs @@ -0,0 +1,93 @@ +using UnityEngine; + +public class PlayerController : MonoBehaviour +{ + [SerializeField] private Animator animator; + [SerializeField] private BoxCollider2D boxCollider2D; + [SerializeField] private SpriteRenderer spr; + + private Vector2 initialBoxSize; + private Vector2 initialBoxOffset; + + private Color colore; + + + + + + void Start() + { + initialBoxSize = boxCollider2D.size; + initialBoxOffset = boxCollider2D.offset; + colore = spr.color; + } + private void Update() + { + if (Input.GetKey(KeyCode.Q)){ + spr.color=Color.blue; + } + else { +spr.color=colore; + } + float horizontalInput = Input.GetAxisRaw("Horizontal"); + float verticalInput = Input.GetAxis("Vertical"); + PlayJumpAnimation( verticalInput ); + + animator.SetFloat("Speed", Mathf.Abs(horizontalInput)); + + + Vector3 scale = transform.localScale; + if (horizontalInput < 0) + { + scale.x = -1 * Mathf.Abs(scale.x); + } + else if (horizontalInput > 0) + { + scale.x = 1 * Mathf.Abs(scale.x); + } + transform.localScale = scale; + + if (Input.GetKey(KeyCode.LeftControl)) + { + + Crouch(true); + } + else + { + Crouch(false); + } + } + + public void Crouch(bool crouch) + { + + if (crouch==true) + { + animator.SetBool( "IsCrouch", crouch ); + float offX = 0.01648927f; //Offset X + float offY = 0.55f; //Offset Y + + float sizeX = 0.5792472f; //Size X + float sizeY = 1f; //Size Y + + boxCollider2D.size = new Vector2( sizeX, sizeY ); + boxCollider2D.offset = new Vector2( offX, offY ); + + } + else + { + boxCollider2D.size = initialBoxSize; + boxCollider2D.offset = initialBoxOffset; + } + } + + public void PlayJumpAnimation( float vertical ) + { + if ( vertical > 0 ) + { + animator.SetTrigger( "IsJump" ); + } + } +} + + diff --git a/Assets/Scripts/playerController.cs.meta b/Assets/Scripts/playerController.cs.meta new file mode 100644 index 0000000000..087a3c8897 --- /dev/null +++ b/Assets/Scripts/playerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e826a9a50ef755f439c762ee643c9cde +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index d3e9be27f5..6ffa347d5f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,15 +3,16 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "4.4.2", - "com.unity.analytics": "3.6.12", - "com.unity.collab-proxy": "2.2.0", - "com.unity.ide.rider": "3.0.26", + "com.unity.ai.navigation": "1.1.5", + "com.unity.analytics": "3.8.1", + "com.unity.collab-proxy": "2.3.1", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", - "com.unity.purchasing": "4.9.3", + "com.unity.purchasing": "4.11.0", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.5", + "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.10", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f089863e92..b50b80f9b8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -10,7 +10,10 @@ "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.ads": { "version": "4.4.2", @@ -21,17 +24,27 @@ }, "url": "https://packages.unity.com" }, + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.analytics": { - "version": "3.6.12", + "version": "3.8.1", "depth": 0, "source": "registry", "dependencies": { + "com.unity.services.analytics": "1.0.4", "com.unity.ugui": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.2.0", + "version": "2.3.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -45,7 +58,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -77,21 +90,31 @@ "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "4.9.3", + "version": "4.11.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.androidjni": "1.0.0", - "com.unity.services.core": "1.8.1" + "com.unity.services.core": "1.8.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.analytics": { + "version": "5.0.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.services.core": "1.10.1" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.12.0", + "version": "1.12.5", "depth": 1, "source": "registry", "dependencies": { @@ -122,7 +145,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.5", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -284,17 +307,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/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml new file mode 100644 index 0000000000..cc01efb7f6 --- /dev/null +++ b/ProjectSettings/GvhProjectSettings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/ProjectSettings/Packages/com.unity.services.mediation/Settings.json b/ProjectSettings/Packages/com.unity.services.mediation/Settings.json new file mode 100644 index 0000000000..1a8b94ab5d --- /dev/null +++ b/ProjectSettings/Packages/com.unity.services.mediation/Settings.json @@ -0,0 +1,78 @@ +{ + "m_Name": "Settings", + "m_Path": "ProjectSettings/Packages/com.unity.services.mediation/Settings.json", + "m_Dictionary": { + "m_DictionaryValues": [ + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "unityads-adapter.version", + "value": "{\"m_Value\":\"latest\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "admob-adapter.version", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "facebook-adapter.version", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "adcolony-adapter.version", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "ironsource-adapter.version", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "applovin-adapter.version", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "vungle-adapter.version", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mintegral-adapter.version", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "admob-adapter.app-id.android", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "admob-adapter.app-id.ios", + "value": "{\"m_Value\":\"\"}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mediation.build.settings.force-dynamic-linking", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mediation.build.settings.disable-dexing-artifact-transform", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mediation.build.settings.deterministic-builds", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "mediation.build.settings.force-dependency-update", + "value": "{\"m_Value\":false}" + } + ] + } +} \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d9f55905fe..7ffc0d18da 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -48,6 +48,7 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 @@ -121,6 +122,7 @@ PlayerSettings: switchNVNOtherPoolsGranularity: 16777216 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -177,10 +179,10 @@ PlayerSettings: StripUnusedMeshComponents: 1 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -446,7 +448,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: @@ -575,7 +577,6 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 @@ -702,7 +703,6 @@ PlayerSettings: allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 @@ -711,8 +711,8 @@ PlayerSettings: apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: Template_2D - metroPackageVersion: + metroPackageName: Template2D + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: @@ -720,7 +720,7 @@ PlayerSettings: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: Template_2D wsaImages: {} - metroTileShortName: + metroTileShortName: 2D Platformer Game metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -783,11 +783,11 @@ PlayerSettings: apiCompatibilityLevel: 6 activeInputHandler: 0 windowsGamepadBackendHint: 0 - cloudProjectId: + cloudProjectId: 19545ee8-01d1-4297-9db8-135c9cd1d1d2 framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] - projectName: - organizationId: + projectName: 2D Platformer Game + organizationId: abhaystudio cloudEnabled: 0 legacyClampBlendShapeWeights: 0 playerDataPath: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d60336d73c..9f9a5338f2 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.33f1 -m_EditorVersionWithRevision: 2021.3.33f1 (ee5a2aa03ab2) +m_EditorVersion: 2022.3.26f1 +m_EditorVersionWithRevision: 2022.3.26f1 (ec6cd8118806) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 4ae8c38e5b..8655d5e7dd 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -18,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 1 + skinWeights: 1 textureQuality: 1 anisotropicTextures: 0 antiAliasing: 0 @@ -27,12 +27,21 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.3 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Low @@ -46,7 +55,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -55,12 +64,21 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.4 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 16 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Medium @@ -74,7 +92,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -83,12 +101,21 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 1 + realtimeGICPUUsage: 25 lodBias: 0.7 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 64 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: High @@ -102,7 +129,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -111,12 +138,21 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 1 + realtimeGICPUUsage: 50 lodBias: 1 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Very High @@ -130,7 +166,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -139,12 +175,21 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 1 + realtimeGICPUUsage: 50 lodBias: 1.5 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] - serializedVersion: 2 name: Ultra @@ -158,7 +203,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 4 + skinWeights: 4 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -167,12 +212,21 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 1 + realtimeGICPUUsage: 100 lodBias: 2 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4096 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 + customRenderPipeline: {fileID: 0} excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2 @@ -181,6 +235,7 @@ QualitySettings: PS4: 5 PSM: 5 PSP2: 2 + Server: 0 Standalone: 5 Tizen: 2 WebGL: 3 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 6a0b8ede35..1e32e763ca 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,17 +14,68 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 2249 - y: 302.5 - width: 1206 - height: 715 + x: 0 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 - m_Title: - m_RootView: {fileID: 6} - m_MinSize: {x: 875, y: 300} + m_Title: Game + m_RootView: {fileID: 8} + m_MinSize: {x: 875, y: 542} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 511 + y: 0 + width: 802 + height: 386 + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 2} + m_Position: + serializedVersion: 2 + x: 0 + y: 561 + width: 1313 + height: 386 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 139 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,19 +88,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 3} + - {fileID: 11} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1206 - height: 665 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + width: 1920 + height: 947 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 119 ---- !u!114 &3 + controlID: 71 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -64,18 +115,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 921 + x: 1313 y: 0 - width: 285 - height: 665 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + width: 607 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 13} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &4 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -92,16 +143,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 228 - height: 394 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + width: 301 + height: 561 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 14} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -111,24 +162,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 394 - width: 921 - height: 271 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} + y: 0 + width: 511 + height: 386 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 22} m_Panes: - - {fileID: 12} - {fileID: 17} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &6 + - {fileID: 22} + - {fileID: 15} + m_Selected: 1 + m_LastSelected: 2 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -141,18 +193,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 2} - - {fileID: 8} + - {fileID: 9} + - {fileID: 4} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1206 - height: 715 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &7 + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -169,14 +225,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1206 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LoadedToolbars: [] - m_MainToolbar: {fileID: 18} - m_LastLoadedLayoutName: Default ---- !u!114 &8 + m_LastLoadedLayoutName: +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,12 +246,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 695 - width: 1206 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &9 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -210,19 +264,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} + - {fileID: 12} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 665 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + width: 1313 + height: 947 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 92 ---- !u!114 &10 + controlID: 72 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -235,19 +289,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 4} - - {fileID: 11} + - {fileID: 6} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 394 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} + width: 1313 + height: 561 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 93 ---- !u!114 &11 + controlID: 73 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -257,24 +311,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 228 + x: 301 y: 0 - width: 693 - height: 394 + width: 1012 + height: 561 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 15} - - {fileID: 16} + - {fileID: 20} + - {fileID: 14} + - {fileID: 21} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 + m_LastSelected: 2 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -282,7 +337,108 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 301 + y: 73 + width: 1010 + height: 540 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 6429399273792195453, guid: 437277285a02f484eb5b8128da830b9b, type: 2} + m_ValueSerializationHelper: + - e00: 0.33767268 + e01: 0 + e02: 0 + e03: 55.643 + e10: 0 + e11: 0.33767268 + e12: 0 + e13: 187.25903 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 437277285a02f484eb5b8128da830b9b, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 6429399273792195453, guid: 437277285a02f484eb5b8128da830b9b, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 634 + width: 510 + height: 365 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -1236 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12014, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: @@ -290,43 +446,48 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 511 + y: 634 + width: 800 + height: 365 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 m_SearchFilter: m_NameFilter: m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] m_ReferencingInstanceIDs: m_SceneHandles: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] + m_OriginalText: + m_FilterByTypeIntersection: 0 m_ViewMode: 1 - m_StartGridSize: 64 + m_StartGridSize: 16 m_LastFolders: - - Assets + - Assets/Scripts m_LastFoldersGridSize: -1 - m_LastProjectPath: U:\layout + m_LastProjectPath: E:\OutscalProjects\2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f4350000 - m_LastClickedID: 13812 - m_ExpandedIDs: 00000000f435000000ca9a3b + m_SelectedIDs: 92530000 + m_LastClickedID: 21394 + m_ExpandedIDs: 000000007a5300007c5300007e53000080530000825300008453000086530000885300009053000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -354,7 +515,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f4350000 + m_ExpandedIDs: 000000007a5300007c5300007e5300008053000082530000845300008653000088530000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -381,6 +542,147 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: playerController + m_OriginalName: playerController + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 16442 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 0 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 2} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 16 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 200 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 634 + width: 977 + height: 365 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets + m_Globs: [] + m_OriginalText: + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Prefab/Player + m_LastFoldersGridSize: -1 + m_LastProjectPath: E:\OutscalProjects\2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 343} + m_SelectedIDs: c09b0000 + m_LastClickedID: 39872 + m_ExpandedIDs: 000000007a5300007c5300007e5300008053000082530000845300008653000088530000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000007a5300007c5300007e5300008053000082530000845300008653000088530000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: d49b0000 + m_LastClickedInstanceID: 39892 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -410,7 +712,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &13 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -426,15 +728,20 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 3170 - y: 332.5 - width: 284 - height: 644 + x: 1313 + y: 73 + width: 606 + height: 926 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: @@ -443,12 +750,12 @@ MonoBehaviour: m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 - m_AssetGUID: - m_InstanceID: 0 + m_GlobalObjectId: + m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &14 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -464,21 +771,26 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 332.5 - width: 227 - height: 373 + x: 0 + y: 73 + width: 300 + height: 540 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: b4520000 m_LastClickedID: 0 - m_ExpandedIDs: 42fbffff + m_ExpandedIDs: 2efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -494,7 +806,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 6} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -502,7 +814,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -518,29 +830,275 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2477 - y: 332.5 - width: 691 - height: 373 + x: 301 + y: 73 + width: 1010 + height: 540 m_ViewDataDictionary: {fileID: 0} - m_ShowContextualTools: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -101, y: -26} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: 0.30027902, y: 2.4630232, z: 0} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 0.30027902, y: 2.4630232, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -550,13 +1108,14 @@ MonoBehaviour: m_DoValidateTrueMetals: 0 m_ExposureSliderValue: 0 m_SceneViewState: + m_AlwaysRefresh: 0 showFog: 1 - showMaterialUpdate: 0 showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 showVisualEffectGraphs: 1 + m_FxEnabled: 1 m_Grid: xGrid: m_Fade: @@ -568,35 +1127,35 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} + m_Size: {x: 1, y: 1} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10 + m_Target: 2.3532987 speed: 2 - m_Value: 10 + m_Value: 2.3532987 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -605,19 +1164,19 @@ MonoBehaviour: m_EasingEnabled: 1 m_EasingDuration: 0.4 m_AccelerationEnabled: 1 - m_FieldOfView: 90 + m_FieldOfViewHorizontalOrVertical: 60 m_NearClip: 0.03 m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -633,26 +1192,31 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 + x: 301 + y: 73 + width: 1010 + height: 540 m_ViewDataDictionary: {fileID: 0} - m_SerializedViewsNames: [] - m_SerializedViewsValues: [] + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] m_PlayModeViewName: GameView m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 640, y: 480} + m_TargetSize: {x: 1010, y: 519} m_TextureFilterMode: 0 m_TextureHideFlags: 61 - m_RenderIMGUI: 0 - m_MaximizeOnPlay: 0 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -663,10 +1227,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766 - m_HBaseRangeMax: 766 - m_VBaseRangeMin: -395 - m_VBaseRangeMax: 395 + m_HBaseRangeMin: -505 + m_HBaseRangeMax: 505 + m_VBaseRangeMin: -259.5 + m_VBaseRangeMax: 259.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -675,7 +1239,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -683,30 +1247,30 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 0 - width: 1532 - height: 790 + y: 21 + width: 1010 + height: 519 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 395} + m_Translation: {x: 505, y: 259.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -766 - y: -395 - width: 1532 - height: 790 + x: -505 + y: -259.5 + width: 1010 + height: 519 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1532, y: 790} + m_LastWindowPixelSize: {x: 1010, y: 540} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &17 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -722,25 +1286,17 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 634 + width: 510 + height: 365 m_ViewDataDictionary: {fileID: 0} ---- !u!114 &18 -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: 13963, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_DontSaveToLayout: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt new file mode 100644 index 0000000000..fdb173c5f9 --- /dev/null +++ b/UserSettings/Layouts/default-2022.dwlt @@ -0,0 +1,1246 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 0 + y: 43 + width: 1920 + height: 997 + m_ShowMode: 4 + m_Title: Scene + m_RootView: {fileID: 7} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 1 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimatorControllerTool + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 148 + y: 0 + width: 613 + height: 561 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 4} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1920 + height: 947 + m_MinSize: {x: 400, y: 100} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 146 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1414 + y: 0 + width: 506 + height: 947 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} + m_Panes: + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 148 + height: 561 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 561 + width: 1414 + height: 386 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + - {fileID: 20} + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 3} + - {fileID: 9} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 997 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1920 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 977 + width: 1920 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 11} + - {fileID: 6} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1414 + height: 947 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 1 + controlID: 93 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 5} + - {fileID: 2} + - {fileID: 12} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1414 + height: 561 + m_MinSize: {x: 300, y: 50} + m_MaxSize: {x: 24288, y: 8096} + vertical: 0 + controlID: 82 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 761 + y: 0 + width: 653 + height: 561 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 18} + - {fileID: 19} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 634 + width: 1590 + height: 365 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 23682 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 148 + y: 73 + width: 611 + height: 540 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 6429399273792195453, guid: 437277285a02f484eb5b8128da830b9b, type: 2} + m_ValueSerializationHelper: + - e00: 0.5438201 + e01: 0 + e02: 0 + e03: -70.69658 + e10: 0 + e11: 0.5438201 + e12: 0 + e13: 129.77167 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 437277285a02f484eb5b8128da830b9b, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 6429399273792195453, guid: 437277285a02f484eb5b8128da830b9b, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 634 + width: 1413 + height: 365 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scripts + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Scripts + m_LastFoldersGridSize: -1 + m_LastProjectPath: D:\OutscalUnityProjects\2D-Platformer-Game\2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 405d0000 + m_LastClickedID: 23872 + m_ExpandedIDs: 00000000145d000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000145d0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000aaa30000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1414 + y: 73 + width: 505 + height: 926 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73 + width: 147 + height: 540 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 14060000 + m_LastClickedID: 0 + m_ExpandedIDs: 66f9ffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 761 + y: 73 + width: 651 + height: 540 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -166, y: -26} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -109, y: -98} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: AINavigationOverlay + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: -0.24167925, y: 1.8756015, z: 0.12633026} + speed: 2 + m_Value: {x: -0.24167925, y: 1.8756015, z: 0.12633026} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 3.120153 + speed: 2 + m_Value: 3.120153 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 763 + y: 81 + width: 645 + height: 531 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 645, y: 510} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -322.5 + m_HBaseRangeMax: 322.5 + m_VBaseRangeMin: -255 + m_VBaseRangeMax: 255 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 645 + height: 510 + m_Scale: {x: 1.304773, y: 1.304773} + m_Translation: {x: 312.3187, y: 275.6497} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -239.36632 + y: -211.26257 + width: 494.33887 + height: 390.8726 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 645, y: 531} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 8 + y: 633 + width: 1401 + height: 358 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 diff --git a/UserSettings/Search.index b/UserSettings/Search.index new file mode 100644 index 0000000000..dba62d53ab --- /dev/null +++ b/UserSettings/Search.index @@ -0,0 +1,13 @@ +{ + "name": "Assets", + "roots": ["Assets"], + "includes": [], + "excludes": [], + "options": { + "types": true, + "properties": true, + "extended": false, + "dependencies": false + }, + "baseScore": 999 +} \ No newline at end of file diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 9e26dfeeb6..00825abdf8 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -1 +1,75 @@ -{} \ No newline at end of file +trackSelection = true +refreshSearchWindowsInPlayMode = false +fetchPreview = true +defaultFlags = 0 +keepOpen = false +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + performance = { + active = false + priority = 100 + defaultAction = null + } + log = { + active = false + priority = 210 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } + adb = { + active = false + priority = 2500 + defaultAction = null + } + store = { + active = false + priority = 100 + defaultAction = null + } + asset = { + active = true + priority = 25 + defaultAction = null + } + profilermarkers = { + active = false + priority = 100 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + packages = { + active = false + priority = 90 + defaultAction = null + } +} +objectSelectors = { +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false +hideTabs = false +expandedQueries = [ +] +queryBuilder = true +ignoredProperties = "id;name;classname;imagecontentshash" +helperWidgetCurrentArea = "all" +disabledIndexers = "" +minIndexVariations = 2 +findProviderIndexHelper = true \ No newline at end of file