woso_javan
4 дней назад
Родитель
Сommit
acc4859629
|
@@ -2198,8 +2198,8 @@
|
|
|
},
|
|
|
"_contentSize": {
|
|
|
"__type__": "cc.Size",
|
|
|
- "width": 264,
|
|
|
- "height": 76
|
|
|
+ "width": 323,
|
|
|
+ "height": 79
|
|
|
},
|
|
|
"_anchorPoint": {
|
|
|
"__type__": "cc.Vec2",
|
|
@@ -2240,7 +2240,7 @@
|
|
|
},
|
|
|
"_type": 0,
|
|
|
"_fillType": 0,
|
|
|
- "_sizeMode": 1,
|
|
|
+ "_sizeMode": 2,
|
|
|
"_fillCenter": {
|
|
|
"__type__": "cc.Vec2",
|
|
|
"x": 0,
|
|
@@ -3288,7 +3288,7 @@
|
|
|
},
|
|
|
"_lpos": {
|
|
|
"__type__": "cc.Vec3",
|
|
|
- "x": 259.5,
|
|
|
+ "x": 307.5,
|
|
|
"y": 0,
|
|
|
"z": 0
|
|
|
},
|
|
@@ -46,10 +46,10 @@
|
|
|
"offsetY": 0,
|
|
|
"trimX": 0,
|
|
|
"trimY": 0,
|
|
|
- "width": 203,
|
|
|
- "height": 115,
|
|
|
- "rawWidth": 203,
|
|
|
- "rawHeight": 115,
|
|
|
+ "width": 199,
|
|
|
+ "height": 37,
|
|
|
+ "rawWidth": 199,
|
|
|
+ "rawHeight": 37,
|
|
|
"borderTop": 0,
|
|
|
"borderBottom": 0,
|
|
|
"borderLeft": 0,
|
|
@@ -61,17 +61,17 @@
|
|
|
"meshType": 0,
|
|
|
"vertices": {
|
|
|
"rawPosition": [
|
|
|
- -101.5,
|
|
|
- -57.5,
|
|
|
+ -99.5,
|
|
|
+ -18.5,
|
|
|
0,
|
|
|
- 101.5,
|
|
|
- -57.5,
|
|
|
+ 99.5,
|
|
|
+ -18.5,
|
|
|
0,
|
|
|
- -101.5,
|
|
|
- 57.5,
|
|
|
+ -99.5,
|
|
|
+ 18.5,
|
|
|
0,
|
|
|
- 101.5,
|
|
|
- 57.5,
|
|
|
+ 99.5,
|
|
|
+ 18.5,
|
|
|
0
|
|
|
],
|
|
|
"indexes": [
|
|
@@ -84,12 +84,12 @@
|
|
|
],
|
|
|
"uv": [
|
|
|
0,
|
|
|
- 115,
|
|
|
- 203,
|
|
|
- 115,
|
|
|
+ 37,
|
|
|
+ 199,
|
|
|
+ 37,
|
|
|
0,
|
|
|
0,
|
|
|
- 203,
|
|
|
+ 199,
|
|
|
0
|
|
|
],
|
|
|
"nuv": [
|
|
@@ -103,13 +103,13 @@
|
|
|
1
|
|
|
],
|
|
|
"minPos": [
|
|
|
- -101.5,
|
|
|
- -57.5,
|
|
|
+ -99.5,
|
|
|
+ -18.5,
|
|
|
0
|
|
|
],
|
|
|
"maxPos": [
|
|
|
- 101.5,
|
|
|
- 57.5,
|
|
|
+ 99.5,
|
|
|
+ 18.5,
|
|
|
0
|
|
|
]
|
|
|
},
|
|
@@ -42,14 +42,14 @@
|
|
|
"trimType": "auto",
|
|
|
"trimThreshold": 1,
|
|
|
"rotated": false,
|
|
|
- "offsetX": -0.5,
|
|
|
+ "offsetX": 0,
|
|
|
"offsetY": 0,
|
|
|
"trimX": 0,
|
|
|
"trimY": 0,
|
|
|
- "width": 198,
|
|
|
- "height": 111,
|
|
|
- "rawWidth": 199,
|
|
|
- "rawHeight": 111,
|
|
|
+ "width": 115,
|
|
|
+ "height": 36,
|
|
|
+ "rawWidth": 115,
|
|
|
+ "rawHeight": 36,
|
|
|
"borderTop": 0,
|
|
|
"borderBottom": 0,
|
|
|
"borderLeft": 0,
|
|
@@ -61,17 +61,17 @@
|
|
|
"meshType": 0,
|
|
|
"vertices": {
|
|
|
"rawPosition": [
|
|
|
- -99,
|
|
|
- -55.5,
|
|
|
+ -57.5,
|
|
|
+ -18,
|
|
|
0,
|
|
|
- 99,
|
|
|
- -55.5,
|
|
|
+ 57.5,
|
|
|
+ -18,
|
|
|
0,
|
|
|
- -99,
|
|
|
- 55.5,
|
|
|
+ -57.5,
|
|
|
+ 18,
|
|
|
0,
|
|
|
- 99,
|
|
|
- 55.5,
|
|
|
+ 57.5,
|
|
|
+ 18,
|
|
|
0
|
|
|
],
|
|
|
"indexes": [
|
|
@@ -84,32 +84,32 @@
|
|
|
],
|
|
|
"uv": [
|
|
|
0,
|
|
|
- 111,
|
|
|
- 198,
|
|
|
- 111,
|
|
|
+ 36,
|
|
|
+ 115,
|
|
|
+ 36,
|
|
|
0,
|
|
|
0,
|
|
|
- 198,
|
|
|
+ 115,
|
|
|
0
|
|
|
],
|
|
|
"nuv": [
|
|
|
0,
|
|
|
0,
|
|
|
- 0.9949748743718593,
|
|
|
+ 1,
|
|
|
0,
|
|
|
0,
|
|
|
1,
|
|
|
- 0.9949748743718593,
|
|
|
+ 1,
|
|
|
1
|
|
|
],
|
|
|
"minPos": [
|
|
|
- -99,
|
|
|
- -55.5,
|
|
|
+ -57.5,
|
|
|
+ -18,
|
|
|
0
|
|
|
],
|
|
|
"maxPos": [
|
|
|
- 99,
|
|
|
- 55.5,
|
|
|
+ 57.5,
|
|
|
+ 18,
|
|
|
0
|
|
|
]
|
|
|
},
|
|
@@ -46,10 +46,10 @@
|
|
|
"offsetY": 0,
|
|
|
"trimX": 0,
|
|
|
"trimY": 0,
|
|
|
- "width": 264,
|
|
|
- "height": 76,
|
|
|
- "rawWidth": 264,
|
|
|
- "rawHeight": 76,
|
|
|
+ "width": 323,
|
|
|
+ "height": 79,
|
|
|
+ "rawWidth": 323,
|
|
|
+ "rawHeight": 79,
|
|
|
"borderTop": 0,
|
|
|
"borderBottom": 0,
|
|
|
"borderLeft": 0,
|
|
@@ -61,17 +61,17 @@
|
|
|
"meshType": 0,
|
|
|
"vertices": {
|
|
|
"rawPosition": [
|
|
|
- -132,
|
|
|
- -38,
|
|
|
+ -161.5,
|
|
|
+ -39.5,
|
|
|
0,
|
|
|
- 132,
|
|
|
- -38,
|
|
|
+ 161.5,
|
|
|
+ -39.5,
|
|
|
0,
|
|
|
- -132,
|
|
|
- 38,
|
|
|
+ -161.5,
|
|
|
+ 39.5,
|
|
|
0,
|
|
|
- 132,
|
|
|
- 38,
|
|
|
+ 161.5,
|
|
|
+ 39.5,
|
|
|
0
|
|
|
],
|
|
|
"indexes": [
|
|
@@ -84,12 +84,12 @@
|
|
|
],
|
|
|
"uv": [
|
|
|
0,
|
|
|
- 76,
|
|
|
- 264,
|
|
|
- 76,
|
|
|
+ 79,
|
|
|
+ 323,
|
|
|
+ 79,
|
|
|
0,
|
|
|
0,
|
|
|
- 264,
|
|
|
+ 323,
|
|
|
0
|
|
|
],
|
|
|
"nuv": [
|
|
@@ -103,13 +103,13 @@
|
|
|
1
|
|
|
],
|
|
|
"minPos": [
|
|
|
- -132,
|
|
|
- -38,
|
|
|
+ -161.5,
|
|
|
+ -39.5,
|
|
|
0
|
|
|
],
|
|
|
"maxPos": [
|
|
|
- 132,
|
|
|
- 38,
|
|
|
+ 161.5,
|
|
|
+ 39.5,
|
|
|
0
|
|
|
]
|
|
|
},
|
|
@@ -46,10 +46,10 @@
|
|
|
"offsetY": 0,
|
|
|
"trimX": 0,
|
|
|
"trimY": 0,
|
|
|
- "width": 143,
|
|
|
- "height": 100,
|
|
|
- "rawWidth": 143,
|
|
|
- "rawHeight": 100,
|
|
|
+ "width": 177,
|
|
|
+ "height": 36,
|
|
|
+ "rawWidth": 177,
|
|
|
+ "rawHeight": 36,
|
|
|
"borderTop": 0,
|
|
|
"borderBottom": 0,
|
|
|
"borderLeft": 0,
|
|
@@ -61,17 +61,17 @@
|
|
|
"meshType": 0,
|
|
|
"vertices": {
|
|
|
"rawPosition": [
|
|
|
- -71.5,
|
|
|
- -50,
|
|
|
+ -88.5,
|
|
|
+ -18,
|
|
|
0,
|
|
|
- 71.5,
|
|
|
- -50,
|
|
|
+ 88.5,
|
|
|
+ -18,
|
|
|
0,
|
|
|
- -71.5,
|
|
|
- 50,
|
|
|
+ -88.5,
|
|
|
+ 18,
|
|
|
0,
|
|
|
- 71.5,
|
|
|
- 50,
|
|
|
+ 88.5,
|
|
|
+ 18,
|
|
|
0
|
|
|
],
|
|
|
"indexes": [
|
|
@@ -84,12 +84,12 @@
|
|
|
],
|
|
|
"uv": [
|
|
|
0,
|
|
|
- 100,
|
|
|
- 143,
|
|
|
- 100,
|
|
|
+ 36,
|
|
|
+ 177,
|
|
|
+ 36,
|
|
|
0,
|
|
|
0,
|
|
|
- 143,
|
|
|
+ 177,
|
|
|
0
|
|
|
],
|
|
|
"nuv": [
|
|
@@ -103,13 +103,13 @@
|
|
|
1
|
|
|
],
|
|
|
"minPos": [
|
|
|
- -71.5,
|
|
|
- -50,
|
|
|
+ -88.5,
|
|
|
+ -18,
|
|
|
0
|
|
|
],
|
|
|
"maxPos": [
|
|
|
- 71.5,
|
|
|
- 50,
|
|
|
+ 88.5,
|
|
|
+ 18,
|
|
|
0
|
|
|
]
|
|
|
},
|
|
@@ -43,13 +43,13 @@
|
|
|
"trimThreshold": 1,
|
|
|
"rotated": false,
|
|
|
"offsetX": 0,
|
|
|
- "offsetY": -0.5,
|
|
|
+ "offsetY": 0,
|
|
|
"trimX": 0,
|
|
|
- "trimY": 1,
|
|
|
- "width": 140,
|
|
|
- "height": 99,
|
|
|
- "rawWidth": 140,
|
|
|
- "rawHeight": 100,
|
|
|
+ "trimY": 0,
|
|
|
+ "width": 142,
|
|
|
+ "height": 36,
|
|
|
+ "rawWidth": 142,
|
|
|
+ "rawHeight": 36,
|
|
|
"borderTop": 0,
|
|
|
"borderBottom": 0,
|
|
|
"borderLeft": 0,
|
|
@@ -61,17 +61,17 @@
|
|
|
"meshType": 0,
|
|
|
"vertices": {
|
|
|
"rawPosition": [
|
|
|
- -70,
|
|
|
- -49.5,
|
|
|
+ -71,
|
|
|
+ -18,
|
|
|
0,
|
|
|
- 70,
|
|
|
- -49.5,
|
|
|
+ 71,
|
|
|
+ -18,
|
|
|
0,
|
|
|
- -70,
|
|
|
- 49.5,
|
|
|
+ -71,
|
|
|
+ 18,
|
|
|
0,
|
|
|
- 70,
|
|
|
- 49.5,
|
|
|
+ 71,
|
|
|
+ 18,
|
|
|
0
|
|
|
],
|
|
|
"indexes": [
|
|
@@ -84,12 +84,12 @@
|
|
|
],
|
|
|
"uv": [
|
|
|
0,
|
|
|
- 99,
|
|
|
- 140,
|
|
|
- 99,
|
|
|
+ 36,
|
|
|
+ 142,
|
|
|
+ 36,
|
|
|
0,
|
|
|
0,
|
|
|
- 140,
|
|
|
+ 142,
|
|
|
0
|
|
|
],
|
|
|
"nuv": [
|
|
@@ -98,18 +98,18 @@
|
|
|
1,
|
|
|
0,
|
|
|
0,
|
|
|
- 0.99,
|
|
|
1,
|
|
|
- 0.99
|
|
|
+ 1,
|
|
|
+ 1
|
|
|
],
|
|
|
"minPos": [
|
|
|
- -70,
|
|
|
- -49.5,
|
|
|
+ -71,
|
|
|
+ -18,
|
|
|
0
|
|
|
],
|
|
|
"maxPos": [
|
|
|
- 70,
|
|
|
- 49.5,
|
|
|
+ 71,
|
|
|
+ 18,
|
|
|
0
|
|
|
]
|
|
|
},
|
|
@@ -42,14 +42,14 @@
|
|
|
"trimType": "auto",
|
|
|
"trimThreshold": 1,
|
|
|
"rotated": false,
|
|
|
- "offsetX": -0.5,
|
|
|
+ "offsetX": 0,
|
|
|
"offsetY": 0,
|
|
|
"trimX": 0,
|
|
|
"trimY": 0,
|
|
|
- "width": 141,
|
|
|
- "height": 96,
|
|
|
- "rawWidth": 142,
|
|
|
- "rawHeight": 96,
|
|
|
+ "width": 167,
|
|
|
+ "height": 42,
|
|
|
+ "rawWidth": 167,
|
|
|
+ "rawHeight": 42,
|
|
|
"borderTop": 0,
|
|
|
"borderBottom": 0,
|
|
|
"borderLeft": 0,
|
|
@@ -61,17 +61,17 @@
|
|
|
"meshType": 0,
|
|
|
"vertices": {
|
|
|
"rawPosition": [
|
|
|
- -70.5,
|
|
|
- -48,
|
|
|
+ -83.5,
|
|
|
+ -21,
|
|
|
0,
|
|
|
- 70.5,
|
|
|
- -48,
|
|
|
+ 83.5,
|
|
|
+ -21,
|
|
|
0,
|
|
|
- -70.5,
|
|
|
- 48,
|
|
|
+ -83.5,
|
|
|
+ 21,
|
|
|
0,
|
|
|
- 70.5,
|
|
|
- 48,
|
|
|
+ 83.5,
|
|
|
+ 21,
|
|
|
0
|
|
|
],
|
|
|
"indexes": [
|
|
@@ -84,32 +84,32 @@
|
|
|
],
|
|
|
"uv": [
|
|
|
0,
|
|
|
- 96,
|
|
|
- 141,
|
|
|
- 96,
|
|
|
+ 42,
|
|
|
+ 167,
|
|
|
+ 42,
|
|
|
0,
|
|
|
0,
|
|
|
- 141,
|
|
|
+ 167,
|
|
|
0
|
|
|
],
|
|
|
"nuv": [
|
|
|
0,
|
|
|
0,
|
|
|
- 0.9929577464788732,
|
|
|
+ 1,
|
|
|
0,
|
|
|
0,
|
|
|
1,
|
|
|
- 0.9929577464788732,
|
|
|
+ 1,
|
|
|
1
|
|
|
],
|
|
|
"minPos": [
|
|
|
- -70.5,
|
|
|
- -48,
|
|
|
+ -83.5,
|
|
|
+ -21,
|
|
|
0
|
|
|
],
|
|
|
"maxPos": [
|
|
|
- 70.5,
|
|
|
- 48,
|
|
|
+ 83.5,
|
|
|
+ 21,
|
|
|
0
|
|
|
]
|
|
|
},
|