diff --git a/Assets/arts/atlas/icon/buff.asset b/Assets/arts/atlas/icon/buff.asset index dbf1b7835..a5f265e1f 100644 --- a/Assets/arts/atlas/icon/buff.asset +++ b/Assets/arts/atlas/icon/buff.asset @@ -34,6 +34,7 @@ MonoBehaviour: - {fileID: 21300000, guid: d0a1bd7ba8d200846a423d105de6156d, type: 3} - {fileID: 21300000, guid: 1b29673b2dd79e04abceec647b3c9fe6, type: 3} - {fileID: 21300000, guid: c7ad3ea55309c6a42977ac94d536e405, type: 3} + - {fileID: 21300000, guid: 4fd484a10024b422f941737e3b4b9a6d, type: 3} - {fileID: 21300000, guid: 5f894bd8341956645b5f8643c6442326, type: 3} - {fileID: 21300000, guid: fcc46b131bedff24b8278d1e41144f55, type: 3} - {fileID: 21300000, guid: fd824a83cca762246afe64ce585ccccf, type: 3} @@ -53,4 +54,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 9509038978143b8419ef45aabc1145c9, type: 3} - {fileID: 21300000, guid: 86f4bf51405bce84381db4ad10b34d7d, type: 3} - {fileID: 21300000, guid: 5c4223ded9ac7e14b898bba98c40519f, type: 3} - spriteNameList: 3a9f9705cf512e00d7d7a3050de6ee3844d744fc9200aa050cc1401e05a627787a7e5d04e7415e8e5cfd091af5ec0eef143e942f9ed464f6a01289b4a2dd3000832c60b9af57f9e68913ac1110d4ad7d2bc53200e38ff110a74f646f086f6cc56c4e7640fb662f9b691f28cab508f5309f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0937ead4eacb792fef52ed0da0eb2d55b83c594c5c6f25f71 + spriteNameList: 3a9f9705cf512e00d7d7a3050de6ee3844d744fc9200aa050cc1401e05a627787a7e5d04e7415e8e5cfd091af5ec0eef143e942f9ed464f6a01289b4a2dd3000832c60b9cfbbd3ea8913ac1110d4ad7d2bc532008284f110e38ff110a74f646f086f6cc56c4e7640fb662f9b691f28cab508f5309f86e95dba0836005ce3dfcb7d16e4cd48c7da9d21aecdd0937ead4eacb792fef52ed0da0eb2d55b83c594c5c6f25f71 diff --git a/Assets/arts/atlas/icon/buff.spriteatlas b/Assets/arts/atlas/icon/buff.spriteatlas index 8af1216f1..c48ff6248 100644 --- a/Assets/arts/atlas/icon/buff.spriteatlas +++ b/Assets/arts/atlas/icon/buff.spriteatlas @@ -68,6 +68,7 @@ SpriteAtlas: - {fileID: 21300000, guid: e0411be0b6b150e469a2958be34b5fc9, type: 3} - {fileID: 21300000, guid: 42e30d11fda48bb498c8aea2b7221e08, type: 3} - {fileID: 21300000, guid: 86f4bf51405bce84381db4ad10b34d7d, type: 3} + - {fileID: 21300000, guid: 4fd484a10024b422f941737e3b4b9a6d, type: 3} - {fileID: 21300000, guid: 911e4ba1e8f5c594a9068ef0d20bbc25, type: 3} - {fileID: 21300000, guid: 06765e0298a373a468ed0efca3170681, type: 3} - {fileID: 21300000, guid: 278c7742301888542971cdf7ec4e7a9f, type: 3} @@ -109,10 +110,11 @@ SpriteAtlas: - weakness_green_add - immune - weakness_red_add + - normal_attack_add - bleed - charm - weakness_blue_add - - imprison + - Imprison - ocean_shield1 - poison - dec_dmg_purple_add diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 2923e2eeb..3dd5523a6 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -249,6 +249,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 08cc8f9d65fd24cf2a347c24c264f15f, type: 3} - {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} - {fileID: 21300000, guid: 5263b9a86b77b2148823254343718685, type: 3} + - {fileID: 21300000, guid: e307a649d1c444bb89c5fc94044f2b41, type: 3} - {fileID: 21300000, guid: 4ccc87cc2d4c949d3a3d1f83f99bd6a3, type: 3} - {fileID: 21300000, guid: fd99658a92bd5441ab344f761565e797, type: 3} - {fileID: 21300000, guid: 41c63054fe0534a80923a5668c34f7f1, type: 3} @@ -281,4 +282,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e6922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e826e418db4e19f42b5e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1ba07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220558aa025459aa0254b36a811bb46a811bb56a811bed355bf9f022f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e6922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e826e418db4e19f42b5e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1ba07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220558aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 3eca9044a..d72cafa44 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -228,6 +228,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 47c6df29a6803614aa3f74efce93cdb3, type: 3} - {fileID: 21300000, guid: e8535639b62372944b836a75493ac3ae, type: 3} - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} + - {fileID: 21300000, guid: e307a649d1c444bb89c5fc94044f2b41, type: 3} - {fileID: 21300000, guid: f777fe49e692d4008bf92f7a1ee40fd4, type: 3} - {fileID: 21300000, guid: 15a10479bd4a42c459af0778f0f3c004, type: 3} - {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} @@ -497,6 +498,7 @@ SpriteAtlas: - common_line_7 - common_icon_shard - common_bg_2 + - common_star_3 - common_bg_31 - common_dec_11 - common_bottom_bg_1 diff --git a/Assets/arts/atlas/ui/hero.asset b/Assets/arts/atlas/ui/hero.asset index dac777a46..d508d783a 100644 --- a/Assets/arts/atlas/ui/hero.asset +++ b/Assets/arts/atlas/ui/hero.asset @@ -63,13 +63,11 @@ MonoBehaviour: - {fileID: 21300000, guid: 1ba7a3e2c834e44538cac9831b655771, type: 3} - {fileID: 21300000, guid: 492a0f14bbc3841b2a53f071b1434baa, type: 3} - {fileID: 21300000, guid: 72c8fdffa156d45e4930661f47851d2c, type: 3} - - {fileID: 21300000, guid: c2b5a778ce5344c8a9a840a12a97c4f1, type: 3} - - {fileID: 21300000, guid: 09fc73aa3f60f40c190a9da258c1bc60, type: 3} - {fileID: 21300000, guid: 945a7ef69d0594a1294304205b4e398a, type: 3} - - {fileID: 21300000, guid: 91d6ecf8d7a9f43b8bffdd8ddcd37c8b, type: 3} - {fileID: 21300000, guid: 7ff045509adf648c5a1910efa22982d6, type: 3} - {fileID: 21300000, guid: 1e04b04df972044b0a12e010f6abba1a, type: 3} - {fileID: 21300000, guid: c2312a4189aad45519d73e561368e869, type: 3} + - {fileID: 21300000, guid: 2e556c7ebe1934fea99ae91b37534c69, type: 3} - {fileID: 21300000, guid: 1a72ab01b7f2dca4cbb5095891cd1009, type: 3} - {fileID: 21300000, guid: 81556c9d4b4230349a17daae01d94bff, type: 3} - {fileID: 21300000, guid: 32bc738b9785cf1439e04d82b1ba24ce, type: 3} @@ -104,4 +102,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 172d4d5f9a8bb9e4fa2be8cf0b90403f, type: 3} - {fileID: 21300000, guid: b4a559b38eb78474995dc80ba996a3fa, type: 3} - {fileID: 21300000, guid: 43caa329b5f2f364584532df1b3c95fe, type: 3} - spriteNameList: 8986dade8a86dade8b86dade8c86dade8d86dade8e86dade8f86dade809e9e96819e9e9608a6c6c4dceffc88ddeffc88deeffc88dfeffc88affbc0252ab3493eaf66bc96616fd040626fd040b066bc96b166bc96b266bc96b366bc96b466bc96b566bc96b666bc96b766bc969aea2359ccb7d39f9bea23598ebbd39f9cea23599dea2359aeabb95aafabb95ab0abb95ab1abb95a1230e25e8baeb44e3665315037653150ac6daf33ad6daf33ae6daf33af6daf33b06daf33b16daf33b26daf33b36daf33b46daf33ec22f634d33ace69ed22f634f23ace69ee22f634ef22f634f022f63451dc9a5952dc9a5953dc9a5954dc9a5955dc9a5981dc9a5982dc9a5983dc9a5984dc9a5985dc9a5986dc9a5993dc9a5940b6c0d9d4a5c05ad5a5c05ad6a5c05ad7a5c05a346eb9f8356eb9f8366eb9f8376eb9f87470603e43ad56393574603e44ad5639f677603e45ad5639b77b603e8b0acf4937881e3238881e3239881e323a881e323b881e32 + spriteNameList: 8986dade8a86dade8b86dade8c86dade8d86dade8e86dade8f86dade809e9e96819e9e9608a6c6c4dceffc88ddeffc88deeffc88dfeffc88affbc0252ab3493eaf66bc96616fd040626fd040b066bc96b166bc96b266bc96b366bc96b466bc96b566bc96b666bc96b766bc969aea2359ccb7d39f9bea23598ebbd39f9cea23599dea2359aeabb95aafabb95ab0abb95ab1abb95a1230e25e8baeb44e3665315037653150ac6daf33ad6daf33ae6daf33af6daf33b06daf33b16daf33b26daf33b36daf33b46daf33ed22f634ee22f634ef22f634f022f634f122f63451dc9a5952dc9a5953dc9a5954dc9a5955dc9a5981dc9a5982dc9a5983dc9a5984dc9a5985dc9a5986dc9a5993dc9a5940b6c0d9d4a5c05ad5a5c05ad6a5c05ad7a5c05a346eb9f8356eb9f8366eb9f8376eb9f87470603e43ad56393574603e44ad5639f677603e45ad5639b77b603e8b0acf4937881e3238881e3239881e323a881e323b881e32 diff --git a/Assets/arts/atlas/ui/hero.spriteatlas b/Assets/arts/atlas/ui/hero.spriteatlas index e4567aa8d..552c88716 100644 --- a/Assets/arts/atlas/ui/hero.spriteatlas +++ b/Assets/arts/atlas/ui/hero.spriteatlas @@ -110,14 +110,12 @@ SpriteAtlas: - {fileID: 21300000, guid: 9c3e2508f13ca7f4b835c1a00ccb24de, type: 3} - {fileID: 21300000, guid: 4c3d0a48af89a864bb285ebc163b77b5, type: 3} - {fileID: 21300000, guid: 696de158b1b354340af80e764b8f47ef, type: 3} - - {fileID: 21300000, guid: c2b5a778ce5344c8a9a840a12a97c4f1, type: 3} - {fileID: 21300000, guid: 4d167b888372e4931923eef5536744ee, type: 3} - {fileID: 21300000, guid: 0d6b9a98bb1053444aa45ac4b16e4232, type: 3} - {fileID: 21300000, guid: 1ccd54c8189c82c42a429b7dc78b0302, type: 3} - {fileID: 21300000, guid: 1c63aec8cdd5c1449b6d5f69c61f1d78, type: 3} - {fileID: 21300000, guid: eabc02d8b56d95b499bd1001c4a5673d, type: 3} - {fileID: 21300000, guid: 3d9039d8f6fd4ec4086b506ac8b3d36d, type: 3} - - {fileID: 21300000, guid: 91d6ecf8d7a9f43b8bffdd8ddcd37c8b, type: 3} - {fileID: 21300000, guid: 1096ec098e87925499361a3fb4a1c0ff, type: 3} - {fileID: 21300000, guid: f417fa19e6a36400a9901925363db788, type: 3} - {fileID: 21300000, guid: 43caa329b5f2f364584532df1b3c95fe, type: 3} @@ -125,7 +123,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 1badd679eb6e501429e07e130f8ee4e3, type: 3} - {fileID: 21300000, guid: bb66230a15825924bae68b2db1f1173b, type: 3} - {fileID: 21300000, guid: cb21042ad3b2a4add8fa74353c657caf, type: 3} - - {fileID: 21300000, guid: 09fc73aa3f60f40c190a9da258c1bc60, type: 3} - {fileID: 21300000, guid: 97461cfa5a3d61b468c86ed677ed8a8f, type: 3} - {fileID: 21300000, guid: a65ecc7baba7ac340ab65153fdb55f3e, type: 3} - {fileID: 21300000, guid: 32bc738b9785cf1439e04d82b1ba24ce, type: 3} @@ -146,6 +143,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 1767274d13d53a2449467e6209588af3, type: 3} - {fileID: 21300000, guid: 81556c9d4b4230349a17daae01d94bff, type: 3} - {fileID: 21300000, guid: cbdf003e2e8bb6840a854e840820ad97, type: 3} + - {fileID: 21300000, guid: 2e556c7ebe1934fea99ae91b37534c69, type: 3} - {fileID: 21300000, guid: a33c4d7e7fd20f24c9abebf0deadea42, type: 3} - {fileID: 21300000, guid: da36a68e123533e4797476431612061c, type: 3} - {fileID: 21300000, guid: 8517539e89f5f5d43a710cce7f5575aa, type: 3} @@ -202,14 +200,12 @@ SpriteAtlas: - hero_dec_7 - hero_dec_5 - hero_skin_frame_4_1 - - hero_quality_1 - hero_property_5 - hero_frame_2 - hero_bg_1 - hero_rune_c - hero_rune_a - hero_skin_frame_select - - 'hero_quality_3 ' - hero_frame_4 - hero_bg_4 - match_5 @@ -217,7 +213,6 @@ SpriteAtlas: - hero_frame_bg_1 - hero_skin_bg_3 - hero_bar_1 - - 'hero_quality_2 ' - hero_attribute_3 - hero_rune_e - hero_rune_3 @@ -238,6 +233,7 @@ SpriteAtlas: - hero_btn_ollect - hero_rune_2 - hero_skin_3 + - hero_quality_6 - hero_attribute_5 - hero_dec_4 - hero_skin_bg_1 diff --git a/Assets/arts/textures/icon/buff/bleed.png b/Assets/arts/textures/icon/buff/bleed.png index eb48d1ce9..7dfa9cca7 100644 Binary files a/Assets/arts/textures/icon/buff/bleed.png and b/Assets/arts/textures/icon/buff/bleed.png differ diff --git a/Assets/arts/textures/icon/buff/burn.png b/Assets/arts/textures/icon/buff/burn.png index 648b7e107..e9cc493bf 100644 Binary files a/Assets/arts/textures/icon/buff/burn.png and b/Assets/arts/textures/icon/buff/burn.png differ diff --git a/Assets/arts/textures/icon/buff/charm.png b/Assets/arts/textures/icon/buff/charm.png index 6e9b7e8c9..7783068e9 100644 Binary files a/Assets/arts/textures/icon/buff/charm.png and b/Assets/arts/textures/icon/buff/charm.png differ diff --git a/Assets/arts/textures/icon/buff/corrupt.png b/Assets/arts/textures/icon/buff/corrupt.png index 8bc28764d..ba0e8280f 100644 Binary files a/Assets/arts/textures/icon/buff/corrupt.png and b/Assets/arts/textures/icon/buff/corrupt.png differ diff --git a/Assets/arts/textures/icon/buff/counterattack.png b/Assets/arts/textures/icon/buff/counterattack.png index 0ebff1f03..46d4b6f58 100644 Binary files a/Assets/arts/textures/icon/buff/counterattack.png and b/Assets/arts/textures/icon/buff/counterattack.png differ diff --git a/Assets/arts/textures/icon/buff/curse.png b/Assets/arts/textures/icon/buff/curse.png index c124fccd8..806baf31d 100644 Binary files a/Assets/arts/textures/icon/buff/curse.png and b/Assets/arts/textures/icon/buff/curse.png differ diff --git a/Assets/arts/textures/icon/buff/death_summon.png b/Assets/arts/textures/icon/buff/death_summon.png index 1f3c834e8..9131943d3 100644 Binary files a/Assets/arts/textures/icon/buff/death_summon.png and b/Assets/arts/textures/icon/buff/death_summon.png differ diff --git a/Assets/arts/textures/icon/buff/first_hand.png b/Assets/arts/textures/icon/buff/first_hand.png index c7dd25292..fd5b695b4 100644 Binary files a/Assets/arts/textures/icon/buff/first_hand.png and b/Assets/arts/textures/icon/buff/first_hand.png differ diff --git a/Assets/arts/textures/icon/buff/frozen.png b/Assets/arts/textures/icon/buff/frozen.png index 2d256e7c9..c8dc912ab 100644 Binary files a/Assets/arts/textures/icon/buff/frozen.png and b/Assets/arts/textures/icon/buff/frozen.png differ diff --git a/Assets/arts/textures/icon/buff/immune.png b/Assets/arts/textures/icon/buff/immune.png index 8b090330c..a4952a88d 100644 Binary files a/Assets/arts/textures/icon/buff/immune.png and b/Assets/arts/textures/icon/buff/immune.png differ diff --git a/Assets/arts/textures/icon/buff/imprison.png b/Assets/arts/textures/icon/buff/imprison.png index a20dc070e..5de2c3111 100644 Binary files a/Assets/arts/textures/icon/buff/imprison.png and b/Assets/arts/textures/icon/buff/imprison.png differ diff --git a/Assets/arts/textures/icon/buff/lethargy.png b/Assets/arts/textures/icon/buff/lethargy.png index e4848badb..35f534b7b 100644 Binary files a/Assets/arts/textures/icon/buff/lethargy.png and b/Assets/arts/textures/icon/buff/lethargy.png differ diff --git a/Assets/arts/textures/icon/buff/lock.png b/Assets/arts/textures/icon/buff/lock.png index ed7caf84a..12c38bd61 100644 Binary files a/Assets/arts/textures/icon/buff/lock.png and b/Assets/arts/textures/icon/buff/lock.png differ diff --git a/Assets/arts/textures/icon/buff/normal_attack_add.png b/Assets/arts/textures/icon/buff/normal_attack_add.png new file mode 100644 index 000000000..689ba6cce Binary files /dev/null and b/Assets/arts/textures/icon/buff/normal_attack_add.png differ diff --git a/Assets/arts/textures/ui/hero/hero_quality_1.png.meta b/Assets/arts/textures/icon/buff/normal_attack_add.png.meta similarity index 97% rename from Assets/arts/textures/ui/hero/hero_quality_1.png.meta rename to Assets/arts/textures/icon/buff/normal_attack_add.png.meta index 89648d7a6..7bf021a34 100644 --- a/Assets/arts/textures/ui/hero/hero_quality_1.png.meta +++ b/Assets/arts/textures/icon/buff/normal_attack_add.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c2b5a778ce5344c8a9a840a12a97c4f1 +guid: 4fd484a10024b422f941737e3b4b9a6d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/hero.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/icon/buff/normal_attack_dec.png b/Assets/arts/textures/icon/buff/normal_attack_dec.png index 2278e5ec6..a1ca86695 100644 Binary files a/Assets/arts/textures/icon/buff/normal_attack_dec.png and b/Assets/arts/textures/icon/buff/normal_attack_dec.png differ diff --git a/Assets/arts/textures/icon/buff/poison.png b/Assets/arts/textures/icon/buff/poison.png index 44fa955d8..7ca9d12c4 100644 Binary files a/Assets/arts/textures/icon/buff/poison.png and b/Assets/arts/textures/icon/buff/poison.png differ diff --git a/Assets/arts/textures/icon/buff/rebirth.png b/Assets/arts/textures/icon/buff/rebirth.png index 860077210..862a1588b 100644 Binary files a/Assets/arts/textures/icon/buff/rebirth.png and b/Assets/arts/textures/icon/buff/rebirth.png differ diff --git a/Assets/arts/textures/icon/buff/self_heal.png b/Assets/arts/textures/icon/buff/self_heal.png index 2f7fdb451..63eb8777d 100644 Binary files a/Assets/arts/textures/icon/buff/self_heal.png and b/Assets/arts/textures/icon/buff/self_heal.png differ diff --git a/Assets/arts/textures/icon/buff/shield.png b/Assets/arts/textures/icon/buff/shield.png index b34e030d2..6bb0ebaa3 100644 Binary files a/Assets/arts/textures/icon/buff/shield.png and b/Assets/arts/textures/icon/buff/shield.png differ diff --git a/Assets/arts/textures/icon/buff/skill_hurt_add.png b/Assets/arts/textures/icon/buff/skill_hurt_add.png index dbad8366f..14a8e1d63 100644 Binary files a/Assets/arts/textures/icon/buff/skill_hurt_add.png and b/Assets/arts/textures/icon/buff/skill_hurt_add.png differ diff --git a/Assets/arts/textures/icon/buff/stun.png b/Assets/arts/textures/icon/buff/stun.png index 7dae56ad1..70bed906a 100644 Binary files a/Assets/arts/textures/icon/buff/stun.png and b/Assets/arts/textures/icon/buff/stun.png differ diff --git a/Assets/arts/textures/icon/buff/thorns.png b/Assets/arts/textures/icon/buff/thorns.png index d03f490a9..bccf60836 100644 Binary files a/Assets/arts/textures/icon/buff/thorns.png and b/Assets/arts/textures/icon/buff/thorns.png differ diff --git a/Assets/arts/textures/icon/buff/undead.png b/Assets/arts/textures/icon/buff/undead.png index f512ee2a1..21a0be959 100644 Binary files a/Assets/arts/textures/icon/buff/undead.png and b/Assets/arts/textures/icon/buff/undead.png differ diff --git a/Assets/arts/textures/icon/buff/vulnerable.png b/Assets/arts/textures/icon/buff/vulnerable.png index 80aac7c86..a7e8cac5e 100644 Binary files a/Assets/arts/textures/icon/buff/vulnerable.png and b/Assets/arts/textures/icon/buff/vulnerable.png differ diff --git a/Assets/arts/textures/icon/buff/weaken.png b/Assets/arts/textures/icon/buff/weaken.png index 5e20f4b97..fc1f40d8f 100644 Binary files a/Assets/arts/textures/icon/buff/weaken.png and b/Assets/arts/textures/icon/buff/weaken.png differ diff --git a/Assets/arts/textures/icon/item/14.png b/Assets/arts/textures/icon/item/14.png index 56863da71..65f72013a 100644 Binary files a/Assets/arts/textures/icon/item/14.png and b/Assets/arts/textures/icon/item/14.png differ diff --git a/Assets/arts/textures/icon/item/15.png b/Assets/arts/textures/icon/item/15.png index f7998b8f5..9038fd9c2 100644 Binary files a/Assets/arts/textures/icon/item/15.png and b/Assets/arts/textures/icon/item/15.png differ diff --git a/Assets/arts/textures/icon/item/16.png b/Assets/arts/textures/icon/item/16.png index bdc2fb988..e354c850e 100644 Binary files a/Assets/arts/textures/icon/item/16.png and b/Assets/arts/textures/icon/item/16.png differ diff --git a/Assets/arts/textures/icon/item/17.png b/Assets/arts/textures/icon/item/17.png index 285108788..5fec2a9dd 100644 Binary files a/Assets/arts/textures/icon/item/17.png and b/Assets/arts/textures/icon/item/17.png differ diff --git a/Assets/arts/textures/ui/common/common_quality_1.png.meta b/Assets/arts/textures/ui/common/common_quality_1.png.meta index 5eb669560..21ac782a7 100644 --- a/Assets/arts/textures/ui/common/common_quality_1.png.meta +++ b/Assets/arts/textures/ui/common/common_quality_1.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/common.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_quality_2.png.meta b/Assets/arts/textures/ui/common/common_quality_2.png.meta index 9c42ebbeb..453279bf9 100644 --- a/Assets/arts/textures/ui/common/common_quality_2.png.meta +++ b/Assets/arts/textures/ui/common/common_quality_2.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/common.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_quality_3.png.meta b/Assets/arts/textures/ui/common/common_quality_3.png.meta index 6aa690832..b5470e855 100644 --- a/Assets/arts/textures/ui/common/common_quality_3.png.meta +++ b/Assets/arts/textures/ui/common/common_quality_3.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/common.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_quality_4.png.meta b/Assets/arts/textures/ui/common/common_quality_4.png.meta index f0efbdce5..e000bb2d9 100644 --- a/Assets/arts/textures/ui/common/common_quality_4.png.meta +++ b/Assets/arts/textures/ui/common/common_quality_4.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/common.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_quality_5.png.meta b/Assets/arts/textures/ui/common/common_quality_5.png.meta index 0c2cc31d5..8fad31da3 100644 --- a/Assets/arts/textures/ui/common/common_quality_5.png.meta +++ b/Assets/arts/textures/ui/common/common_quality_5.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/common.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_star_1.png b/Assets/arts/textures/ui/common/common_star_1.png index 127c781c7..c6038f219 100644 Binary files a/Assets/arts/textures/ui/common/common_star_1.png and b/Assets/arts/textures/ui/common/common_star_1.png differ diff --git a/Assets/arts/textures/ui/common/common_star_2.png b/Assets/arts/textures/ui/common/common_star_2.png index 04cecaaad..c1a748e56 100644 Binary files a/Assets/arts/textures/ui/common/common_star_2.png and b/Assets/arts/textures/ui/common/common_star_2.png differ diff --git a/Assets/arts/textures/ui/common/common_star_3.png b/Assets/arts/textures/ui/common/common_star_3.png new file mode 100644 index 000000000..b1d6fe053 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_star_3.png differ diff --git a/Assets/arts/textures/ui/hero/hero_quality_3 .png.meta b/Assets/arts/textures/ui/common/common_star_3.png.meta similarity index 97% rename from Assets/arts/textures/ui/hero/hero_quality_3 .png.meta rename to Assets/arts/textures/ui/common/common_star_3.png.meta index 6db8b72b0..200cfa9bf 100644 --- a/Assets/arts/textures/ui/hero/hero_quality_3 .png.meta +++ b/Assets/arts/textures/ui/common/common_star_3.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 91d6ecf8d7a9f43b8bffdd8ddcd37c8b +guid: e307a649d1c444bb89c5fc94044f2b41 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/hero.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_tips_1.png.meta b/Assets/arts/textures/ui/common/common_tips_1.png.meta index 19d524645..2d1f4f663 100644 --- a/Assets/arts/textures/ui/common/common_tips_1.png.meta +++ b/Assets/arts/textures/ui/common/common_tips_1.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 26, y: 26, z: 26, w: 26} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/arts/textures/ui/hero/hero_quality_2 .png b/Assets/arts/textures/ui/hero/hero_quality_2 .png deleted file mode 100644 index 5a2efac54..000000000 Binary files a/Assets/arts/textures/ui/hero/hero_quality_2 .png and /dev/null differ diff --git a/Assets/arts/textures/ui/hero/hero_quality_2.png b/Assets/arts/textures/ui/hero/hero_quality_2.png index b06b1ad8c..849142447 100644 Binary files a/Assets/arts/textures/ui/hero/hero_quality_2.png and b/Assets/arts/textures/ui/hero/hero_quality_2.png differ diff --git a/Assets/arts/textures/ui/hero/hero_quality_2.png.meta b/Assets/arts/textures/ui/hero/hero_quality_2.png.meta index 7074ba13e..d0c729b8f 100644 --- a/Assets/arts/textures/ui/hero/hero_quality_2.png.meta +++ b/Assets/arts/textures/ui/hero/hero_quality_2.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/hero.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/hero/hero_quality_3 .png b/Assets/arts/textures/ui/hero/hero_quality_3 .png deleted file mode 100644 index 849142447..000000000 Binary files a/Assets/arts/textures/ui/hero/hero_quality_3 .png and /dev/null differ diff --git a/Assets/arts/textures/ui/hero/hero_quality_3.png b/Assets/arts/textures/ui/hero/hero_quality_3.png index caf288714..b06b1ad8c 100644 Binary files a/Assets/arts/textures/ui/hero/hero_quality_3.png and b/Assets/arts/textures/ui/hero/hero_quality_3.png differ diff --git a/Assets/arts/textures/ui/hero/hero_quality_3.png.meta b/Assets/arts/textures/ui/hero/hero_quality_3.png.meta index 581db6ced..706baeec5 100644 --- a/Assets/arts/textures/ui/hero/hero_quality_3.png.meta +++ b/Assets/arts/textures/ui/hero/hero_quality_3.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/hero.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/hero/hero_quality_4.png b/Assets/arts/textures/ui/hero/hero_quality_4.png index b06b1ad8c..caf288714 100644 Binary files a/Assets/arts/textures/ui/hero/hero_quality_4.png and b/Assets/arts/textures/ui/hero/hero_quality_4.png differ diff --git a/Assets/arts/textures/ui/hero/hero_quality_4.png.meta b/Assets/arts/textures/ui/hero/hero_quality_4.png.meta index 92a8965a2..30327afb4 100644 --- a/Assets/arts/textures/ui/hero/hero_quality_4.png.meta +++ b/Assets/arts/textures/ui/hero/hero_quality_4.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/hero.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/hero/hero_quality_5.png b/Assets/arts/textures/ui/hero/hero_quality_5.png index caf288714..5a2efac54 100644 Binary files a/Assets/arts/textures/ui/hero/hero_quality_5.png and b/Assets/arts/textures/ui/hero/hero_quality_5.png differ diff --git a/Assets/arts/textures/ui/hero/hero_quality_5.png.meta b/Assets/arts/textures/ui/hero/hero_quality_5.png.meta index e2a2d7ed2..148ddd782 100644 --- a/Assets/arts/textures/ui/hero/hero_quality_5.png.meta +++ b/Assets/arts/textures/ui/hero/hero_quality_5.png.meta @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/hero.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/textures/ui/hero/hero_quality_1.png b/Assets/arts/textures/ui/hero/hero_quality_6.png similarity index 100% rename from Assets/arts/textures/ui/hero/hero_quality_1.png rename to Assets/arts/textures/ui/hero/hero_quality_6.png diff --git a/Assets/arts/textures/ui/hero/hero_quality_2 .png.meta b/Assets/arts/textures/ui/hero/hero_quality_6.png.meta similarity index 97% rename from Assets/arts/textures/ui/hero/hero_quality_2 .png.meta rename to Assets/arts/textures/ui/hero/hero_quality_6.png.meta index 4adb1ad6e..121919db6 100644 --- a/Assets/arts/textures/ui/hero/hero_quality_2 .png.meta +++ b/Assets/arts/textures/ui/hero/hero_quality_6.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 09fc73aa3f60f40c190a9da258c1bc60 +guid: 2e556c7ebe1934fea99ae91b37534c69 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -143,5 +143,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/textures/ui/hero.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/lua/app/config/hero_star.lua.bytes b/Assets/lua/app/config/hero_star.lua.bytes index a485bd1ca..777b153ec 100644 Binary files a/Assets/lua/app/config/hero_star.lua.bytes and b/Assets/lua/app/config/hero_star.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 82e660fb6..be403071d 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 b2ed82e43..0f62e6724 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/strings/cn/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/cn/task_daily_challenge.lua.bytes index 0b5d64e83..870c90638 100644 Binary files a/Assets/lua/app/config/strings/cn/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/cn/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/de/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/de/task_daily_challenge.lua.bytes index e9a1ab100..3b8d7d385 100644 Binary files a/Assets/lua/app/config/strings/de/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/de/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/en/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/en/task_daily_challenge.lua.bytes index 1232a7ffd..9b9617958 100644 Binary files a/Assets/lua/app/config/strings/en/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/en/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/es/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/es/task_daily_challenge.lua.bytes index feb5b7a74..628075846 100644 Binary files a/Assets/lua/app/config/strings/es/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/es/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/fr/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/fr/task_daily_challenge.lua.bytes index ee0f33671..541e2f46c 100644 Binary files a/Assets/lua/app/config/strings/fr/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/fr/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/id/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/id/task_daily_challenge.lua.bytes index 1242dad41..d72a985b7 100644 Binary files a/Assets/lua/app/config/strings/id/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/id/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ja/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/ja/task_daily_challenge.lua.bytes index bc7453695..e8cdfd188 100644 Binary files a/Assets/lua/app/config/strings/ja/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/ja/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ko/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/ko/task_daily_challenge.lua.bytes index a36eab9c1..e294fb014 100644 Binary files a/Assets/lua/app/config/strings/ko/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/ko/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/pt/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/pt/task_daily_challenge.lua.bytes index 49c554d34..7295ba643 100644 Binary files a/Assets/lua/app/config/strings/pt/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/pt/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ru/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/ru/task_daily_challenge.lua.bytes index 72788e50c..c6ab3e803 100644 Binary files a/Assets/lua/app/config/strings/ru/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/ru/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/th/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/th/task_daily_challenge.lua.bytes index 047b75633..5e105d394 100644 Binary files a/Assets/lua/app/config/strings/th/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/th/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/vi/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/vi/task_daily_challenge.lua.bytes index bfe7dcfaf..897644953 100644 Binary files a/Assets/lua/app/config/strings/vi/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/vi/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/config/strings/zh/task_daily_challenge.lua.bytes b/Assets/lua/app/config/strings/zh/task_daily_challenge.lua.bytes index 4b280b5e8..ddf911521 100644 Binary files a/Assets/lua/app/config/strings/zh/task_daily_challenge.lua.bytes and b/Assets/lua/app/config/strings/zh/task_daily_challenge.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index 1b87a113d..9780104a1 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/hero/hero_manager.lua.bytes b/Assets/lua/app/module/hero/hero_manager.lua.bytes index 1e59dd82a..729ccef13 100644 Binary files a/Assets/lua/app/module/hero/hero_manager.lua.bytes and b/Assets/lua/app/module/hero/hero_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes index 04407f170..b1199db41 100644 Binary files a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes b/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes index c4afee15d..be305f869 100644 Binary files a/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes and b/Assets/lua/app/ui/hero/hero_info_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_skill_info_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_skill_info_ui.lua.bytes index de30d81bd..e6ebea38a 100644 Binary files a/Assets/lua/app/ui/hero/hero_skill_info_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_skill_info_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/star_info_comp.lua.bytes b/Assets/lua/app/ui/hero/star_info_comp.lua.bytes index daf958c6c..1dd4e9ec1 100644 Binary files a/Assets/lua/app/ui/hero/star_info_comp.lua.bytes and b/Assets/lua/app/ui/hero/star_info_comp.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 3dbe633d7..cb704a867 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/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index 61cd95af7..75a8cfba6 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -355,6 +355,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &80086686209794686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3496455608690316081} + - component: {fileID: 406017277682098760} + - component: {fileID: 562164503275917168} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3496455608690316081 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 80086686209794686} + 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: 8148162193111931924} + 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: -75, y: 0} + m_SizeDelta: {x: 56, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &406017277682098760 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 80086686209794686} + m_CullTransparentMesh: 1 +--- !u!114 &562164503275917168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 80086686209794686} + 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: 4d5eca674cfc87745bd0c368f2270a6c, 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 &199403992461306064 GameObject: m_ObjectHideFlags: 0 @@ -1520,6 +1596,97 @@ MonoBehaviour: hashName: 3908752270 objectType: 0 gameObject: {fileID: 3942623789596697069} +--- !u!1 &746960737986135297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3151358170550231450} + - component: {fileID: 6662874638495413356} + - component: {fileID: 6865879519317396553} + - component: {fileID: 6724749657403284221} + m_Layer: 5 + m_Name: goto_btn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3151358170550231450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746960737986135297} + 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: 1825401053186303347} + m_Father: {fileID: 1641418511942259705} + 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: 201, y: 0} + m_SizeDelta: {x: 156, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6662874638495413356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746960737986135297} + m_CullTransparentMesh: 1 +--- !u!114 &6865879519317396553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746960737986135297} + 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: 1a4363e1856808e4ea0a078472b03c75, 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 &6724749657403284221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 746960737986135297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &753559182013577693 GameObject: m_ObjectHideFlags: 0 @@ -1866,7 +2033,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6592573833229225066} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2078,7 +2245,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8148162193111931924} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -3112,6 +3279,82 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &1892444118314620515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2902796383437075657} + - component: {fileID: 6535422424460243370} + - component: {fileID: 5610006960001344149} + m_Layer: 5 + m_Name: star_img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2902796383437075657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892444118314620515} + 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: 9219826320608855525} + 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: 38, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6535422424460243370 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892444118314620515} + m_CullTransparentMesh: 1 +--- !u!114 &5610006960001344149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892444118314620515} + 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: 8674bea5658936f42a406b8b4655a7cd, 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 &1893021065376552313 GameObject: m_ObjectHideFlags: 0 @@ -3339,6 +3582,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1910521019071445157 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 487509463233501162} + - component: {fileID: 1903943720064702401} + - component: {fileID: 5461211676208648769} + m_Layer: 0 + m_Name: desc_tx_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &487509463233501162 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910521019071445157} + 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: 9219826320608855525} + 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: 50, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1903943720064702401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910521019071445157} + m_CullTransparentMesh: 1 +--- !u!114 &5461211676208648769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910521019071445157} + 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: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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 &2003844870066198068 GameObject: m_ObjectHideFlags: 0 @@ -3919,7 +4297,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8148162193111931924} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -5133,12 +5511,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8148162193111931924} - m_RootOrder: 0 + 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: -75, y: 0} - m_SizeDelta: {x: 52, y: 52} + m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3029645121310562737 CanvasRenderer: @@ -5168,7 +5546,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} + m_Sprite: {fileID: 21300000, guid: 2406b504a91c18b43af5f1e8479825e4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5305,8 +5683,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: 0} - m_SizeDelta: {x: 100, y: 26} + m_AnchoredPosition: {x: 6, y: 0} + m_SizeDelta: {x: 80, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8989963282834566810 CanvasRenderer: @@ -5540,6 +5918,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3798708987328336019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8138738973471793891} + - component: {fileID: 3502294548297967197} + - component: {fileID: 1612014567705514087} + m_Layer: 0 + m_Name: desc_tx_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8138738973471793891 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3798708987328336019} + 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: 9219826320608855525} + m_RootOrder: 2 + 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: 50, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3502294548297967197 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3798708987328336019} + m_CullTransparentMesh: 1 +--- !u!114 &1612014567705514087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3798708987328336019} + 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: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + 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 &3818792409003586365 GameObject: m_ObjectHideFlags: 0 @@ -5788,7 +6301,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -251.3, y: -122.5} - m_SizeDelta: {x: 60, y: 60} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1456058682979890450 CanvasRenderer: @@ -5818,7 +6331,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Sprite: {fileID: 21300000, guid: 1fac7f85b1398064bb2fe6291b431566, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6774,8 +7287,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -7033,6 +7546,30 @@ MonoBehaviour: hashName: 135824794 objectType: 0 gameObject: {fileID: 8061818373701141259} + - name: hero_info.up.goto_btn + hashName: 1173861336 + objectType: 0 + gameObject: {fileID: 746960737986135297} + - name: hero_info.up.goto_btn.text + hashName: 3275059587 + objectType: 0 + gameObject: {fileID: 4550966250538466649} + - name: hero_info.up.need_star_node + hashName: 1106153406 + objectType: 0 + gameObject: {fileID: 5520592980630032104} + - name: hero_info.up.need_star_node.desc_tx_1 + hashName: 2945876980 + objectType: 0 + gameObject: {fileID: 1910521019071445157} + - name: hero_info.up.need_star_node.star_img + hashName: 1363381382 + objectType: 0 + gameObject: {fileID: 1892444118314620515} + - name: hero_info.up.need_star_node.desc_tx_2 + hashName: 2945876981 + objectType: 0 + gameObject: {fileID: 3798708987328336019} --- !u!1 &4449630744303281474 GameObject: m_ObjectHideFlags: 0 @@ -7399,6 +7936,141 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4550966250538466649 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1825401053186303347} + - component: {fileID: 6783541941895175644} + - component: {fileID: 2720682625497532184} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1825401053186303347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550966250538466649} + 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: 3151358170550231450} + 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: 90, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6783541941895175644 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550966250538466649} + m_CullTransparentMesh: 1 +--- !u!114 &2720682625497532184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550966250538466649} + 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: 26 + m_fontSizeBase: 26 + 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 &4556571182114799776 GameObject: m_ObjectHideFlags: 0 @@ -7429,6 +8101,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5162946044283401170} - {fileID: 1921541548618611738} - {fileID: 8858472983762581176} - {fileID: 1031846887667425403} @@ -7804,6 +8477,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4757724001893737438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5162946044283401170} + - component: {fileID: 5823571495603492284} + - component: {fileID: 6565068170788208037} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5162946044283401170 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757724001893737438} + 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: 6592573833229225066} + 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: -75, y: 0} + m_SizeDelta: {x: 56, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5823571495603492284 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757724001893737438} + m_CullTransparentMesh: 1 +--- !u!114 &6565068170788208037 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757724001893737438} + 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: 4d5eca674cfc87745bd0c368f2270a6c, 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 &4879279636802726530 GameObject: m_ObjectHideFlags: 0 @@ -8637,7 +9386,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8148162193111931924} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -8956,6 +9705,65 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5520592980630032104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9219826320608855525} + - component: {fileID: 248302588161566504} + m_Layer: 5 + m_Name: need_star_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9219826320608855525 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5520592980630032104} + 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: 487509463233501162} + - {fileID: 2902796383437075657} + - {fileID: 8138738973471793891} + m_Father: {fileID: 1641418511942259705} + m_RootOrder: 7 + 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: 44, y: 0} + m_SizeDelta: {x: 360, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &248302588161566504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5520592980630032104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61cd9c9c2795741588033c81cd008e7e, type: 3} + m_Name: + m_EditorClassIdentifier: + left: 0 + right: 0 + top: 0 + bottom: 0 + childAlignment: 3 + spacing: 0 + verticalOrHorizontal: 0 --- !u!1 &5530860429340917537 GameObject: m_ObjectHideFlags: 0 @@ -9151,7 +9959,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -11904,7 +12712,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -11951,12 +12759,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6592573833229225066} - m_RootOrder: 0 + 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: -75, y: 0} - m_SizeDelta: {x: 52, y: 52} + m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7160582571550089605 CanvasRenderer: @@ -11986,7 +12794,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 70658f5f22e6038469c551a1665ae009, type: 3} + m_Sprite: {fileID: 21300000, guid: c5b636b42c0365744914663e4752e5d5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12831,7 +13639,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6592573833229225066} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -13807,7 +14615,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1641418511942259705} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -14468,9 +15276,11 @@ RectTransform: - {fileID: 4752038755234961756} - {fileID: 3371267595211282172} - {fileID: 3475723758926816043} + - {fileID: 3151358170550231450} - {fileID: 4271728327669168111} - {fileID: 93194185536245758} - {fileID: 7512232424142366493} + - {fileID: 9219826320608855525} m_Father: {fileID: 3121552964615492639} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15125,6 +15935,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3496455608690316081} - {fileID: 6708055227925792670} - {fileID: 8152215851318833616} - {fileID: 189167395446950824} @@ -16229,7 +17040,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x @@ -16352,7 +17163,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/prefabs/ui/hero/hero_skill_info_ui.prefab b/Assets/prefabs/ui/hero/hero_skill_info_ui.prefab index a767c4e07..99ea8319a 100644 --- a/Assets/prefabs/ui/hero/hero_skill_info_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_skill_info_ui.prefab @@ -825,7 +825,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -902,7 +902,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -981,7 +981,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1070,7 +1070,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1581,6 +1581,7 @@ GameObject: - component: {fileID: 1652254950293225014} - component: {fileID: 5438448160771658672} - component: {fileID: 5842376029746574301} + - component: {fileID: 1614968076188277627} m_Layer: 5 m_Name: hero_skill_info_ui m_TagString: Untagged @@ -1786,6 +1787,19 @@ MonoBehaviour: hashName: 3318088408 objectType: 0 gameObject: {fileID: 1101105095228392331} +--- !u!114 &1614968076188277627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &6432115336548433707 GameObject: m_ObjectHideFlags: 0 @@ -1846,7 +1860,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2199,7 +2213,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2275,7 +2289,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -2573,6 +2587,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 7726749931678830040, guid: 05e10b2d77b6c41fdbe17918326668c8, type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9162349277071933201, guid: 05e10b2d77b6c41fdbe17918326668c8, type: 3} propertyPath: m_Name value: hero_cell_2 @@ -2696,6 +2714,10 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 1 objectReference: {fileID: 0} + - target: {fileID: 7726749931678830040, guid: 05e10b2d77b6c41fdbe17918326668c8, type: 3} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9162349277071933201, guid: 05e10b2d77b6c41fdbe17918326668c8, type: 3} propertyPath: m_Name value: hero_cell_1 diff --git a/Assets/prefabs/ui/tips/skill_tips.prefab b/Assets/prefabs/ui/tips/skill_tips.prefab index 6be42c445..f4b3481de 100644 --- a/Assets/prefabs/ui/tips/skill_tips.prefab +++ b/Assets/prefabs/ui/tips/skill_tips.prefab @@ -27,6 +27,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: 654075438816540464} - {fileID: 1067114817365619758} @@ -87,6 +88,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: 2383273957139519021} m_RootOrder: 0 @@ -162,6 +164,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: 5170824783243581902} m_RootOrder: 6 @@ -237,6 +240,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: 3964021106553127987} m_RootOrder: 0 @@ -312,6 +316,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: 5170824783243581902} m_Father: {fileID: 3632126005436163848} @@ -392,6 +397,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: 8929359402390539833} m_Father: {fileID: 0} @@ -572,6 +578,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: 2383273957139519021} m_RootOrder: 1 @@ -705,6 +712,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: 8632294599848792079} - {fileID: 5882920884253492371} @@ -762,18 +770,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4338060300455236839} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5170824783243581902} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 6} - m_SizeDelta: {x: 35, y: 23} - m_Pivot: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -13} + m_SizeDelta: {x: 34, y: 46} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7276600681715550690 CanvasRenderer: m_ObjectHideFlags: 0 @@ -802,7 +811,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 330be4d1490173b4a8a049003427d8fb, type: 3} + m_Sprite: {fileID: 21300000, guid: 85e741dcfd8f49442aeb8c4312368284, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -840,6 +849,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: 9096380766769172552} m_RootOrder: 1 @@ -974,6 +984,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: 5170824783243581902} m_RootOrder: 7 @@ -1049,6 +1060,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: 5170824783243581902} m_RootOrder: 5 @@ -1124,6 +1136,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: 5134494717779098393} - {fileID: 2830059589752948311} @@ -1169,7 +1182,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3} + m_Sprite: {fileID: 21300000, guid: b3690164a42104eadbcbe70ee551b72a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1206,6 +1219,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: 4938512675810476067} - {fileID: 3061793860685153617} @@ -1266,6 +1280,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: 9096380766769172552} m_RootOrder: 0 @@ -1341,6 +1356,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: 3964021106553127987} m_RootOrder: 1 @@ -1476,6 +1492,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: 5170824783243581902} m_RootOrder: 1