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

Assets/arts/spines/characters/m30011/m30011.atlas.txt

@@ -1,105 +1,115 @@
 m30011.png
 size:512,512
 filter:Linear,Linear
+eye_death
+bounds:427,369,22,17
+eye_hit
+bounds:312,373,32,44
+rotate:90
 eye_l
-bounds:118,186,39,32
+bounds:274,333,39,32
 offsets:1,1,41,34
+rotate:90
 eye_r
-bounds:77,188,39,33
+bounds:153,239,39,33
 offsets:1,1,41,35
+eye_yun
+bounds:91,145,43,47
 hand_l_1
-bounds:217,415,93,91
+bounds:217,374,93,91
 hand_l_2
-bounds:312,468,71,38
+bounds:380,472,71,38
 offsets:1,1,73,40
 hand_l_3
-bounds:2,115,55,41
+bounds:87,194,55,41
 offsets:1,1,57,43
-rotate:90
 hand_r_1
-bounds:2,232,83,81
+bounds:2,191,83,81
 hand_r_2
-bounds:312,431,64,35
+bounds:87,237,64,35
 offsets:1,1,66,37
 hand_r_3
-bounds:132,271,51,42
+bounds:47,138,51,42
 offsets:1,1,53,44
+rotate:90
 jb_1
-bounds:223,382,43,31
+bounds:383,439,43,31
 offsets:1,1,45,33
 jb_10
-bounds:28,73,40,23
+bounds:358,372,40,23
 offsets:1,1,42,25
 rotate:90
 jb_11
-bounds:28,31,40,23
+bounds:308,348,40,23
+offsets:1,1,42,25
+jb_12
+bounds:196,278,40,24
+offsets:1,1,42,26
+rotate:90
+jb_13
+bounds:267,291,40,23
 offsets:1,1,42,25
 rotate:90
-jb_12
-bounds:132,245,40,24
-offsets:1,1,42,26
-jb_13
-bounds:131,220,40,23
-offsets:1,1,42,25
 jb_14
-bounds:312,373,40,23
+bounds:428,430,40,23
 offsets:1,1,42,25
+rotate:90
 jb_2
-bounds:268,382,42,31
+bounds:383,406,42,31
 offsets:1,1,44,33
 jb_3
-bounds:312,398,43,31
+bounds:222,314,43,31
 offsets:1,1,45,33
 jb_4
-bounds:357,389,40,23
+bounds:453,457,40,23
 offsets:1,1,42,25
-rotate:90
 jb_5
-bounds:196,317,43,31
+bounds:222,281,43,31
 offsets:1,1,45,33
-rotate:90
 jb_6
-bounds:87,223,42,30
+bounds:383,374,42,30
 offsets:1,1,44,32
 jb_7
-bounds:185,273,40,23
+bounds:453,432,40,23
 offsets:1,1,42,25
-rotate:90
 jb_8
-bounds:210,275,40,23
+bounds:427,388,40,23
 offsets:1,1,42,25
 rotate:90
 jb_9
-bounds:159,178,40,23
+bounds:292,291,40,23
 offsets:1,1,42,25
 rotate:90
 leg_l_1
-bounds:2,172,43,58
+bounds:312,407,43,58
 leg_l_2
-bounds:2,62,51,24
+bounds:357,414,51,24
 offsets:1,1,53,26
 rotate:90
 leg_l_3
-bounds:385,469,60,37
+bounds:2,69,60,37
 offsets:1,1,62,39
-leg_l_4
-bounds:47,173,57,28
-offsets:1,1,59,30
 rotate:90
+leg_l_4
+bounds:453,482,57,28
+offsets:1,1,59,30
 leg_r_1
-bounds:87,255,43,58
+bounds:2,131,43,58
 leg_r_2
-bounds:2,9,51,24
+bounds:196,320,51,24
 offsets:1,1,53,26
 rotate:90
 leg_r_3
-bounds:447,474,59,32
+bounds:2,8,59,32
 offsets:1,1,61,34
-leg_r_4
-bounds:196,362,50,25
-offsets:1,1,52,27
 rotate:90
+leg_r_4
+bounds:222,347,50,25
+offsets:1,1,52,27
 spine2
-bounds:2,414,213,92
+bounds:2,373,213,92
 spine_1
-bounds:2,315,192,97
+bounds:2,274,192,97
+yingzi
+bounds:2,467,376,43
+offsets:1,1,378,45

Assets/arts/spines/characters/m30012/m30012.atlas.txt

@@ -1,56 +1,78 @@
 m30012.png
 size:512,512
 filter:Linear,Linear
+canying
+bounds:2,168,81,118
+offsets:0,2,81,122
+eye_death
+bounds:348,387,22,17
+rotate:90
+eye_hit
+bounds:172,219,24,31
 eye_l
-bounds:308,463,27,20
+bounds:41,45,27,20
 offsets:1,1,29,22
+rotate:90
 eye_r
-bounds:393,490,27,20
+bounds:41,16,27,20
 offsets:1,1,29,22
+rotate:90
+eye_yun
+bounds:169,292,43,47
 hand_l_1
-bounds:169,418,56,92
+bounds:2,74,56,92
 hand_l_2
-bounds:169,351,51,65
+bounds:169,341,51,65
 offsets:1,1,53,67
 hand_r_1
-bounds:2,186,56,92
+bounds:85,194,56,92
 hand_r_2
-bounds:2,119,51,65
+bounds:300,411,51,65
 offsets:1,1,53,67
+rotate:90
 head
-bounds:2,280,129,54
+bounds:169,408,129,54
 offsets:1,1,131,56
 jiao
-bounds:2,47,70,37
+bounds:2,2,70,37
 offsets:1,1,72,39
 rotate:90
+kele
+bounds:60,85,21,35
+kulou
+bounds:143,207,27,38
 leg_l_1
-bounds:133,294,38,40
+bounds:214,296,38,40
 leg_l_2
-bounds:2,2,43,38
+bounds:303,371,43,38
 offsets:1,1,45,40
-rotate:90
 leg_l_3
-bounds:347,489,44,21
+bounds:60,122,44,21
 offsets:1,1,46,23
-leg_r_1
-bounds:95,193,38,40
-leg_r_2
-bounds:95,235,43,38
-offsets:1,1,45,40
 rotate:90
+leg_r_1
+bounds:254,296,38,40
+leg_r_2
+bounds:303,331,43,38
+offsets:1,1,45,40
 leg_r_3
-bounds:227,427,44,21
+bounds:85,171,44,21
 offsets:1,1,46,23
 mouth
-bounds:227,485,118,25
+bounds:380,482,118,25
 offsets:1,1,120,27
+pingzi
+bounds:143,247,26,39
+sanjiao
+bounds:171,252,27,38
 spine
-bounds:2,336,165,174
+bounds:2,288,165,174
 ya_1
-bounds:60,199,79,33
+bounds:222,373,79,33
 offsets:1,1,81,35
-rotate:90
 ya_2
-bounds:227,450,79,33
+bounds:222,338,79,33
 offsets:1,1,81,35
+yingzi
+bounds:2,464,376,43
+offsets:1,1,378,45