Merge branch 'dev_hero' into dev_hero_2

Assets/arts/spines/ui/ui_arena_pairing/ui_arena_pairing.atlas.txt

@@ -2,43 +2,46 @@ ui_arena_pairing.png
 size:2048,2048
 filter:Linear,Linear
 fang
-bounds:2,57,332,336
+bounds:646,1244,332,336
 offsets:1,1,334,338
 g1
-bounds:646,1595,414,414
+bounds:2,2,414,414
 offsets:3,3,420,420
 hjying
-bounds:646,1263,171,156
+bounds:1098,1702,171,156
 offsets:1,1,173,159
 hongg
-bounds:336,208,27,27
+bounds:646,1057,27,27
 offsets:1,1,28,28
 hongjian
-bounds:1062,1837,171,172
+bounds:418,244,171,172
 offsets:1,1,173,175
 hongtiao
-bounds:2,1203,642,806
+bounds:2,1226,642,806
 offsets:1,1,644,808
+kuangg
+bounds:646,1582,450,450
+offsets:2,2,454,454
 lang
-bounds:510,367,27,26
+bounds:820,1216,27,26
 offsets:0,1,27,28
 lanjian
-bounds:646,1421,172,172
+bounds:1098,1860,172,172
 offsets:1,1,174,174
 lantiao
-bounds:2,395,642,806
+bounds:2,418,642,806
 offsets:1,1,644,808
 ljying
-bounds:336,237,172,156
+bounds:646,1086,172,156
 offsets:1,1,174,158
 xx
-bounds:1062,1798,37,37
+bounds:418,205,37,37
 xx1
-bounds:2,2,40,53
+bounds:980,1527,40,53
 offsets:1,1,42,55
 xx2
-bounds:1235,1972,29,37
+bounds:591,379,29,37
 offsets:1,1,31,39
 xx3
-bounds:820,1540,40,53
+bounds:1272,1979,40,53
 offsets:1,1,42,55