From e7b16b0edf6f56ec6f17c12ce8abb272c80e0d87 Mon Sep 17 00:00:00 2001 From: ZdenekM Date: Mon, 9 Oct 2023 11:13:40 +0200 Subject: [PATCH] updated packages, Unity version, switched to higher API level and from armv7 to arm64 --- .../ImageTracking/ReferenceImageLibrary.asset | 4 +- .../Assets/TABLET/Scenes/TabletGUI.unity | 319 +++++++++++------- arcor2_AREditor/Packages/manifest.json | 7 +- arcor2_AREditor/Packages/packages-lock.json | 34 +- .../ProjectSettings/ProjectSettings.asset | 21 +- .../ProjectSettings/ProjectVersion.txt | 4 +- 6 files changed, 245 insertions(+), 144 deletions(-) diff --git a/arcor2_AREditor/Assets/TABLET/ImageTracking/ReferenceImageLibrary.asset b/arcor2_AREditor/Assets/TABLET/ImageTracking/ReferenceImageLibrary.asset index 5d687ef24..e94e22e0f 100644 --- a/arcor2_AREditor/Assets/TABLET/ImageTracking/ReferenceImageLibrary.asset +++ b/arcor2_AREditor/Assets/TABLET/ImageTracking/ReferenceImageLibrary.asset @@ -15,9 +15,7 @@ MonoBehaviour: m_GuidLow: 5054854507635655558 m_GuidHigh: 2665802222856307590 m_DataStore: - m_Storage: - - key: com.unity.xr.arcore - value: 0ab01a0d50c142ba558143eab51d42344fc1426f3de142edc24043ba5f0443bf5a14432e5841434ba10a439058f742269ee5425d8d284305b749433e091e433d88874247db1e43a5fe41432f666043b2af14434ab04c4340366d43c8512e431a357f43cbe553433878e542cb721343ab323a43c2f06e43a8c9264329544943dac831439a4ec142e76a1d4291b81d423c5a49433f38f542a280524336558143fc4fc142c0ca0243dc0947425f0d524305a00143933d7043286f3943ca32ab422c76f4425e0bf042e8dbdf42201ce1427e048842f646e2428f4a8742c01d1543e84f6f43570ef74228ad364368882643b754be42128a0d436f754943c0a89d42c7b12843939b19439d6d0343e817364383ada9426ee53643c5ada942943a5d43dd402743eb7ccb420a4c4343485540432c55404369659642a32b2e43d34d5b43ec629d42db505b43324b6542a5659d4251679d428b629d420b4365422f629d4298505b437a416542b4b37043fa692e43d88c43436c2a40435cd42843c897e142fcfa4642e8057843a310e2422f736a429f56f44228a26e43e90330439a194a4204bd254353e6534352361643a533e2428c7ef342ad1c4b4356fd0b43ce14f742cb7aae42f8d42f431e2602431c8c66435183df4297d743437c9e134339332943c6bacf4235783043ea95d04256ad03432d37bb425c6e8043d1a4404337ccc042886f15437fa5e0425fbdc042012fbb429b8ce042cb5c0b43bc7f76435fae544328f81c43d2b90c4396ea6443d4093043515e0643f1c30b43ab3466439b112743cafa014372ca794368536d43252b644313b44c4301be37432fb51b43c99a8442864c1c437f357f436cae5e4356036f435c435c43c1a9de42d758814365609d42e069de424d9e84426195f742c0b3c0427fcf3843aacb6643d0fb264340574043eca75543a64c6542d8ac0d4379bce4429f4bd142236330432db54943aa6e324384dc88426afc534380d66f43552e54430f7b7043799a134346ac4b43e7a70343aab05c435b74cd4293910d439a53c142a45749432bc315437bf4874291634c4390a5144394a755437ea80443fe688143c0ad0d435852c142ec52c1424cbd1d4283741d42c50bae429edff44223740a436473df4265e9f0421febcc42a77e5443f77bdf420c381343aa6f96423e331343ee4a7342c80530437ff5bd42a7caf34224fd4c42d0150343d8c5e242520b0c43a018ce42abf802435ea77843c92c4d43e4120c43d30db24281380b430bfef342421a49428a3b0d43ab236f430c06f14288d66e433854f24291026f43660ed542c10f9b425c5af14209ac404348d202433c7a7943b70fdc423e483643ee457042f876f142bb4c2643c231bb42bb916643b787f642e5866c432c4b3943a2f6fa4283a615434cd80b43ab8d1d43e6fe03430ab01e438d010c43d3c1024306453a4314707f43c98df14276460d43de82ae4295750143d4a9aa42ad04e54283431f438d7a544311a1cd42a17513433c410c43f5fc6e43a34827438f7d0343948ebc4282041e439dca31437ea49d4261720a43d28e1643848a16439c89284382cc76439c743743f4322f430f21974247a50c43520741435e7f14434377bb42625781434d532543b46e4943746d1d421f800443b85e5c4361720243714a30438ae6d94216381543ffc041427258524322d026432dca414397460343e2966d423de80b4334c3014349800143b59f30436081e042a9ea144313a95543ce55404383401f43ca93f642e2974943e9620c43e94d64432a4e404332ae79432eae79432e619d42f84d1c43e34e1d4218a9de429acb4343a32c2e435c6ae442c96d6c4274863a435817e5424ba51f43a4a57943ea555d4351bc1d4316653a430f640543278a554352762543576f5243826541424d61af42e4a8794307ba41421056af4202b9a842f1a2a8422d5daf42d34baf420b6daf426f525243f0790c432cfd3943dff85b43d55f1d43a88130431944554319413143e68a3043b4dc6e434c635543e400e5424a519b4204b62f43a511f3424fcf5243f3394343bfe9494317b5f042566aaf4291514142dbb84142155b4142c00b274342ec87423c8c1443b0a330437d07bd42ce3e03434fc31e43880b8842f4630c43df5f6642f07536438e5d2743ce96d14280e4f3424f61f5428a3097420c8a0343c29cbe42e0e0f44215769a42a43abe42e40ae1422fcfba42be69bb420a29f242d8a8a44294ab7943e1d1164366d316433760e5429e59144323a22e4374363a43264479432dfb26435b07ed42122f0c4353b69c4226327643d856494334ab28435d6881434f6781434352644393181e43d3c13a4355a9f242e0a02e43d83d0343843d2743989e0243969e2643de53404340ab16437f5481431c558143bc37394358e96c422afd38432ea98942d45781431aad3143f6466542df525b43f4466542634a6542e96c4943f051c142aa7a1643385f8842784f76430652014339a299423e860a438a9af642788e0a433f1d0c4308c1b242e09af742f22a76434db9e142155c4643034e04437c6a4043c44e4c4365691c438d8d2843de14af42f679374363eecc424dc21c43036430435e1c444366bf2243071fc14208c41d4385391543c4eff34259995e43315d9742ded313435ceedd42f885f642348b1f4310c0404337ba80435198494337a002433617d742b593064384a33943d8b8c042aa90b242eaab26438a020443b8a14a42de4c1f43b07b03430c79154306f74143b8357f431b3613432a4b2b42cab11643bf721543ccb765432544be422e52f3421d5a8b42e1c90d4375aba84222c60d43619009433c21314398312e4375acde4239cf4c439958f742e328434363284343af770a43c47b2543f61c1543ac9f41435acc6743242e5243e7d6644340427043ae8ac44297b4e142bc9b2543fad4144385771543d7056f4353b21343c7905c43b995f742afca67435db82043bbc2264373c61143e784264337f9134366606543ef8b0443ac93f642b0b4034310e3a6429452d1424fb5cc42a2f70b43fb866d425dc14c43695fbb42d3458842a56231436e981343dfaf78437404424380adc8427e93f1422dce874294cee4422c721543681da94278600543ff2fab425462d542016f52439051af422c83874277e32f436488314306dc654216110343a6e967425c2b014370cb8742698443433986044309cb0a43e8a94742210c70437bb964437df8f3424407be4235c8024397c31d43a73ff342cac4264377857a4386aef44211d02843beab0d4380743743f2bd0143858f0443f0492a42fde50b4382365e4383c20b43e7374243166af44202f26c42f465df42f0f31c4350c1be42104e39439ed815432ade5c430d1340434a4a3443c812dc42b23d08436cadbf42c4012743b65c654278ab3a435ea7e542035001439af31c4243571c4363d81c4212af04436da83a430d3a2543b6f7c04266c8264344678143adac4c4321bc6d43324280434b76de426daba8427366de427c505b4374416542fc659d42e4b1704345416542b9649d4209b4704391b27043f5669d42875781435a5301434a7f31431844d1423db31343bc7d03439a822e43dac4aa42634555437c4380434fc31c43afa1264356d238434d389742f53815430f884b433c680243d98c14432d760143687fae423cd6f042334d4c43d2ca17438db61443954c0b4320a70a431208bb42ad2c1e4300d8f142961b694275c25343eb371e4315941343e311f3429cc77943eac7434318efbe424df4f342c2b10243d64f65439ad05c431174d34297284c430c02d3424ecfc042508f0b43e0733743563a4e42590c1543529ac042cd3142437b8de1426111e142ea12bd42a41ba3420fcc33433a289942e79211434f35e1429d3f4c43fbb25b432090144324099a428d2c0b437c235d435c033b43a9ba2e433efb7242803701437fc85543c8fb5c4313456e436a054b4367054b435ccb0243523603430999f442655a534373a83143b1a816434b01bb42c4a203437118fa429de24443a0562643fe400943eb36df426550f442e616f642be992643eca20243c031df4265670c436696d242f7b0704335ae0d434b073943acf8f342b6b36d43351f2843d330274327b2f54245ef0b431107f642e2ae0b4349bef242b016e442f1ddb042de504043bb526d439ca41f43da5664432cbb24438df6a4422909bb42583330433dcc5c43fb826d4388a555438ba555437762044396aa3843c2b41d422b5481437c5381435e711d42f692f142693b3a4323be764391903143d88b04437587d2427ea3e44267760d43c13e6f4331ff5c431600e54205a254430206e44276475443c6f92f43c3f86e43a69b5543ec9ea842ba24674399b12e43dc9e654399601f43b2420c43702c384308e43043f083e6428bbc41422da97943dfb479439a504142f3b279438b50af427864704350922f43735b0243947d644312426643cb066f43fa790c43f7ff1d43b535ce428981e442bf882f43c34c3b435125e5425a4f3a43cbea2f437709f642d165524309120e4388347f43224f5243f08f4043cec88842c5dbe04271d2d042a27fbc4269053043e9af1b43ce31f042d87540439debf042fb522b42d34b0a432d58bd4259fa14438a416f435adb5343af492e4310173043da30154368767843f397f14224761343ee77974260fc97421915e542cb361e43e631764304c96743122d08ac0210ac021d8fc2753d222036363466663362363363663734343835396164343564386261383039353730371aa603000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022ad010a280801122439363261663032312d363561362d323936362d616165662d35626166346232663162616512280806122431626333336263662d383633372d323732362d613835652d3234376433313866656634361a280806122436313631656365362d383961342d323732362d616164342d31643566356364366461376522280806122439343738356132372d386138322d323732362d613933372d3135383463366663396333365203312e32a206df210ab01abb88aacd9c38587a5b8e2c409cd15e9a05126209fc9ba0f5481e105835418cb19af192c282b12798682a40ab8362f2203da3755a278983dbb12b4a336ca041ad9a32e3735d2c79a4bae256734a806e3ff7b765fa82171e899e519ee9debf9996e5c8200b02b240242911e99ffd72b0363786684b2069e96f27d9cb76d2a446538816452112ca76b53f1c037b60cc7a356d54bfac3cc2399b87ec454e3a0aa461374921975492651f351755d98aac007f03186682cd17b5035595e566e3499ba2d0547421924865684b7a5d05ceba575047797de05c474597bde1e5fe298c5ab0ada47542cab83da95de0eb1aa41634a53168b99c0923337b418b9fb7946e048aee001bb3c284ae34a64fa382e3b5512dc7452859c53a7a98adee88339f5fd2dccd421651108e5db84d565b4b841570b755f2e78daa6303efde9a09f6a679200f5ef69027077f19da5e9d90b1485b2d3f5efd9897e6578dba3e3699b1e25399305e9d08e776701ddaca36f1c3b385462c411238af0eac663283b7058fb6762c86c134e044efa242dcc98053e8367ee9f6e89071f18f79347e91ef3984196b9d5911044e7ae0449bb2ff4aa377e016ca487a14b5413277a246cb4574783a72686cf82bcc3c84bc3c57b5f331cefcfade608355888c20390fe983af358ef01f3678e5f20390b5e36c99c798023bc81732988e5095f5786034e83fa998f886935f288d9f605f548d28ee9f45b9dbd1a76376338778c9f33a0b328ff506b40465e8b6e2a977669b8733523f000b1328d0c6329e0eb1bfeac3901a6f4fee82ce999cdf8ffb8af4849852817a0d0ef055b390c4fab7359ffd9716fa56496000278659033deeaab00e28944bf85308e7f963960c86d6f12758a55c08b4d82b829d920f1435235441bac06543ef37e9b4c2829dff9341b98663e666b223c048ce0e36e5c06909a55ecbac5d92893d1955d69a00c410cb05d23730f84373741e5a723fa10f61b3768fe9de27ac68b783974df5348af647e0c491990a0a4ada54dd7f432ddfdaec6d6d15b1096a8054a8c99e496d1d04fea72301f87a4d61b90010ea27c2550c38cce8432b90797c59c9f86a0262d2565788fa7daca4f5d29d1d4118ae569610fc6076323917b115bb6796bdb2e81a65096d2cb11d2a401183278522b47a3c318a5c529cad100e328162d31aa7dfd8ce54eef7cdf9c9134888388221d928685efc458c7a5d2c7472da9cb7d945a374a8483cc3188623e45251ad317374b58360e4760244c4001684dc57a24d798be1dde29ec53da0e27b35b838f373075e259cb20a80d189d0852827f6844339a279ba37dae14f329acdba225a13bf3285b2805cf0e79c6cea783c92aa295e74d0b8ddb4bddd40830003925fd09a7ca359b10ad3107bbdc91d36210a9f461661c6c932d01f2e1cc9e6268b1122c6d787b4e9335c028973ea90253b5677f22e0c89ac792b91212ec599a85166039c6208a0e95e932aa9c94ddaf283329b23dc4e06f63e79b71e18be62e94d9cd51e08d82b15a7dadba6414170c520a9759df33f7b782a48ab2049d611b22ff2930685641b0b9b231c0cd9308dbdc8fa64503475f49c8c019b639de9e41754954cbfa35219a31099775cf19612466b227436471803e147cb4b4a1d00521992b7ccfdc389cdd66e203e5b44237400b976a8324eacffeaf79c2c4ff7e303926786d9b742e9bb927c30b1eaff416255363f5bb85457182bf7d894c3240ca1af04b4bd34e281d95870d890694c8a8135570cbccee66c9244f64afec5227c2403566fa4b4c3f7b06ca4d0a113a3802b5e5a52294c9daa06b591040760a50554e45ae327815a3246bc576349ff5e8bbebe36f4fcad436eb2e755612520d4cefdb357940d99697ff2679f0e2c5ccf57e62e4f6c2c821fa008fc77b12e2435a32e2a83937e2098444005f391be9a58ac8075979e06a7f5154e2787160f53f4e60f9c33987ce0d4e6e0590aeb905b324e0826f5385e163604b6df9a9d775831e15451d79d45f9a2ad380445b4001294e83b4c9813b77f7b85062a381080c7feb5549438a37d1c9333198538f9dc5fcbf9aac875a18fff75de282378b12e9385841e95dd0c37922414626831b0f8a285129502186c6f802627bcae7eea5b0aeb3d88a058137565923de0d54cc4db5c05fc8af2ac7c8a0a8009995f0fbc065e0f24256263c3d0212b394f143e887644e36b48a422820d853c821c8c3d304c0a7e00a90a33f5fb83097cd3993c393820be3c0d76c5c3c75b5117956ce00c6fa3b81f288ba2646d9d5f4682f0f91371424ec9206bc493abc996995d31fd32568386b572f13083fd71b9773f58a9809a342507e47e2883ab679c6804452b264cc404892ff99b1684104ca5c47ce9168f523312deb184b108cf96c78762038a0fde52edda9c0f7395a9b462376b1e54f67aefa4fc2352ceb5b53575c5e4cd3c93587850293fcd469c61067b1dbf5a33e089b82c95c9e7f6bb78971484323237b86756557e87e534a7cc1a8725d01cc175166ae3dc6b9d7474f5aed734e6f4840b419483b7ad7d9973a449b18a09cec9f2832ac2c66cbf5dca3041c48f5ced0ea2a7bc0bc63a4e05f36e4bc3489e1ba13151370488aa449e38c31f4a5a59a08b052470d2c1d15e301585f0985365177f3fca818e87c63758a1183da733d3f0b10f1536990905a095885c1f0b5d3c2259ede39393a8d8489855c251a15f51df92c71a47883052bf37e6e83b23f637d94d3194805c9b26f1f5a629d98deee5770387483b9aad4bf2a3b32892bc8b948ba1282882d770c55f403240d96f259919671059d9edb91031c88129834059b3dd792ca9d8a2834e4b69d1296b7e42270d1ebfb54200c3ead4cd322505af435f496629b4be0043983614a1a135b69e636baea12bfe510f1ded8e1e5313b52cd2f0f05a243b92c828fa833fae2c0785cfe7dc94bf08843d0ce2ec89e077905a823c29188415a005f60b4f72afbd18ed203346defd0d46bce20778454aad4504412cea3e20b5f247f2dd69284d08acd88e0a579c678c0aba99a012c0266517cf1d2471795a1c32731db32855f972c7713bb192f6dfb7dfde65c4e43089676a647dd438685c1bed7688c408f4b8493b08b0c2825e301b1c33af08798a9024ada93b2f384e2e5560a780bb3976c1a9dd39231c0a9ddd1f8f46c688f05b8deff79e50e52ca217e140ff32d5a72887e31fad92561982c64ada34ac55905ddc09c1e4de532f7b53aaf5f73f659520278dece12108baa0ac974dca651f5aa5fbc32a35be8cda4dd9590a984d76539c5008b893aa7ad255c49abb5afba39ed95ca15b9949c7276a42b7f778b87814353e2e2128e2074bcdb5e219c5eb3598da5536adea57787e5caca32c5f398bf908235e3870173c803a8feb9737f239331e143cb49dfc2fb883c4ce4241e8d5c44638464b32bfdd9c875665d606142426ba1695f1c98a070c707245d438ea8e103ba3bac94752c7a820929684bf2453b8a4ced4db2d41d2bbc94d09876c7206149602ca41408df0ce7b32a62024725a3c4a77085f2db2aa728403e67315ba5a3c475708532db2aa828497765c853a211586d212434200a02737f73b9434dfe8dca09568c49652a43f3207defff490b4269664c2bdc55ae045c5075984ed52fdb6b3093f45fbc11ec96c404766c9d605c5b04f3a853c469a8fcd614752bc4355388e9310c314bce04879a5e4f0ea6d81184065aa71a04abadac838a1ea0fcc28631523be771bef78083004d8f1dfd9eb8028414ca7c4e2ea229082629fd421d4f2a35b7d975f1e0ebc0841dd73ef282d40f1bddec468a604de5ab8435214f9f45aa93abbd4449c010a305b940798e168b7e0ec128197b1c478c86a5a40911205cd299813453b550a21d057e02005c9f562963cb2f4b2d4b5e907f953882b83a01bf8223b869b626f6a50afc425ee2d17b6a1ce63e24ea1e83638a8443b4b7a735b53c7a0b340a1b2afcce6d8a332c8ae802b6b40fa83b4e775450f94ae2b7c521114f5338c194ab3af237ad50fa164134fac5f335f3243f33fd01d28186ba9763e939d5365c697fb71f4ccac02a509eed3b7c07007205ff59b0a3577565f736e48d393b3f9febdb94f0764eb06cccb630979a5c3408062024f33993cc99b1475f20d9729a18ec65489ab026c44e16a253038e944a1411f5d0e67b1f0facbc213493bf80d6d96cc132fd948002451eb445e5655cdc585877ade436aa34776ca68522d6e99213f7160393952504796e68d6935dadbc2329ee63c84e627497f281689e386a83405ef819e51be52f38cd48cdc303788b99ca8b7877ea4b5d07e231afb374482b5c4bc0a81ea7550d7396309f6c14d4a1107750a1484776c73ffab1584570ce123556d98998440dca5b90900911f44c914b40d50f7430b7654f71ad26627502224d9803919c61cb50259f76837f722a469088e6937f74794690d956037f7118c8c1de1e621356508140419d85a179a675c38920867239df04634faf2e96062333cde340702f72fe6c185c9ab3239573085f4e9c442d9d3ae73898317b9303fcae54852fb4322b18341390e2ba985056ebf35a938a5782075f3abeddbb335f12a354e46238fcc00a7aa7fc11b4ab61698e8f366b1e046fb4179ee6427c1e5552c0dd09722f2fd70cc63519a6e95f08b2b79d8791b45333a72258c1ee0b04a4d428de54a90931454a2d610e63e719d096885a3be4d1258682e83725d2f08a75cbffd2b0812a907808004a603c81005f002030203b804031203b602038a1603ba0903040382030394020396030398010318039a0203ba08052e0302031803c20103b201032e036e03500376051a03f80103bc0a033e039e03030a038e0103a00b03dc04037e039e0903420db60103e02603c624034a039c0903280360038601032c036c03b20103640326036003ce0d031003de0103100356030510032403b80103ca01034a038e1903080302034a035603dc0103860403ae01030a03fa01038a0103900803c201052c035e03800203b606036003c003031e039003039e05031003140303720308035803360324032803bc1b03be0303d6010320030c030c03be01031203b00107a202033e050c034c033a0312030e0364038c0203ae0603be0303d60203ee0103b204032603d40e031203a40103035003d60203ee01036603c0040578032a03a00203ea0203b20303b00203c40103ca01034a03100308032403040340031c0308033a0366035003051a037603ea02035c030a030a030a032e030a0306072a030a050302032203040506052a031c0370030c03e21203ac0203b00203820203bc08038a03034a0304035403280310030c03100304039e0503a601032003a602039e04031e030805da010346036c072003e80a03960d03e404034e054e034a036c033803980103ca0203900103b402037e05ec01032003da08031e03fa04032e03e00c03ec01031003e41603580314039e0103840203600320039201038a02036e030a03d40c030a0356033803420514039001031803de0803880103f203038007031203f401031003dc0103fc1403aa0103220332030e03aa03037803bc0c036c033e0302038601030c031803380366030203220328032a030e03033203e60103d208037a031203800203f00403d40603f80903e20103ba0103d803032803ac0a031003a801072a030e03c0010338030c037003460362034209c60203b804031603360302038601038a0603f6010306038807038c0103120310037003ec0c03960203d8010312035003b003037a035403b20103ec0503fa12034803c007033a03340368032603b00503920b03cc0203b808032c0388040314039c0c0312059205038601031c030c050803e80103d40f03ee02031c03b00a030c03e40103a405032c031803ca01032c03a8010390010314037803240336051e033a0362032403280504032c031e0316032a055a03020306038c1903820b03ae04031e03c60c030603800103080338030803140324038001032e03920b03aa01034a036003a803037e03981603b20203ac01 + m_Storage: [] m_Images: - m_SerializedGuid: m_GuidLow: 4937419599752721334 diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 7df6a0a8c..0cde22249 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.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,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -148,13 +148,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 133288} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 17.5, y: -4.5, z: 10.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 931971011} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11479312 MonoBehaviour: @@ -184,6 +184,7 @@ MonoBehaviour: _line: {fileID: 12022754} --- !u!120 &12022754 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -302,16 +303,20 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 1 m_Loop: 0 + m_ApplyActiveColorSpace: 0 --- !u!1 &23077986 GameObject: m_ObjectHideFlags: 0 @@ -336,13 +341,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 23077986} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &23077988 MonoBehaviour: @@ -427,13 +432,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 72610858} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1815563879} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &99909972 GameObject: @@ -466,7 +471,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1008964083} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -596,13 +600,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 139061313} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -11.167273, y: 0, z: 90} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &139061315 MonoBehaviour: @@ -701,13 +705,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 169938987} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1815563879} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &169938990 MeshRenderer: @@ -791,7 +795,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1664456697} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -933,13 +936,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 196288058} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &196288060 MonoBehaviour: @@ -989,13 +992,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268868612} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &268868614 MonoBehaviour: @@ -1061,6 +1064,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 311940052} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1068,7 +1072,6 @@ Transform: m_Children: - {fileID: 1815563879} m_Father: {fileID: 1452655581} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &311940055 MonoBehaviour: @@ -1107,13 +1110,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 316004889} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &316004891 MonoBehaviour: @@ -1165,6 +1168,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 323698321} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1173,7 +1177,6 @@ Transform: - {fileID: 386309527} - {fileID: 516447806} m_Father: {fileID: 0} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &324332329 GameObject: @@ -1198,13 +1201,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 324332329} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1815563879} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &343567673 GameObject: @@ -1230,13 +1233,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 343567673} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.4202204, y: 2.3235648, z: 215.41406} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &343567675 MonoBehaviour: @@ -1256,6 +1259,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 323698322} m_Modifications: - target: {fileID: 183544, guid: 6d0acc00cc82d436b9d11446d2ddfef6, type: 3} @@ -1311,6 +1315,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6d0acc00cc82d436b9d11446d2ddfef6, type: 3} --- !u!114 &384423527 stripped MonoBehaviour: @@ -1377,13 +1384,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 386295007} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &386295011 MonoBehaviour: @@ -1441,7 +1448,6 @@ RectTransform: - {fileID: 757587163} - {fileID: 579514954} m_Father: {fileID: 323698322} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1505,7 +1511,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 2 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1591,7 +1599,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1676873410} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1643,7 +1650,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 4 + serializedVersion: 6 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 @@ -1683,7 +1690,7 @@ LightingSettings: m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 m_PVRMinBounces: 2 - m_PVREnvironmentMIS: 1 + m_PVREnvironmentImportanceSampling: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeIndirect: 1 @@ -1698,11 +1705,14 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1001 &467958154 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1485875352} m_Modifications: - target: {fileID: 726247919581590288, guid: a3922b7c196726f4b83aca2ff3bc8876, @@ -1917,6 +1927,17 @@ PrefabInstance: value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 726247919949420684, guid: a3922b7c196726f4b83aca2ff3bc8876, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1123195959} + - targetCorrespondingSourceObject: {fileID: 726247919949420684, guid: a3922b7c196726f4b83aca2ff3bc8876, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1123195960} m_SourcePrefab: {fileID: 100100000, guid: a3922b7c196726f4b83aca2ff3bc8876, type: 3} --- !u!1 &503275753 GameObject: @@ -1942,13 +1963,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 503275753} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &503275755 MonoBehaviour: @@ -1988,13 +2009,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 513205134} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1815563879} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &516447806 stripped Transform: @@ -2007,6 +2028,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1485875352} m_Modifications: - target: {fileID: 7813841756834291697, guid: 9547639699352b645a1ffa5934e4710d, @@ -2291,6 +2313,17 @@ PrefabInstance: value: objectReference: {fileID: 517122712} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7813841757805299989, guid: 9547639699352b645a1ffa5934e4710d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 517122709} + - targetCorrespondingSourceObject: {fileID: 7813841757805299989, guid: 9547639699352b645a1ffa5934e4710d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 517122711} m_SourcePrefab: {fileID: 100100000, guid: 9547639699352b645a1ffa5934e4710d, type: 3} --- !u!224 &517122707 stripped RectTransform: @@ -2431,7 +2464,6 @@ RectTransform: m_Children: - {fileID: 1519921291} m_Father: {fileID: 386309527} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2507,6 +2539,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1485875352} m_Modifications: - target: {fileID: 1731849047933434, guid: 1f849deee3a88b449ae981c0346be184, type: 3} @@ -2629,6 +2662,13 @@ PrefabInstance: value: -3375 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 224432371709137870, guid: 1f849deee3a88b449ae981c0346be184, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1419685486} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f849deee3a88b449ae981c0346be184, type: 3} --- !u!224 &588340291 stripped RectTransform: @@ -2683,6 +2723,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 645530829} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -2701,7 +2742,6 @@ Transform: - {fileID: 316004890} - {fileID: 196288059} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &673993476 GameObject: @@ -2745,13 +2785,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 673993476} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &747290456 stripped GameObject: @@ -2810,7 +2850,6 @@ RectTransform: m_Children: - {fileID: 1466712749} m_Father: {fileID: 386309527} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2951,13 +2990,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 877604997} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &927791638 stripped MonoBehaviour: @@ -2996,6 +3035,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 931971010} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -3003,7 +3043,6 @@ Transform: m_Children: - {fileID: 491746} m_Father: {fileID: 645530830} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &931971012 MonoBehaviour: @@ -3124,13 +3163,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952576526} + serializedVersion: 2 m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} --- !u!1 &952602188 GameObject: @@ -3163,7 +3202,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1804142159} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3303,7 +3341,6 @@ RectTransform: m_Children: - {fileID: 99909973} m_Father: {fileID: 1676873410} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3352,7 +3389,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1452655581} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3413,6 +3449,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1485875352} m_Modifications: - target: {fileID: 1574677008445526, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} @@ -3552,7 +3589,7 @@ PrefabInstance: - target: {fileID: 224562823260510934, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 92.485 objectReference: {fileID: 0} - target: {fileID: 224562823260510934, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} @@ -3697,7 +3734,7 @@ PrefabInstance: - target: {fileID: 224978018433022574, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 20 objectReference: {fileID: 0} - target: {fileID: 224978018433022574, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} @@ -3706,6 +3743,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 114999874459135732, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1574677008445526, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1131211187} m_SourcePrefab: {fileID: 100100000, guid: c5e2dc3d9dda6b44189132bc2fbee2b3, type: 3} --- !u!224 &1131211183 stripped RectTransform: @@ -3817,13 +3861,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1350991959} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1815563879} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1356537444 stripped MonoBehaviour: @@ -3849,6 +3893,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4966719baa26e4b0e8231a24d9bd491a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &1419685486 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7721400276146817733, guid: 4829eff037f39bf4188d5061d0b11ab0, + type: 3} + m_PrefabInstance: {fileID: 2011160562} + m_PrefabAsset: {fileID: 0} --- !u!114 &1430095120 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7694872492407101040, guid: 917a61edd84946d4d84b396b6e2eefc8, @@ -3896,6 +3946,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452655580} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -3904,7 +3955,6 @@ Transform: - {fileID: 311940053} - {fileID: 1118031016} m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1465367013 stripped MonoBehaviour: @@ -3923,6 +3973,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 757587163} m_Modifications: - target: {fileID: 1292172246486946, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -4175,6 +4226,9 @@ PrefabInstance: value: -135 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} --- !u!224 &1466712749 stripped RectTransform: @@ -4276,7 +4330,9 @@ Canvas: m_OverrideSorting: 1 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 1 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4301,7 +4357,6 @@ RectTransform: - {fileID: 1804142159} - {fileID: 2097176140} m_Father: {fileID: 0} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4370,7 +4425,6 @@ RectTransform: - {fileID: 2075953934} - {fileID: 1720267179} m_Father: {fileID: 1664456697} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4426,6 +4480,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1542303087, guid: 917a61edd84946d4d84b396b6e2eefc8, type: 3} @@ -4534,6 +4589,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7694872491458505938, guid: 917a61edd84946d4d84b396b6e2eefc8, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 917a61edd84946d4d84b396b6e2eefc8, type: 3} --- !u!114 &1617425453 stripped MonoBehaviour: @@ -4619,13 +4677,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1633447618} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1633447620 MonoBehaviour: @@ -4705,7 +4763,6 @@ RectTransform: - {fileID: 1537397827} - {fileID: 190841677} m_Father: {fileID: 1791362938} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4823,7 +4880,6 @@ RectTransform: - {fileID: 393921153} - {fileID: 1008964083} m_Father: {fileID: 1485875352} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -4922,13 +4978,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1688362175} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1688362177 MonoBehaviour: @@ -4994,7 +5050,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1537397827} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5114,7 +5169,6 @@ RectTransform: m_Children: - {fileID: 1664456697} m_Father: {fileID: 1485875352} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5172,7 +5226,6 @@ RectTransform: m_Children: - {fileID: 952602189} m_Father: {fileID: 1485875352} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -5312,6 +5365,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1815563878} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -5323,7 +5377,6 @@ Transform: - {fileID: 1350991960} - {fileID: 169938988} m_Father: {fileID: 311940053} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1818021644 stripped MonoBehaviour: @@ -5361,13 +5414,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1836188412} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -3.4202204, y: 2.3235648, z: 215.41406} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1836188414 MonoBehaviour: @@ -5428,13 +5481,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1921127888} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645530830} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1921127890 MonoBehaviour: @@ -5489,13 +5542,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975355539} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.02280967, y: 0.005812862, z: -0.013080541} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1975355541 MonoBehaviour: @@ -5544,6 +5597,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 6029586771067145, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -12038,7 +12092,7 @@ PrefabInstance: - target: {fileID: 1115083955671284944, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1373.1779 objectReference: {fileID: 0} - target: {fileID: 1115083955671284944, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -14697,7 +14751,7 @@ PrefabInstance: - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 600 objectReference: {fileID: 0} - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -14707,7 +14761,7 @@ PrefabInstance: - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 1649989580645426746, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -21381,7 +21435,7 @@ PrefabInstance: - target: {fileID: 2872467149482557878, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 2872467149482557878, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22679,7 +22733,7 @@ PrefabInstance: - target: {fileID: 3095204741275097900, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1373.1779 objectReference: {fileID: 0} - target: {fileID: 3095204741275097900, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22770,7 +22824,7 @@ PrefabInstance: - target: {fileID: 3095204741803177420, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3095204741803177420, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22832,7 +22886,7 @@ PrefabInstance: - target: {fileID: 3095204742360027973, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 3095204742360027973, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -22842,7 +22896,7 @@ PrefabInstance: - target: {fileID: 3095204742360027973, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 3095204742360027973, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -23879,7 +23933,7 @@ PrefabInstance: - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2603.1777 objectReference: {fileID: 0} - target: {fileID: 3281146437937522406, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -23934,7 +23988,7 @@ PrefabInstance: - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3281146438198352431, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24104,7 +24158,7 @@ PrefabInstance: - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -24114,7 +24168,7 @@ PrefabInstance: - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 3281146439618114797, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -25329,7 +25383,7 @@ PrefabInstance: - target: {fileID: 3348120566240321850, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 500.5 objectReference: {fileID: 0} - target: {fileID: 3348120566240321850, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28396,7 +28450,7 @@ PrefabInstance: - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 600 objectReference: {fileID: 0} - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28406,7 +28460,7 @@ PrefabInstance: - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 3834814108211916874, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28696,7 +28750,7 @@ PrefabInstance: - target: {fileID: 3894373152342064767, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1373.1779 objectReference: {fileID: 0} - target: {fileID: 3894373152342064767, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28811,7 +28865,7 @@ PrefabInstance: - target: {fileID: 3894373152887427231, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3894373152887427231, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28856,7 +28910,7 @@ PrefabInstance: - target: {fileID: 3894373153440101910, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 3894373153440101910, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -28866,7 +28920,7 @@ PrefabInstance: - target: {fileID: 3894373153440101910, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 3894373153440101910, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31438,7 +31492,7 @@ PrefabInstance: - target: {fileID: 4488229724252769761, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1373.1779 objectReference: {fileID: 0} - target: {fileID: 4488229724252769761, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31570,7 +31624,7 @@ PrefabInstance: - target: {fileID: 4488229725350151560, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 4488229725350151560, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31580,7 +31634,7 @@ PrefabInstance: - target: {fileID: 4488229725350151560, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 4488229725350151560, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -31697,7 +31751,7 @@ PrefabInstance: - target: {fileID: 4488229725871366913, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 4488229725871366913, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33165,7 +33219,7 @@ PrefabInstance: - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 4717613570155323688, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33290,7 +33344,7 @@ PrefabInstance: - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2603.1777 objectReference: {fileID: 0} - target: {fileID: 4717613570970328545, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33445,7 +33499,7 @@ PrefabInstance: - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -33455,7 +33509,7 @@ PrefabInstance: - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 4717613571436695530, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -41337,7 +41391,7 @@ PrefabInstance: - target: {fileID: 6322496099284538130, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 6322496099284538130, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44388,7 +44442,7 @@ PrefabInstance: - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 550 objectReference: {fileID: 0} - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44398,7 +44452,7 @@ PrefabInstance: - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 275 objectReference: {fileID: 0} - target: {fileID: 7045213563210528473, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44709,7 +44763,7 @@ PrefabInstance: - target: {fileID: 7074426695024217787, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1430 objectReference: {fileID: 0} - target: {fileID: 7074426695024217787, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -44719,7 +44773,7 @@ PrefabInstance: - target: {fileID: 7074426695024217787, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 730 objectReference: {fileID: 0} - target: {fileID: 7074426695024217787, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47306,7 +47360,7 @@ PrefabInstance: - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47316,7 +47370,7 @@ PrefabInstance: - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 7475979443393067823, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47341,7 +47395,7 @@ PrefabInstance: - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2603.1777 objectReference: {fileID: 0} - target: {fileID: 7475979443864119588, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47371,7 +47425,7 @@ PrefabInstance: - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 7475979444108170733, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47791,7 +47845,7 @@ PrefabInstance: - target: {fileID: 7529791229527138168, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1373.6779 objectReference: {fileID: 0} - target: {fileID: 7529791229527138168, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47891,7 +47945,7 @@ PrefabInstance: - target: {fileID: 7529791229928230601, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 730 objectReference: {fileID: 0} - target: {fileID: 7529791229928230601, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47961,7 +48015,7 @@ PrefabInstance: - target: {fileID: 7529791230083938244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 7529791230083938244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -47971,7 +48025,7 @@ PrefabInstance: - target: {fileID: 7529791230083938244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 7529791230083938244, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -55553,7 +55607,7 @@ PrefabInstance: - target: {fileID: 8239716510286927632, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 8239716510286927632, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -55563,7 +55617,7 @@ PrefabInstance: - target: {fileID: 8239716510286927632, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 8239716510286927632, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} @@ -60406,6 +60460,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7514116624052355986, guid: ce7fcaa9f2e51014ba31f987a92587f1, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1485548098} m_SourcePrefab: {fileID: 100100000, guid: ce7fcaa9f2e51014ba31f987a92587f1, type: 3} --- !u!114 &1994642990 stripped MonoBehaviour: @@ -60460,6 +60521,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 588340291} m_Modifications: - target: {fileID: 64807106392850193, guid: 4829eff037f39bf4188d5061d0b11ab0, @@ -60724,6 +60786,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1755187160897531689, guid: 4829eff037f39bf4188d5061d0b11ab0, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4829eff037f39bf4188d5061d0b11ab0, type: 3} --- !u!1 &2015589892 GameObject: @@ -60785,13 +60850,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2015589892} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2046099992 stripped MonoBehaviour: @@ -60901,7 +60966,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1537397827} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -60913,6 +60977,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 579514954} m_Modifications: - target: {fileID: 1530605722893704, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} @@ -61070,6 +61135,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} --- !u!1 &2097176139 GameObject: @@ -61100,7 +61168,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1485875352} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -61118,6 +61185,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 10378591568680502, guid: f7743f6bdf9d84344b045e7ea8842dec, @@ -63299,7 +63367,7 @@ PrefabInstance: - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1373.1779 objectReference: {fileID: 0} - target: {fileID: 2778343469765913399, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63329,7 +63397,7 @@ PrefabInstance: - target: {fileID: 2778343469814027912, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 2778343469814027912, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63349,7 +63417,7 @@ PrefabInstance: - target: {fileID: 2778343470104895911, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 2778343470104895911, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63359,7 +63427,7 @@ PrefabInstance: - target: {fileID: 2778343470104895911, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 2778343470104895911, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63390,7 +63458,7 @@ PrefabInstance: - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1405 objectReference: {fileID: 0} - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63400,7 +63468,7 @@ PrefabInstance: - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 702.5 objectReference: {fileID: 0} - target: {fileID: 2778343470200416436, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63501,7 +63569,7 @@ PrefabInstance: - target: {fileID: 2797029014025994065, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 600 objectReference: {fileID: 0} - target: {fileID: 2797029014025994065, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -63511,7 +63579,7 @@ PrefabInstance: - target: {fileID: 2797029014025994065, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 2797029014025994065, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64119,7 +64187,7 @@ PrefabInstance: - target: {fileID: 3703633929023263987, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 3703633929023263987, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64129,7 +64197,7 @@ PrefabInstance: - target: {fileID: 3703633929023263987, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 3703633929023263987, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64190,7 +64258,7 @@ PrefabInstance: - target: {fileID: 3703633929546576506, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 3703633929546576506, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -64235,7 +64303,7 @@ PrefabInstance: - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1373.1779 objectReference: {fileID: 0} - target: {fileID: 3703633930074971290, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -66934,7 +67002,7 @@ PrefabInstance: - target: {fileID: 6660789680987878300, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 600 objectReference: {fileID: 0} - target: {fileID: 6660789680987878300, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -66944,7 +67012,7 @@ PrefabInstance: - target: {fileID: 6660789680987878300, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 6660789680987878300, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68355,7 +68423,7 @@ PrefabInstance: - target: {fileID: 8994770306746203453, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 15 objectReference: {fileID: 0} - target: {fileID: 8994770306746203453, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68441,7 +68509,7 @@ PrefabInstance: - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 2603.1777 objectReference: {fileID: 0} - target: {fileID: 8994770307525018100, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68511,7 +68579,7 @@ PrefabInstance: - target: {fileID: 8994770308132426751, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 1460 objectReference: {fileID: 0} - target: {fileID: 8994770308132426751, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68521,7 +68589,7 @@ PrefabInstance: - target: {fileID: 8994770308132426751, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 750 objectReference: {fileID: 0} - target: {fileID: 8994770308132426751, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} @@ -68671,6 +68739,9 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3232450956286077595, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} - {fileID: 0} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7743f6bdf9d84344b045e7ea8842dec, type: 3} --- !u!114 &3232450957232059526 stripped MonoBehaviour: @@ -68689,6 +68760,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 368556023188992106, guid: 8e95bb22958bf384e8daab13c9290323, @@ -69150,6 +69222,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5657451143301786145, guid: 8e95bb22958bf384e8daab13c9290323, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e95bb22958bf384e8daab13c9290323, type: 3} --- !u!114 &6292087474232253253 stripped MonoBehaviour: @@ -69163,3 +69238,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: accb714425edfcc4abfab54e2b4267a3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 952576528} + - {fileID: 877604999} + - {fileID: 1617425452} + - {fileID: 386295010} + - {fileID: 673993478} + - {fileID: 645530830} + - {fileID: 2015589895} + - {fileID: 1452655581} + - {fileID: 5657451142901975894} + - {fileID: 3232450957232059525} + - {fileID: 1994642989} + - {fileID: 1485875352} + - {fileID: 1975355540} + - {fileID: 323698322} diff --git a/arcor2_AREditor/Packages/manifest.json b/arcor2_AREditor/Packages/manifest.json index ea0f92c11..3b71797f5 100644 --- a/arcor2_AREditor/Packages/manifest.json +++ b/arcor2_AREditor/Packages/manifest.json @@ -23,11 +23,12 @@ "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.5", + "com.unity.toolchain.linux-x86_64": "2.0.6", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4", "com.unity.ugui": "1.0.0", - "com.unity.xr.arcore": "5.0.6", - "com.unity.xr.arfoundation": "5.0.6", - "com.unity.xr.arkit": "5.0.6", + "com.unity.xr.arcore": "5.0.7", + "com.unity.xr.arfoundation": "5.0.7", + "com.unity.xr.arkit": "5.0.7", "com.unity.xr.arkit-face-tracking": "5.0.2", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/arcor2_AREditor/Packages/packages-lock.json b/arcor2_AREditor/Packages/packages-lock.json index 93a8fa0b5..005622fd0 100644 --- a/arcor2_AREditor/Packages/packages-lock.json +++ b/arcor2_AREditor/Packages/packages-lock.json @@ -94,7 +94,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.6.1", + "version": "1.7.0", "depth": 1, "source": "registry", "dependencies": { @@ -137,7 +137,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.10.1", + "version": "1.11.0", "depth": 2, "source": "registry", "dependencies": { @@ -148,18 +148,18 @@ "url": "https://packages.unity.com" }, "com.unity.sysroot": { - "version": "2.0.5", + "version": "2.0.7", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.sysroot.linux-x86_64": { - "version": "2.0.4", + "version": "2.0.6", "depth": 1, "source": "registry", "dependencies": { - "com.unity.sysroot": "2.0.5" + "com.unity.sysroot": "2.0.7" }, "url": "https://packages.unity.com" }, @@ -195,6 +195,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.linux-x86_64": { + "version": "2.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.7", + "com.unity.sysroot.linux-x86_64": "2.0.6" + }, + "url": "https://packages.unity.com" + }, "com.unity.toolchain.win-x86_64-linux-x86_64": { "version": "2.0.4", "depth": 0, @@ -215,11 +225,11 @@ } }, "com.unity.xr.arcore": { - "version": "5.0.6", + "version": "5.0.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.arfoundation": "5.0.6", + "com.unity.xr.arfoundation": "5.0.7", "com.unity.xr.core-utils": "2.1.0", "com.unity.xr.management": "4.0.1", "com.unity.modules.androidjni": "1.0.0", @@ -228,7 +238,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arfoundation": { - "version": "5.0.6", + "version": "5.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -245,12 +255,12 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arkit": { - "version": "5.0.6", + "version": "5.0.7", "depth": 0, "source": "registry", "dependencies": { "com.unity.editorcoroutines": "1.0.0", - "com.unity.xr.arfoundation": "5.0.6", + "com.unity.xr.arfoundation": "5.0.7", "com.unity.xr.core-utils": "2.1.0", "com.unity.xr.management": "4.0.1" }, @@ -266,7 +276,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.2.1", + "version": "2.2.3", "depth": 1, "source": "registry", "dependencies": { @@ -285,7 +295,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.3.3", + "version": "4.4.0", "depth": 1, "source": "registry", "dependencies": { diff --git a/arcor2_AREditor/ProjectSettings/ProjectSettings.asset b/arcor2_AREditor/ProjectSettings/ProjectSettings.asset index e29b88bb8..a984f4c07 100644 --- a/arcor2_AREditor/ProjectSettings/ProjectSettings.asset +++ b/arcor2_AREditor/ProjectSettings/ProjectSettings.asset @@ -88,6 +88,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -127,6 +128,7 @@ PlayerSettings: switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -135,14 +137,10 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0.2 + bundleVersion: 1.0.3 preloadedAssets: - {fileID: 11400000, guid: 20a9bcdf4f5308b4cbe95702f502a097, type: 2} - {fileID: 0} - - {fileID: -2463257785536252682, guid: 4c23dffa6be639149863cb8c370c5da8, type: 2} - - {fileID: 11400000, guid: e05e58d77793b7781bbf314d2061a0ad, type: 2} - - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} - - {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3} - {fileID: 11400000, guid: d53a61adfc9ff4d89aacb9db70fb859b, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -173,7 +171,7 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 26 + AndroidMinSdkVersion: 29 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 0 aotOptions: @@ -262,7 +260,7 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 1 - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 2 AndroidTargetDevices: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -598,6 +596,7 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 switchUseGOLDLinker: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 @@ -853,7 +852,7 @@ PlayerSettings: additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: - Android: 0 + Android: 1 Standalone: 0 il2cppCompilerConfiguration: Android: 1 @@ -911,6 +910,7 @@ PlayerSettings: metroSplashScreenUseBackgroundColor: 0 platformCapabilities: WindowsStoreApps: + EnterpriseAuthentication: False OfflineMapsManagement: False HumanInterfaceDevice: False Location: False @@ -922,7 +922,6 @@ PlayerSettings: PrivateNetworkClientServer: False InternetClientServer: False VideosLibrary: False - BackgroundMediaPlayback: False Objects3D: False RemoteSystem: False BlockedChatMessages: False @@ -944,10 +943,10 @@ PlayerSettings: PointOfService: False RecordedCallsFolder: False Contacts: False - InternetClient: True Proximity: False + InternetClient: True CodeGeneration: False - EnterpriseAuthentication: False + BackgroundMediaPlayback: False metroTargetDeviceFamilies: Desktop: False Holographic: True diff --git a/arcor2_AREditor/ProjectSettings/ProjectVersion.txt b/arcor2_AREditor/ProjectSettings/ProjectVersion.txt index 0a60761e0..88bb9cf99 100644 --- a/arcor2_AREditor/ProjectSettings/ProjectVersion.txt +++ b/arcor2_AREditor/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.5f1 -m_EditorVersionWithRevision: 2022.3.5f1 (9674261d40ee) +m_EditorVersion: 2022.3.10f1 +m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62)