Merge branch 'dev_hero' of https://git.wdd817.link/puxuan/c1_unity into dev_hero

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

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

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

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

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

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

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: 

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: 

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: 

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: 

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: 

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: 

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: 

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: []

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: 

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: 

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: 

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: 

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: 

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

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_AnchoredPosition: {x: 0, y: -13}
-  m_SizeDelta: {x: 35, y: 23}
+  m_SizeDelta: {x: 34, y: 46}
-  m_Pivot: {x: 0.5, y: 1}
+  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