From ea5075a59164fc62cafe8e292f6f9b210b5d2065 Mon Sep 17 00:00:00 2001 From: Andy Date: Fri, 18 Oct 2024 01:17:48 +0800 Subject: [PATCH] no message --- client/Assets/Ether/Scenes/Boot.unity | 40 +++- .../Scripts/Module/Extension/UGUI/Toggle.meta | 8 + .../Module/Extension/UGUI/Toggle/ToggleEx.cs | 12 + .../Extension/UGUI/Toggle/ToggleEx.cs.meta | 11 + .../Plugins/Animancer/Read Me v7.4.2.asset | 2 +- .../Resources/ES3/ES3GlobalReferences.asset | 37 ++- .../Resources/Art/UI/Main/UI_Main_Bg.png.meta | 30 ++- .../Prefabs/Frames/Login/LoginFrame.prefab | 58 ++++- .../Assets/Resources/Prefabs/Frames/Main.meta | 8 + .../Prefabs/Frames/Main/MainFrame.prefab | 225 ++++++++++++++++++ .../Prefabs/Frames/Main/MainFrame.prefab.meta | 7 + client/UserSettings/EditorUserSettings.asset | 4 +- client/UserSettings/Layouts/default-2022.dwlt | 196 +++++++-------- 13 files changed, 522 insertions(+), 116 deletions(-) create mode 100644 client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle.meta create mode 100644 client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle/ToggleEx.cs create mode 100644 client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle/ToggleEx.cs.meta create mode 100644 client/Assets/Resources/Prefabs/Frames/Main.meta create mode 100644 client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab create mode 100644 client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab.meta diff --git a/client/Assets/Ether/Scenes/Boot.unity b/client/Assets/Ether/Scenes/Boot.unity index 9606ad1..ac06625 100644 --- a/client/Assets/Ether/Scenes/Boot.unity +++ b/client/Assets/Ether/Scenes/Boot.unity @@ -1104,6 +1104,11 @@ MonoBehaviour: Name: Level: 0 JobList: [] +--- !u!95 &549239031 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 4650152669287310831, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} + m_PrefabInstance: {fileID: 549239009} + m_PrefabAsset: {fileID: 0} --- !u!1 &635917027 stripped GameObject: m_CorrespondingSourceObject: {fileID: 491595545510713278, guid: 2d40455ce379bd946bbf5e5e4e71d04c, type: 3} @@ -1317,7 +1322,7 @@ MonoBehaviour: openPrefabs: 0 prefabs: [] idRef: - _Keys: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef807273ed4d82f77fa3117d52bb9c665d7aa545cd63732fbb03921f9fbdfe7d589f4265fc87a4a912787717f7186df3643453fed272c5aecffe812f105d68c26e7134be387642fb5503d06682bd2536d6caf50d362220ad1fe5b4de27d054df1dabd62d20890cda9a8005df33fe6687a906568ca6ddbd2ae0b197c5ea9b16d3718573dbfe00651a266c55e2199130e729def78b18c3b97fd14986685d215c868729107c05703bcb18424275266b4f8129b12635882ddde307e8172bfe80df6d1df5a4b95d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e50fe914a6209ac2b97ebb968a060ab16c1b221ea5070373eda76fec8762d5571f49656ecf638ff62d1f6b9ba3ae62d1e6bdbc9e041900521c75371ec0be3b43a412a74090abf1f074e7ce6a54883fc0db720cbad08c94c639135b34aa9eb6d12437efc655b372853453e6e3a55a027496ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b8770553581d79025078ece7cd246af8b57fd2f15730ba1219393dc161df3e2e41082438c98184ed7e4038f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220b44d77bd8f4222832baf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb8557339d44764e04dd84dfa8962944a215803b0815cd4519ebc77de1077d40bd55e63f12c1838809e9611491ef1473787b9325cfd99288f98c11f3c73436baefd5f19622eb6d67711374e186e8a32ac753f565645780e3c36d37612c802f2a5d49d477d0be409d0e3bb4bc64a0f210e8e734f4d653d0b8992aa2c5a40c4af0e44a943d142b5a19036867377d3b80ed94d987cac4c5ac0686e4215a047516fe1f3c27ea0cc50cbd9d1be1721357da3b547fa58d8415a5a9e6aac3f84ca40d887f5547d113aafa59d63567c0b719f33f09e6058b307b8ddb1e2e336e0efb9f06f1a701676046d8568ab443b97d665100adf30232a99257f3d76cb0de21a3952559af20ffe76560af31a3f08c27c45db7cd22c4021dd1a083fef53007ffe182fa6b29101b094595704ae26143d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367728e4801be365469460d88fb486fa2554d7452269e75e95b2c62bc0877910b0133d9513bc0912023ebb830194c652175f3c199300f6e42648381f1f3bd803b0f48d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf7030024d6cb0047b1faff623fa7a295d00000064af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e327911bf278db968f841bf4d8ffabf8ba5451c183fb24342b85b19801c4aa39a042ec8a05db28e0e1a02e355119389252f0f591dbdc030f0901013078ccc4b04b01137a92d6b870e692f6ab708d93f674846f2d59ea253ecce47326d9f87814db7170623c932539b966786ec29e8f9694f54bf46bf21a2536422e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a74169ccc6a2e25a30e93c0b114160e092e4044de14fbc5a3a8e1678753a196ee1ad1cff0e209dcf8466573f361b66c2e64e6587ebaac8d6b0d5686f7f8b7effe078348d946e883e6c444667ba1715b64e7a43ad1660d96fcbe45ec49f5c7918728e697d39ea1c25627f71a04c3283029ce36e857a7288c964c853d0098c760c4f810caf8309cfc3ab56792cad997d645d1d4a98ef392298615c27130308122790ba14532d96ac61dfba3cd87882ddc3f42450d2917cdae36b8f6e394160521a423a4bb1403cef4fcffe4d64cb32f16e775a0a0c857c7c376f2943f5b3b21bc7fc21162c1aef78ca9d78390469aafbcc4e1806823ca06a3f4f091ba0f3ec9f7f225e1b5347730bd4414e6e0e4380a01924105865536775a348297b67b12666446ab2228de94dc0fe0a1c77a6755ed061f1675daf8e91147244ee5a6dbfbb048efc1562c8d65ca7d941dc5086f8535260f432754ac8b7b5d89daf2dd7a82dbdc52106569f0467c8b1f0c8106be28f7af19bfa7872b9443abaa07565858ad031131e8b59ffa9f1645bfa263a6e38b50af2cbc4735d59b4f4233364018e0142272096fc76911684b85569e26d2080347d14948c45c65d8d6dd37f7c3446f0f25c3c4e5a273c3e78db470c1d39c3dd2a5d011913238d8761c3088fa3129a4ffd465c3faa2e260db9520d678c45c1ab560aaae0cd5e0516eac4af1e30536699be08f129227bcd047cf12c99ce0a14a683b4e6aebd7ae4a3b58dd69121072399128c567bab688ada3da663db316a48e0d956a1e539135739254d7395a53be37514c6ac5b606605e5c23f149b21078eb4ba0a47349a08d326e28fa1f9dc0ccbfd3b1139944213808dae43dd050045181edb2750af8316f0e2662cc20ff802c2cf0a11d73340068f5976457aa9d432269da6bfd4045c7bb798052468382d3ad47a6dd7ab69cb5b551824da527fbc158075635561ac4b41ee869f95102c085c823527695bba8f465e0ab3ae9e894738240f5c22637d637fc5afe925c9364a280fc75b88a626703bc19847df76d43f042d57d0f45c4aef271678782df4c7d4228b9f7cb63d38233c + _Keys: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef807273ed4d82f77fa3117d52bb9c665d7aa545cd63732fbb03921f9fbdfe7d589f4265fc87a4a912787717f7186df3643453fed272c5aecffe812f105d68c26e7134be387642fb5503d06682bd2536d6caf50d362220ad1fe5b4de27d054df1dabd62d20890cda9a8005df33fe6687a906568ca6ddbd2ae0b197c5ea9b16d3718573dbfe00651a266c55e2199130e729def78b18c3b97fd14986685d215c868729107c05703bcb18424275266b4f8129b12635882ddde307e8172bfe80df6d1df5a4b95d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e50fe914a6209ac2b97ebb968a060ab16c1b221ea5070373eda76fec8762d5571f49656ecf638ff62d1f6b9ba3ae62d1e6bdbc9e041900521c75371ec0be3b43a412a74090abf1f074e7ce6a54883fc0db720cbad08c94c639135b34aa9eb6d12437efc655b372853453e6e3a55a027496ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b8770553581d79025078ece7cd246af8b57fd2f15730ba1219393dc161df3e2e41082438c98184ed7e4038f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220b44d77bd8f4222832baf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb8557339d44764e04dd84dfa8962944a215803b0815cd4519ebc77de1077d40bd55e63f12c1838809e9611491ef1473787b9325cfd99288f98c11f3c73436baefd5f19622eb6d67711374e186e8a32ac753f565645780e3c36d37612c802f2a5d49d477d0be409d0e3bb4bc64a0f210e8e734f4d653d0b8992aa2c5a40c4af0e44a943d142b5a19036867377d3b80ed94d987cac4c5ac0686e4215a047516fe1f3c27ea0cc50cbd9d1be1721357da3b547fa58d8415a5a9e6aac3f84ca40d887f5547d113aafa59d63567c0b719f33f09e6058b307b8ddb1e2e336e0efb9f06f1a701676046d8568ab443b97d665100adf30232a99257f3d76cb0de21a3952559af20ffe76560af31a3f08c27c45db7cd22c4021dd1a083fef53007ffe182fa6b29101b094595704ae26143d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367728e4801be365469460d88fb486fa2554d7452269e75e95b2c62bc0877910b0133d9513bc0912023ebb830194c652175f3c199300f6e42648381f1f3bd803b0f48d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf7030024d6cb0047b1faff623fa7a295d00000064af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e327911bf278db968f841bf4d8ffabf8ba5451c183fb24342b85b19801c4aa39a042ec8a05db28e0e1a02e355119389252f0f591dbdc030f0901013078ccc4b04b01137a92d6b870e692f6ab708d93f674846f2d59ea253ecce47326d9f87814db7170623c932539b966786ec29e8f9694f54bf46bf21a2536422e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a74169ccc6a2e25a30e93c0b114160e092e4044de14fbc5a3a8e1678753a196ee1ad1cff0e209dcf8466573f361b66c2e64e6587ebaac8d6b0d5686f7f8b7effe078348d946e883e6c444667ba1715b64e7a43ad1660d96fcbe45ec49f5c7918728e697d39ea1c25627f71a04c3283029ce36e857a7288c964c853d0098c760c4f810caf8309cfc3ab56792cad997d645d1d4a98ef392298615c27130308122790ba14532d96ac61dfba3cd87882ddc3f42450394160521a423a4bb1403cef4fcffe4d679763d3485ad74f0c857c7c376f2943f5b3b21bc7fc21162c1aef78ca9d78390469aafbcc4e1806823ca06a3f4f091ba0f3ec9f7f225e1b5347730bd4414e6e0e4380a01924105865536775a348297b67b12666446ab2228de94dc0fe0a1c77a6755ed061f1675daf8e91147244ee5a6dbfbb048efc1562c8d65ca7d941dc5086f8535260f432754ac8b7b5d89daf2dd7a82dbdc52106569f0467c8b1f0c8106be28f7af19bfa7872b9443abaa07565858ad031131e8b59ffa9f1645bfa263a6e38b50af2cbc4735d59b4f4233364018e0142272096fc76911684b85569e26d2080347d14948c45c65d8d6dd37f7c3446f0f25c3c4e5a273c3e78db470c1d39c3dd2a5d011913238d8761c3088fa3129a4ffd465c3faa2e260db9520d678c45c1ab560aaae0cd5e0516eac4af1e30536699be08f129227bcd047cf12c99ce0a14a683b4e6aebd7ae4a3b58dd69121072399128c567bab688ada3da663db316a48e0d956a1e539135739254d7395a53be37514c6ac5b606605e5c23f149b21078eb4ba0a47349a08d326e28fa1f9dc0ccbfd3b1139944213808dae43dd050045181edb2750af8316f0e2662cc20ff802c2cf0a11d73340068f5976457aa9d432269da6bfd4045c7bb798052468382d3ad47a6dd7ab69cb5b551824da527fbc158075635561ac4b41ee869f95102c085c823527695bba8f465e0ab3ae9e894738240f5c22637d637fc5afe925c9364a280fc75b88a626703bc19847df76d43f042d57d0f45c4aef271678782df4c7d4228b9f7cb63d38233c461f16339470a916c5b151be74e5eb3aa4ba393fccbd2126fc0cfca62fe90f2ab9e025e1f4ea9025333bbd5b95f4ad6ea3cc576426e1e81cde1f5c7887c0e301de18b37e04d89113092d0ba01a81aa391dbc2fb6e7512632a4ba06ed95cc5f425d99dfc6d2ffb26e55fcfc69d508ac3aa024a7efd4778b76cf42f87835c7b66e709235368eb4882223daa28b53508471468e532ab47f0a6d66564e9c6ca58c14863b08a2927fdf62deceb0f52aeaae700baa148b6f6ef70e7938631afddb717cba378d4f3ea9525b78bf8e07f80cc2215c41200f6b433e45d720a54fd113b7217a79f2f38ec9d330ba0773223a66de28 _Values: - {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} @@ -1608,10 +1613,9 @@ MonoBehaviour: - {fileID: 11500000, guid: 9107aee0ced90422da95f0b31680501f, type: 3} - {fileID: 11500000, guid: 4286eeee023cce141b7df518847d52e9, type: 3} - {fileID: 263135845} - - {fileID: 2800000, guid: b8ba3923a6094cd48b85425f47fd7450, type: 3} - {fileID: 344948077} - {fileID: 6872002841214859180, guid: 2d40455ce379bd946bbf5e5e4e71d04c, type: 3} - - {fileID: 2800000, guid: ee148e281f3c41c5b4ff5f8a5afe5a6c, type: 3} + - {fileID: 1145879265431766087, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} - {fileID: 1264828649} - {fileID: 1264828652} - {fileID: 1264828653} @@ -1682,6 +1686,36 @@ MonoBehaviour: - {fileID: 1696162572} - {fileID: 549239030} - {fileID: 11500000, guid: 1088843c7a33c074eadd082f8de5d357, type: 3} + - {fileID: 549239031} + - {fileID: 2800000, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 4650152669287310831, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} + - {fileID: 7400000, guid: 0d45ae2c8992c7f4bb1a2fc82aea59e5, type: 2} + - {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 9100000, guid: 07cd654f8477ab745922816a74df00f2, type: 2} + - {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + - {fileID: 21300000, guid: 4d824b7d4ff95134d8fc4b3ad98ca944, type: 3} + - {fileID: 2800000, guid: 4d824b7d4ff95134d8fc4b3ad98ca944, type: 3} + - {fileID: 2800000, guid: 5f8db75d2285b9c4f846527e7ca0e719, type: 3} + - {fileID: 21300000, guid: 5f8db75d2285b9c4f846527e7ca0e719, type: 3} + - {fileID: 2800000, guid: 3028dc075ba8c584d9bc7d1e0255e038, type: 3} + - {fileID: 2800000, guid: 08a04b12dd0d5ec4da08f074806d5bf7, type: 3} + - {fileID: 3490045521475080903, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 3289614238733425816, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 9073674028789606162, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4368226541343473412, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4435295015565172945, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8923559829592244387, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4576783527034617061, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4569178611706505149, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2816930960907507644, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 9100865826815272717, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 7513414227915240351, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + - {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10900, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10904, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} --- !u!4 &1650476989 Transform: m_ObjectHideFlags: 0 diff --git a/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle.meta b/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle.meta new file mode 100644 index 0000000..c7e5317 --- /dev/null +++ b/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a374be6674c4b704392426a4d222b7ec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle/ToggleEx.cs b/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle/ToggleEx.cs new file mode 100644 index 0000000..e5b58f2 --- /dev/null +++ b/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle/ToggleEx.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Ether +{ + public class ToggleEx : MonoBehaviour + { + + } +} + diff --git a/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle/ToggleEx.cs.meta b/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle/ToggleEx.cs.meta new file mode 100644 index 0000000..1b3ba75 --- /dev/null +++ b/client/Assets/Ether/Scripts/Module/Extension/UGUI/Toggle/ToggleEx.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a3d711ca0cd13b64e8cacf3429ef0b84 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Plugins/Animancer/Read Me v7.4.2.asset b/client/Assets/Plugins/Animancer/Read Me v7.4.2.asset index b040535..9d6d32b 100644 --- a/client/Assets/Plugins/Animancer/Read Me v7.4.2.asset +++ b/client/Assets/Plugins/Animancer/Read Me v7.4.2.asset @@ -13,4 +13,4 @@ MonoBehaviour: m_Name: Read Me v7.4.2 m_EditorClassIdentifier: _ExamplesFolder: {fileID: 102900000, guid: 833bcac93994ed2459b0b7f61940e220, type: 3} - _DontShowOnStartup: 1 + _DontShowOnStartup: 0 diff --git a/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset b/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset index 4e5702a..f89cd35 100644 --- a/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset +++ b/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset @@ -215,8 +215,39 @@ MonoBehaviour: - {fileID: 11500000, guid: 9a83408fcc9044c4fbc7e5d09a369ab6, type: 3} - {fileID: 11500000, guid: 9107aee0ced90422da95f0b31680501f, type: 3} - {fileID: 11500000, guid: 4286eeee023cce141b7df518847d52e9, type: 3} - - {fileID: 2800000, guid: b8ba3923a6094cd48b85425f47fd7450, type: 3} - {fileID: 6872002841214859180, guid: 2d40455ce379bd946bbf5e5e4e71d04c, type: 3} - - {fileID: 2800000, guid: ee148e281f3c41c5b4ff5f8a5afe5a6c, type: 3} - {fileID: 11500000, guid: 1088843c7a33c074eadd082f8de5d357, type: 3} - _Values: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef80727e387642fb5503d06682bd2536d6caf50e27d054df1dabd62d362220ad1fe5b4dd20890cda9a8005df33fe6687a9065682199130e729def7895d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e6ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b8770553581d79025078ece7cd246af8b57fd2f15730ba1219393dc161df3e2e41082438c98184ed7e4038f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220b44d77bd8f4222832baf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb8557339d44764e04dd84dfa8962944a215803bf4d8ffabf8ba54519801c4aa39a042eb094595704ae26148381f1f3bd803b0f3d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367460d88fb486fa2551c183fb24342b85b11bf278db968f8412c62bc0877910b014d7452269e75e95b728e4801be36546933d9513bc0912023ebb830194c652175f3c199300f6e4264d6cb0047b1faff6248d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf70300247ffe182fa6b291014af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e32793fa7a295d0000006e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a741690b114160e092e4044de14fbc5a3a8e166f7f8b7effe078348d946e883e6c4446ccc6a2e25a30e93ce5d5b6a08124795daf8309cfc3ab5679130308122790ba14532d96ac61dfba3cd2917cdae36b8f6eb1403cef4fcffe4d64cb32f16e775a0a8b9f7cb63d38233c + - {fileID: 2800000, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 4650152669287310831, guid: 0aaca3e185238014bba82a38ce55f4fc, type: 3} + - {fileID: 7400000, guid: 0d45ae2c8992c7f4bb1a2fc82aea59e5, type: 2} + - {fileID: -1518724910, guid: 42573517692667044a6784f3a56fd63f, type: 3} + - {fileID: 9100000, guid: 07cd654f8477ab745922816a74df00f2, type: 2} + - {fileID: 21300000, guid: 4d824b7d4ff95134d8fc4b3ad98ca944, type: 3} + - {fileID: 2800000, guid: 4d824b7d4ff95134d8fc4b3ad98ca944, type: 3} + - {fileID: 2800000, guid: 5f8db75d2285b9c4f846527e7ca0e719, type: 3} + - {fileID: 21300000, guid: 5f8db75d2285b9c4f846527e7ca0e719, type: 3} + - {fileID: 11500000, guid: b08c28ca6504f2948a482164f765d5b1, type: 3} + - {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + - {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + - {fileID: 2800000, guid: 3028dc075ba8c584d9bc7d1e0255e038, type: 3} + - {fileID: 2800000, guid: 08a04b12dd0d5ec4da08f074806d5bf7, type: 3} + - {fileID: 1145879265431766087, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 3490045521475080903, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 3289614238733425816, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 9073674028789606162, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4368226541343473412, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4435295015565172945, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 8923559829592244387, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4576783527034617061, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 4569178611706505149, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 2816930960907507644, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 9100865826815272717, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 7513414227915240351, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3} + - {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + - {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10900, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10904, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + _Values: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef80727e387642fb5503d06682bd2536d6caf50e27d054df1dabd62d362220ad1fe5b4dd20890cda9a8005df33fe6687a9065682199130e729def7895d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e6ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b8770553581d79025078ece7cd246af8b57fd2f15730ba1219393dc161df3e2e41082438c98184ed7e4038f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220b44d77bd8f4222832baf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb8557339d44764e04dd84dfa8962944a215803bf4d8ffabf8ba54519801c4aa39a042eb094595704ae26148381f1f3bd803b0f3d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367460d88fb486fa2551c183fb24342b85b11bf278db968f8412c62bc0877910b014d7452269e75e95b728e4801be36546933d9513bc0912023ebb830194c652175f3c199300f6e4264d6cb0047b1faff6248d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf70300247ffe182fa6b291014af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e32793fa7a295d0000006e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a741690b114160e092e4044de14fbc5a3a8e166f7f8b7effe078348d946e883e6c4446ccc6a2e25a30e93ce5d5b6a08124795daf8309cfc3ab5679130308122790ba14532d96ac61dfba3cb1403cef4fcffe4d8b9f7cb63d38233cc5b151be74e5eb3aa4ba393fccbd2126fc0cfca62fe90f2ab9e025e1f4ea9025333bbd5b95f4ad6ede1f5c7887c0e301de18b37e04d89113092d0ba01a81aa391dbc2fb6e7512632dcc9fa81aab5332410e2ea21b5973076ac33aa42444bdb21a4ba06ed95cc5f425d99dfc6d2ffb26e679763d3485ad74f55fcfc69d508ac3aa024a7efd4778b76cf42f87835c7b66e709235368eb4882223daa28b53508471468e532ab47f0a6d66564e9c6ca58c14863b08a2927fdf62deceb0f52aeaae700baa148b6f6ef70e7938631afddb717ca3cc576426e1e81cba378d4f3ea9525b78bf8e07f80cc2215c41200f6b433e45d720a54fd113b7217a79f2f38ec9d330ba0773223a66de28 diff --git a/client/Assets/Resources/Art/UI/Main/UI_Main_Bg.png.meta b/client/Assets/Resources/Art/UI/Main/UI_Main_Bg.png.meta index 5b09c66..da6740d 100644 --- a/client/Assets/Resources/Art/UI/Main/UI_Main_Bg.png.meta +++ b/client/Assets/Resources/Art/UI/Main/UI_Main_Bg.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 1360, y: 313, z: 531, w: 680} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -93,6 +93,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -100,7 +126,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/client/Assets/Resources/Prefabs/Frames/Login/LoginFrame.prefab b/client/Assets/Resources/Prefabs/Frames/Login/LoginFrame.prefab index 84f119e..bca6ba8 100644 --- a/client/Assets/Resources/Prefabs/Frames/Login/LoginFrame.prefab +++ b/client/Assets/Resources/Prefabs/Frames/Login/LoginFrame.prefab @@ -52,8 +52,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 - SerializedBytes: 01010f00000061006c006c0041006e0069006d006100740069006f006e005300650074002f000000000168000000530079007300740065006d002e0043006f006c006c0065006300740069006f006e0073002e00470065006e0065007200690063002e00440069006300740069006f006e00610072007900600032005b005b00530079007300740065006d002e0053007400720069006e0067002c0020006d00730063006f0072006c00690062005d002c005b00450074006800650072002e0041006e0069006d006100740069006f006e005300650074002c002000450074006800650072005d005d002c0020006d00730063006f0072006c00690062000000000001010800000063006f006d00700061007200650072002f010000000159000000530079007300740065006d002e0043006f006c006c0065006300740069006f006e0073002e00470065006e0065007200690063002e00470065006e00650072006900630045007100750061006c0069007400790043006f006d0070006100720065007200600031005b005b00530079007300740065006d002e0053007400720069006e0067002c0020006d00730063006f0072006c00690062005d005d002c0020006d00730063006f0072006c00690062000100000005060200000000000000042e27010200000024006b000104000000530068006f0077000b0102000000240076000000000005042e27010200000024006b00010400000048006900640065000b01020000002400760001000000050705 + SerializedFormat: 2 + SerializedBytes: ReferencedUnityObjects: - {fileID: 11400000, guid: 720ee3502774a404384f52fa209b733d, type: 2} - {fileID: 11400000, guid: 5d1f120691afb9a4f86607a0e5de4b20, type: 2} @@ -61,7 +61,51 @@ MonoBehaviour: Prefab: {fileID: 0} PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] - SerializationNodes: [] + SerializationNodes: + - Name: allAnimationSet + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[Ether.AnimationSet, + Ether]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: Show + - Name: $v + Entry: 10 + Data: 0 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: Hide + - Name: $v + Entry: 10 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: isPlayEnable: 1 enablePlayAnim: Show isPlayDisable: 1 @@ -235,7 +279,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -402,7 +446,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -644,7 +688,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: @@ -811,7 +855,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializationData: - SerializedFormat: 0 + SerializedFormat: 2 SerializedBytes: ReferencedUnityObjects: [] SerializedBytesString: diff --git a/client/Assets/Resources/Prefabs/Frames/Main.meta b/client/Assets/Resources/Prefabs/Frames/Main.meta new file mode 100644 index 0000000..2639f03 --- /dev/null +++ b/client/Assets/Resources/Prefabs/Frames/Main.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 14e65d6483145a141b4d32c19120e0c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab b/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab new file mode 100644 index 0000000..0446f04 --- /dev/null +++ b/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab @@ -0,0 +1,225 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2816930960907507644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3490045521475080903} + m_Layer: 0 + m_Name: MainFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3490045521475080903 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2816930960907507644} + 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: + - {fileID: 4569178611706505149} + - {fileID: 9073674028789606162} + - {fileID: 8923559829592244387} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4576783527034617061 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4569178611706505149} + - component: {fileID: 4435295015565172945} + - component: {fileID: 4368226541343473412} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4569178611706505149 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4576783527034617061} + 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: 3490045521475080903} + 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: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4435295015565172945 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4576783527034617061} + m_CullTransparentMesh: 1 +--- !u!114 &4368226541343473412 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4576783527034617061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 4d824b7d4ff95134d8fc4b3ad98ca944, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7513414227915240351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9073674028789606162} + - component: {fileID: 3289614238733425816} + - component: {fileID: 1145879265431766087} + m_Layer: 0 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &9073674028789606162 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7513414227915240351} + 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: 3490045521475080903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3289614238733425816 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7513414227915240351} + m_CullTransparentMesh: 1 +--- !u!114 &1145879265431766087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7513414227915240351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 5f8db75d2285b9c4f846527e7ca0e719, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9100865826815272717 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8923559829592244387} + m_Layer: 0 + m_Name: Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8923559829592244387 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9100865826815272717} + 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: 3490045521475080903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 568.77924, y: -59.83313} + m_SizeDelta: {x: 1137.5583, y: 119.6663} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab.meta b/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab.meta new file mode 100644 index 0000000..844be2f --- /dev/null +++ b/client/Assets/Resources/Prefabs/Frames/Main/MainFrame.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0ebe8a92216c64e4da431cc8ec8366b0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/UserSettings/EditorUserSettings.asset b/client/UserSettings/EditorUserSettings.asset index 4f08cc2..29db5fe 100644 --- a/client/UserSettings/EditorUserSettings.asset +++ b/client/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 020502515c500a0e5d5c5f2014710f4444164a2f7a2a7e31292b4b67e7e6353e flags: 0 RecentlyUsedSceneGuid-8: - value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + value: 0007035757040a5e0e580e2447775b44451640797c7c23327b2a1932b0b3676c flags: 0 RecentlyUsedSceneGuid-9: - value: 0007035757040a5e0e580e2447775b44451640797c7c23327b2a1932b0b3676c + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 UIBuilder.DisableMouseWheelZooming: value: 2550581500 diff --git a/client/UserSettings/Layouts/default-2022.dwlt b/client/UserSettings/Layouts/default-2022.dwlt index 17ca235..24c8885 100644 --- a/client/UserSettings/Layouts/default-2022.dwlt +++ b/client/UserSettings/Layouts/default-2022.dwlt @@ -38,12 +38,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: -1920 + x: 0 y: 43 - width: 1920 - height: 997 + width: 3440 + height: 1357 m_ShowMode: 4 - m_Title: Inspector + m_Title: Project m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -92,8 +92,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 3440 + height: 1357 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -117,7 +117,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 3440 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -138,8 +138,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 1337 + width: 3440 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -163,12 +163,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 3440 + height: 1307 m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 175 + controlID: 166 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -189,12 +189,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1059 - height: 947 + width: 1897 + height: 1307 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 0 - controlID: 79 + controlID: 52 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -215,8 +215,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 712 - height: 947 + width: 1427 + height: 1307 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 @@ -239,8 +239,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 712 - height: 409 + width: 1427 + height: 683 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} @@ -264,9 +264,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 409 - width: 712 - height: 538 + y: 683 + width: 1427 + height: 624 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} @@ -291,14 +291,14 @@ MonoBehaviour: - {fileID: 14} m_Position: serializedVersion: 2 - x: 712 + x: 1427 y: 0 - width: 347 - height: 947 + width: 470 + height: 1307 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 80 + controlID: 53 draggingID: 0 --- !u!114 &13 MonoBehaviour: @@ -317,8 +317,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 347 - height: 412 + width: 470 + height: 569 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 19} @@ -342,9 +342,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 412 - width: 347 - height: 535 + y: 569 + width: 470 + height: 738 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 20} @@ -367,10 +367,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1059 + x: 1897 y: 0 - width: 564 - height: 947 + width: 1010 + height: 1307 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 21} @@ -393,10 +393,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1623 + x: 2907 y: 0 - width: 297 - height: 947 + width: 533 + height: 1307 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 22} @@ -424,10 +424,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1920 - y: 482 - width: 711 - height: 517 + x: 0 + y: 756 + width: 1426 + height: 603 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -468,7 +468,7 @@ MonoBehaviour: m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 - m_HSlider: 1 + m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 @@ -480,23 +480,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 711 - height: 496 - m_Scale: {x: 0.3703125, y: 0.37031254} - m_Translation: {x: 355.49997, y: 248.00002} + width: 1426 + height: 582 + m_Scale: {x: 0.5388889, y: 0.5388889} + m_Translation: {x: 713, y: 291} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -959.9999 - y: -669.7046 - width: 1919.9999 - height: 1339.4092 + x: -1323.0928 + y: -540 + width: 2646.1855 + height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.3703125 - m_LastWindowPixelSize: {x: 711, y: 517} + m_defaultScale: 0.5388889 + m_LastWindowPixelSize: {x: 1426, y: 603} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -522,10 +522,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1920 + x: 0 y: 73 - width: 711 - height: 388 + width: 1426 + height: 662 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -580,7 +580,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 1 id: unity-search-toolbar index: 3 @@ -619,7 +619,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -645,7 +645,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Cloth Constraints index: 1 @@ -658,7 +658,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Cloth Collisions index: 2 @@ -710,7 +710,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Occlusion Culling index: 3 @@ -723,7 +723,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Physics Debugger index: 4 @@ -736,7 +736,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Scene Visibility index: 5 @@ -749,7 +749,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 id: Scene View/Particles index: 6 @@ -850,17 +850,17 @@ MonoBehaviour: m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 - m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 + m_OverrideSceneCullingMask: 0 + m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: 0} + m_Target: {x: 960, y: 540, z: 0} speed: 2 - m_Value: {x: 0, y: 0, z: 0} + m_Value: {x: 534.4482, y: 1046.3319, z: 3.2474828} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -871,7 +871,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 1 + showSkybox: 0 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -910,9 +910,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 10 + m_Target: 1101.4536 speed: 2 - m_Value: 10 + m_Value: 247.16815 m_Ortho: m_Target: 1 speed: 2 @@ -957,10 +957,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1208 + x: 1427 y: 73 - width: 345 - height: 391 + width: 468 + height: 548 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -974,9 +974,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c0740000 - m_LastClickedID: 29888 - m_ExpandedIDs: f4faffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 1ef3fdff32f3fdff6c0e01009e0e0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1020,10 +1020,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1208 - y: 485 - width: 345 - height: 514 + x: 1427 + y: 642 + width: 468 + height: 717 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1054,10 +1054,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -861 + x: 1897 y: 73 - width: 562 - height: 926 + width: 1008 + height: 1286 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1079,7 +1079,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/System/Property + - Assets/Plugins/Sirenix/Odin Inspector/Modules m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1087,16 +1087,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Scripts/System/Property + - Assets/Plugins/Sirenix/Odin Inspector/Modules m_LastFoldersGridSize: 16 - m_LastProjectPath: D:\Andy\svnIndieGame\client + m_LastProjectPath: E:\Andy\IndieGame\client m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 794} - m_SelectedIDs: da7f0000 - m_LastClickedID: 32730 - m_ExpandedIDs: 00000000be760000c0760000c2760000c4760000c6760000c8760000ca760000cc760000ce760000d0760000d2760000d4760000d6760000d8760000da760000dc760000de760000e0760000e2760000e4760000e6760000e8760000ea760000ec760000ee760000f0760000f2760000f4760000f6760000f8760000fa760000fc760000fe76000000770000027700000477000006770000087700000a7700000c7700000e77000010770000127700001477000016770000187700001a7700001c7700001e77000020770000227700007c790000167d000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 004b0000 + m_LastClickedID: 19200 + m_ExpandedIDs: 0000000030410000884100000c420000484200008c420000e8430000f443000028440000bc460000384700004c48000088480000a84b0000d452000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1124,7 +1124,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000be760000c0760000c2760000c4760000c6760000c8760000ca760000cc760000ce760000d0760000d2760000d4760000d6760000d8760000da760000dc760000de760000e0760000e2760000e4760000e6760000e8760000ea760000ec760000ee760000f0760000f2760000f4760000f6760000f8760000fa760000fc760000fe76000000770000027700000477000006770000087700000a7700000c7700000e77000010770000127700001477000016770000187700001a7700001c7700001e7700002077000022770000 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1152,18 +1152,18 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000ea160200066600000000000032730000ac6c00003e73000036c6ffff5889fffff669000084ecffff14ceffff18baffff46b1ffff82adffff4ca4ffff989dffff729bffffee96ffff8e94ffff1692ffff428fffff6488ffff3c84ffff6681ffffb67fffff4a75ffff9a71ffff6269ffff4265ffffb25fffffbc9bfdff7e96fdff32690000fcf1ffff00e0ffff + m_ExpandedInstanceIDs: c6230000ea160200066600000000000032730000ac6c00003e73000036c6ffff5889fffff669000084ecffff14ceffff18baffff46b1ffff82adffff4ca4ffff989dffff729bffffee96ffff8e94ffff1692ffff428fffff6488ffff3c84ffff6681ffffb67fffff4a75ffff9a71ffff6269ffff4265ffffb25fffffbc9bfdff7e96fdff32690000fcf1ffff00e0fffffcef0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: PropertyData - m_OriginalName: PropertyData + m_Name: "\u6548\u679C\u56FE_\u89E3\u5BC6\u754C\u9762" + m_OriginalName: "\u6548\u679C\u56FE_\u89E3\u5BC6\u754C\u9762" m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 32742 + m_UserData: 61236 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -1200,10 +1200,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -297 + x: 2907 y: 73 - width: 296 - height: 926 + width: 532 + height: 1286 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0