diff --git a/Assets/arts/atlas/icon/avatar.asset b/Assets/arts/atlas/icon/avatar.asset index 858976293..6fc3cc00e 100644 --- a/Assets/arts/atlas/icon/avatar.asset +++ b/Assets/arts/atlas/icon/avatar.asset @@ -13,6 +13,27 @@ MonoBehaviour: m_Name: avatar m_EditorClassIdentifier: spriteList: - - {fileID: 21300000, guid: 4b100dc83cc42cb4ca8273dba82da6b1, type: 3} + - {fileID: 21300000, guid: 8935fea43ddf7416eaa926070bb7a5b8, type: 3} + - {fileID: 21300000, guid: 708c0091709784c4ead4848cb3e9bb72, type: 3} + - {fileID: 21300000, guid: 25f7407a107de4e3d8c755d77dda451f, type: 3} + - {fileID: 21300000, guid: f04635e2276b049be924640187302959, type: 3} + - {fileID: 21300000, guid: b9db06750fc1f459cbf3940043acf834, type: 3} + - {fileID: 21300000, guid: de56021ced54f4f01bb3e53481b96fc4, type: 3} + - {fileID: 21300000, guid: df6c970c2fcda4dc8ad4a61ce9755b22, type: 3} + - {fileID: 21300000, guid: 428c3429cd0064d7fb52ef242326a511, type: 3} + - {fileID: 21300000, guid: 848d33ba264e44eb7b2052d62177af44, type: 3} + - {fileID: 21300000, guid: eb7559ced34044cc69c4142cdb37cc60, type: 3} + - {fileID: 21300000, guid: 0ad3c5bc1a0044e08af27c13ff81752d, type: 3} + - {fileID: 21300000, guid: 1a08afe645c0b4f2786cad59820f609c, type: 3} + - {fileID: 21300000, guid: bd0437fe7307a49b9afc0cfa48efa513, type: 3} + - {fileID: 21300000, guid: 63c5ef62b7fea452bb694dbdc153f27a, type: 3} + - {fileID: 21300000, guid: 70cb227f1515847b49d46ea6c0c38ee9, type: 3} + - {fileID: 21300000, guid: 99f39492b26ee45f68e9e2df54fcead9, type: 3} + - {fileID: 21300000, guid: 34d82a979e07346a7a401d234e6f92ed, type: 3} + - {fileID: 21300000, guid: 75a360b6b501a4603aba7c8c31435742, type: 3} + - {fileID: 21300000, guid: de7f968c0cae14e12835f4ef067b90e5, type: 3} + - {fileID: 21300000, guid: 3df470ec152fd4b02a4d3b35c6fddb3e, type: 3} + - {fileID: 21300000, guid: fe7298bedd400416b96436a63a8fc4f9, type: 3} + - {fileID: 21300000, guid: 28e473293ee124ca3a9ed42b5983c0ad, type: 3} - {fileID: 21300000, guid: c8485a9f3db164b4fb56e6b8008a982d, type: 3} - spriteNameList: 47ac896a75d12fb7 + spriteNameList: e519d479448ed479a302d579a402d5790277d5796631e279c5a5e279241ae379251ae379838ee379e748f07946bdf079a531f179a631f1796860fe79c7d4fe792649ff792749ff79e9770c7a48ec0c7aa7600d7aa8600d7a75d12fb7 diff --git a/Assets/arts/atlas/icon/avatar.spriteatlas b/Assets/arts/atlas/icon/avatar.spriteatlas index 2a45c22d5..7228d7a48 100644 --- a/Assets/arts/atlas/icon/avatar.spriteatlas +++ b/Assets/arts/atlas/icon/avatar.spriteatlas @@ -62,10 +62,52 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: - - {fileID: 21300000, guid: 4b100dc83cc42cb4ca8273dba82da6b1, type: 3} + - {fileID: 21300000, guid: 708c0091709784c4ead4848cb3e9bb72, type: 3} + - {fileID: 21300000, guid: 63c5ef62b7fea452bb694dbdc153f27a, type: 3} + - {fileID: 21300000, guid: 99f39492b26ee45f68e9e2df54fcead9, type: 3} + - {fileID: 21300000, guid: f04635e2276b049be924640187302959, type: 3} + - {fileID: 21300000, guid: 8935fea43ddf7416eaa926070bb7a5b8, type: 3} + - {fileID: 21300000, guid: b9db06750fc1f459cbf3940043acf834, type: 3} + - {fileID: 21300000, guid: 75a360b6b501a4603aba7c8c31435742, type: 3} + - {fileID: 21300000, guid: 1a08afe645c0b4f2786cad59820f609c, type: 3} + - {fileID: 21300000, guid: 34d82a979e07346a7a401d234e6f92ed, type: 3} + - {fileID: 21300000, guid: 28e473293ee124ca3a9ed42b5983c0ad, type: 3} + - {fileID: 21300000, guid: 428c3429cd0064d7fb52ef242326a511, type: 3} + - {fileID: 21300000, guid: 25f7407a107de4e3d8c755d77dda451f, type: 3} + - {fileID: 21300000, guid: 848d33ba264e44eb7b2052d62177af44, type: 3} + - {fileID: 21300000, guid: df6c970c2fcda4dc8ad4a61ce9755b22, type: 3} + - {fileID: 21300000, guid: de56021ced54f4f01bb3e53481b96fc4, type: 3} + - {fileID: 21300000, guid: de7f968c0cae14e12835f4ef067b90e5, type: 3} + - {fileID: 21300000, guid: 0ad3c5bc1a0044e08af27c13ff81752d, type: 3} + - {fileID: 21300000, guid: 3df470ec152fd4b02a4d3b35c6fddb3e, type: 3} + - {fileID: 21300000, guid: fe7298bedd400416b96436a63a8fc4f9, type: 3} + - {fileID: 21300000, guid: eb7559ced34044cc69c4142cdb37cc60, type: 3} + - {fileID: 21300000, guid: bd0437fe7307a49b9afc0cfa48efa513, type: 3} + - {fileID: 21300000, guid: 70cb227f1515847b49d46ea6c0c38ee9, type: 3} - {fileID: 21300000, guid: c8485a9f3db164b4fb56e6b8008a982d, type: 3} m_PackedSpriteNamesToIndex: - - avater_1 + - avater_14001 + - avater_35002 + - avater_44001 + - avater_15002 + - avater_13001 + - avater_16001 + - avater_45002 + - avater_34001 + - avater_45001 + - avater_55002 + - avater_25001 + - avater_15001 + - avater_25002 + - avater_24001 + - avater_23001 + - avater_53001 + - avater_33001 + - avater_54001 + - avater_55001 + - avater_26001 + - avater_35001 + - avater_43001 - avater_frame_1 m_RenderDataMap: {} m_Tag: avatar diff --git a/Assets/arts/atlas/ui/act_common.asset b/Assets/arts/atlas/ui/act_common.asset index f3a2c40ba..0004ad4d6 100644 --- a/Assets/arts/atlas/ui/act_common.asset +++ b/Assets/arts/atlas/ui/act_common.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: spriteList: - {fileID: 21300000, guid: 666894d917ae1d245806727eead478cd, type: 3} + - {fileID: 21300000, guid: bedd9bfc4d7a449b0af6b545f0fb9675, type: 3} - {fileID: 21300000, guid: 06f54b3817430cf48baa1914794db514, type: 3} - {fileID: 21300000, guid: caa9f2ce69e435b4ca90780d2d9de31c, type: 3} - {fileID: 21300000, guid: 8c3ca04eb36a76a478721536e16a82f7, type: 3} @@ -215,4 +216,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 1fe01cb8eb0904079a1359cb409a7c55, type: 3} - {fileID: 21300000, guid: e0db0ada99791964bac9c02f92e6b04b, type: 3} - {fileID: 21300000, guid: 5cbb4c1d1c46f9d43870f838755ed134, type: 3} - spriteNameList: 81edc3405eb071e0925bc42d935bc42d945bc42d955bc42d965bc42d975bc42d985bc42d995bc42d9a5bc42d5fb071e0b15bc42db25bc42db35bc42db45bc42db55bc42db65bc42db75bc42db85bc42db95bc42dba5bc42d60b071e0d05bc42dd15bc42dd25bc42dd35bc42dd45bc42dd55bc42dd65bc42dd75bc42dd85bc42dd95bc42d61b071e0ef5bc42df35bc42df45bc42d62b071e063b071e064b071e065b071e066b071e0110efddb3fb4a4a340b4a4a341b4a4a342b4a4a343b4a4a3120efddb130efddb140efddb150efddb160efddb170efddb180efddb190efddb449e01cf459e01cf469e01cf479e01cf489e01cf499e01cf4a9e01cf4782ca2d391833e53a1833e53b442fc13c442fc1fc472fc1fd472fc1bd4b2fc1be4b2fc17e4f2fc17f4f2fc13f532fc140532fc100572fc101572fc1c15a2fc1c25a2fc1825e2fc1835e2fc143622fc144622fc104662fc105662fc14882ca2dfa1b33e5fb1b33e59ab82fc19bb82fc15bbc2fc15cbc2fc11cc02fc11dc02fc1ddc32fc1dec32fc19ec72fc19fc72fc15fcb2fc160cb2fc120cf2fc121cf2fc1e1d22fc1e2d22fc1a2d62fc1a3d62fc163da2fc164da2fc1bb1f33e5bc1f33e5f92c30c1fa2c30c1ba3030c1bb3030c17b3430c17c3430c13c3830c13d3830c1fd3b30c1fe3b30c1be3f30c1bf3f30c17f4330c1804330c1404730c1414730c1014b30c1024b30c1c24e30c1c34e30c17c2333e57d2333e558a130c159a130c119a530c11aa530c1daa830c1dba830c19bac30c19cac30c15cb030c15db030c11db430c11eb430c1deb730c1dfb730c19fbb30c1a0bb30c160bf30c161bf30c13d2733e53e2733e5fe2a33e5ff2a33e5bf2e33e5c02e33e5803233e5813233e5413633e5423633e536e96489503cce976db6df2d6317178e6417178e6517178e6617178e6717178e6817178e6917178e6a17178e6b17178e6eb6df2d6fb6df2d70b6df2d71b6df2d72b6df2d73b6df2d74b6df2d75b6df2daf4ffb4ab04ffb4ab14ffb4aeb3a1f96740c33668d56fb9b3b7203c13c7203c13d7203c13e7203c10c73dde6589250040d73dde6b7065104e3fcb3a74059bf2e4159bf2e438d0701448d0701974096eb984096eb + spriteNameList: 81edc340f39c7e1f5eb071e0925bc42d935bc42d945bc42d955bc42d965bc42d975bc42d985bc42d995bc42d9a5bc42d5fb071e0b15bc42db25bc42db35bc42db45bc42db55bc42db65bc42db75bc42db85bc42db95bc42dba5bc42d60b071e0d05bc42dd15bc42dd25bc42dd35bc42dd45bc42dd55bc42dd65bc42dd75bc42dd85bc42dd95bc42d61b071e0ef5bc42df35bc42df45bc42d62b071e063b071e064b071e065b071e066b071e0110efddb3fb4a4a340b4a4a341b4a4a342b4a4a343b4a4a3120efddb130efddb140efddb150efddb160efddb170efddb180efddb190efddb449e01cf459e01cf469e01cf479e01cf489e01cf499e01cf4a9e01cf4782ca2d391833e53a1833e53b442fc13c442fc1fc472fc1fd472fc1bd4b2fc1be4b2fc17e4f2fc17f4f2fc13f532fc140532fc100572fc101572fc1c15a2fc1c25a2fc1825e2fc1835e2fc143622fc144622fc104662fc105662fc14882ca2dfa1b33e5fb1b33e59ab82fc19bb82fc15bbc2fc15cbc2fc11cc02fc11dc02fc1ddc32fc1dec32fc19ec72fc19fc72fc15fcb2fc160cb2fc120cf2fc121cf2fc1e1d22fc1e2d22fc1a2d62fc1a3d62fc163da2fc164da2fc1bb1f33e5bc1f33e5f92c30c1fa2c30c1ba3030c1bb3030c17b3430c17c3430c13c3830c13d3830c1fd3b30c1fe3b30c1be3f30c1bf3f30c17f4330c1804330c1404730c1414730c1014b30c1024b30c1c24e30c1c34e30c17c2333e57d2333e558a130c159a130c119a530c11aa530c1daa830c1dba830c19bac30c19cac30c15cb030c15db030c11db430c11eb430c1deb730c1dfb730c19fbb30c1a0bb30c160bf30c161bf30c13d2733e53e2733e5fe2a33e5ff2a33e5bf2e33e5c02e33e5803233e5813233e5413633e5423633e536e96489503cce976db6df2d6317178e6417178e6517178e6617178e6717178e6817178e6917178e6a17178e6b17178e6eb6df2d6fb6df2d70b6df2d71b6df2d72b6df2d73b6df2d74b6df2d75b6df2daf4ffb4ab04ffb4ab14ffb4aeb3a1f96740c33668d56fb9b3b7203c13c7203c13d7203c13e7203c10c73dde6589250040d73dde6b7065104e3fcb3a74059bf2e4159bf2e438d0701448d0701974096eb984096eb diff --git a/Assets/arts/atlas/ui/act_common.spriteatlas b/Assets/arts/atlas/ui/act_common.spriteatlas index d2ae2f8d6..2b40d2fc6 100644 --- a/Assets/arts/atlas/ui/act_common.spriteatlas +++ b/Assets/arts/atlas/ui/act_common.spriteatlas @@ -227,6 +227,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3569dfdcd6f978f4ab5fd10e9a6abf83, type: 3} - {fileID: 21300000, guid: 2b303eec4dd78c44ab49752a7f8d3238, type: 3} - {fileID: 21300000, guid: 09a7a3fc037398b4c961cc7dbf64f940, type: 3} + - {fileID: 21300000, guid: bedd9bfc4d7a449b0af6b545f0fb9675, type: 3} - {fileID: 21300000, guid: e30cc10da1b4d194997125b79477ec1f, type: 3} - {fileID: 21300000, guid: 5cbb4c1d1c46f9d43870f838755ed134, type: 3} - {fileID: 21300000, guid: 65cadd1db6413e24e915cf23b9e2d2ff, type: 3} @@ -430,6 +431,7 @@ SpriteAtlas: - act_common_dec_1 - act_common_progress_8_bg - act_common_dec_10 + - act_common_ad_banner_1 - act_common_board_1 - common_menu_1_2 - act_common_btn_26_1 diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index d667ba755..cf2b09b81 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -166,9 +166,11 @@ MonoBehaviour: - {fileID: 21300000, guid: de3a93d4a2390470186bd6f12fa365bd, type: 3} - {fileID: 21300000, guid: e236966d63e4e4c6fb3beb9975f97acd, type: 3} - {fileID: 21300000, guid: 14ee130415b5f493eb358a92ec2fc547, type: 3} + - {fileID: 21300000, guid: 3d7caae5e90a442449b68a9427558f6e, type: 3} + - {fileID: 21300000, guid: 6b4f6254dcd20462d9665f8635662f56, type: 3} - {fileID: 21300000, guid: f68fde5de9bc3bb4bb20c8c2e8de00e1, type: 3} - {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} - {fileID: 21300000, guid: ff122855b832135498d2983ecb71e37b, type: 3} - {fileID: 21300000, guid: a01a4ad0b72a64241a3ecffb906eff54, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d277d33eeca7e33eeca7f33eecab833eecaa4a1213850349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4cca15c468dbe552355bf552355c0552355c569b158 + spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d277d33eeca7e33eeca7f33eecab833eecaa4a1213850349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4cca15c468dbe552355bf552355c0552355c569b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 0945f2bbc..4842b9b49 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -108,6 +108,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 9abaaf4457b41ea46ba4f998c247ddb6, type: 3} - {fileID: 21300000, guid: 41c63054fe0534a80923a5668c34f7f1, type: 3} - {fileID: 21300000, guid: d31d90548330f4a20ba6681fa394b94e, type: 3} + - {fileID: 21300000, guid: 6b4f6254dcd20462d9665f8635662f56, type: 3} - {fileID: 21300000, guid: 2acbdd5496c4c59418aef59f65450ce8, type: 3} - {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} - {fileID: 21300000, guid: 75e56c64bd5cbf44793bb354da0cd0b5, type: 3} @@ -127,6 +128,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 769955952967445c4880e9db82df6b7d, type: 3} - {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} - {fileID: 21300000, guid: 324d3fc5bf7f47241865971067a87b80, type: 3} + - {fileID: 21300000, guid: 3d7caae5e90a442449b68a9427558f6e, type: 3} - {fileID: 21300000, guid: 646ad906d9c5043ae880e677c5b79eae, type: 3} - {fileID: 21300000, guid: f9043e169e5a34f9ab31a2ec7acbaf7f, type: 3} - {fileID: 21300000, guid: f65bbb56e45988348b8aeb0272f58047, type: 3} @@ -267,6 +269,7 @@ SpriteAtlas: - common_menu_3 - common_tab_3 - common_tab_4 + - common_tettle_7 - common_plus_3 - common_tips_1 - common_bottom_bg_4 @@ -286,6 +289,7 @@ SpriteAtlas: - common_bg_35 - common_star_1 - common_line_5 + - common_tettle_6 - common_tettle_1 - common_bg_32 - common_dec_10 diff --git a/Assets/arts/atlas/ui/mail.asset b/Assets/arts/atlas/ui/mail.asset index 28cc48b92..cc257dfc3 100644 --- a/Assets/arts/atlas/ui/mail.asset +++ b/Assets/arts/atlas/ui/mail.asset @@ -16,11 +16,8 @@ MonoBehaviour: - {fileID: 21300000, guid: 2c1ddf6d0fe39ce4caa48556adf15ead, type: 3} - {fileID: 21300000, guid: afaa89278d1f8e34384a29aab5820f09, type: 3} - {fileID: 21300000, guid: 82fcbd0e17ac13d46926340d89ff4981, type: 3} - - {fileID: 21300000, guid: 0c685b353f6fe5f45a158f6d79f60871, type: 3} - - {fileID: 21300000, guid: 9b4cac269d8d42d4f92c0cebc519a7d9, type: 3} - {fileID: 21300000, guid: 524d8ada3219633418886910b5b1fe11, type: 3} - {fileID: 21300000, guid: 9b409fa2a72a4bb41bc4dc3578bb3cd0, type: 3} - {fileID: 21300000, guid: 8efeb4a8c4b657d4da2483daad2d1267, type: 3} - - {fileID: 21300000, guid: 33bec6471f24bf6468e5318b6cec9109, type: 3} - - {fileID: 21300000, guid: 7d49105bbb826fe4592b21c43422fce1, type: 3} - spriteNameList: 3fc897ed40c897ed41c897ed90def1ff91def1ffac9a7cc5ad9a7cc5ae9a7cc5c10668ff182b68ff + - {fileID: 21300000, guid: 3c636b931b7b845119fddd103e955ac5, type: 3} + spriteNameList: 3fc897ed40c897ed41c897edac9a7cc5ad9a7cc5ae9a7cc5af9a7cc5 diff --git a/Assets/arts/atlas/ui/mail.spriteatlas b/Assets/arts/atlas/ui/mail.spriteatlas index e04c48766..605907cdd 100644 --- a/Assets/arts/atlas/ui/mail.spriteatlas +++ b/Assets/arts/atlas/ui/mail.spriteatlas @@ -63,24 +63,18 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 9b409fa2a72a4bb41bc4dc3578bb3cd0, type: 3} - - {fileID: 21300000, guid: 0c685b353f6fe5f45a158f6d79f60871, type: 3} - - {fileID: 21300000, guid: 9b4cac269d8d42d4f92c0cebc519a7d9, type: 3} + - {fileID: 21300000, guid: 3c636b931b7b845119fddd103e955ac5, type: 3} - {fileID: 21300000, guid: afaa89278d1f8e34384a29aab5820f09, type: 3} - - {fileID: 21300000, guid: 33bec6471f24bf6468e5318b6cec9109, type: 3} - {fileID: 21300000, guid: 8efeb4a8c4b657d4da2483daad2d1267, type: 3} - {fileID: 21300000, guid: 524d8ada3219633418886910b5b1fe11, type: 3} - - {fileID: 21300000, guid: 7d49105bbb826fe4592b21c43422fce1, type: 3} - {fileID: 21300000, guid: 2c1ddf6d0fe39ce4caa48556adf15ead, type: 3} - {fileID: 21300000, guid: 82fcbd0e17ac13d46926340d89ff4981, type: 3} m_PackedSpriteNamesToIndex: - mail_dec_2 - - mail_board_1 - - mail_board_2 + - mail_dec_4 - mail_bg_2 - - mail_dot - mail_dec_3 - mail_dec_1 - - mail_new - mail_bg_1 - mail_bg_3 m_RenderDataMap: {} diff --git a/Assets/arts/effects/texture/fx_b9_b155.png.meta b/Assets/arts/effects/texture/fx_b9_b155.png.meta index fb8052029..ce2b879fa 100644 --- a/Assets/arts/effects/texture/fx_b9_b155.png.meta +++ b/Assets/arts/effects/texture/fx_b9_b155.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -101,6 +101,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_1.png b/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_1.png index 4b0508530..f56cf7690 100644 Binary files a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_1.png and b/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_1.png differ diff --git a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_1.png.meta b/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_1.png.meta index 0fce192b7..2840354ec 100644 --- a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_1.png.meta +++ b/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_1.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -101,6 +89,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/background/daily_challenge/daily_challenge_bg_1.png.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_2.png b/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_2.png deleted file mode 100644 index d3f0d491e..000000000 Binary files a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_2.png and /dev/null differ diff --git a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_2.png.meta b/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_2.png.meta deleted file mode 100644 index d17e1d6e5..000000000 --- a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_2.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 045c3cfa40b940748a0734c9b5613347 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: arts/textures/background/daily_challenge/daily_challenge_bg_2.png.ab - assetBundleVariant: diff --git a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_3.png b/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_3.png deleted file mode 100644 index ffe15965d..000000000 Binary files a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_3.png and /dev/null differ diff --git a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_3.png.meta b/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_3.png.meta deleted file mode 100644 index 264c2f169..000000000 --- a/Assets/arts/textures/background/daily_challenge/daily_challenge_bg_3.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 16325d6a0a9a2ba479a5d2224fc565ff -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 1 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 45 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: arts/textures/background/daily_challenge/daily_challenge_bg_3.png.ab - assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_1.png b/Assets/arts/textures/icon/avatar/avater_1.png deleted file mode 100644 index 9078329e4..000000000 Binary files a/Assets/arts/textures/icon/avatar/avater_1.png and /dev/null differ diff --git a/Assets/arts/textures/icon/avatar/avater_13001.png b/Assets/arts/textures/icon/avatar/avater_13001.png new file mode 100644 index 000000000..6c1726c57 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_13001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_1.png.meta b/Assets/arts/textures/icon/avatar/avater_13001.png.meta similarity index 98% rename from Assets/arts/textures/icon/avatar/avater_1.png.meta rename to Assets/arts/textures/icon/avatar/avater_13001.png.meta index 3713ab239..5e6ec4423 100644 --- a/Assets/arts/textures/icon/avatar/avater_1.png.meta +++ b/Assets/arts/textures/icon/avatar/avater_13001.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b100dc83cc42cb4ca8273dba82da6b1 +guid: 8935fea43ddf7416eaa926070bb7a5b8 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/arts/textures/icon/avatar/avater_14001.png b/Assets/arts/textures/icon/avatar/avater_14001.png new file mode 100644 index 000000000..da8410a02 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_14001.png differ diff --git a/Assets/arts/textures/ui/mail/mail_dot.png.meta b/Assets/arts/textures/icon/avatar/avater_14001.png.meta similarity index 97% rename from Assets/arts/textures/ui/mail/mail_dot.png.meta rename to Assets/arts/textures/icon/avatar/avater_14001.png.meta index d78ac687a..98318f959 100644 --- a/Assets/arts/textures/ui/mail/mail_dot.png.meta +++ b/Assets/arts/textures/icon/avatar/avater_14001.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 33bec6471f24bf6468e5318b6cec9109 +guid: 708c0091709784c4ead4848cb3e9bb72 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_15001.png b/Assets/arts/textures/icon/avatar/avater_15001.png new file mode 100644 index 000000000..a6d8de37f Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_15001.png differ diff --git a/Assets/arts/textures/ui/mail/mail_new.png.meta b/Assets/arts/textures/icon/avatar/avater_15001.png.meta similarity index 97% rename from Assets/arts/textures/ui/mail/mail_new.png.meta rename to Assets/arts/textures/icon/avatar/avater_15001.png.meta index 2a0ce6c73..b65ae6dbc 100644 --- a/Assets/arts/textures/ui/mail/mail_new.png.meta +++ b/Assets/arts/textures/icon/avatar/avater_15001.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d49105bbb826fe4592b21c43422fce1 +guid: 25f7407a107de4e3d8c755d77dda451f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_15002.png b/Assets/arts/textures/icon/avatar/avater_15002.png new file mode 100644 index 000000000..d833a2947 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_15002.png differ diff --git a/Assets/arts/textures/ui/mail/mail_board_1.png.meta b/Assets/arts/textures/icon/avatar/avater_15002.png.meta similarity index 95% rename from Assets/arts/textures/ui/mail/mail_board_1.png.meta rename to Assets/arts/textures/icon/avatar/avater_15002.png.meta index 2ca800df0..000c06381 100644 --- a/Assets/arts/textures/ui/mail/mail_board_1.png.meta +++ b/Assets/arts/textures/icon/avatar/avater_15002.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c685b353f6fe5f45a158f6d79f60871 +guid: f04635e2276b049be924640187302959 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 28, z: 0, w: 28} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_16001.png b/Assets/arts/textures/icon/avatar/avater_16001.png new file mode 100644 index 000000000..55e89fe55 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_16001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_16001.png.meta b/Assets/arts/textures/icon/avatar/avater_16001.png.meta new file mode 100644 index 000000000..5c61c6d65 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_16001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: b9db06750fc1f459cbf3940043acf834 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_23001.png b/Assets/arts/textures/icon/avatar/avater_23001.png new file mode 100644 index 000000000..8bbd77b4d Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_23001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_23001.png.meta b/Assets/arts/textures/icon/avatar/avater_23001.png.meta new file mode 100644 index 000000000..8592aaa41 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_23001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: de56021ced54f4f01bb3e53481b96fc4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_24001.png b/Assets/arts/textures/icon/avatar/avater_24001.png new file mode 100644 index 000000000..03990e292 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_24001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_24001.png.meta b/Assets/arts/textures/icon/avatar/avater_24001.png.meta new file mode 100644 index 000000000..7e4995ab1 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_24001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: df6c970c2fcda4dc8ad4a61ce9755b22 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_25001.png b/Assets/arts/textures/icon/avatar/avater_25001.png new file mode 100644 index 000000000..e569eecb7 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_25001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_25001.png.meta b/Assets/arts/textures/icon/avatar/avater_25001.png.meta new file mode 100644 index 000000000..80dbe65a0 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_25001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 428c3429cd0064d7fb52ef242326a511 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_25002.png b/Assets/arts/textures/icon/avatar/avater_25002.png new file mode 100644 index 000000000..11db87ac4 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_25002.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_25002.png.meta b/Assets/arts/textures/icon/avatar/avater_25002.png.meta new file mode 100644 index 000000000..5392f2a65 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_25002.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 848d33ba264e44eb7b2052d62177af44 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_26001.png b/Assets/arts/textures/icon/avatar/avater_26001.png new file mode 100644 index 000000000..68e246ebd Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_26001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_26001.png.meta b/Assets/arts/textures/icon/avatar/avater_26001.png.meta new file mode 100644 index 000000000..7ea3487b5 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_26001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: eb7559ced34044cc69c4142cdb37cc60 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_33001.png b/Assets/arts/textures/icon/avatar/avater_33001.png new file mode 100644 index 000000000..3405a27f6 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_33001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_33001.png.meta b/Assets/arts/textures/icon/avatar/avater_33001.png.meta new file mode 100644 index 000000000..df73fc1d6 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_33001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 0ad3c5bc1a0044e08af27c13ff81752d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_34001.png b/Assets/arts/textures/icon/avatar/avater_34001.png new file mode 100644 index 000000000..04b49c0d6 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_34001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_34001.png.meta b/Assets/arts/textures/icon/avatar/avater_34001.png.meta new file mode 100644 index 000000000..38ec03d93 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_34001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 1a08afe645c0b4f2786cad59820f609c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_35001.png b/Assets/arts/textures/icon/avatar/avater_35001.png new file mode 100644 index 000000000..64505cab2 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_35001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_35001.png.meta b/Assets/arts/textures/icon/avatar/avater_35001.png.meta new file mode 100644 index 000000000..32912b5fe --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_35001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: bd0437fe7307a49b9afc0cfa48efa513 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_35002.png b/Assets/arts/textures/icon/avatar/avater_35002.png new file mode 100644 index 000000000..aca003262 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_35002.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_35002.png.meta b/Assets/arts/textures/icon/avatar/avater_35002.png.meta new file mode 100644 index 000000000..43acadd04 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_35002.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 63c5ef62b7fea452bb694dbdc153f27a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_43001.png b/Assets/arts/textures/icon/avatar/avater_43001.png new file mode 100644 index 000000000..bb2a246fa Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_43001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_43001.png.meta b/Assets/arts/textures/icon/avatar/avater_43001.png.meta new file mode 100644 index 000000000..d4ede0e26 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_43001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 70cb227f1515847b49d46ea6c0c38ee9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_44001.png b/Assets/arts/textures/icon/avatar/avater_44001.png new file mode 100644 index 000000000..045d1b0bf Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_44001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_44001.png.meta b/Assets/arts/textures/icon/avatar/avater_44001.png.meta new file mode 100644 index 000000000..3a40388be --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_44001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 99f39492b26ee45f68e9e2df54fcead9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_45001.png b/Assets/arts/textures/icon/avatar/avater_45001.png new file mode 100644 index 000000000..b76870239 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_45001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_45001.png.meta b/Assets/arts/textures/icon/avatar/avater_45001.png.meta new file mode 100644 index 000000000..470b2ed06 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_45001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 34d82a979e07346a7a401d234e6f92ed +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_45002.png b/Assets/arts/textures/icon/avatar/avater_45002.png new file mode 100644 index 000000000..69d08d453 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_45002.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_45002.png.meta b/Assets/arts/textures/icon/avatar/avater_45002.png.meta new file mode 100644 index 000000000..70f780a32 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_45002.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 75a360b6b501a4603aba7c8c31435742 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_53001.png b/Assets/arts/textures/icon/avatar/avater_53001.png new file mode 100644 index 000000000..45585d91f Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_53001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_53001.png.meta b/Assets/arts/textures/icon/avatar/avater_53001.png.meta new file mode 100644 index 000000000..4552f0a03 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_53001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: de7f968c0cae14e12835f4ef067b90e5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_54001.png b/Assets/arts/textures/icon/avatar/avater_54001.png new file mode 100644 index 000000000..96ac119a4 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_54001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_54001.png.meta b/Assets/arts/textures/icon/avatar/avater_54001.png.meta new file mode 100644 index 000000000..4ad0c623f --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_54001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 3df470ec152fd4b02a4d3b35c6fddb3e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_55001.png b/Assets/arts/textures/icon/avatar/avater_55001.png new file mode 100644 index 000000000..793282122 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_55001.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_55001.png.meta b/Assets/arts/textures/icon/avatar/avater_55001.png.meta new file mode 100644 index 000000000..e61ae9687 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_55001.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: fe7298bedd400416b96436a63a8fc4f9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/avatar/avater_55002.png b/Assets/arts/textures/icon/avatar/avater_55002.png new file mode 100644 index 000000000..db7b96dc8 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avater_55002.png differ diff --git a/Assets/arts/textures/icon/avatar/avater_55002.png.meta b/Assets/arts/textures/icon/avatar/avater_55002.png.meta new file mode 100644 index 000000000..25a5b4d21 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avater_55002.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 28e473293ee124ca3a9ed42b5983c0ad +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/act_common/act_common_ad_banner_1.png b/Assets/arts/textures/ui/act_common/act_common_ad_banner_1.png new file mode 100644 index 000000000..58bc5fc04 Binary files /dev/null and b/Assets/arts/textures/ui/act_common/act_common_ad_banner_1.png differ diff --git a/Assets/arts/textures/ui/act_common/act_common_ad_banner_1.png.meta b/Assets/arts/textures/ui/act_common/act_common_ad_banner_1.png.meta new file mode 100644 index 000000000..51abea564 --- /dev/null +++ b/Assets/arts/textures/ui/act_common/act_common_ad_banner_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: bedd9bfc4d7a449b0af6b545f0fb9675 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/arena/arena_bg_3.png b/Assets/arts/textures/ui/arena/arena_bg_3.png index fcce44ac8..30e2271cf 100644 Binary files a/Assets/arts/textures/ui/arena/arena_bg_3.png and b/Assets/arts/textures/ui/arena/arena_bg_3.png differ diff --git a/Assets/arts/textures/ui/arena/arena_dec_6.png b/Assets/arts/textures/ui/arena/arena_dec_6.png index d30eaa46c..119c85fab 100644 Binary files a/Assets/arts/textures/ui/arena/arena_dec_6.png and b/Assets/arts/textures/ui/arena/arena_dec_6.png differ diff --git a/Assets/arts/textures/ui/arena/arena_dec_8.png b/Assets/arts/textures/ui/arena/arena_dec_8.png index 783c454f3..729e47b70 100644 Binary files a/Assets/arts/textures/ui/arena/arena_dec_8.png and b/Assets/arts/textures/ui/arena/arena_dec_8.png differ diff --git a/Assets/arts/textures/ui/arena/arena_dec_9.png b/Assets/arts/textures/ui/arena/arena_dec_9.png index 3ae4831f6..68d68948f 100644 Binary files a/Assets/arts/textures/ui/arena/arena_dec_9.png and b/Assets/arts/textures/ui/arena/arena_dec_9.png differ diff --git a/Assets/arts/textures/ui/common/common_ad_1.png b/Assets/arts/textures/ui/common/common_ad_1.png index 339ec41ba..76916d948 100644 Binary files a/Assets/arts/textures/ui/common/common_ad_1.png and b/Assets/arts/textures/ui/common/common_ad_1.png differ diff --git a/Assets/arts/textures/ui/common/common_ad_2.png b/Assets/arts/textures/ui/common/common_ad_2.png index 3219b45e7..c937a7219 100644 Binary files a/Assets/arts/textures/ui/common/common_ad_2.png and b/Assets/arts/textures/ui/common/common_ad_2.png differ diff --git a/Assets/arts/textures/ui/common/common_bg_1.png b/Assets/arts/textures/ui/common/common_bg_1.png index 888785a1c..9ec176af0 100644 Binary files a/Assets/arts/textures/ui/common/common_bg_1.png and b/Assets/arts/textures/ui/common/common_bg_1.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_3.png b/Assets/arts/textures/ui/common/common_dec_3.png index bcc8b7734..8e83bdf11 100644 Binary files a/Assets/arts/textures/ui/common/common_dec_3.png and b/Assets/arts/textures/ui/common/common_dec_3.png differ diff --git a/Assets/arts/textures/ui/common/common_tettle_6.png b/Assets/arts/textures/ui/common/common_tettle_6.png new file mode 100644 index 000000000..7f9a5ac05 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_tettle_6.png differ diff --git a/Assets/arts/textures/ui/common/common_tettle_6.png.meta b/Assets/arts/textures/ui/common/common_tettle_6.png.meta new file mode 100644 index 000000000..82c32c81d --- /dev/null +++ b/Assets/arts/textures/ui/common/common_tettle_6.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 3d7caae5e90a442449b68a9427558f6e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_tettle_7.png b/Assets/arts/textures/ui/common/common_tettle_7.png new file mode 100644 index 000000000..9796db08c Binary files /dev/null and b/Assets/arts/textures/ui/common/common_tettle_7.png differ diff --git a/Assets/arts/textures/ui/common/common_tettle_7.png.meta b/Assets/arts/textures/ui/common/common_tettle_7.png.meta new file mode 100644 index 000000000..4fce975c6 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_tettle_7.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 6b4f6254dcd20462d9665f8635662f56 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/daily_challenge/daily_challenge_bg_1.png b/Assets/arts/textures/ui/daily_challenge/daily_challenge_bg_1.png index 6d6b4238d..ea20ed549 100644 Binary files a/Assets/arts/textures/ui/daily_challenge/daily_challenge_bg_1.png and b/Assets/arts/textures/ui/daily_challenge/daily_challenge_bg_1.png differ diff --git a/Assets/arts/textures/ui/daily_challenge/daily_challenge_bg_2.png b/Assets/arts/textures/ui/daily_challenge/daily_challenge_bg_2.png index 38513c889..d7b1d63b7 100644 Binary files a/Assets/arts/textures/ui/daily_challenge/daily_challenge_bg_2.png and b/Assets/arts/textures/ui/daily_challenge/daily_challenge_bg_2.png differ diff --git a/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_1.png b/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_1.png index 8fc3190af..695cadb7a 100644 Binary files a/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_1.png and b/Assets/arts/textures/ui/daily_challenge/daily_challenge_dec_1.png differ diff --git a/Assets/arts/textures/ui/mail/mail_bg_1.png b/Assets/arts/textures/ui/mail/mail_bg_1.png index a0ecf7298..58c0884d3 100644 Binary files a/Assets/arts/textures/ui/mail/mail_bg_1.png and b/Assets/arts/textures/ui/mail/mail_bg_1.png differ diff --git a/Assets/arts/textures/ui/mail/mail_bg_1.png.meta b/Assets/arts/textures/ui/mail/mail_bg_1.png.meta index 17c150efd..589749eb5 100644 --- a/Assets/arts/textures/ui/mail/mail_bg_1.png.meta +++ b/Assets/arts/textures/ui/mail/mail_bg_1.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/mail/mail_bg_2.png b/Assets/arts/textures/ui/mail/mail_bg_2.png index af75fdc9e..939bd7357 100644 Binary files a/Assets/arts/textures/ui/mail/mail_bg_2.png and b/Assets/arts/textures/ui/mail/mail_bg_2.png differ diff --git a/Assets/arts/textures/ui/mail/mail_bg_2.png.meta b/Assets/arts/textures/ui/mail/mail_bg_2.png.meta index c00c6d858..6304f8aa0 100644 --- a/Assets/arts/textures/ui/mail/mail_bg_2.png.meta +++ b/Assets/arts/textures/ui/mail/mail_bg_2.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/mail/mail_bg_3.png b/Assets/arts/textures/ui/mail/mail_bg_3.png index 4e595c238..abafb1cac 100644 Binary files a/Assets/arts/textures/ui/mail/mail_bg_3.png and b/Assets/arts/textures/ui/mail/mail_bg_3.png differ diff --git a/Assets/arts/textures/ui/mail/mail_bg_3.png.meta b/Assets/arts/textures/ui/mail/mail_bg_3.png.meta index 9d7e40e04..5c41c570b 100644 --- a/Assets/arts/textures/ui/mail/mail_bg_3.png.meta +++ b/Assets/arts/textures/ui/mail/mail_bg_3.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 34, z: 0, w: 135} + spriteBorder: {x: 0, y: 34, z: 0, w: 150} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/mail/mail_board_1.png b/Assets/arts/textures/ui/mail/mail_board_1.png deleted file mode 100644 index ee46990cd..000000000 Binary files a/Assets/arts/textures/ui/mail/mail_board_1.png and /dev/null differ diff --git a/Assets/arts/textures/ui/mail/mail_board_2.png b/Assets/arts/textures/ui/mail/mail_board_2.png deleted file mode 100644 index 973f53e05..000000000 Binary files a/Assets/arts/textures/ui/mail/mail_board_2.png and /dev/null differ diff --git a/Assets/arts/textures/ui/mail/mail_board_2.png.meta b/Assets/arts/textures/ui/mail/mail_board_2.png.meta deleted file mode 100644 index 3a6e63652..000000000 --- a/Assets/arts/textures/ui/mail/mail_board_2.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 9b4cac269d8d42d4f92c0cebc519a7d9 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 21, y: 21, z: 21, w: 21} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 1 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 47 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: arts/textures/ui/mail.ab - assetBundleVariant: diff --git a/Assets/arts/textures/ui/mail/mail_dec_1.png b/Assets/arts/textures/ui/mail/mail_dec_1.png index 33f4678f5..b701bb5fd 100644 Binary files a/Assets/arts/textures/ui/mail/mail_dec_1.png and b/Assets/arts/textures/ui/mail/mail_dec_1.png differ diff --git a/Assets/arts/textures/ui/mail/mail_dec_1.png.meta b/Assets/arts/textures/ui/mail/mail_dec_1.png.meta index 964fa06c3..31a8e5fdb 100644 --- a/Assets/arts/textures/ui/mail/mail_dec_1.png.meta +++ b/Assets/arts/textures/ui/mail/mail_dec_1.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/mail/mail_dec_2.png b/Assets/arts/textures/ui/mail/mail_dec_2.png index f4c48eb7a..4b58747aa 100644 Binary files a/Assets/arts/textures/ui/mail/mail_dec_2.png and b/Assets/arts/textures/ui/mail/mail_dec_2.png differ diff --git a/Assets/arts/textures/ui/mail/mail_dec_2.png.meta b/Assets/arts/textures/ui/mail/mail_dec_2.png.meta index ae83656e9..684fdc00b 100644 --- a/Assets/arts/textures/ui/mail/mail_dec_2.png.meta +++ b/Assets/arts/textures/ui/mail/mail_dec_2.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/mail/mail_dec_3.png b/Assets/arts/textures/ui/mail/mail_dec_3.png index 6dec76f69..6545a6967 100644 Binary files a/Assets/arts/textures/ui/mail/mail_dec_3.png and b/Assets/arts/textures/ui/mail/mail_dec_3.png differ diff --git a/Assets/arts/textures/ui/mail/mail_dec_3.png.meta b/Assets/arts/textures/ui/mail/mail_dec_3.png.meta index 18503e0d3..691c6edec 100644 --- a/Assets/arts/textures/ui/mail/mail_dec_3.png.meta +++ b/Assets/arts/textures/ui/mail/mail_dec_3.png.meta @@ -63,20 +63,8 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - cookieLightType: 1 + cookieLightType: 0 platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 @@ -113,6 +101,18 @@ TextureImporter: overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Server maxTextureSize: 2048 @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/mail.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/mail/mail_dec_4.png b/Assets/arts/textures/ui/mail/mail_dec_4.png new file mode 100644 index 000000000..0d36165c8 Binary files /dev/null and b/Assets/arts/textures/ui/mail/mail_dec_4.png differ diff --git a/Assets/arts/textures/ui/mail/mail_dec_4.png.meta b/Assets/arts/textures/ui/mail/mail_dec_4.png.meta new file mode 100644 index 000000000..2b0a3ebf4 --- /dev/null +++ b/Assets/arts/textures/ui/mail/mail_dec_4.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 3c636b931b7b845119fddd103e955ac5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/mail/mail_dot.png b/Assets/arts/textures/ui/mail/mail_dot.png deleted file mode 100644 index c30fd7e42..000000000 Binary files a/Assets/arts/textures/ui/mail/mail_dot.png and /dev/null differ diff --git a/Assets/arts/textures/ui/mail/mail_new.png b/Assets/arts/textures/ui/mail/mail_new.png deleted file mode 100644 index f4c454388..000000000 Binary files a/Assets/arts/textures/ui/mail/mail_new.png and /dev/null differ diff --git a/Assets/arts/textures/ui/summon/summon_dec_1.png b/Assets/arts/textures/ui/summon/summon_dec_1.png index 036bdc284..17e2e111d 100644 Binary files a/Assets/arts/textures/ui/summon/summon_dec_1.png and b/Assets/arts/textures/ui/summon/summon_dec_1.png differ diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index a73342f9c..e6fe2936a 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/common/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index 927d3830f..4898a4eb7 100644 Binary files a/Assets/lua/app/common/data_manager.lua.bytes and b/Assets/lua/app/common/data_manager.lua.bytes differ diff --git a/Assets/lua/app/common/module_manager.lua.bytes b/Assets/lua/app/common/module_manager.lua.bytes index cf62a81e9..d0700a851 100644 Binary files a/Assets/lua/app/common/module_manager.lua.bytes and b/Assets/lua/app/common/module_manager.lua.bytes differ diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index bfa58a6b2..10d084045 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index a6bd851a0..6ebd1e575 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/config/talent.lua.bytes b/Assets/lua/app/config/talent.lua.bytes index 60d6aaa43..90cf88e51 100644 Binary files a/Assets/lua/app/config/talent.lua.bytes and b/Assets/lua/app/config/talent.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 9e7ce1420..269bfb42c 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index ae956920e..5e9637e12 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index 2e0e6b18c..d734a7736 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_manager.lua.bytes b/Assets/lua/app/module/battle/battle_manager.lua.bytes index 40d0f2e92..114f57508 100644 Binary files a/Assets/lua/app/module/battle/battle_manager.lua.bytes and b/Assets/lua/app/module/battle/battle_manager.lua.bytes differ diff --git a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes index c54235c1d..86ff70b6b 100644 Binary files a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes and b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes index a9ee45377..b20121758 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller_daily_challenge.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller_daily_challenge.lua.bytes index ad52826a1..2499bd17f 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller_daily_challenge.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes index 1f2ef04ab..8544a8895 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller_pvp.lua.bytes differ diff --git a/Assets/lua/app/module/battle/helper/battle_board_touch_helper.lua.bytes b/Assets/lua/app/module/battle/helper/battle_board_touch_helper.lua.bytes index 10a5ca5cb..63164ff2c 100644 Binary files a/Assets/lua/app/module/battle/helper/battle_board_touch_helper.lua.bytes and b/Assets/lua/app/module/battle/helper/battle_board_touch_helper.lua.bytes differ diff --git a/Assets/lua/app/module/battle/helper/battle_formula.lua.bytes b/Assets/lua/app/module/battle/helper/battle_formula.lua.bytes index 888d95c3f..9a2dd1653 100644 Binary files a/Assets/lua/app/module/battle/helper/battle_formula.lua.bytes and b/Assets/lua/app/module/battle/helper/battle_formula.lua.bytes differ diff --git a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes index d3f45ecb6..f8db1d0f4 100644 Binary files a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes and b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/arena_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_ui.lua.bytes index 76ecc71ed..1b8daa0a4 100644 Binary files a/Assets/lua/app/ui/arena/arena_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/bag/bag_main_ui.lua.bytes b/Assets/lua/app/ui/bag/bag_main_ui.lua.bytes index ba9bc348e..11368d705 100644 Binary files a/Assets/lua/app/ui/bag/bag_main_ui.lua.bytes and b/Assets/lua/app/ui/bag/bag_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index 4d9aa6e05..a6861f6e4 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_skill_select_comp.lua.bytes b/Assets/lua/app/ui/battle/battle_skill_select_comp.lua.bytes index 73d888fc5..9f9165bc4 100644 Binary files a/Assets/lua/app/ui/battle/battle_skill_select_comp.lua.bytes and b/Assets/lua/app/ui/battle/battle_skill_select_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes b/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes index bcd6cb705..39fc4229b 100644 Binary files a/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/hero_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes index a0e33934e..26e6f58db 100644 Binary files a/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/common/common_box_ui.lua.bytes b/Assets/lua/app/ui/common/common_box_ui.lua.bytes index d145bea8d..087eefad4 100644 Binary files a/Assets/lua/app/ui/common/common_box_ui.lua.bytes and b/Assets/lua/app/ui/common/common_box_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_skin_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_skin_ui.lua.bytes index 9fc39e5c6..d219188f7 100644 Binary files a/Assets/lua/app/ui/hero/hero_skin_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_skin_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes b/Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes index 387c37c2f..ac0f6ba82 100644 Binary files a/Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes and b/Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/mail/mail_ui.lua.bytes b/Assets/lua/app/ui/mail/mail_ui.lua.bytes index 0aba2d616..cfb18d3b0 100644 Binary files a/Assets/lua/app/ui/mail/mail_ui.lua.bytes and b/Assets/lua/app/ui/mail/mail_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_act_sprint_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_act_sprint_cell.lua.bytes index 4cc05b7dd..c95eb26c2 100644 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_act_sprint_cell.lua.bytes and b/Assets/lua/app/ui/main_city/cell/side_bar_act_sprint_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index c0b96696d..21db4ec8f 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes index ad358ecec..fa0fb1aa5 100644 Binary files a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes and b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/act_sprint/act_sprint_data.lua.bytes b/Assets/lua/app/userdata/activity/act_sprint/act_sprint_data.lua.bytes index 68e1bbeda..e2f1bf53c 100644 Binary files a/Assets/lua/app/userdata/activity/act_sprint/act_sprint_data.lua.bytes and b/Assets/lua/app/userdata/activity/act_sprint/act_sprint_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua.bytes b/Assets/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua.bytes index 68f932841..ae9111b57 100644 Binary files a/Assets/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua.bytes and b/Assets/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes b/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes index 56c544abd..7084c31b1 100644 Binary files a/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes and b/Assets/lua/app/userdata/battle/battle_base_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes b/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes index 5650e038d..197001451 100644 Binary files a/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes and b/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes index 74c1e313e..bfe09e4ed 100644 Binary files a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes and b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes index be8b7d150..a40b74cf9 100644 Binary files a/Assets/lua/app/userdata/hero/hero_entity.lua.bytes and b/Assets/lua/app/userdata/hero/hero_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/talent/talent_data.lua.bytes b/Assets/lua/app/userdata/talent/talent_data.lua.bytes index 57d6e454e..cfb62cf34 100644 Binary files a/Assets/lua/app/userdata/talent/talent_data.lua.bytes and b/Assets/lua/app/userdata/talent/talent_data.lua.bytes differ diff --git a/Assets/prefabs/ui/bag/bag_main_ui.prefab b/Assets/prefabs/ui/bag/bag_main_ui.prefab index e4bd84adf..33371244c 100644 --- a/Assets/prefabs/ui/bag/bag_main_ui.prefab +++ b/Assets/prefabs/ui/bag/bag_main_ui.prefab @@ -33,7 +33,6 @@ RectTransform: - {fileID: 5779420772345834667} - {fileID: 5920618919447900822} - {fileID: 2542682175726021875} - - {fileID: 1603035702617088389} - {fileID: 1298275860812990621} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 @@ -41,7 +40,7 @@ RectTransform: 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: 620, y: 956} + m_SizeDelta: {x: 620, y: 786} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8375105319518710068 CanvasRenderer: @@ -81,326 +80,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &906140913188719211 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4974535595758238340} - - component: {fileID: 3829059194163451217} - - component: {fileID: 5315570469542449163} - m_Layer: 5 - m_Name: lock_img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4974535595758238340 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 906140913188719211} - 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: 6706497757523550084} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 26, y: 31} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3829059194163451217 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 906140913188719211} - m_CullTransparentMesh: 1 ---- !u!114 &5315570469542449163 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 906140913188719211} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - 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: bf5180354d324cb4685dcfb6480b6a65, 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 &1367890399676357581 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4243587229810431492} - - component: {fileID: 5890725874307209278} - - component: {fileID: 9166215425997292937} - - component: {fileID: 5775907852355030725} - m_Layer: 5 - m_Name: page_btn_3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4243587229810431492 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1367890399676357581} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2205015901696860582} - - {fileID: 693728187526487307} - m_Father: {fileID: 1603035702617088389} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 434.55, y: -50} - m_SizeDelta: {x: 126, y: 90} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5890725874307209278 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1367890399676357581} - m_CullTransparentMesh: 1 ---- !u!114 &9166215425997292937 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1367890399676357581} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - 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: 8557e6412e7e6464495c2efa8f5f2f78, type: 3} - m_Type: 1 - 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!114 &5775907852355030725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1367890399676357581} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 ---- !u!1 &2009782464441115506 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2205015901696860582} - - component: {fileID: 1301551424018457308} - - component: {fileID: 2097836136227878733} - m_Layer: 5 - m_Name: lock_img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2205015901696860582 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2009782464441115506} - m_LocalRotation: {x: -0, y: -0, z: 1, w: -0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4243587229810431492} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: 26, y: 31} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1301551424018457308 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2009782464441115506} - m_CullTransparentMesh: 1 ---- !u!114 &2097836136227878733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2009782464441115506} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - 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: bf5180354d324cb4685dcfb6480b6a65, 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 &2348674475130942949 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4509207081567672783} - - component: {fileID: 5380202317902581485} - - component: {fileID: 845731319647297214} - m_Layer: 5 - m_Name: red_img_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4509207081567672783 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2348674475130942949} - 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: 6287751932931666943} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 148, y: 0} - m_SizeDelta: {x: 26, y: 27} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5380202317902581485 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2348674475130942949} - m_CullTransparentMesh: 1 ---- !u!114 &845731319647297214 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2348674475130942949} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, 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 &2665812822011304502 GameObject: m_ObjectHideFlags: 0 @@ -519,141 +198,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 ---- !u!1 &3129015344215432201 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 693728187526487307} - - component: {fileID: 2657956192399651026} - - component: {fileID: 1827014630953145157} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &693728187526487307 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129015344215432201} - m_LocalRotation: {x: -0, y: -0, z: 1, w: -0} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4243587229810431492} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: 115, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2657956192399651026 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129015344215432201} - m_CullTransparentMesh: 1 ---- !u!114 &1827014630953145157 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129015344215432201} - 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: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4290679964 - m_fontColor: {r: 0.6117647, g: 0.5803922, b: 0.74509805, 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: 26 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 26 - m_fontStyle: 0 - 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 &3840463542936215678 GameObject: m_ObjectHideFlags: 0 @@ -789,82 +333,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4156663065910893430 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7014297166435613594} - - component: {fileID: 5258386844272863739} - - component: {fileID: 6278182544214692887} - m_Layer: 5 - m_Name: red_img_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7014297166435613594 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4156663065910893430} - 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: 6287751932931666943} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -20, y: 0} - m_SizeDelta: {x: 26, y: 27} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5258386844272863739 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4156663065910893430} - m_CullTransparentMesh: 1 ---- !u!114 &6278182544214692887 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4156663065910893430} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, 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 &4336206737176385080 GameObject: m_ObjectHideFlags: 0 @@ -955,271 +423,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &5487776139469221114 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6512204233236575816} - - component: {fileID: 3819418271764413512} - - component: {fileID: 4369844400324575678} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6512204233236575816 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5487776139469221114} - 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: 6706497757523550084} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 115, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3819418271764413512 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5487776139469221114} - m_CullTransparentMesh: 1 ---- !u!114 &4369844400324575678 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5487776139469221114} - 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: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4290679964 - 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: 30 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 30 - m_fontStyle: 0 - 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 &5505528400008111988 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6287751932931666943} - m_Layer: 5 - m_Name: red_node - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6287751932931666943 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5505528400008111988} - 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: 7014297166435613594} - - {fileID: 4509207081567672783} - m_Father: {fileID: 8461932745927490369} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -442} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &5948735851318114585 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6706497757523550084} - - component: {fileID: 3401750929851841596} - - component: {fileID: 4886531734183451769} - - component: {fileID: 7174168358322805197} - m_Layer: 5 - m_Name: page_btn_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6706497757523550084 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5948735851318114585} - 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: 4974535595758238340} - - {fileID: 6512204233236575816} - m_Father: {fileID: 1603035702617088389} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3401750929851841596 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5948735851318114585} - m_CullTransparentMesh: 1 ---- !u!114 &4886531734183451769 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5948735851318114585} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - 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: 4ccc87cc2d4c949d3a3d1f83f99bd6a3, 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!114 &7174168358322805197 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5948735851318114585} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 --- !u!1 &5997397792976241942 GameObject: m_ObjectHideFlags: 0 @@ -1254,7 +457,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5129409844343259102} - - {fileID: 6287751932931666943} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1363,27 +565,27 @@ MonoBehaviour: - name: bag_main_ui.bg.btns.page_btn_1 hashName: 3777703063 objectType: 0 - gameObject: {fileID: 9179747951399816384} + gameObject: {fileID: 0} - name: bag_main_ui.bg.btns.page_btn_1.text hashName: 995792932 objectType: 0 - gameObject: {fileID: 6259978606875189643} + gameObject: {fileID: 0} - name: bag_main_ui.bg.btns.page_btn_2 hashName: 3777703064 objectType: 0 - gameObject: {fileID: 5948735851318114585} + gameObject: {fileID: 0} - name: bag_main_ui.bg.btns.page_btn_2.text hashName: 1024422083 objectType: 0 - gameObject: {fileID: 5487776139469221114} + gameObject: {fileID: 0} - name: bag_main_ui.bg.btns.page_btn_3 hashName: 3777703065 objectType: 0 - gameObject: {fileID: 1367890399676357581} + gameObject: {fileID: 0} - name: bag_main_ui.bg.btns.page_btn_3.text hashName: 1053051234 objectType: 0 - gameObject: {fileID: 3129015344215432201} + gameObject: {fileID: 0} - name: bag_main_ui.bg hashName: 1612591216 objectType: 0 @@ -1391,158 +593,23 @@ MonoBehaviour: - name: bag_main_ui.bg.btns.page_btn_2.lock_img hashName: 6319941 objectType: 0 - gameObject: {fileID: 906140913188719211} + gameObject: {fileID: 0} - name: bag_main_ui.bg.btns.page_btn_3.lock_img hashName: 4104773732 objectType: 0 - gameObject: {fileID: 2009782464441115506} + gameObject: {fileID: 0} - name: bag_main_ui.red_node.red_img_1 hashName: 377823284 objectType: 0 - gameObject: {fileID: 4156663065910893430} + gameObject: {fileID: 0} - name: bag_main_ui.red_node.red_img_2 hashName: 377823285 objectType: 0 - gameObject: {fileID: 2348674475130942949} + gameObject: {fileID: 0} - name: bag_main_ui.bg.scrollrect hashName: 1928682095 objectType: 0 gameObject: {fileID: 6951123019671975613} ---- !u!1 &6259978606875189643 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5200247587277741513} - - component: {fileID: 5109452523343823247} - - component: {fileID: 8664860772081763953} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5200247587277741513 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6259978606875189643} - 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: 2388967263079406643} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 115, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5109452523343823247 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6259978606875189643} - m_CullTransparentMesh: 1 ---- !u!114 &8664860772081763953 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6259978606875189643} - 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: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4290679964 - 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: 30 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 30 - m_fontStyle: 0 - 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 &6951123019671975613 GameObject: m_ObjectHideFlags: 0 @@ -1578,13 +645,13 @@ RectTransform: m_Children: - {fileID: 4316770005862767155} m_Father: {fileID: 5129409844343259102} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 378} - m_SizeDelta: {x: 580, y: 826} - m_Pivot: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -38} + m_SizeDelta: {x: 550, y: 642} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &781533129004805253 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1676,75 +743,9 @@ MonoBehaviour: downRecoveryOffset: 5 direction: 0 reverse: 0 - cellWidth: 116 - cellHeight: 116 + cellWidth: 110 + cellHeight: 110 perLineNum: 5 ---- !u!1 &8239297190618542949 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1603035702617088389} - - component: {fileID: 4373255015250709164} - m_Layer: 5 - m_Name: btns - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1603035702617088389 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8239297190618542949} - 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: 2388967263079406643} - - {fileID: 6706497757523550084} - - {fileID: 4243587229810431492} - m_Father: {fileID: 5129409844343259102} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 597.1, y: 60} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &4373255015250709164 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8239297190618542949} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!1 &8400083494403196675 GameObject: m_ObjectHideFlags: 0 @@ -1778,10 +779,10 @@ RectTransform: m_Father: {fileID: 5129409844343259102} m_RootOrder: 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: -34} - m_SizeDelta: {x: -20, y: -112} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -38} + m_SizeDelta: {x: 574, y: 662} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3705240144531967862 CanvasRenderer: @@ -1821,97 +822,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &9179747951399816384 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2388967263079406643} - - component: {fileID: 5832668305201115769} - - component: {fileID: 2559544009480814832} - - component: {fileID: 7988616688005157333} - m_Layer: 5 - m_Name: page_btn_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2388967263079406643 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9179747951399816384} - 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: 5200247587277741513} - m_Father: {fileID: 1603035702617088389} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158, y: 60} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5832668305201115769 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9179747951399816384} - m_CullTransparentMesh: 1 ---- !u!114 &2559544009480814832 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9179747951399816384} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - 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: 4ccc87cc2d4c949d3a3d1f83f99bd6a3, 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!114 &7988616688005157333 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9179747951399816384} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 --- !u!1001 &7902626319762026039 PrefabInstance: m_ObjectHideFlags: 0 @@ -1957,15 +867,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.62 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.62 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 0.62 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/prefabs/ui/battle/battle_pause_ui.prefab b/Assets/prefabs/ui/battle/battle_pause_ui.prefab index e1f268d89..3cee7d981 100644 --- a/Assets/prefabs/ui/battle/battle_pause_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_pause_ui.prefab @@ -435,7 +435,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -164, y: -203} - m_SizeDelta: {x: 200, y: 40} + m_SizeDelta: {x: 260, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5391537079982350337 CanvasRenderer: @@ -495,9 +495,9 @@ MonoBehaviour: m_fontSize: 24 m_fontSizeBase: 24 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -508,7 +508,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -677,7 +677,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9b0c72ee6bd91d64b9793aa8a2e4bfe4, type: 3} + m_Sprite: {fileID: 21300000, guid: 8966095d414c7cc469442996c595c1ab, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -872,7 +872,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 164, y: -233} - m_SizeDelta: {x: 200, y: 40} + m_SizeDelta: {x: 260, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3510021104539593841 CanvasRenderer: @@ -932,9 +932,9 @@ MonoBehaviour: m_fontSize: 24 m_fontSizeBase: 24 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -945,7 +945,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -2032,7 +2032,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9b0c72ee6bd91d64b9793aa8a2e4bfe4, type: 3} + m_Sprite: {fileID: 21300000, guid: 8966095d414c7cc469442996c595c1ab, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index 26879bae0..8d17eee46 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -858,8 +858,8 @@ RectTransform: 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: -36, y: 16} - m_SizeDelta: {x: 46, y: 38} + m_AnchoredPosition: {x: -50, y: 16} + m_SizeDelta: {x: 41, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6453146833886735163 CanvasRenderer: diff --git a/Assets/prefabs/ui/common/common_ad_ui.prefab b/Assets/prefabs/ui/common/common_ad_ui.prefab index 69476b1bb..2027a9952 100644 --- a/Assets/prefabs/ui/common/common_ad_ui.prefab +++ b/Assets/prefabs/ui/common/common_ad_ui.prefab @@ -35,7 +35,7 @@ RectTransform: 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: 145, y: 0} + m_AnchoredPosition: {x: 90, y: 0} m_SizeDelta: {x: 330, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &832590403912408616 @@ -75,8 +75,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4283454570 - m_fontColor: {r: 0.41568628, g: 0.32941177, b: 0.3137255, a: 1} + rgba: 4282662702 + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -93,12 +93,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 22 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -168,11 +168,11 @@ RectTransform: m_Father: {fileID: 4002258812364763181} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -110} - m_SizeDelta: {x: 614, y: 246} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 73} + m_SizeDelta: {x: 584, y: 246} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7969685718366547740 CanvasRenderer: m_ObjectHideFlags: 0 @@ -201,7 +201,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 79099448722e071469c702fa5acb4893, type: 3} + m_Texture: {fileID: 2800000, guid: bedd9bfc4d7a449b0af6b545f0fb9675, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -246,8 +246,8 @@ RectTransform: 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: -400} - m_SizeDelta: {x: 496, y: 184} + m_AnchoredPosition: {x: 0, y: -367} + m_SizeDelta: {x: 578, y: 206} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3804135926128178346 CanvasRenderer: @@ -323,7 +323,7 @@ RectTransform: 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: 35, y: 35} + m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2030605477274569625 CanvasRenderer: @@ -353,7 +353,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fbe82426a04e3b342b75a08099121f15, type: 3} + m_Sprite: {fileID: 21300000, guid: f26e07a00be5c469c92ffb50eaf4482d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -396,11 +396,11 @@ RectTransform: m_Father: {fileID: 7813070650028083980} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -100, y: 60} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 26, y: 57} m_SizeDelta: {x: 250, y: 40} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &6724226010665829946 CanvasRenderer: m_ObjectHideFlags: 0 @@ -439,7 +439,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4284542719 - m_fontColor: {r: 1, g: 0.93333334, b: 0.3764706, a: 1} + m_fontColor: {r: 0.972549, g: 1, b: 0.5019608, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -456,12 +456,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 30 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 28 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -533,7 +533,7 @@ RectTransform: 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: 5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4247662444903599028 @@ -567,7 +567,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 3867a45abce498941a20e7bae19ceb9e, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -803,8 +803,8 @@ RectTransform: 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: -75, y: 5} - m_SizeDelta: {x: 60, y: 60} + m_AnchoredPosition: {x: -60, y: 0} + m_SizeDelta: {x: 41, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &854075825644274418 CanvasRenderer: @@ -924,8 +924,8 @@ RectTransform: 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: 45} - m_SizeDelta: {x: 668, y: 617} + m_AnchoredPosition: {x: 0, y: 82} + m_SizeDelta: {x: 620, y: 586} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &929043086436108139 CanvasRenderer: @@ -1003,7 +1003,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -150, y: 78} - m_SizeDelta: {x: 250, y: 100} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1218842666232575035 CanvasRenderer: @@ -1034,7 +1034,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1092,7 +1092,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 3.3, y: 1.4} - m_SizeDelta: {x: 41.4, y: 31.5} + m_SizeDelta: {x: 43, y: 30.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1562677465284346290 CanvasRenderer: @@ -1122,7 +1122,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c524d21ffee0d904fb67977d7ca146f3, type: 3} + m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1168,9 +1168,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: 10} - m_SizeDelta: {x: 74, y: 81} - m_Pivot: {x: 1, y: 1} + m_AnchoredPosition: {x: -32, y: -24} + m_SizeDelta: {x: 84, y: 68} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2472007163120904425 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1199,7 +1199,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0345d60aa4b70445b1152f2ab4a5e32, type: 3} + m_Sprite: {fileID: 21300000, guid: 7372681aea33b7b4099e3685b7ee975e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1261,7 +1261,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 150, y: 78} - m_SizeDelta: {x: 250, y: 100} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7835573384773876876 CanvasRenderer: @@ -1292,7 +1292,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1351,8 +1351,8 @@ RectTransform: 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: -150, y: -40} - m_SizeDelta: {x: 160, y: 72} + m_AnchoredPosition: {x: -192, y: -50} + m_SizeDelta: {x: 156, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4963315711473843725 CanvasRenderer: @@ -1382,8 +1382,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bcc862864e5d18e4a99af0cdf5c45e1e, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1440,8 +1440,8 @@ RectTransform: 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: 30, y: 5} - m_SizeDelta: {x: 150, y: 50} + m_AnchoredPosition: {x: 29, y: 0} + m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4360177676599532802 CanvasRenderer: @@ -1474,7 +1474,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1575,8 +1575,8 @@ RectTransform: 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: 5} - m_SizeDelta: {x: 0, y: -10} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7584509180014164879 CanvasRenderer: @@ -1609,7 +1609,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1633,12 +1633,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 30 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1967,11 +1967,11 @@ RectTransform: m_Father: {fileID: 7813070650028083980} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -100, y: 25} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 26, y: 0} m_SizeDelta: {x: 250, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &4070324096242948324 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2027,8 +2027,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2105,7 +2105,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 614, y: 50} + m_SizeDelta: {x: 560, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1112107140792425333 CanvasRenderer: @@ -2145,7 +2145,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4278982706 - m_fontColor: {r: 0.19607843, g: 0.09411765, b: 0.047058824, a: 1} + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2162,12 +2162,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 + m_fontSize: 26 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 22 - m_fontSizeMax: 28 + m_fontSizeMax: 26 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -2242,7 +2242,7 @@ RectTransform: 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: -45, y: 0} + m_AnchoredPosition: {x: -100, y: 0} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8138152585163357604 diff --git a/Assets/prefabs/ui/common/common_box_ui.prefab b/Assets/prefabs/ui/common/common_box_ui.prefab index 24aee7603..dc1b78fd0 100644 --- a/Assets/prefabs/ui/common/common_box_ui.prefab +++ b/Assets/prefabs/ui/common/common_box_ui.prefab @@ -1,140 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &103117922735277531 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8167662069306022579} - - component: {fileID: 5602077385546016194} - - component: {fileID: 4805839740884885615} - m_Layer: 5 - m_Name: tx_desc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8167662069306022579 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 103117922735277531} - 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: 2411944977254693079} - m_RootOrder: 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!222 &5602077385546016194 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 103117922735277531} - m_CullTransparentMesh: 1 ---- !u!114 &4805839740884885615 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 103117922735277531} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4283460484 - m_fontColor: {r: 0.5176471, g: 0.41960785, b: 0.3137255, 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: 24 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 24 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: -15 - 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 &854379427783161725 GameObject: m_ObjectHideFlags: 0 @@ -165,9 +30,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2318254839190573415} - {fileID: 7069575832691996240} - {fileID: 3649236046540359187} - - {fileID: 2411944977254693079} - {fileID: 1072252240344718822} - {fileID: 7180786389947159580} - {fileID: 5882121349733644069} @@ -177,7 +42,7 @@ RectTransform: 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: 516, y: 728} + m_SizeDelta: {x: 620, y: 768} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2882145843986852169 CanvasRenderer: @@ -229,7 +94,7 @@ GameObject: - component: {fileID: 6554934924188294835} - component: {fileID: 8932500840178233693} m_Layer: 5 - m_Name: tx_type + m_Name: tx_desc m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -252,7 +117,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 150, y: -25} + m_AnchoredPosition: {x: 186, y: -196} m_SizeDelta: {x: 160, y: 38} m_Pivot: {x: 0, y: 0.5} --- !u!222 &6554934924188294835 @@ -293,7 +158,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -310,12 +175,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 26 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 26 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -390,8 +255,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -430} - m_SizeDelta: {x: 460, y: 260} + m_AnchoredPosition: {x: 0, y: -396} + m_SizeDelta: {x: 552, y: 306} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2837536926976802237 MonoBehaviour: @@ -446,12 +311,12 @@ MonoBehaviour: isDrag: 0 contentTrans: {fileID: 499313438581218689} bfCell: {fileID: 5070691909980143667} - topRecoveryOffset: 0 + topRecoveryOffset: 10 downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 120 - cellHeight: 120 + cellWidth: 138 + cellHeight: 138 perLineNum: 4 --- !u!114 &6752539936695607037 MonoBehaviour: @@ -643,7 +508,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 150, y: 30.6} + m_AnchoredPosition: {x: 186, y: -126} m_SizeDelta: {x: 304.5, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &7134176862113457420 @@ -701,12 +566,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 30 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -743,6 +608,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3886114793281191132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2318254839190573415} + - component: {fileID: 1974814069560533442} + - component: {fileID: 2969696689619715279} + m_Layer: 5 + m_Name: bg3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2318254839190573415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3886114793281191132} + 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: 3389846184421536484} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -396} + m_SizeDelta: {x: 576, y: 318} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1974814069560533442 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3886114793281191132} + m_CullTransparentMesh: 1 +--- !u!114 &2969696689619715279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3886114793281191132} + 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: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} + m_Type: 1 + 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 &4514629930623914753 GameObject: m_ObjectHideFlags: 0 @@ -902,7 +843,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3389846184421536484} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -996,8 +937,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: 42, y: 40} + m_AnchoredPosition: {x: 52, y: 0} + m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &855253366265577796 CanvasRenderer: @@ -1087,8 +1028,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -668} - m_SizeDelta: {x: 156, y: 68} + m_AnchoredPosition: {x: 0, y: -692} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4674232233192787073 CanvasRenderer: @@ -1118,7 +1059,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1302,18 +1243,10 @@ MonoBehaviour: hashName: 3596633124 objectType: 0 gameObject: {fileID: 3384254460697037337} - - name: common_box_ui.content.info_node.tx_type - hashName: 3596835027 + - name: common_box_ui.content.info_node.tx_desc + hashName: 3596339242 objectType: 0 gameObject: {fileID: 1279953671673852805} - - name: common_box_ui.content.info_node.tx_count - hashName: 4111710870 - objectType: 0 - gameObject: {fileID: 7883588264007801791} - - name: common_box_ui.content.desc.tx_desc - hashName: 3989125302 - objectType: 0 - gameObject: {fileID: 103117922735277531} - name: common_box_ui.content.scrollrect hashName: 499122072 objectType: 0 @@ -1403,7 +1336,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -594} - m_SizeDelta: {x: 130, y: 30} + m_SizeDelta: {x: 208, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9087888076191822146 CanvasRenderer: @@ -1433,7 +1366,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} + m_Sprite: {fileID: 21300000, guid: 769955952967445c4880e9db82df6b7d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1479,8 +1412,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -10, y: 0} - m_SizeDelta: {x: 42, y: 40} + m_AnchoredPosition: {x: -52, y: 0} + m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7639527005185077043 CanvasRenderer: @@ -1533,141 +1466,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &6676265657034686658 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7121627614258431986} - - component: {fileID: 2364923819326248487} - - component: {fileID: 4721642102959372460} - m_Layer: 5 - m_Name: tx_max - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7121627614258431986 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6676265657034686658} - 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: 8330166268477100875} - m_RootOrder: 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!222 &2364923819326248487 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6676265657034686658} - m_CullTransparentMesh: 1 ---- !u!114 &4721642102959372460 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6676265657034686658} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 22 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 22 - m_fontStyle: 0 - 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: 0 - 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 &6910680105803097448 GameObject: m_ObjectHideFlags: 0 @@ -1699,150 +1497,14 @@ RectTransform: - {fileID: 21796348844161226} - {fileID: 4694413695243353028} - {fileID: 7521815809354361873} - - {fileID: 534784708544217172} m_Father: {fileID: 3389846184421536484} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -160} - m_SizeDelta: {x: 516, y: 158} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6958855410790209727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7724797466202803114} - - component: {fileID: 5813828825751487817} - - component: {fileID: 7164621047878457726} - m_Layer: 5 - m_Name: tx_max - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7724797466202803114 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6958855410790209727} - 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: 1741946074441857177} - m_RootOrder: 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_SizeDelta: {x: 620, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5813828825751487817 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6958855410790209727} - m_CullTransparentMesh: 1 ---- !u!114 &7164621047878457726 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6958855410790209727} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 22 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 22 - m_fontStyle: 0 - 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: 0 - 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 &7203495284947200609 GameObject: m_ObjectHideFlags: 0 @@ -1873,15 +1535,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7724797466202803114} + m_Children: [] m_Father: {fileID: 7180786389947159580} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 85, y: 0} - m_SizeDelta: {x: 85, y: 40} + m_AnchoredPosition: {x: 130, y: 0} + m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7238360891825018284 CanvasRenderer: @@ -1969,8 +1630,8 @@ RectTransform: 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: 5} - m_SizeDelta: {x: 0, y: -10} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9014442675532763316 CanvasRenderer: @@ -2069,218 +1730,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7748642168179495551 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2411944977254693079} - - component: {fileID: 3246192654912181425} - - component: {fileID: 2486733113018251536} - m_Layer: 5 - m_Name: desc - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2411944977254693079 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7748642168179495551} - 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: 8167662069306022579} - m_Father: {fileID: 3389846184421536484} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -270} - m_SizeDelta: {x: 458, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3246192654912181425 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7748642168179495551} - m_CullTransparentMesh: 1 ---- !u!114 &2486733113018251536 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7748642168179495551} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} - m_Type: 1 - 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 &7883588264007801791 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 534784708544217172} - - component: {fileID: 4891162113269465281} - - component: {fileID: 6032526745191249464} - m_Layer: 5 - m_Name: tx_count - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &534784708544217172 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7883588264007801791} - 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: 3649236046540359187} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -20, y: -25} - m_SizeDelta: {x: 160, y: 38} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &4891162113269465281 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7883588264007801791} - m_CullTransparentMesh: 1 ---- !u!114 &6032526745191249464 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7883588264007801791} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 24 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 18 - m_fontSizeMax: 24 - m_fontStyle: 0 - m_HorizontalAlignment: 4 - 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: 0 - 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 &8422671885953630298 GameObject: m_ObjectHideFlags: 0 @@ -2312,15 +1761,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7121627614258431986} + m_Children: [] m_Father: {fileID: 7180786389947159580} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -85, y: 0} - m_SizeDelta: {x: 85, y: 40} + m_AnchoredPosition: {x: -130, y: 0} + m_SizeDelta: {x: 52, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7364086711260732436 CanvasRenderer: @@ -2472,11 +1920,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 80 + value: 103 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -158 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2567,15 +2015,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.7 + value: 0.8 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index 4bc03bb57..5636a39e9 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -976,7 +976,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 18, y: 14} m_SizeDelta: {x: 89, y: 59} m_Pivot: {x: 1, y: 1} --- !u!222 &6777153603382021301 @@ -1481,18 +1481,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7179628397645800183} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: -0.18223555, w: 0.9832549} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2868650351307595292} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -21} 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: 89, y: 31} + m_SizeDelta: {x: 70, y: 31} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8411278721028498068 CanvasRenderer: @@ -1549,14 +1549,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 20 + m_fontSizeBase: 20 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 diff --git a/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab b/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab index 7d6b829a0..ad171987d 100644 --- a/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab +++ b/Assets/prefabs/ui/daily_challenge/daily_challenge_ui.prefab @@ -381,11 +381,11 @@ RectTransform: - {fileID: 8208622899822353587} - {fileID: 4159116984310726332} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 12 + m_RootOrder: 11 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: -404} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 216} m_SizeDelta: {x: 288, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6554589511208922406 @@ -477,7 +477,7 @@ RectTransform: 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: 74, y: 82} + m_SizeDelta: {x: 76, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6349947895044697291 CanvasRenderer: @@ -530,79 +530,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &1308496548908379479 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6533637007407953853} - - component: {fileID: 157606685918462965} - - component: {fileID: 4690173734154297300} - m_Layer: 5 - m_Name: bg2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6533637007407953853 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1308496548908379479} - 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: 4476004844096841350} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 97} - m_SizeDelta: {x: 604, y: 376} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &157606685918462965 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1308496548908379479} - m_CullTransparentMesh: 1 ---- !u!114 &4690173734154297300 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1308496548908379479} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: 045c3cfa40b940748a0734c9b5613347, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &1556702793227498985 GameObject: m_ObjectHideFlags: 0 @@ -641,7 +568,7 @@ RectTransform: 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: 74, y: 82} + m_SizeDelta: {x: 76, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4609625701599778188 CanvasRenderer: @@ -729,7 +656,7 @@ RectTransform: 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: 55} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1280, y: 1800} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5741485684912026602 @@ -799,11 +726,11 @@ RectTransform: - {fileID: 5262307373085457783} - {fileID: 1575012484665666931} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 8 + m_RootOrder: 7 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: -50} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 557} m_SizeDelta: {x: 400, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1313070341834142519 @@ -824,7 +751,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 52 + m_Spacing: 56 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -863,11 +790,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4476004844096841350} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -330} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 241} m_SizeDelta: {x: 200, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8303831664053208066 @@ -908,7 +835,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 0.94509804, b: 0.58431375, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -925,8 +852,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1213,7 +1140,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 17} + m_AnchoredPosition: {x: 0, y: 22} m_SizeDelta: {x: 350, y: 28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3119956528492541755 @@ -1583,96 +1510,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &3820565228612370093 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4195473913832875727} - - component: {fileID: 4357930986262569412} - - component: {fileID: 6165481585167277443} - - component: {fileID: 6334124024869680003} - m_Layer: 5 - m_Name: btn_buff - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4195473913832875727 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3820565228612370093} - 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: 5262307373085457783} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1, y: 0} - m_SizeDelta: {x: 108, y: 108} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4357930986262569412 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3820565228612370093} - m_CullTransparentMesh: 1 ---- !u!114 &6165481585167277443 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3820565228612370093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b3e4a58ca4cdfbb4c82b0db93117f65a, 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!114 &6334124024869680003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3820565228612370093} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 --- !u!1 &3845421130701619639 GameObject: m_ObjectHideFlags: 0 @@ -1846,7 +1683,7 @@ RectTransform: 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: 74, y: 82} + m_SizeDelta: {x: 76, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3556081100031293291 CanvasRenderer: @@ -2063,15 +1900,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4195473913832875727} + m_Children: [] m_Father: {fileID: 2187274201200544790} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 126, y: 126} + m_SizeDelta: {x: 74, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &119817017963260791 CanvasRenderer: @@ -2139,8 +1975,8 @@ RectTransform: m_GameObject: {fileID: 5002901690807264222} 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_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 3567538706249601981} m_Father: {fileID: 7811581884657323959} @@ -2149,7 +1985,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 74, y: 82} + m_SizeDelta: {x: 76, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6824530981751911782 CanvasRenderer: @@ -2236,11 +2072,11 @@ RectTransform: - {fileID: 1045303882048620576} - {fileID: 1568120362827251322} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 10 + m_RootOrder: 9 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: -171} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 447} m_SizeDelta: {x: 156, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2386563011081099375 @@ -2327,7 +2163,6 @@ RectTransform: m_Children: - {fileID: 8489469490172231283} - {fileID: 1421560141108770934} - - {fileID: 6533637007407953853} - {fileID: 8265552178166110028} - {fileID: 7239148063482177012} - {fileID: 244475786994935081} @@ -2540,7 +2375,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 74, y: 82} + m_SizeDelta: {x: 76, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1553521743030735026 CanvasRenderer: @@ -2628,12 +2463,12 @@ RectTransform: - {fileID: 6877306057343581149} - {fileID: 5172730960187486193} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 9 + m_RootOrder: 8 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: -257} - m_SizeDelta: {x: 400, y: 82} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 360} + m_SizeDelta: {x: 400, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3413572464311536574 CanvasRenderer: @@ -2663,8 +2498,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2691,7 +2526,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 10 m_ChildAlignment: 1 - m_Spacing: 28 + m_Spacing: 31 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -2699,96 +2534,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1 &5824678109636714794 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3777716746806580274} - - component: {fileID: 7237591878255717786} - - component: {fileID: 8454973065671044240} - - component: {fileID: 6485369078262361188} - m_Layer: 5 - m_Name: btn_debuff - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3777716746806580274 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5824678109636714794} - 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: 1575012484665666931} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4, y: 0} - m_SizeDelta: {x: 108, y: 108} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7237591878255717786 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5824678109636714794} - m_CullTransparentMesh: 1 ---- !u!114 &8454973065671044240 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5824678109636714794} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9054252af098f94e8d742fed787259c, 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!114 &6485369078262361188 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5824678109636714794} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 --- !u!1 &6176347273259600874 GameObject: m_ObjectHideFlags: 0 @@ -2821,12 +2566,12 @@ RectTransform: m_Children: - {fileID: 7146397491034890663} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -186} - m_SizeDelta: {x: 396, y: 82} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 396} + m_SizeDelta: {x: 350, y: 95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8007842669113880983 CanvasRenderer: @@ -2856,7 +2601,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 891a25c2a7778a9438591337c4f2fb00, type: 3} + m_Sprite: {fileID: 21300000, guid: 3d7caae5e90a442449b68a9427558f6e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2899,11 +2644,11 @@ RectTransform: m_Children: - {fileID: 8668008813031153306} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 11 + m_RootOrder: 10 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: 166, y: -171} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 166, y: 447} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2733361000646276660 @@ -2982,15 +2727,15 @@ RectTransform: m_GameObject: {fileID: 7197139559494529798} 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 4476004844096841350} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} + m_AnchoredPosition: {x: 0, y: -155} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7242870151585524972 @@ -3022,15 +2767,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3777716746806580274} + m_Children: [] m_Father: {fileID: 2187274201200544790} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 126, y: 126} + m_SizeDelta: {x: 74, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1476183928283098597 CanvasRenderer: @@ -3103,11 +2847,11 @@ RectTransform: - {fileID: 3884384415307166803} - {fileID: 8841488660413968864} m_Father: {fileID: 4476004844096841350} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -256} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 316} m_SizeDelta: {x: 140, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2258472133316994714 @@ -3138,7 +2882,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e28dfe8ca34221e458141880d94104d4, type: 3} + m_Sprite: {fileID: 21300000, guid: 769955952967445c4880e9db82df6b7d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3332,7 +3076,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4476004844096841350} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3507,7 +3251,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 74, y: 82} + m_SizeDelta: {x: 76, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &176638261103501822 CanvasRenderer: @@ -3591,11 +3335,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4476004844096841350} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -292} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 276} m_SizeDelta: {x: 200, y: 32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3667049114719650588 @@ -3940,12 +3684,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 44 + m_fontSizeBase: 44 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 50 + m_fontSizeMax: 44 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 diff --git a/Assets/prefabs/ui/equip/equip_info_ui.prefab b/Assets/prefabs/ui/equip/equip_info_ui.prefab index b90156e4d..49ca58f26 100644 --- a/Assets/prefabs/ui/equip/equip_info_ui.prefab +++ b/Assets/prefabs/ui/equip/equip_info_ui.prefab @@ -3462,8 +3462,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/prefabs/ui/mail/mail_detail_ui.prefab b/Assets/prefabs/ui/mail/mail_detail_ui.prefab index bb2b6789e..facd06daa 100644 --- a/Assets/prefabs/ui/mail/mail_detail_ui.prefab +++ b/Assets/prefabs/ui/mail/mail_detail_ui.prefab @@ -30,6 +30,7 @@ RectTransform: 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: 6625617490829459400} m_Father: {fileID: 5060826230616986651} @@ -37,8 +38,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 18, y: 0} - m_SizeDelta: {x: 370, y: 84} + m_AnchoredPosition: {x: 14, y: 0} + m_SizeDelta: {x: 342, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2690407909842753632 MonoBehaviour: @@ -84,7 +85,7 @@ MonoBehaviour: m_EditorClassIdentifier: isDrag: 0 contentTrans: {fileID: 5831359578226560016} - bfCell: {fileID: 723154051615640381} + bfCell: {fileID: 3712397935026165009} topRecoveryOffset: 0 downRecoveryOffset: 0 direction: 1 @@ -148,15 +149,16 @@ RectTransform: 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: 7566195969221443551} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 154.8, y: -35.5} + m_AnchoredPosition: {x: 105, y: -64} m_SizeDelta: {x: 410.3429, y: 60} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &4492399857930192725 CanvasRenderer: m_ObjectHideFlags: 0 @@ -212,12 +214,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 + m_fontSize: 24 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 32 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -281,6 +283,7 @@ RectTransform: 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: 4236614701541074416} m_Father: {fileID: 2847435076885080532} @@ -334,15 +337,16 @@ RectTransform: 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: 5060826230616986651} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 19, y: 36} - m_SizeDelta: {x: 496, y: 23} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 24.5} + m_SizeDelta: {x: 496, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1747516082444716476 CanvasRenderer: m_ObjectHideFlags: 0 @@ -488,6 +492,7 @@ RectTransform: 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: 5831359578226560016} m_Father: {fileID: 9174747806668630394} @@ -541,6 +546,7 @@ RectTransform: 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: 7051409112484368855} m_Father: {fileID: 7566195969221443551} @@ -548,9 +554,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -256, y: -147} - m_SizeDelta: {x: 496, y: 180} - m_Pivot: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -146} + m_SizeDelta: {x: 504, y: 180} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &5427729126273813063 MonoBehaviour: m_ObjectHideFlags: 0 @@ -637,13 +643,14 @@ RectTransform: 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: 8360181265990071987} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &678719367876417624 @@ -706,7 +713,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 22 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -769,8 +776,9 @@ RectTransform: 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: 6417495185618085266} + - {fileID: 8376016858575537745} m_Father: {fileID: 6625617490829459400} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -807,6 +815,7 @@ RectTransform: 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: 6986927731672083776} - {fileID: 6251193038138806046} @@ -821,7 +830,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 8} - m_SizeDelta: {x: 630, y: 534} + m_SizeDelta: {x: 620, y: 540} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7566195969221443537 CanvasRenderer: @@ -890,6 +899,7 @@ RectTransform: 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: 7566195971146164768} - {fileID: 7566195969221443551} @@ -1021,15 +1031,16 @@ RectTransform: 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: 7566195969221443551} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -22} - m_SizeDelta: {x: 92, y: 98} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -33, y: -29} + m_SizeDelta: {x: 84, y: 68} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7566195969850039890 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1109,6 +1120,7 @@ RectTransform: 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: 7566195969290565670} m_RootOrder: 0 @@ -1185,6 +1197,7 @@ RectTransform: 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: 1926742161775714807} m_Father: {fileID: 5060826230616986651} @@ -1192,8 +1205,8 @@ RectTransform: 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: 209, y: 0} - m_SizeDelta: {x: 104, y: 60} + m_AnchoredPosition: {x: 183, y: 0} + m_SizeDelta: {x: 136, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &646339197986285837 CanvasRenderer: @@ -1223,8 +1236,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1274,6 +1287,7 @@ RectTransform: 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: 7566195969221443551} m_RootOrder: 1 @@ -1349,14 +1363,15 @@ RectTransform: 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: 7566195969221443551} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36, y: -30} - m_SizeDelta: {x: 97, y: 79} + m_AnchoredPosition: {x: 40, y: -38} + m_SizeDelta: {x: 48, y: 46} m_Pivot: {x: 0, y: 1} --- !u!222 &4951813030596052672 CanvasRenderer: @@ -1386,7 +1401,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8efeb4a8c4b657d4da2483daad2d1267, type: 3} + m_Sprite: {fileID: 21300000, guid: 524d8ada3219633418886910b5b1fe11, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1425,15 +1440,16 @@ RectTransform: 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: 7566195969221443551} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 406, y: -96} - m_SizeDelta: {x: 193, y: 19} - m_Pivot: {x: 0, y: 1} + m_AnchoredPosition: {x: 106, y: -112} + m_SizeDelta: {x: 193, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &6364698837396558077 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1472,7 +1488,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4280553239 - m_fontColor: {r: 0.09019608, g: 0.05882353, b: 0.14117648, a: 1} + m_fontColor: {r: 0.1764706, g: 0.20392157, b: 0.28627452, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1489,8 +1505,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1580,6 +1596,7 @@ RectTransform: 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: 9174747806668630394} - {fileID: 8360181265990071987} @@ -1587,11 +1604,11 @@ RectTransform: m_Father: {fileID: 7566195969221443551} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -380} - m_SizeDelta: {x: 550, y: 118} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -163} + m_SizeDelta: {x: 540, y: 122} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4185323894608603333 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1620,7 +1637,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9b4cac269d8d42d4f92c0cebc519a7d9, type: 3} + m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1659,6 +1676,7 @@ RectTransform: 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: 7051409112484368855} m_RootOrder: 0 @@ -1666,7 +1684,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 496, y: 180} + m_SizeDelta: {x: 504, y: 180} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6168950271902265598 CanvasRenderer: @@ -1699,14 +1717,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, 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_fontColor: {r: 0.1764706, g: 0.20392157, b: 0.28627452, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1786,17 +1804,13 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!1001 &8838717998277187014 +--- !u!1001 &6312775755339560453 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5831359578226560016} m_Modifications: - - target: {fileID: 2430526724533500735, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1827,19 +1841,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.7 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.7 + value: 0.6 + objectReference: {fileID: 0} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_LocalScale.z + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -1889,9 +1907,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4101644123587406057, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Name @@ -1899,25 +1917,25 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!224 &6417495185618085266 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 8838717998277187014} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2851754773183397964 stripped +--- !u!1 &766004400639484815 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 8838717998277187014} + m_PrefabInstance: {fileID: 6312775755339560453} m_PrefabAsset: {fileID: 0} ---- !u!114 &723154051615640381 +--- !u!114 &3712397935026165009 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2851754773183397964} + m_GameObject: {fileID: 766004400639484815} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &8376016858575537745 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 6312775755339560453} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/mail/mail_ui.prefab b/Assets/prefabs/ui/mail/mail_ui.prefab index 84b16deff..2b80a2ceb 100644 --- a/Assets/prefabs/ui/mail/mail_ui.prefab +++ b/Assets/prefabs/ui/mail/mail_ui.prefab @@ -1,80 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &35377802450056702 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8599431933218491982} - - component: {fileID: 8956605612634524907} - - component: {fileID: 8344347649017717296} - m_Layer: 5 - m_Name: img_3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8599431933218491982 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35377802450056702} - 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_Children: [] - m_Father: {fileID: 6986927731672083776} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 29} - m_SizeDelta: {x: 590, y: 630} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8956605612634524907 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35377802450056702} - m_CullTransparentMesh: 1 ---- !u!114 &8344347649017717296 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35377802450056702} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, 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 &188002599309509424 GameObject: m_ObjectHideFlags: 0 @@ -103,15 +28,16 @@ RectTransform: 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: 8600845836930343375} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 12, y: -36} - m_SizeDelta: {x: 60, y: 44} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 17, y: -11} + m_SizeDelta: {x: 48, y: 46} + m_Pivot: {x: 0, y: 1} --- !u!222 &5993215772719877291 CanvasRenderer: m_ObjectHideFlags: 0 @@ -178,14 +104,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5170986472199570194} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 70, y: 38} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 41, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5661526790854868377 CanvasRenderer: @@ -215,7 +142,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, type: 3} + m_Sprite: {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -253,14 +180,15 @@ RectTransform: 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: 6625617490829459400} m_Father: {fileID: 6986927731672083776} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 28} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 566, y: 616} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2690407909842753632 @@ -312,8 +240,8 @@ MonoBehaviour: downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 538 - cellHeight: 140 + cellWidth: 542 + cellHeight: 130 perLineNum: 1 --- !u!1 &623357668698260563 GameObject: @@ -344,15 +272,16 @@ RectTransform: 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: 5887093191519273592} m_Father: {fileID: 7566195969221443551} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -134, y: 94.2} - m_SizeDelta: {x: 222, y: 88} + m_AnchoredPosition: {x: -134, y: 74} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2222053965674315381 CanvasRenderer: @@ -382,8 +311,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 8e279276358266d4abd13f0e7fde1e50, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -433,15 +362,16 @@ RectTransform: 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: 8600845836930343375} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 82, y: -74} - m_SizeDelta: {x: 213, y: 20} - m_Pivot: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 82, y: -24} + m_SizeDelta: {x: 213, y: 30} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &5958465484583706516 CanvasRenderer: m_ObjectHideFlags: 0 @@ -480,7 +410,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4280553239 - m_fontColor: {r: 0.09019608, g: 0.05882353, b: 0.14117648, a: 1} + m_fontColor: {r: 0.10980392, g: 0.2901961, b: 0.3372549, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -497,8 +427,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -567,6 +497,7 @@ RectTransform: 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: 211727296437561409} m_Father: {fileID: 8600845836930343375} @@ -575,7 +506,7 @@ RectTransform: 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: 548, y: 131} + m_SizeDelta: {x: 542, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4261204026883150511 CanvasRenderer: @@ -643,13 +574,14 @@ RectTransform: 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: 1677542816361193477} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4629354035039301575 @@ -707,12 +639,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 30 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -777,6 +709,7 @@ RectTransform: 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: 8600845836930343375} m_RootOrder: 4 @@ -784,7 +717,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 10, y: -9} - m_SizeDelta: {x: 37, y: 14} + m_SizeDelta: {x: 37, y: 16} m_Pivot: {x: 0, y: 1} --- !u!222 &3323057431354790090 CanvasRenderer: @@ -814,7 +747,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7d49105bbb826fe4592b21c43422fce1, type: 3} + m_Sprite: {fileID: 21300000, guid: 8efeb4a8c4b657d4da2483daad2d1267, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -852,6 +785,7 @@ RectTransform: 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: 3307694950109039778} m_RootOrder: 0 @@ -899,82 +833,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3049447054789388926 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1202012022912060748} - - component: {fileID: 6766222889546409158} - - component: {fileID: 1834828589567702766} - m_Layer: 5 - m_Name: title_bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1202012022912060748 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3049447054789388926} - 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_Children: - - {fileID: 447958044314611673} - m_Father: {fileID: 7566195969221443551} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 7, y: 42.16} - m_SizeDelta: {x: 630, y: 96} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &6766222889546409158 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3049447054789388926} - m_CullTransparentMesh: 1 ---- !u!114 &1834828589567702766 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3049447054789388926} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 66f7e9bcf829fc04d816daa40ffaad77, type: 3} - m_Type: 1 - 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 &3077122243824335145 GameObject: m_ObjectHideFlags: 0 @@ -1003,6 +861,7 @@ RectTransform: 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: 4212912139947199992} - {fileID: 8677176571600625715} @@ -1013,7 +872,7 @@ RectTransform: 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: 82, y: 0.5} + m_AnchoredPosition: {x: 65, y: 0} m_SizeDelta: {x: 85, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3834478852350274253 @@ -1083,6 +942,7 @@ RectTransform: 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: 4648517587838244279} m_Father: {fileID: 575591752916364803} @@ -1090,8 +950,8 @@ RectTransform: 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: 198, y: 0} - m_SizeDelta: {x: 110, y: 58} + m_AnchoredPosition: {x: 188, y: 3} + m_SizeDelta: {x: 136, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7934541358557280360 CanvasRenderer: @@ -1121,8 +981,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1173,6 +1033,7 @@ RectTransform: 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: 1873881017907318335} m_Father: {fileID: 7851363200477077497} @@ -1180,8 +1041,8 @@ RectTransform: 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: 198, y: 0} - m_SizeDelta: {x: 110, y: 58} + m_AnchoredPosition: {x: 188, y: 3} + m_SizeDelta: {x: 136, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5385566560171288866 CanvasRenderer: @@ -1211,8 +1072,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1261,6 +1122,7 @@ RectTransform: 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: 5831359578226560016} m_Father: {fileID: 9174747806668630394} @@ -1313,6 +1175,7 @@ RectTransform: 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: 2227735373841069307} m_Father: {fileID: 3307694950109039778} @@ -1389,15 +1252,16 @@ RectTransform: 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: 8600845836930343375} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 82, y: -11} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 82, y: 22} m_SizeDelta: {x: 210, y: 48} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &2155945862528372222 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1523,9 +1387,10 @@ RectTransform: 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: 7566195969221443551} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1598,13 +1463,14 @@ RectTransform: 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: 4306506592415653498} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &742680490140893446 @@ -1662,8 +1528,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1704,81 +1570,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4362292485816492768 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9162892671307415469} - - component: {fileID: 1692073640265036207} - - component: {fileID: 8304920091416406656} - m_Layer: 5 - m_Name: line_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9162892671307415469 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4362292485816492768} - 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_Children: [] - m_Father: {fileID: 6986927731672083776} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 346} - m_SizeDelta: {x: 590, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1692073640265036207 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4362292485816492768} - m_CullTransparentMesh: 1 ---- !u!114 &8304920091416406656 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4362292485816492768} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, 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 &4375333900711932812 GameObject: m_ObjectHideFlags: 0 @@ -1808,6 +1599,7 @@ RectTransform: 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: 1528016297552675656} m_Father: {fileID: 8220498573057395349} @@ -1815,8 +1607,8 @@ RectTransform: 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: 198, y: 0} - m_SizeDelta: {x: 102, y: 58} + m_AnchoredPosition: {x: 188, y: 3} + m_SizeDelta: {x: 136, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3597963575925303725 CanvasRenderer: @@ -1846,8 +1638,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1897,13 +1689,14 @@ RectTransform: 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: 8360181265990071987} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &678719367876417624 @@ -1961,12 +1754,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 + m_fontSize: 30 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 24 + m_fontSizeMax: 30 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -2029,6 +1822,7 @@ RectTransform: 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: 8600845836930343375} m_Father: {fileID: 6625617490829459400} @@ -2067,6 +1861,7 @@ RectTransform: 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: 4306506592415653498} m_Father: {fileID: 8600845836930343375} @@ -2075,7 +1870,7 @@ RectTransform: 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: 548, y: 131} + m_SizeDelta: {x: 542, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3439269527961507166 CanvasRenderer: @@ -2143,6 +1938,7 @@ RectTransform: 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: 3307694950109039778} m_RootOrder: 2 @@ -2218,13 +2014,14 @@ RectTransform: 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: 211727296437561409} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5923046257956811797 @@ -2282,8 +2079,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 22 - m_fontSizeBase: 22 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2324,81 +2121,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &6569154692194052744 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 361526074445244080} - - component: {fileID: 1540599493283783261} - - component: {fileID: 342700308188417555} - m_Layer: 5 - m_Name: line_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &361526074445244080 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6569154692194052744} - 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_Children: [] - m_Father: {fileID: 6986927731672083776} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -287} - m_SizeDelta: {x: 590, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1540599493283783261 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6569154692194052744} - m_CullTransparentMesh: 1 ---- !u!114 &342700308188417555 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6569154692194052744} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, 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 &6690817573040244421 GameObject: m_ObjectHideFlags: 0 @@ -2427,6 +2149,7 @@ RectTransform: 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: 3307694950109039778} m_RootOrder: 1 @@ -2502,6 +2225,7 @@ RectTransform: 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: 5170986472199570194} m_Father: {fileID: 8600845836930343375} @@ -2510,7 +2234,7 @@ RectTransform: 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: 548, y: 131} + m_SizeDelta: {x: 542, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8198826550239213322 CanvasRenderer: @@ -2550,81 +2274,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7063144320243466488 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8872432027986490163} - - component: {fileID: 1225449400454942884} - - component: {fileID: 6785207926881579317} - m_Layer: 5 - m_Name: img_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8872432027986490163 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7063144320243466488} - 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_Children: [] - m_Father: {fileID: 7566195969221443551} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -265, y: 438} - m_SizeDelta: {x: 144, y: 125} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1225449400454942884 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7063144320243466488} - m_CullTransparentMesh: 1 ---- !u!114 &6785207926881579317 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7063144320243466488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8efeb4a8c4b657d4da2483daad2d1267, 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 &7358952445231455090 GameObject: m_ObjectHideFlags: 0 @@ -2652,7 +2301,8 @@ RectTransform: m_GameObject: {fileID: 7358952445231455090} 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_LocalScale: {x: 0.54, y: 0.54, z: 0.54} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 6036705673248894383} m_RootOrder: 0 @@ -2660,7 +2310,7 @@ RectTransform: 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: 62, y: 53} + m_SizeDelta: {x: 86, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2276597659721206216 CanvasRenderer: @@ -2690,7 +2340,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3} + m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2729,10 +2379,10 @@ RectTransform: 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: 6986927731672083776} - - {fileID: 1202012022912060748} - - {fileID: 8872432027986490163} + - {fileID: 447958044314611673} - {fileID: 7960994250086198594} - {fileID: 1677542816361193477} - {fileID: 8360181265990071987} @@ -2743,7 +2393,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 12} - m_SizeDelta: {x: 612, y: 868} + m_SizeDelta: {x: 620, y: 878} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7566195969221443537 CanvasRenderer: @@ -2773,7 +2423,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3e59dd84e2531004687f4aac9e94a88e, type: 3} + m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2828,6 +2478,7 @@ RectTransform: 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: 7566195971146164768} - {fileID: 7566195969221443551} @@ -2890,8 +2541,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: mail_ui.bg.title_bg.title_tx - hashName: 3890118934 + - name: mail_ui.bg.title_tx + hashName: 2456412290 objectType: 0 gameObject: {fileID: 7998144099265508707} - name: mail_ui.bg.img_2.scrollrect @@ -2992,14 +2643,15 @@ RectTransform: 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: 7566195969221443551} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -78} - m_SizeDelta: {x: 92, y: 98} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -32, y: -24} + m_SizeDelta: {x: 84, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7566195969850039890 CanvasRenderer: @@ -3080,6 +2732,7 @@ RectTransform: 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: 7566195969290565670} m_RootOrder: 0 @@ -3156,15 +2809,16 @@ RectTransform: 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: 1926742161775714807} m_Father: {fileID: 7566195969221443551} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 134, y: 94.2} - m_SizeDelta: {x: 222, y: 88} + m_AnchoredPosition: {x: 134, y: 74} + m_SizeDelta: {x: 218, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &646339197986285837 CanvasRenderer: @@ -3194,8 +2848,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3245,18 +2899,16 @@ RectTransform: 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: 8599431933218491982} - - {fileID: 9162892671307415469} - - {fileID: 361526074445244080} - {fileID: 9174747806668630394} m_Father: {fileID: 7566195969221443551} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 18} - m_SizeDelta: {x: 612, y: 868} + m_AnchoredPosition: {x: 0, y: 23} + m_SizeDelta: {x: 574, y: 632} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4951813030596052672 CanvasRenderer: @@ -3286,7 +2938,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3} + m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3321,18 +2973,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7998144099265508707} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 1202012022912060748} - m_RootOrder: 0 + m_Father: {fileID: 7566195969221443551} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 43, y: -40} m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &6891291582178398164 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3388,14 +3041,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -3458,6 +3111,7 @@ RectTransform: 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: 8220498573057395349} - {fileID: 575591752916364803} @@ -3467,14 +3121,14 @@ RectTransform: - {fileID: 2563800361560119283} - {fileID: 8608315821400018279} - {fileID: 3307694950109039778} - - {fileID: 146405179050855353} + - {fileID: 4585690142866505785} m_Father: {fileID: 5831359578226560016} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 538, y: 120} + m_SizeDelta: {x: 542, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7334946165052647519 MonoBehaviour: @@ -3552,7 +3206,7 @@ MonoBehaviour: - name: mail_cell.reward_cell hashName: 2284713838 objectType: 1 - gameObject: {fileID: 8977029453566586471} + gameObject: {fileID: 4701572083367618023} --- !u!114 &6009990630970616344 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3565,17 +3219,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &2427097504672185325 +--- !u!1001 &2019105828441944173 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 8600845836930343375} m_Modifications: - - target: {fileID: 2430526724533500735, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -3606,23 +3256,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 120 + value: 150 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 0.54 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.54 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.8 + value: 0.54 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -3654,11 +3304,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x - value: 82 + value: 65 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3672,9 +3322,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4101644123587406057, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - propertyPath: m_Layer - value: 5 + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 objectReference: {fileID: 0} - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Name @@ -3682,13 +3332,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} ---- !u!1 &8977029453566586471 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 2427097504672185325} - m_PrefabAsset: {fileID: 0} ---- !u!224 &146405179050855353 stripped +--- !u!224 &4585690142866505785 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} - m_PrefabInstance: {fileID: 2427097504672185325} + m_PrefabInstance: {fileID: 2019105828441944173} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4701572083367618023 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 2019105828441944173} m_PrefabAsset: {fileID: 0} diff --git a/Assets/prefabs/ui/soul.meta b/Assets/prefabs/ui/soul.meta deleted file mode 100644 index 644c9dad8..000000000 --- a/Assets/prefabs/ui/soul.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5fb80ff73c66c4adeaed5fa42aea47b4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/prefabs/ui/soul/cell.meta b/Assets/prefabs/ui/soul/cell.meta deleted file mode 100644 index f7952a8e0..000000000 --- a/Assets/prefabs/ui/soul/cell.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 90cc48973644647aabbe687962615425 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/prefabs/ui/soul/cell/soul_cell.prefab b/Assets/prefabs/ui/soul/cell/soul_cell.prefab deleted file mode 100755 index 13204d9c0..000000000 --- a/Assets/prefabs/ui/soul/cell/soul_cell.prefab +++ /dev/null @@ -1,1375 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &6176029551455148 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2765355741242153473} - - component: {fileID: 6744053529305125456} - - component: {fileID: 7702417918692378359} - m_Layer: 5 - m_Name: mask - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &2765355741242153473 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6176029551455148} - 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: 6838332976521077515} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6744053529305125456 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6176029551455148} - m_CullTransparentMesh: 1 ---- !u!114 &7702417918692378359 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6176029551455148} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.9490196} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, 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 &2340272676728489685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6838332976521077515} - - component: {fileID: 7298782026136927014} - - component: {fileID: 6067014809525195023} - - component: {fileID: 2191618090360247651} - - component: {fileID: 2463267800911552702} - - component: {fileID: 1635511367153660809} - - component: {fileID: 6278717252305137396} - m_Layer: 5 - m_Name: soul_cell - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6838332976521077515 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2340272676728489685} - 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: 6041320485448127995} - - {fileID: 7046917829467952299} - - {fileID: 4579589795882131481} - - {fileID: 2520171081847454326} - - {fileID: 296473613241186508} - - {fileID: 2765355741242153473} - - {fileID: 6215621578684087192} - - {fileID: 5212638097470253917} - - {fileID: 4305354507385495014} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7298782026136927014 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2340272676728489685} - m_CullTransparentMesh: 1 ---- !u!114 &6067014809525195023 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2340272676728489685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2191618090360247651 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2340272676728489685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} - m_Name: - m_EditorClassIdentifier: - lis_AddObject: [] - prefabList: - - name: soul_cell.img_qlt - hashName: 1485500797 - objectType: 0 - gameObject: {fileID: 2445831339045555393} - - name: soul_cell.img_icon - hashName: 3100604725 - objectType: 0 - gameObject: {fileID: 5230213578544830750} - - name: soul_cell.qlt_lv - hashName: 2631720848 - objectType: 0 - gameObject: {fileID: 2667089954117904837} - - name: soul_cell.qlt_lv.tx_qlt_lv - hashName: 1617168141 - objectType: 0 - gameObject: {fileID: 8548968350588082940} - - name: soul_cell.mask - hashName: 1003724972 - objectType: 0 - gameObject: {fileID: 6176029551455148} - - name: soul_cell.check - hashName: 1041662792 - objectType: 0 - gameObject: {fileID: 6049999267703662920} - - name: soul_cell.lock - hashName: 1003708139 - objectType: 0 - gameObject: {fileID: 8735932560169076049} - - name: soul_cell.damage_bg.damage_type - hashName: 2662982385 - objectType: 0 - gameObject: {fileID: 7058611021358122326} - - name: soul_cell.damage_bg.damage_type.damage_mask - hashName: 423868991 - objectType: 0 - gameObject: {fileID: 6788568984499830956} - - name: soul_cell.damage_bg - hashName: 3723426133 - objectType: 0 - gameObject: {fileID: 2608285700916666867} - - name: soul_cell.wear - hashName: 1004026175 - objectType: 0 - gameObject: {fileID: 6756318377859285651} - - name: soul_cell.wear.tx_desc_wear - hashName: 3716198593 - objectType: 0 - gameObject: {fileID: 6097108937011012019} - - name: soul_cell.img_hero - hashName: 3100576950 - objectType: 0 - gameObject: {fileID: 7261824767476899206} - - name: soul_cell.img_hero.img_hero_icon - hashName: 2517097706 - objectType: 0 - gameObject: {fileID: 3598410332071999161} ---- !u!225 &2463267800911552702 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2340272676728489685} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1635511367153660809 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2340272676728489685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - 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: [] ---- !u!114 &6278717252305137396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2340272676728489685} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 ---- !u!1 &2445831339045555393 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6041320485448127995} - - component: {fileID: 6229639759497718496} - - component: {fileID: 6696668939293080305} - m_Layer: 5 - m_Name: img_qlt - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6041320485448127995 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2445831339045555393} - 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: 6838332976521077515} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6229639759497718496 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2445831339045555393} - m_CullTransparentMesh: 1 ---- !u!114 &6696668939293080305 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2445831339045555393} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, 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 &2608285700916666867 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2520171081847454326} - - component: {fileID: 3300915780421290202} - - component: {fileID: 2666117514334409763} - m_Layer: 5 - m_Name: damage_bg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2520171081847454326 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2608285700916666867} - 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: 2235930517469645866} - m_Father: {fileID: 6838332976521077515} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 4, y: -4} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!222 &3300915780421290202 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2608285700916666867} - m_CullTransparentMesh: 1 ---- !u!114 &2666117514334409763 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2608285700916666867} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 521053bce6aacb44aa18944d4fb0e7d8, 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 &2667089954117904837 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4579589795882131481} - - component: {fileID: 7382140028921911284} - - component: {fileID: 3030237353847042977} - m_Layer: 5 - m_Name: qlt_lv - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4579589795882131481 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2667089954117904837} - 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: 7066602661076011894} - m_Father: {fileID: 6838332976521077515} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 73, y: 40} - m_Pivot: {x: 1, y: 1} ---- !u!222 &7382140028921911284 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2667089954117904837} - m_CullTransparentMesh: 1 ---- !u!114 &3030237353847042977 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2667089954117904837} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e9d298f7812d6a6499c5fbee04a3e625, 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 &3598410332071999161 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8937747651626647102} - - component: {fileID: 4247370955841454712} - - component: {fileID: 5373787828850092205} - m_Layer: 5 - m_Name: img_hero_icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8937747651626647102 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3598410332071999161} - 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: 4305354507385495014} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 73, y: 40} - m_Pivot: {x: 1, y: 1} ---- !u!222 &4247370955841454712 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3598410332071999161} - m_CullTransparentMesh: 1 ---- !u!114 &5373787828850092205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3598410332071999161} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e9d298f7812d6a6499c5fbee04a3e625, 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 &5230213578544830750 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7046917829467952299} - - component: {fileID: 5500974690371273298} - - component: {fileID: 4084712363376639721} - m_Layer: 5 - m_Name: img_icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7046917829467952299 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5230213578544830750} - 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: 6838332976521077515} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 135, y: 135} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5500974690371273298 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5230213578544830750} - m_CullTransparentMesh: 1 ---- !u!114 &4084712363376639721 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5230213578544830750} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 19fe0b5a0556e744584c4b508a5964cd, 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 &6049999267703662920 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6215621578684087192} - - component: {fileID: 8870637871624242518} - - component: {fileID: 6462078016061179088} - m_Layer: 5 - m_Name: check - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6215621578684087192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6049999267703662920} - 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: 6838332976521077515} - m_RootOrder: 6 - 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: 46, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8870637871624242518 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6049999267703662920} - m_CullTransparentMesh: 1 ---- !u!114 &6462078016061179088 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6049999267703662920} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c524d21ffee0d904fb67977d7ca146f3, 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 &6097108937011012019 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7627416665695607368} - - component: {fileID: 1031301652275701792} - - component: {fileID: 4139095519644312589} - m_Layer: 5 - m_Name: tx_desc_wear - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7627416665695607368 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097108937011012019} - 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: 296473613241186508} - m_RootOrder: 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: 2.5} - m_SizeDelta: {x: 0, y: -5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1031301652275701792 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097108937011012019} - m_CullTransparentMesh: 1 ---- !u!114 &4139095519644312589 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097108937011012019} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 20 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 12 - m_fontSizeMax: 20 - m_fontStyle: 0 - 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 &6756318377859285651 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 296473613241186508} - - component: {fileID: 8475422911218904961} - - component: {fileID: 5067279226328176005} - m_Layer: 5 - m_Name: wear - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &296473613241186508 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6756318377859285651} - 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: 7627416665695607368} - m_Father: {fileID: 6838332976521077515} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 36} - m_Pivot: {x: 0.5, y: 0} ---- !u!222 &8475422911218904961 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6756318377859285651} - m_CullTransparentMesh: 1 ---- !u!114 &5067279226328176005 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6756318377859285651} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d6d332c08686e354a9b80fbaadf189dd, type: 3} - m_Type: 1 - 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 &6788568984499830956 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7162099636144661599} - - component: {fileID: 4801413852101081389} - - component: {fileID: 7359470309280509510} - m_Layer: 5 - m_Name: damage_mask - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7162099636144661599 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6788568984499830956} - 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: 2235930517469645866} - m_RootOrder: 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!222 &4801413852101081389 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6788568984499830956} - m_CullTransparentMesh: 1 ---- !u!114 &7359470309280509510 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6788568984499830956} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.9019608} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ea99325f20bd23d468ab66e825b11d5a, 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 &7058611021358122326 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2235930517469645866} - - component: {fileID: 4921382568263037301} - - component: {fileID: 3084392441655407994} - m_Layer: 5 - m_Name: damage_type - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2235930517469645866 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7058611021358122326} - 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: 7162099636144661599} - m_Father: {fileID: 2520171081847454326} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 36, y: 36} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4921382568263037301 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7058611021358122326} - m_CullTransparentMesh: 1 ---- !u!114 &3084392441655407994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7058611021358122326} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ea99325f20bd23d468ab66e825b11d5a, 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 &7261824767476899206 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4305354507385495014} - - component: {fileID: 4698801721486814920} - - component: {fileID: 8162288799424289865} - m_Layer: 5 - m_Name: img_hero - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4305354507385495014 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7261824767476899206} - 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: 8937747651626647102} - m_Father: {fileID: 6838332976521077515} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 73, y: 40} - m_Pivot: {x: 1, y: 1} ---- !u!222 &4698801721486814920 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7261824767476899206} - m_CullTransparentMesh: 1 ---- !u!114 &8162288799424289865 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7261824767476899206} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e9d298f7812d6a6499c5fbee04a3e625, 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 &8548968350588082940 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7066602661076011894} - - component: {fileID: 5836020271029571229} - - component: {fileID: 8800136237246183105} - m_Layer: 5 - m_Name: tx_qlt_lv - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7066602661076011894 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8548968350588082940} - 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: 4579589795882131481} - m_RootOrder: 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!222 &5836020271029571229 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8548968350588082940} - m_CullTransparentMesh: 1 ---- !u!114 &8800136237246183105 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8548968350588082940} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, 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: 1 - m_fontSizeMin: 12 - m_fontSizeMax: 26 - m_fontStyle: 0 - 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 &8735932560169076049 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5212638097470253917} - - component: {fileID: 2095221022411378468} - - component: {fileID: 1623076265868697468} - m_Layer: 5 - m_Name: lock - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5212638097470253917 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8735932560169076049} - 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: 6838332976521077515} - m_RootOrder: 7 - 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: 34, y: 34} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2095221022411378468 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8735932560169076049} - m_CullTransparentMesh: 1 ---- !u!114 &1623076265868697468 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8735932560169076049} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ee4e0eecba15cbc4081e64039cdfbcda, 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 diff --git a/Assets/prefabs/ui/soul/cell/soul_cell.prefab.meta b/Assets/prefabs/ui/soul/cell/soul_cell.prefab.meta deleted file mode 100755 index 7525be014..000000000 --- a/Assets/prefabs/ui/soul/cell/soul_cell.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6cf873440894bdb438cff703e7a71e6f -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: prefabs/ui/soul/cell/soul_cell.prefab.ab - assetBundleVariant: diff --git a/Assets/prefabs/ui/talent/talent_ui.prefab b/Assets/prefabs/ui/talent/talent_ui.prefab index 99a334242..a0cfb4e2b 100644 --- a/Assets/prefabs/ui/talent/talent_ui.prefab +++ b/Assets/prefabs/ui/talent/talent_ui.prefab @@ -146,6 +146,231 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GroupOrder: 0 +--- !u!1 &1064558281158378983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2639429392728018287} + - component: {fileID: 6750875913723871695} + - component: {fileID: 1573019094702188392} + m_Layer: 5 + m_Name: continue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2639429392728018287 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064558281158378983} + 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: 5045946273449496793} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 181} + m_SizeDelta: {x: 600, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6750875913723871695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064558281158378983} + m_CullTransparentMesh: 1 +--- !u!114 &1573019094702188392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1064558281158378983} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, 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: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + 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: 0 + 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 &1767210584995776506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1605968675839388522} + - component: {fileID: 5820668970791133795} + - component: {fileID: 3303206756205015840} + - component: {fileID: 4771342000518652826} + m_Layer: 0 + m_Name: help_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1605968675839388522 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767210584995776506} + 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: 6034806423593252542} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 30, y: 20} + m_SizeDelta: {x: 38, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5820668970791133795 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767210584995776506} + m_CullTransparentMesh: 1 +--- !u!114 &3303206756205015840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767210584995776506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + 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: b7ef85b6c0ed64dc5b499de328e705ed, 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!114 &4771342000518652826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1767210584995776506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &1914987686953387228 GameObject: m_ObjectHideFlags: 0 @@ -654,6 +879,7 @@ RectTransform: - {fileID: 3546132602191833182} - {fileID: 1804718365283170291} - {fileID: 5915020035617818991} + - {fileID: 2639429392728018287} m_Father: {fileID: 8461932745927490369} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1230,6 +1456,14 @@ MonoBehaviour: hashName: 2759760009 objectType: 0 gameObject: {fileID: 6248864186042080988} + - name: talent_ui.up_node.continue + hashName: 807774390 + objectType: 0 + gameObject: {fileID: 1064558281158378983} + - name: talent_ui.top_bg.help_btn + hashName: 2167216854 + objectType: 0 + gameObject: {fileID: 1767210584995776506} --- !u!114 &1700860188155505658 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2171,7 +2405,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1605968675839388522} m_Father: {fileID: 8461932745927490369} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/prefabs/ui/tips/weight_box_tips.prefab b/Assets/prefabs/ui/tips/weight_box_tips.prefab index 1b90eb42f..44c347d3b 100644 --- a/Assets/prefabs/ui/tips/weight_box_tips.prefab +++ b/Assets/prefabs/ui/tips/weight_box_tips.prefab @@ -503,7 +503,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 43, y: -48} + m_AnchoredPosition: {x: 43, y: -40} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4149158187376799623