From 3a1ee5f9efb7a351e68e63a29cf372f7d63d772a Mon Sep 17 00:00:00 2001 From: TRAfoer Date: Wed, 12 Feb 2025 21:29:40 +0800 Subject: [PATCH] Vec3InputField 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit e 按·（esc下面那个）暂时关闭UI --- .../Resources/ES3/ES3GlobalReferences.asset | 16 +- .../DynamicUI/Elements/InputField.prefab | 16 +- .../DynamicUI/Elements/Vec3InputField.prefab | 495 +++--------------- .../DynamicUIVec3InputField.cs | 57 +- .../DynamicUI/Hierarchy/HierarchyTab.cs | 8 +- .../Scripts/DynamicUI/Inspector/Inspector.cs | 1 + .../ElementFolder/ElementFolder.cs | 3 + Assets/Scripts/GameElements/GameElement.cs | 25 +- Assets/Scripts/GameElements/Track/Track.cs | 2 +- 9 files changed, 137 insertions(+), 486 deletions(-) diff --git a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset index a0d312c7..0255cb05 100644 --- a/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset +++ b/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset @@ -338,7 +338,6 @@ MonoBehaviour: - {fileID: 2800000, guid: 188dfe7e559f13248ba2c41eb5a59328, type: 3} - {fileID: 569625742320642989, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 4499456117278156033, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 2897437631605142572, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 7596590615969385144, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 4669748465869492962, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 1109358340149190358, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} @@ -351,14 +350,9 @@ MonoBehaviour: - {fileID: 1367879115595448537, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 5456343920773810964, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 8816247129259985422, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 6240002274609338210, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 8250293319114463492, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 7779862125215313892, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 1876853640019479660, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 1960046375090445140, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 405046286491307477, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 4787506965637756451, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 7439332005388610437, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 2569097339568223559, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 7865900641476678793, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 7888148428386565859, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} @@ -370,15 +364,9 @@ MonoBehaviour: - {fileID: 4820553838928225789, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 4627887233940880744, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 2207948231675607019, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 8503979273296401553, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 2730124660575366187, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 3391848432509066319, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 1636400817113236187, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 3385538268891444206, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 2792476238050467884, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 4410930810289194328, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 7176579438568494463, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - - {fileID: 7296372054047457828, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 6603823063929320148, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 398793150947721882, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 1006677740166385603, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} @@ -407,4 +395,6 @@ MonoBehaviour: - {fileID: 1850510772748301779, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 9001319910968385871, guid: 9e72408c17dfe4740b0e9060d6b3fafa, type: 3} - {fileID: 11500000, guid: 8372da2ad7a105d4aa3904e8b3fdfd71, type: 3} - _Values: 526a8851fe85233e7cc810cd2b8a733faa68e71a62b99912cf2f06228873853005edfb00aa354575a31cc8ad1ac7b966f52afefc8351b636e2b71574be99675b6400dfc3607f0069e96d5112b3681f5fcf550a7f3749f10c2c006f2e23d1db370e64801184e106752a681216ffa3837998b5a5688fe7245230fcd93d5728ea479cf46b8ba7516b16ed2e96b5bbb6e20e0c6272c125d7806f67cd366983232521642549cf9088373b29cf12c86a843666a9d2726c53c784328db49f8d499d2140c6bf413c35ce7d12821326d7a7c36313210e18f42f147d60db1f64f3ada3bb2d6666d31a094491222bbde8f495825a4e2f05ece33b3881253ca117543370bf2531ac8ebf10b7f565a03ac9712b88ca58c516c5a7b6d8f161d84e972e95f1f208f318fcbd24a42f1a1594d13a0cca1e4d0b9a28c0e4238a4cd5432183fe0a3d37c5600352a5affe32a0f1cca64d60c95d6de43a2f1ab3ec2f8dafe7e182ac1c0b579975acc6cca75b9cf61ff356e4ff757ac4f0e2446c5178b3cc3b0938e3500b2c3eb04c15e369388d95cb10d3df8656069a951142fc403ed6b4a90102e5146519f66f6d35134e18b132d9ec6c3ec954f282992fe09c9f2a9752fc7c47b5d52b06e06eab61a6d10e4d7cc274d62caa67eb540f7f4be5844b6a66281ce82d2f664f7483a3a0ebff69576b98633aaa8921a5ddbe04814bd97aac297cdb1235373261c4cec06828ec556592c57c95cb2c5c853ad052230733029b09f8776f245772a3ca0276dcc8b833ca146a1411560f76a926a9289a1bf169092fa58ddf9c3a7517c82635364a7f4df403890f9d1ef144fb812196cd7f0c77286780f491baec2cdaf4fd482fda400ba6f61b9da4000716c29e6ca1845b5768bcaf0ecfc98bbb39185d35a921a8142041153dc39aaa1c286f97b630278db035fff6d32e0ef214326ce60b1f02d1fa3100beb18fe2b7e76ee911c7c76ae00c14c122f29acc03601a51f08a4016e1082f6d7eea356c2d4766a7c4e03aa5e33455a9d65f214d9d8402a2681f2dbdd87b070a985bebf6d6a81097a7bf6f1b653f6d44ca68c07e191e3105186bfcf1e65731b726cef277b7a02e2f4f8ba6de14e73c29b17188403b8622b78df10f42a4017cfff026423332e5732a39eecea4c4101a0158da5ca71f8e0cacf1a805a8b07076b2f15811115bf709cdfeb27a2a54c77a62f3f016365a2b209de610da2415e4793787e44c9401f65bb01b6f5693eb1d01b923a2b5bf5a3f57c537732b4a1ce41e1dd3bc5c8f84196316b39ae5142b724ec80f2101722eba6ec83b11cc7422a66c365139bf2fc07134f6c0358c0bda930f573d9dc4051c541157fd8ac87b1d9952a64ba6e19ca69e2499417fddbe2caa24c1a561f21387762d2def8c67a4f06e2bc76e0cb0d75f9409b22d34593aa82d7ba7ae89207f8b652d5f423bce6076d56121e00caac4b88c2c7dcb083a94c883285aa4d5c6ce0a8162bfdd6753d123843ddced44e075745b023dbb7e5b896e8269c01328054c9b302a1ab4da484855f13539de7736f3892f04d9f6479188c48f2cd00d4fa9d9c99a7201753abb270b443240a506dad2e62f21bcf924dbc733497deec366e53a852b5d6e466fed752cfb7898b19bdc423679483d7065d2ed753932d34255148ed5933b2f9bb6e6a9e268170b63bcea6793c524c3515736dfa68f07f4c3e5cd2819166dba29f321139f0d5a074dc689b94fcb3f83cf281fd236e5292abdda6dc835402586d5d0c1605cee625fb13d2d6d18c0428f254a59f1f69a0ef2e209aa3a5f6e2ef35ef170e07360261e3a3ede074843437e1dfbee809a1671c43e2f82acbcd800430f3a0f274f621bc623782b35791639d9b3d6a7a4a251738a9dcae15d1d2c629ec1dee87cac94318016b3a41242a73e5469a8f9e5305b1a9e52653be5bb871d51da8e739a2dbc794808278eefad6148f68c8cf374337c311ef987ce12cf173b716a0b132fe4277edbdd4e22f732d40ef01d45592e93a97ca93fa95e5a129817e09c00a6478b8824b30bce51819f29142579bf2f14716a04ec784291717a27138999bca5ced2397ca56aa623c557fa0aea6b7c2b2d37d36ecd046c4031e66938e3bac7e8e2834609b33cd57e178eca6b83c7852308adbe3e94d428359a07b5400093c0f470edd76c4e79870e9eaba95c32283d069372be6e79067bb6ab7ca454796a807a3129056bd4516d76698e182e2bcd6bccd4d0d55bd256e985ffc3c546e2bb353081161d28e9f2b17c68842a61ffbca8999ef095525156bae067ce736817b45824c349af41156b1c1de1a70c577fb57abce4d3570d25e2df2a5b3cc1489ae5994cd4f9624895167ccd2c878e56b79ca0e2b6cfb2425d4b4aa628d99c27562c7d03f23f7d7819c328ce578ae1527135e0f7dda3ff6a97dca81f440971457a5478000a8b6376e1d8360c581b142d9608e7a1456bfa07b651858937153a686575e98014203e3e284564acf772d0414ace1d3510e7224a5ade01287e0be64f896976eb354cd453dd6c74b85fa2e828b9d4c8b9fdf7d24683ea1f5d51667f1d5e15238dfce40c6aa371127c5bdaaa470b279155bdd3ad6d9730674a2c76017713a8a6b681a4d32ac75e5c6e094fa25e94676779f8d5da313d6e0934833ec218748a6ab334f3c665ab98e2e4d0e388478e09b6c50e887e177c2785ed64615806e08b1e6b46aa6d77d33232a00d0a9e1f09ae3d730b78d804f67dd0a3864c364a40dbc45b01f48e388ad267be45e0da793a5a1c4adc1a0557652262c47b11fe1e96831e163005de15e0fb03221f68b5285849dde06880275b1fe340dba9ac4b77d44955c8fff1aa3ec7ce951ee81cc70492c6e23b11207815a53ccaebba464132d331f694d66968042f655630447ceb4524f930ad89858d64d39f505d3e46807a1100bbe767782751b8dbae93ee5fc7226db8ffaccc4a55445f1007aba41b4260bcb047a020454d5b3229c26b55bebe32232d20cceb1df107ea74ef6b3011a50761a6801b71d94a7d2c046a22d1333431a134bf8204e4ed2af4022af362109e2f2bef44313d81ec1a66a47b3c19c878470a55a2690825a356561e72b38fd7ae01ae4a6e96bb747f192505286ef155af188deaeb8cd4eec2232870ac4269fb76048416d70ae562427dd5bc4403fc346500705927a4eb212c63f36e41d3df3e7d298f24eada7da53229579148e75640d90c0cacd20fd3d11862168be888de916169c0e48b27b6757d3627fefc7d6914ba33b8b137cc9492aa430c88f1098dba073930de2672b5b1567fd6f7162a2a64072a451ccf2c5994d52e5bbfe973432468198e568f78da72731274c4468ee18fc367d4dc573e3c894702f74d106b78d3cd639abd3cfef63523231af4bf491b069c3f6fa51cfe8a26f82a3862d4b8df032e395b7650edaecae8507bfae382678d6e456f60c0820b69a968c953246344f2490055701c155611592b394b9a3c1ee2f55a1bf1f247ccd2d2694ad889b2a6521d6ef8a3102955feb74a8770a5d5a1229266ec4babb2d341af68b75b7f20341902746809447bd2cc041cc65840a4d302386b6bef9ff2fdcf41490c571f4e8127805e731a6c98de1794208daa08aac206d37cd656ef8a3a32d12f111d50acd2e01727942ed923ac200f4bd13d91114c1fc636929d3615656a0a7bbc9bffa1e8fa965da8113e79c5a1a532ea7e69180454e3301d79c190e8d37329dca220b7df4ecc352b1196c41eb28f0f07fbff1c2bdc8067b8cfbd62bc27462b9e145567c25c1264b234edf3be1e113109d197e4d28f550022b8fe0f916a78044273957140d5010e40aa7584a4dd0a48bce92853bcdd2800a4fcf236f94cef6aa7ddc4fa9baa221f9c96ce44e2cb1472b56a55f91470e032c3ed7b7ac540e3304aa888e7b67a23199892ea67d8a8886e3c1377a78f0b3b603c0fdb93fa5c2e4a7d24561caa96003a473b91a75a470a6a98d8a779cf888976dfb7c7ef7a257b79309bde95c7ed4c3e15154df74f13005731f237a3cd6f326f9431926a9edec432f542409f7691a6580ae26bd175690d2c0a0bcfdefe65af544078f6f57d7bd96b3d0d446eccc550371053189c384ca07db14684e8d850aa19c651a98b6a058644e66f933b98d3f00b2986bcc9080f6c13622ba77a1bc4cc0bcdd33418335b655093c331b81c194e667a0d386610db497d85bc8c077879970f0f788481ef1da14bf438ddcf86935441de988d54da39ba18e886f1c49546fc655bb9abaac6878c5c94128d280185080d674ae51107ece948329c69750e65e03bf4c85e45f9d5f44230b5c90e524e0b3bb3cbf2f392c067444ffa037bccaf833cc7382a1dcc2e985810164f89baa0c11e6db27652245a744ccf5d09012d86897f338cd68b7928087b339ae27b70de891043de1680da2a9e6d + - {fileID: 2800000, guid: f66c4aa44c09b6a42a2b5b9f9334d824, type: 3} + - {fileID: 2800000, guid: dcc0ed9263c0d524aabeb5f4bd75ecee, type: 3} + _Values: 526a8851fe85233e7cc810cd2b8a733faa68e71a62b99912cf2f06228873853005edfb00aa354575a31cc8ad1ac7b966f52afefc8351b636e2b71574be99675b6400dfc3607f0069e96d5112b3681f5fcf550a7f3749f10c2c006f2e23d1db370e64801184e106752a681216ffa3837998b5a5688fe7245230fcd93d5728ea479cf46b8ba7516b16ed2e96b5bbb6e20e0c6272c125d7806f67cd366983232521642549cf9088373b29cf12c86a843666a9d2726c53c784328db49f8d499d2140c6bf413c35ce7d12821326d7a7c36313210e18f42f147d60db1f64f3ada3bb2d6666d31a094491222bbde8f495825a4e2f05ece33b3881253ca117543370bf2531ac8ebf10b7f565a03ac9712b88ca58c516c5a7b6d8f161d84e972e95f1f208f318fcbd24a42f1a1594d13a0cca1e4d0b9a28c0e4238a4cd5432183fe0a3d37c5600352a5affe32a0f1cca64d60c95d6de43a2f1ab3ec2f8dafe7e182ac1c0b579975acc6cca75b9cf61ff356e4ff757ac4f0e2446c5178b3cc3b0938e3500b2c3eb04c15e369388d95cb10d3df8656069a951142fc403ed6b4a90102e5146519f66f6d35134e18b132d9ec6c3ec954f282992fe09c9f2a9752fc7c47b5d52b06e06eab61a6d10e4d7cc274d62caa67eb540f7f4be5844b6a66281ce82d2f664f7483a3a0ebff69576b98633aaa8921a5ddbe04814bd97aac297cdb1235373261c4cec06828ec556592c57c95cb2c5c853ad052230733029b09f8776f245772a3ca0276dcc8b833ca146a1411560f76a926a9289a1bf169092fa58ddf9c3a7517c82635364a7f4df403890f9d1ef144fb812196cd7f0c77286780f491baec2cdaf4fd482fda400ba6f61b9da4000716c29e6ca1845b5768bcaf0ecfc98bbb39185d35a921a8142041153dc39aaa1c286f97b630278db035fff6d32e0ef214326ce60b1f02d1fa3100beb18fe2b7e76ee911c7c76ae00c14c122f29acc03601a51f08a4016e1082f6d7eea356c2d4766a7c4e03aa5e33455a9d65f214d9d8402a2681f2dbdd87b070a985bebf6d6a81097a7bf6f1b653f6d44ca68c07e191e3105186bfcf1e65731b726cef277b7a02e2f4f8ba6de14e73c29b17188403b8622b78df10f42a4017cfff026423332e5732a39eecea4c4101a0158da5ca71f8e0cacf1a805a8b07076b2f15811115bf709cdfeb27a2a54c77a62f3f016365a2b209de610da2415e4793787e44c9401f65bb01b6f5693eb1d01b923a2b5bf5a3f57c537732b4a1ce41e1dd3bc5c8f84196316b39ae5142b724ec80f2101722eba6ec83b11cc7422a66c365139bf2fc07134f6c0358c0bda930f573d9dc4051c541157fd8ac87b1d9952a64ba6e19ca69e2499417fddbe2caa24c1a561f21387762d2def8c67a4f06e2bc76e0cb0d75f9409b22d34593aa82d7ba7ae89207f8b652d5f423bce6076d56121e00caac4b88c2c7dcb083a94c883285aa4d5c6ce0a8162bfdd6753d123843ddced44e075745b023dbb7e5b896e8269c01328054c9b302a1ab4da484855f13539de7736f3892f04d9f6479188c48f2cd00d4fa9d9c99a7201753abb270b443240a506dad2e62f21bcf924dbc733497deec366e53a852b5d6e466fed752cfb7898b19bdc423679483d7065d2ed753932d34255148ed5933b2f9bb6e6a9e268170b63bcea6793c524c3515736dfa68f07f4c3e5cd2819166dba29f321139f0d5a074dc689b94fcb3f83cf281fd236e5292abdda6dc835402586d5d0c1605cee625fb13d2d6d18c0428f254a59f1f69a0ef2e209aa3a5f6e2ef35ef170e07360261e3a3ede074843437e1dfbee809a1671c43e2f82acbcd800430f3a0f274f621bc623782b35791639d9b3d6a7a4a251738a9dcae15d1d2c629ec1dee87cac94318016b3a41242a73e5469a8f9e5305b1a9e52653be5bb871d51da8e739a2dbc794808278eefad6148f68c8cf374337c311ef987ce12cf173b716a0b132fe4277edbdd4e22f732d40ef01d45592e93a97ca93fa95e5a129817e09c00a6478b8824b30bce51819f29142579bf2f14716a04ec784291717a27138999bca5ced2397ca56aa623c557fa0aea6b7c2b2d37d36ecd046c4031e66938e3bac7e8e2834609b33cd57e178eca6b83c7852308adbe3e94d428359a07b5400093c0f470edd76c4e79870e9eaba95c32283d069372be6e79067bb6ab7ca454796a807a3129056bd4516d76698e182e2bcd6bccd4d0d55bd256e985ffc3c546e2bb353081161d28e9f2b17c68842a61ffbca8999ef095525156bae067ce736817b45824c349af41156b1c1de1a70c577fb57abce4d3570d25e2df2a5b3cc1489ae5994cd4f9624895167ccd2c878e56b79ca0e2b6cfb2425d4b4aa628d99c27562c7d03f23f7d7819c328ce578ae1527135e0f7dda3ff6a97dca81f440971457a5478000a8b6376e1d8360c581b142d9608e7a1456bfa07b651858937153a686575e98014203e3e284564acf772d0414ace1d3510e7224a5ade01287e0be64f896976eb354cd453dd6c74b85fa2e828b9d4c8b9fdf7d24683ea1f5d51667f1d5e15238dfce40c6aa371127c5bdaaa470b279155bdd3ad6d9730674a2c76017713a8a6b681a4d32ac75e5c6e094fa25e94676779f8d5da313d6e0934833ec218748a6ab334f3c665ab98e2e4d0e388478e09b6c50e887e177c2785ed64615806e08b1e6b46aa6d77d33232a00d0a9e1f09ae3d730b78d804f67dd0a3864c364a40dbc45b01f48e388ad267be45e0da793a5a1c4adc1a0557652262c47b11fe1e96831e163005de15e0fb03221f68b5285849dde06880275b1fe340dba9ac4b77d44955c8fff1aa3ec7ce951ee81cc70492c6e23b11207815a53ccaebba464132d331f694d66968042f655630447ceb4524f930ad89858d64d39f505d3e46807a1100bbe767782751b8dbae93ee5fc7226db8ffaccc4a55445f1007aba41b4260bcb047a020454d5b3229c26b55bebe32232d20cceb1df107ea74ef6b3011a50761a6801b71d94a7d2c046a22d1333431a134bf8204e4ed2af4022af362109e2f2bef44313d81ec1a66a47b3c19c878470a55a2690825a356561e72b38fd7ae01ae4a6e96bb747f192505286ef155af188deaeb8cd4eec2232870ac4269fb76048416d70ae562427dd5bc4403fc346500705927a4eb212c63f36e41d3df3e7d298f24eada7da53229579148e75640d90c0cacd20fd3d11862168be888de916169c0e48b27b6757d3627fefc7d6914ba33b8b137cc9492aa430c88f1098dba073930de2672b5b1567fd6f7162a2a64072a451ccf2c5994d52e5bbfe973432468198e568f78da72731274c4468ee18fc367d4dc573e3c894702f74d106b78d3cd639abd3cfef63523231af4bf491b069c3f6fa51cfe8a26f82a3862d4b8df032e395b7650edaecae8507bfae382678d6e456f60c0820b69a968c953246344f2490055701c155611592b394b9a3c1ee2f55a1bf1f247ccd2d2694ad889b2a6521d6ef8a3102955feb74a8770a5d5a1229266ec4babb2d341af68b75b7f20341902746809447bd2cc041cc65840a4d302386b6bef9ff2fdcf41490c571f4e8127805e731a6c98de1794208daa08aac206d37cd656ef8a3a32d12f111d50acd2e01727d13d91114c1fc636929d3615656a0a7bbc9bffa1e8fa965da8113e79c5a1a532ea7e69180454e3301d79c190e8d37329dca220b7df4ecc352b1196c41eb28f0f07fbff1c2bdc8067b8cfbd62bc27462b9e145567c25c1264b234edf3be1e113122b8fe0f916a78044273957140d5010ea7ddc4fa9baa221fb56a55f91470e032c3ed7b7ac540e3304aa888e7b67a23199892ea67d8a8886e3c1377a78f0b3b603c0fdb93fa5c2e4a7d24561caa96003a473b91a75a470a6a98d8a779cf888976dfb7c7ef7a257b79309bde95c7ed4c3e31f237a3cd6f326f0a0bcfdefe65af544078f6f57d7bd96bb14684e8d850aa19c651a98b6a058644e66f933b98d3f00b2986bcc9080f6c13622ba77a1bc4cc0bcdd33418335b655093c331b81c194e667a0d386610db497d85bc8c077879970f0f788481ef1da14bf438ddcf86935441de988d54da39ba18e886f1c49546fc655bb9abaac6878c5c94128d280185080d674ae51107ece948329c69750e65e03bf4c85e45f9d5f44230b5c90e524e0b3bb3cbf2f392c067444ffa037bccaf833cc7382a1dcc2e985810164f89baa0c11e6db27652245a744ccf5d09012d86897f338cd68b7928087b339ae27b70de891043de1680da2a9e6de579444dd73a9d39b5ff4de8b3cfc74b diff --git a/Assets/Prefabs/DynamicUI/Elements/InputField.prefab b/Assets/Prefabs/DynamicUI/Elements/InputField.prefab index 18f94ef2..3106c2be 100644 --- a/Assets/Prefabs/DynamicUI/Elements/InputField.prefab +++ b/Assets/Prefabs/DynamicUI/Elements/InputField.prefab @@ -92,10 +92,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 72 + m_fontSizeBase: 22 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -319,8 +319,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: title: {fileID: 4146383444293307128} - isAlwaysUpdated: 0 parameterName: + isAlwaysUpdated: 0 inputField: {fileID: 8133616667585172139} --- !u!1 &6054617597329561493 GameObject: @@ -642,13 +642,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 - m_fontSizeBase: 14 + m_fontSize: 33.1 + m_fontSizeBase: 22 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 2 + m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 diff --git a/Assets/Prefabs/DynamicUI/Elements/Vec3InputField.prefab b/Assets/Prefabs/DynamicUI/Elements/Vec3InputField.prefab index 035779a8..038fa54e 100644 --- a/Assets/Prefabs/DynamicUI/Elements/Vec3InputField.prefab +++ b/Assets/Prefabs/DynamicUI/Elements/Vec3InputField.prefab @@ -125,20 +125,32 @@ MonoBehaviour: m_VerticalScrollbarEventHandler: {fileID: 0} m_LayoutGroup: {fileID: 0} m_ScrollSensitivity: 1 - m_ContentType: 9 + m_ContentType: 3 m_InputType: 0 m_AsteriskChar: 42 - m_KeyboardType: 4 + m_KeyboardType: 2 m_LineType: 0 m_HideMobileInput: 0 m_HideSoftKeyboard: 0 - m_CharacterValidation: 2 + m_CharacterValidation: 3 m_RegexValue: m_GlobalPointSize: 14 m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 9001319910968385871} + m_TargetAssemblyTypeName: Ichni.Editor.DynamicUIVec3InputField, Assembly-CSharp + m_MethodName: ApplyParametersx + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnSubmit: m_PersistentCalls: m_Calls: [] @@ -175,140 +187,6 @@ MonoBehaviour: m_isRichTextEditingAllowed: 0 m_LineLimit: 0 m_InputValidator: {fileID: 0} ---- !u!1 &405046286491307477 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7439332005388610437} - - component: {fileID: 6240002274609338210} - - component: {fileID: 8503979273296401553} - m_Layer: 5 - m_Name: X - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7439332005388610437 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 405046286491307477} - 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: 8691581922048536374} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -25, y: 30} - m_SizeDelta: {x: 150, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6240002274609338210 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 405046286491307477} - m_CullTransparentMesh: 1 ---- !u!114 &8503979273296401553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 405046286491307477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: VEC1 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 16 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1850510772748301779 GameObject: m_ObjectHideFlags: 0 @@ -443,274 +321,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1876853640019479660 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7176579438568494463} - - component: {fileID: 3391848432509066319} - - component: {fileID: 1636400817113236187} - m_Layer: 5 - m_Name: Y - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7176579438568494463 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1876853640019479660} - 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: 8691581922048536374} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 125, y: 30} - m_SizeDelta: {x: 150, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3391848432509066319 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1876853640019479660} - m_CullTransparentMesh: 1 ---- !u!114 &1636400817113236187 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1876853640019479660} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: VEC1 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 16 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1960046375090445140 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7296372054047457828} - - component: {fileID: 3385538268891444206} - - component: {fileID: 2897437631605142572} - m_Layer: 5 - m_Name: Z - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7296372054047457828 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1960046375090445140} - 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: 8691581922048536374} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 275, y: 30} - m_SizeDelta: {x: 150, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3385538268891444206 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1960046375090445140} - m_CullTransparentMesh: 1 ---- !u!114 &2897437631605142572 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1960046375090445140} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: VEC1 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 16 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2792476238050467884 GameObject: m_ObjectHideFlags: 0 @@ -777,7 +387,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -807,10 +417,10 @@ MonoBehaviour: m_fontSize: 14 m_fontSizeBase: 14 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 2 + m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 @@ -958,10 +568,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 + m_fontSize: 33.1 m_fontSizeBase: 25 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -1118,7 +728,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1148,10 +758,10 @@ MonoBehaviour: m_fontSize: 14 m_fontSizeBase: 14 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 2 + m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 @@ -1332,20 +942,32 @@ MonoBehaviour: m_VerticalScrollbarEventHandler: {fileID: 0} m_LayoutGroup: {fileID: 0} m_ScrollSensitivity: 1 - m_ContentType: 4 + m_ContentType: 3 m_InputType: 0 m_AsteriskChar: 42 - m_KeyboardType: 1 + m_KeyboardType: 2 m_LineType: 0 m_HideMobileInput: 0 m_HideSoftKeyboard: 0 - m_CharacterValidation: 4 + m_CharacterValidation: 3 m_RegexValue: m_GlobalPointSize: 14 m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 9001319910968385871} + m_TargetAssemblyTypeName: Ichni.Editor.DynamicUIVec3InputField, Assembly-CSharp + m_MethodName: ApplyParametersz + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnSubmit: m_PersistentCalls: m_Calls: [] @@ -1500,7 +1122,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Enter text... + m_text: 0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1530,10 +1152,10 @@ MonoBehaviour: m_fontSize: 14 m_fontSizeBase: 14 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 2 + m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 @@ -1714,20 +1336,32 @@ MonoBehaviour: m_VerticalScrollbarEventHandler: {fileID: 0} m_LayoutGroup: {fileID: 0} m_ScrollSensitivity: 1 - m_ContentType: 9 + m_ContentType: 3 m_InputType: 0 m_AsteriskChar: 42 - m_KeyboardType: 4 + m_KeyboardType: 2 m_LineType: 0 m_HideMobileInput: 0 m_HideSoftKeyboard: 0 - m_CharacterValidation: 2 + m_CharacterValidation: 3 m_RegexValue: m_GlobalPointSize: 14 m_CharacterLimit: 0 m_OnEndEdit: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 9001319910968385871} + m_TargetAssemblyTypeName: Ichni.Editor.DynamicUIVec3InputField, Assembly-CSharp + m_MethodName: ApplyParametersy + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_OnSubmit: m_PersistentCalls: m_Calls: [] @@ -1856,10 +1490,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 + m_fontSize: 33.1 m_fontSizeBase: 25 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -1990,10 +1624,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25 + m_fontSize: 33.1 m_fontSizeBase: 25 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -2117,9 +1751,6 @@ RectTransform: - {fileID: 4820553838928225789} - {fileID: 6603823063929320148} - {fileID: 4787506965637756451} - - {fileID: 7439332005388610437} - - {fileID: 7176579438568494463} - - {fileID: 7296372054047457828} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Scripts/DynamicUI/DynamicUIElements/DynamicUIVec3InputField.cs b/Assets/Scripts/DynamicUI/DynamicUIElements/DynamicUIVec3InputField.cs index 15d0939d..84a07cfa 100644 --- a/Assets/Scripts/DynamicUI/DynamicUIElements/DynamicUIVec3InputField.cs +++ b/Assets/Scripts/DynamicUI/DynamicUIElements/DynamicUIVec3InputField.cs @@ -1,5 +1,7 @@ using System.Collections; using System.Collections.Generic; +using Ichni.RhythmGame; +using JetBrains.Annotations; using TMPro; using UnityEngine; using UnityEngine.UIElements.Experimental; @@ -9,47 +11,58 @@ public class DynamicUIVec3InputField : DynamicUIElement public TMP_InputField inputFieldx; public TMP_InputField inputFieldy; public TMP_InputField inputFieldz; - Transform objtransform; - + + public TransformSubmodule e=null; public override void Initialize(string title, string parameterName) { + + foreach(var i in connectedGameElement.submoduleList){ + if(i.GetType()==typeof(TransformSubmodule)){ + e= (TransformSubmodule)i; + break; + } + } + if (e == null)Destroy(gameObject); base.Initialize(title, parameterName); - objtransform = connectedGameElement.transform; - Vector3 pos = (Vector3)objtransform.GetType().GetProperty(parameterName).GetValue(objtransform); + + Vector3 pos = (Vector3)e.GetType().GetField(parameterName).GetValue(e); //获取对应变量的值 inputFieldx.text =pos.x.ToString(); - inputFieldx.onEndEdit.AddListener(ApplyParametersx); + inputFieldy.text =pos.y.ToString(); - inputFieldx.onEndEdit.AddListener(ApplyParametersy); + inputFieldz.text =pos.z.ToString(); - inputFieldx.onEndEdit.AddListener(ApplyParametersz); + }//我不应该用这种复制大法的（ - private void ApplyParametersx(string text) + public void ApplyParametersx(string text) { - Vector3 newpos=totramsf(float.Parse(text),0); - transform.GetType().GetProperty(parameterName).SetValue(objtransform,newpos); + + Vector3 newpos=totramsf(text,0); + e.GetType().GetField(parameterName).SetValue(e, newpos); } - private void ApplyParametersy(string text) + public void ApplyParametersy(string text) { - Vector3 newpos=totramsf(float.Parse(text),1); - transform.GetType().GetProperty(parameterName).SetValue(objtransform,newpos); + + Vector3 newpos=totramsf(text,1); + e.GetType().GetField(parameterName).SetValue(e, newpos); } - private void ApplyParametersz(string text) + public void ApplyParametersz(string text) { - Vector3 newpos=totramsf(float.Parse(text),2); - transform.GetType().GetProperty(parameterName).SetValue(objtransform,newpos); + + Vector3 newpos=totramsf(text,2); + e.GetType().GetField(parameterName).SetValue(e, newpos); } - Vector3 totramsf(float value,int queue){ - Vector3 a= (Vector3)transform.GetType().GetProperty(parameterName).GetValue(connectedGameElement.transform); - switch(queue){ - case 0:a.x=value;break; - case 1:a.y=value;break; - case 2:a.z=value;break; + Vector3 totramsf(string value,int queue){ + float avalue; + if(!float.TryParse(value,out avalue)){ + avalue=0f; } + Vector3 a= (Vector3)e.GetType().GetField(parameterName).GetValue(e); //获取对应变量的值 + a[queue]=avalue; return a; } } diff --git a/Assets/Scripts/DynamicUI/Hierarchy/HierarchyTab.cs b/Assets/Scripts/DynamicUI/Hierarchy/HierarchyTab.cs index 9ba61562..6efcd251 100644 --- a/Assets/Scripts/DynamicUI/Hierarchy/HierarchyTab.cs +++ b/Assets/Scripts/DynamicUI/Hierarchy/HierarchyTab.cs @@ -63,13 +63,13 @@ namespace Ichni.Editor for (int i = 1; i <= this.tabLayer; i++) { - float lineX = 30 * i; + float lineX = 30 * i; Instantiate(indentationLinePrefab, tabRect).GetComponent().anchoredPosition = new Vector2(lineX, 0); } } - float posX = -5 + 30 * tabLayer; + float posX = -25 +( 30 * tabLayer); tabMainRect.anchoredPosition = new Vector2(posX, tabMainRect.anchoredPosition.y); tabButton.onClick.AddListener(SelectGameElement); @@ -125,9 +125,9 @@ namespace Ichni.Editor { if (!expand && isExpanded) { - foreach (var tab in childTabList) + for(int i=childTabList.Count;i>0;i--) { - tab.SetExpansion(expand); //false + childTabList[i-1].SetExpansion(expand); //false } } diff --git a/Assets/Scripts/DynamicUI/Inspector/Inspector.cs b/Assets/Scripts/DynamicUI/Inspector/Inspector.cs index c923c325..1af10429 100644 --- a/Assets/Scripts/DynamicUI/Inspector/Inspector.cs +++ b/Assets/Scripts/DynamicUI/Inspector/Inspector.cs @@ -22,6 +22,7 @@ namespace Ichni.Editor containers.Clear(); connectedGameElement = gameElement; connectedGameElement.SetUpInspector(); + } } diff --git a/Assets/Scripts/GameElements/ElementFolder/ElementFolder.cs b/Assets/Scripts/GameElements/ElementFolder/ElementFolder.cs index 65afa147..a40e0a5d 100644 --- a/Assets/Scripts/GameElements/ElementFolder/ElementFolder.cs +++ b/Assets/Scripts/GameElements/ElementFolder/ElementFolder.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using Ichni.Editor; using Ichni.RhythmGame.Beatmap; using Lean.Pool; using UnityEngine; @@ -32,8 +33,10 @@ namespace Ichni.RhythmGame submoduleList.Add(transformSubmodule); submoduleList.Add(timeDurationSubmodule); } + } + public partial class ElementFolder { public override void SaveBM() diff --git a/Assets/Scripts/GameElements/GameElement.cs b/Assets/Scripts/GameElements/GameElement.cs index be1797a5..5bdd0e08 100644 --- a/Assets/Scripts/GameElements/GameElement.cs +++ b/Assets/Scripts/GameElements/GameElement.cs @@ -1,9 +1,11 @@ using System; using System.Collections; using System.Collections.Generic; +using Dreamteck.Splines; using Ichni.Editor; using Ichni.RhythmGame.Beatmap; using Sirenix.OdinInspector; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; using UnityEngine.UIElements; @@ -36,7 +38,7 @@ namespace Ichni.RhythmGame //存档类 public BaseElement_BM matchedBM { get; set; } - private Inspector inspector; + public Editor.Inspector inspector; /// @@ -141,16 +143,27 @@ namespace Ichni.RhythmGame public abstract partial class GameElement { - public virtual void SetUpInspector() + public virtual void SetUpInspector()//被点击时设置第一层Inspector { var container = inspector.GenerateContainer("Element Info"); var nameInputField = inspector.GenerateInputField(container, GetType().Name+"'s Name", nameof(elementName)); var guidText = inspector.GenerateText(container, "Element GUID", nameof(elementGuid), true); - var container2 = inspector.GenerateContainer("Element Property"); + foreach(var i in submoduleList){ + if(i.GetType()==typeof(TransformSubmodule)){ + SetUpSecondInspector((TransformSubmodule)i); + break; + } + } + + + } + public virtual void SetUpSecondInspector(TransformSubmodule i){ + var container2 = inspector.GenerateContainer("Element Property"); container2.setVoH(true); - var posInputField=inspector.GenerateVec3InputField(container2,"Position",nameof(transform.position)); - var rotInputField=inspector.GenerateVec3InputField(container2,"Rotation",nameof(transform.eulerAngles)); - var scaleInputField=inspector.GenerateVec3InputField(container2,"Scale",nameof(transform.localScale)); + var posInputField=inspector.GenerateVec3InputField(container2,"Start Position",nameof(i.originalPosition)); + var rotInputField=inspector.GenerateVec3InputField(container2,"Start Rotation",nameof(i.originalEulerAngles)); + var scaleInputField=inspector.GenerateVec3InputField(container2,"Start Scale",nameof(i.originalScale)); + } diff --git a/Assets/Scripts/GameElements/Track/Track.cs b/Assets/Scripts/GameElements/Track/Track.cs index 9c3a74ce..858424c7 100644 --- a/Assets/Scripts/GameElements/Track/Track.cs +++ b/Assets/Scripts/GameElements/Track/Track.cs @@ -35,7 +35,7 @@ namespace Ichni.RhythmGame submoduleList.Add(transformSubmodule); submoduleList.Add(timeDurationSubmodule); } - + private void Update() { if (timeDurationSubmodule.CheckTimeInDuration(EditorManager.instance.songModule.songTime))