Commit fea25b2a authored by liujiangnan's avatar liujiangnan

feat:

parent 2c1dd1de
...@@ -882,7 +882,7 @@ ...@@ -882,7 +882,7 @@
"__id__": 10 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 16
...@@ -976,7 +976,7 @@ ...@@ -976,7 +976,7 @@
"__id__": 10 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 18 "__id__": 18
...@@ -1164,7 +1164,7 @@ ...@@ -1164,7 +1164,7 @@
"__id__": 10 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 22
...@@ -1258,7 +1258,7 @@ ...@@ -1258,7 +1258,7 @@
"__id__": 10 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 24
...@@ -1352,7 +1352,7 @@ ...@@ -1352,7 +1352,7 @@
"__id__": 10 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 26
...@@ -1540,7 +1540,7 @@ ...@@ -1540,7 +1540,7 @@
"__id__": 10 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 30
...@@ -1634,7 +1634,7 @@ ...@@ -1634,7 +1634,7 @@
"__id__": 10 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 32
...@@ -1822,7 +1822,7 @@ ...@@ -1822,7 +1822,7 @@
"__id__": 10 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 36 "__id__": 36
...@@ -2393,8 +2393,8 @@ ...@@ -2393,8 +2393,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 146
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2412,8 +2412,8 @@ ...@@ -2412,8 +2412,8 @@
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
1 1
] ]
}, },
...@@ -2446,7 +2446,7 @@ ...@@ -2446,7 +2446,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "752422e3-750b-4884-9ac0-36e363acc8d7"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2539,8 +2539,8 @@ ...@@ -2539,8 +2539,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "a_e",
"_N$string": "aaa", "_N$string": "a_e",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 120, "_lineHeight": 120,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -2783,7 +2783,7 @@ ...@@ -2783,7 +2783,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 140.06,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -2835,8 +2835,8 @@ ...@@ -2835,8 +2835,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "ame",
"_N$string": "aaa", "_N$string": "ame",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -2878,8 +2878,8 @@ ...@@ -2878,8 +2878,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 128
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2891,14 +2891,14 @@ ...@@ -2891,14 +2891,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-60.294, -60.294,
91.993, 56.92,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
0.3 0.3
] ]
}, },
...@@ -2931,7 +2931,7 @@ ...@@ -2931,7 +2931,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "0fa563ec-0b9e-4a3b-bd30-df90c207e67a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2972,8 +2972,8 @@ ...@@ -2972,8 +2972,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 122
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2984,15 +2984,15 @@ ...@@ -2984,15 +2984,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
66.292, 80.906,
-59.54, -59.54,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
0.25 0.25
] ]
}, },
...@@ -3025,7 +3025,7 @@ ...@@ -3025,7 +3025,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "03c12c47-5f6f-42bf-831b-5deaff70186d"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3066,7 +3066,7 @@ ...@@ -3066,7 +3066,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 116.09,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3118,8 +3118,8 @@ ...@@ -3118,8 +3118,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "ake",
"_N$string": "aaa", "_N$string": "ake",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -3268,7 +3268,7 @@ ...@@ -3268,7 +3268,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 116.09,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3320,8 +3320,8 @@ ...@@ -3320,8 +3320,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "ave",
"_N$string": "aaa", "_N$string": "ave",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -3363,8 +3363,8 @@ ...@@ -3363,8 +3363,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 198,
"height": 36 "height": 240
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3382,8 +3382,8 @@ ...@@ -3382,8 +3382,8 @@
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
0.25 0.25
] ]
}, },
...@@ -3416,7 +3416,7 @@ ...@@ -3416,7 +3416,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "6d5af61b-fed7-4776-99a5-60511435cc9f"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3457,8 +3457,8 @@ ...@@ -3457,8 +3457,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 133
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3470,14 +3470,14 @@ ...@@ -3470,14 +3470,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-60.294, -60.294,
82.092, 61.633,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
0.3 0.3
] ]
}, },
...@@ -3510,7 +3510,7 @@ ...@@ -3510,7 +3510,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "2fd72324-b8b6-418f-b0a5-7e8030cde388"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3551,7 +3551,7 @@ ...@@ -3551,7 +3551,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 100.09,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3603,8 +3603,8 @@ ...@@ -3603,8 +3603,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "ate",
"_N$string": "aaa", "_N$string": "ate",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -3954,8 +3954,8 @@ ...@@ -3954,8 +3954,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 250
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3973,8 +3973,8 @@ ...@@ -3973,8 +3973,8 @@
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
1 1
] ]
}, },
...@@ -4007,7 +4007,7 @@ ...@@ -4007,7 +4007,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "a049e26c-8825-404e-ba5c-ba83969d6e3a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4048,7 +4048,7 @@ ...@@ -4048,7 +4048,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 96.08,
"height": 151.2 "height": 151.2
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4100,8 +4100,8 @@ ...@@ -4100,8 +4100,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "i_e",
"_N$string": "aaa", "_N$string": "i_e",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 120, "_lineHeight": 120,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -4344,7 +4344,7 @@ ...@@ -4344,7 +4344,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 116.02,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4396,8 +4396,8 @@ ...@@ -4396,8 +4396,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "ime",
"_N$string": "aaa", "_N$string": "ime",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -4439,8 +4439,8 @@ ...@@ -4439,8 +4439,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 250
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4452,14 +4452,14 @@ ...@@ -4452,14 +4452,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-60.294, -60.294,
91.993, 62.766,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
0.3 0.3
] ]
}, },
...@@ -4492,7 +4492,7 @@ ...@@ -4492,7 +4492,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "4274836e-6452-4487-803a-212b31ab961f"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4533,8 +4533,8 @@ ...@@ -4533,8 +4533,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 243
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4552,8 +4552,8 @@ ...@@ -4552,8 +4552,8 @@
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
0.25 0.25
] ]
}, },
...@@ -4586,7 +4586,7 @@ ...@@ -4586,7 +4586,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "9d4ecb91-70a5-4dac-b9f2-faa7b440fcd1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4627,7 +4627,7 @@ ...@@ -4627,7 +4627,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 92.04,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4679,8 +4679,8 @@ ...@@ -4679,8 +4679,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "ike",
"_N$string": "aaa", "_N$string": "ike",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -4829,7 +4829,7 @@ ...@@ -4829,7 +4829,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 96.08,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4881,8 +4881,8 @@ ...@@ -4881,8 +4881,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "ine",
"_N$string": "aaa", "_N$string": "ine",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -4924,8 +4924,8 @@ ...@@ -4924,8 +4924,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 198,
"height": 36 "height": 283
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4943,8 +4943,8 @@ ...@@ -4943,8 +4943,8 @@
0, 0,
0, 0,
1, 1,
1, 0.3,
1, 0.3,
0.25 0.25
] ]
}, },
...@@ -4977,7 +4977,7 @@ ...@@ -4977,7 +4977,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "7a9ce777-c242-4b4e-8a0d-da8239e03751"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5018,8 +5018,8 @@ ...@@ -5018,8 +5018,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 212
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -5031,14 +5031,14 @@ ...@@ -5031,14 +5031,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-60.294, -60.294,
82.092, 61.633,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
0.3 0.3
] ]
}, },
...@@ -5071,7 +5071,7 @@ ...@@ -5071,7 +5071,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "db1da2be-bacf-45b9-ac52-3464b291d8c2"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5112,7 +5112,7 @@ ...@@ -5112,7 +5112,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 92.04,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -5164,8 +5164,8 @@ ...@@ -5164,8 +5164,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "ive",
"_N$string": "aaa", "_N$string": "ive",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -5605,7 +5605,7 @@ ...@@ -5605,7 +5605,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "9cDnrfblNHJJ6j3lsKptKT" "_id": "6coWrLfiRDPbtg4e1WNZho"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -5638,7 +5638,7 @@ ...@@ -5638,7 +5638,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "21XflXrc1JTpKgwqDRY4KF" "_id": "ffAYtUgP1LNLex506T2EvR"
}, },
{ {
"__type__": "cc.LabelOutline", "__type__": "cc.LabelOutline",
...@@ -5656,7 +5656,7 @@ ...@@ -5656,7 +5656,7 @@
"a": 255 "a": 255
}, },
"_width": 3, "_width": 3,
"_id": "9aLcWKPglJ068GT07aTBbO" "_id": "77duh6dl9IdKUO8JWmgnpu"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -5809,7 +5809,7 @@ ...@@ -5809,7 +5809,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "17S4XpKwJEzIJtEOoDuLTt" "_id": "fdhdQoH5JKHphvyIB/0ogM"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -5842,7 +5842,7 @@ ...@@ -5842,7 +5842,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "82M27Oi+lLyJmuw4nYreEP" "_id": "52RtgWrGBLFYKu3uBtR1kB"
}, },
{ {
"__type__": "cc.LabelOutline", "__type__": "cc.LabelOutline",
...@@ -5860,7 +5860,7 @@ ...@@ -5860,7 +5860,7 @@
"a": 255 "a": 255
}, },
"_width": 7, "_width": 7,
"_id": "98WwTvQt9Oibi1yfSbqOJ+" "_id": "a7Z+etRwJIpbz4QW0dWXqn"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -6362,8 +6362,8 @@ ...@@ -6362,8 +6362,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "o_e",
"_N$string": "aaa", "_N$string": "o_e",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -6405,8 +6405,8 @@ ...@@ -6405,8 +6405,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 126
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6424,8 +6424,8 @@ ...@@ -6424,8 +6424,8 @@
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
1 1
] ]
}, },
...@@ -6458,7 +6458,7 @@ ...@@ -6458,7 +6458,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "2922eb9c-a3c4-462c-a0a5-7785d32ce36f"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6694,7 +6694,7 @@ ...@@ -6694,7 +6694,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60.05, "width": 120.13,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -6746,8 +6746,8 @@ ...@@ -6746,8 +6746,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "et", "_string": "u_e",
"_N$string": "et", "_N$string": "u_e",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -6789,8 +6789,8 @@ ...@@ -6789,8 +6789,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 173
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6801,15 +6801,15 @@ ...@@ -6801,15 +6801,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
61.787, 73.032,
0, 0,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.5,
1, 0.5,
1 1
] ]
}, },
...@@ -6842,7 +6842,7 @@ ...@@ -6842,7 +6842,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "d27884a7-4fb8-4044-abb1-7b45f4caa6b9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6984,7 +6984,7 @@ ...@@ -6984,7 +6984,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60.05, "width": 120.13,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -7036,8 +7036,8 @@ ...@@ -7036,8 +7036,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "et", "_string": "u_e",
"_N$string": "et", "_N$string": "u_e",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -7079,8 +7079,8 @@ ...@@ -7079,8 +7079,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 198,
"height": 36 "height": 420
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -7098,8 +7098,8 @@ ...@@ -7098,8 +7098,8 @@
0, 0,
0, 0,
1, 1,
1, 0.2,
1, 0.2,
1 1
] ]
}, },
...@@ -7132,7 +7132,7 @@ ...@@ -7132,7 +7132,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "0303266b-052a-47ec-a3ca-999dc00d951b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7575,7 +7575,7 @@ ...@@ -7575,7 +7575,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 88.98, "width": 62.27,
"height": 151.2 "height": 151.2
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -7627,8 +7627,8 @@ ...@@ -7627,8 +7627,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aa", "_string": "ai",
"_N$string": "aa", "_N$string": "ai",
"_fontSize": 80, "_fontSize": 80,
"_lineHeight": 120, "_lineHeight": 120,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -7670,8 +7670,8 @@ ...@@ -7670,8 +7670,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 205
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -7689,8 +7689,8 @@ ...@@ -7689,8 +7689,8 @@
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
1 1
] ]
}, },
...@@ -7723,7 +7723,7 @@ ...@@ -7723,7 +7723,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "89211ea4-971f-44b9-9d39-cd473bb41b3b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7959,7 +7959,7 @@ ...@@ -7959,7 +7959,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 62.27, "width": 84.49,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -8011,8 +8011,8 @@ ...@@ -8011,8 +8011,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "ip", "_string": "ay",
"_N$string": "ip", "_N$string": "ay",
"_fontSize": 80, "_fontSize": 80,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -8054,8 +8054,8 @@ ...@@ -8054,8 +8054,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 179
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8073,8 +8073,8 @@ ...@@ -8073,8 +8073,8 @@
0, 0,
0, 0,
1, 1,
1, 0.5,
1, 0.5,
1 1
] ]
}, },
...@@ -8107,7 +8107,7 @@ ...@@ -8107,7 +8107,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "0360b486-61b6-4a8e-a79f-23cb27586d3d"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -8255,8 +8255,8 @@ ...@@ -8255,8 +8255,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 205
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8268,14 +8268,14 @@ ...@@ -8268,14 +8268,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-56.042, -56.042,
80, 67.212,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
1 1
] ]
}, },
...@@ -8308,7 +8308,7 @@ ...@@ -8308,7 +8308,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "89211ea4-971f-44b9-9d39-cd473bb41b3b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -8401,8 +8401,8 @@ ...@@ -8401,8 +8401,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "ib", "_string": "ai",
"_N$string": "ib", "_N$string": "ai",
"_fontSize": 80, "_fontSize": 80,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -8444,7 +8444,7 @@ ...@@ -8444,7 +8444,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 62.27, "width": 84.49,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -8457,7 +8457,7 @@ ...@@ -8457,7 +8457,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-80, -80,
-80, -57.51,
0, 0,
0, 0,
0, 0,
...@@ -8496,8 +8496,8 @@ ...@@ -8496,8 +8496,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "id", "_string": "ay",
"_N$string": "id", "_N$string": "ay",
"_fontSize": 80, "_fontSize": 80,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -8539,8 +8539,8 @@ ...@@ -8539,8 +8539,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 179
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8551,15 +8551,15 @@ ...@@ -8551,15 +8551,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
52.971, 58.784,
-80, -71.004,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.5,
1, 0.5,
1 1
] ]
}, },
...@@ -8592,7 +8592,7 @@ ...@@ -8592,7 +8592,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "0360b486-61b6-4a8e-a79f-23cb27586d3d"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -8937,7 +8937,7 @@ ...@@ -8937,7 +8937,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "c8UD0Do55LRJmRSD6c8Gsm" "_id": "c8IYd/7etFb7RGaJm07BJy"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -8970,7 +8970,7 @@ ...@@ -8970,7 +8970,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "0abGYPr2VHEJFYGUZmbaqF" "_id": "dfnSM2RGVDA7A2KNSyEzpf"
}, },
{ {
"__type__": "cc.LabelOutline", "__type__": "cc.LabelOutline",
...@@ -8988,7 +8988,7 @@ ...@@ -8988,7 +8988,7 @@
"a": 255 "a": 255
}, },
"_width": 7, "_width": 7,
"_id": "bfBivspf9DFpIW5oLDGSb5" "_id": "aaco4A0BVAub2mOLVqAxAZ"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -9141,7 +9141,7 @@ ...@@ -9141,7 +9141,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "6app697WdDSLrkfruaTPwS" "_id": "485Xxxbv5Pk67LwgR38KnU"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9174,7 +9174,7 @@ ...@@ -9174,7 +9174,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "65NrtW7N5IAaDZOQtIb57N" "_id": "a8CXdXTbVNFJ+WowWHoWJG"
}, },
{ {
"__type__": "cc.LabelOutline", "__type__": "cc.LabelOutline",
...@@ -9192,7 +9192,7 @@ ...@@ -9192,7 +9192,7 @@
"a": 255 "a": 255
}, },
"_width": 3, "_width": 3,
"_id": "dej/3vzzxLCrPp536Gq3rv" "_id": "93STABIuJOWpvVW40Wv+5W"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -9642,7 +9642,7 @@ ...@@ -9642,7 +9642,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 56.04, "width": 80.09,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -9694,8 +9694,8 @@ ...@@ -9694,8 +9694,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "in", "_string": "ee",
"_N$string": "in", "_N$string": "ee",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -9737,8 +9737,8 @@ ...@@ -9737,8 +9737,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 173
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -9756,8 +9756,8 @@ ...@@ -9756,8 +9756,8 @@
0, 0,
0, 0,
1, 1,
1, 0.5,
1, 0.5,
1 1
] ]
}, },
...@@ -9790,7 +9790,7 @@ ...@@ -9790,7 +9790,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "aefe8519-743a-4388-956a-ae12a4895cb1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -10026,7 +10026,7 @@ ...@@ -10026,7 +10026,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 56.04, "width": 80.09,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -10078,8 +10078,8 @@ ...@@ -10078,8 +10078,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "ig", "_string": "ea",
"_N$string": "ig", "_N$string": "ea",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -10121,8 +10121,8 @@ ...@@ -10121,8 +10121,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 198,
"height": 36 "height": 303
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -10140,8 +10140,8 @@ ...@@ -10140,8 +10140,8 @@
0, 0,
0, 0,
1, 1,
1, 0.3,
1, 0.3,
1 1
] ]
}, },
...@@ -10174,7 +10174,7 @@ ...@@ -10174,7 +10174,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "b012afa8-e8ec-4da9-a097-2917f2ce34b9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -10322,8 +10322,8 @@ ...@@ -10322,8 +10322,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 151
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -10334,15 +10334,15 @@ ...@@ -10334,15 +10334,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-54.297, -48.484,
80, 63.724,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.6,
1, 0.6,
1 1
] ]
}, },
...@@ -10375,7 +10375,7 @@ ...@@ -10375,7 +10375,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "fe7593b0-4b5f-4c08-82ba-9926775fddf2"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -10468,8 +10468,8 @@ ...@@ -10468,8 +10468,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "it", "_string": "y",
"_N$string": "it", "_N$string": "y",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -10511,7 +10511,7 @@ ...@@ -10511,7 +10511,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 52, "width": 76.04,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -10524,7 +10524,7 @@ ...@@ -10524,7 +10524,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-80, -80,
-80, -68.374,
0, 0,
0, 0,
0, 0,
...@@ -10563,8 +10563,8 @@ ...@@ -10563,8 +10563,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "ix", "_string": "ey",
"_N$string": "ix", "_N$string": "ey",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -10606,8 +10606,8 @@ ...@@ -10606,8 +10606,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 263
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -10619,14 +10619,14 @@ ...@@ -10619,14 +10619,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
52.584, 52.584,
-80, -71.862,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.3,
1, 0.3,
1 1
] ]
}, },
...@@ -10659,7 +10659,7 @@ ...@@ -10659,7 +10659,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "2cd837b8-d315-4606-a1fa-ded8c98e815a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -11102,7 +11102,7 @@ ...@@ -11102,7 +11102,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120.13, "width": 96.08,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -11154,8 +11154,8 @@ ...@@ -11154,8 +11154,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "aaa", "_string": "igh",
"_N$string": "aaa", "_N$string": "igh",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -11197,8 +11197,8 @@ ...@@ -11197,8 +11197,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 194,
"height": 36 "height": 216
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -11216,8 +11216,8 @@ ...@@ -11216,8 +11216,8 @@
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
1 1
] ]
}, },
...@@ -11250,7 +11250,7 @@ ...@@ -11250,7 +11250,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "50132135-ecef-4d36-898e-98eb1370c9c3"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -11486,7 +11486,7 @@ ...@@ -11486,7 +11486,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60.05, "width": 56.04,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -11538,8 +11538,8 @@ ...@@ -11538,8 +11538,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "et", "_string": "ie",
"_N$string": "et", "_N$string": "ie",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -11581,8 +11581,8 @@ ...@@ -11581,8 +11581,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 95
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -11600,8 +11600,8 @@ ...@@ -11600,8 +11600,8 @@
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
1 1
] ]
}, },
...@@ -11634,7 +11634,7 @@ ...@@ -11634,7 +11634,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "70f8237f-bd5d-4add-913e-22fd6621c6bd"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -11776,7 +11776,7 @@ ...@@ -11776,7 +11776,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60.05, "width": 36,
"height": 90.72 "height": 90.72
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -11788,8 +11788,8 @@ ...@@ -11788,8 +11788,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-80, -77.675,
0, 2.325,
0, 0,
0, 0,
0, 0,
...@@ -11828,8 +11828,8 @@ ...@@ -11828,8 +11828,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "et", "_string": "y",
"_N$string": "et", "_N$string": "y",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 72, "_lineHeight": 72,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -11871,8 +11871,8 @@ ...@@ -11871,8 +11871,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 198,
"height": 36 "height": 299
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -11890,8 +11890,8 @@ ...@@ -11890,8 +11890,8 @@
0, 0,
0, 0,
1, 1,
1, 0.4,
1, 0.4,
1 1
] ]
}, },
...@@ -11924,7 +11924,7 @@ ...@@ -11924,7 +11924,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "125fd215-0ea1-4589-806e-7566673d1449"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -12269,7 +12269,7 @@ ...@@ -12269,7 +12269,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "b510RhsJNMarlKJG6MJxCN" "_id": "e9xWzD735ISoY0AGpcdbBM"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -12302,7 +12302,7 @@ ...@@ -12302,7 +12302,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "6bZhWEdQ5CFK/C+eCDyT28" "_id": "5b2fQuPspHaLoeeV+zO+tA"
}, },
{ {
"__type__": "cc.LabelOutline", "__type__": "cc.LabelOutline",
...@@ -12320,7 +12320,7 @@ ...@@ -12320,7 +12320,7 @@
"a": 255 "a": 255
}, },
"_width": 7, "_width": 7,
"_id": "b5p/7cct5JIaR/SdvAAw7/" "_id": "74HpAcauJIpZGF7WtODiXX"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -12473,7 +12473,7 @@ ...@@ -12473,7 +12473,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "22eL+TWxxLdIlB9o5M0x3N" "_id": "e36qp2cthCSZyBnghs/A1s"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -12506,7 +12506,7 @@ ...@@ -12506,7 +12506,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "d4KVCoXr1HCaZOAPhePDD7" "_id": "56jCOiXl9EkqP/yz2a1k34"
}, },
{ {
"__type__": "cc.LabelOutline", "__type__": "cc.LabelOutline",
...@@ -12524,7 +12524,7 @@ ...@@ -12524,7 +12524,7 @@
"a": 255 "a": 255
}, },
"_width": 3, "_width": 3,
"_id": "f9i4Rao8JIdJq3x37mzVjg" "_id": "b8Gvfom0pM/LZfRt10f+y/"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -12974,7 +12974,7 @@ ...@@ -12974,7 +12974,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 56.04, "width": 80.09,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -13026,8 +13026,8 @@ ...@@ -13026,8 +13026,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "in", "_string": "oa",
"_N$string": "in", "_N$string": "oa",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -13069,8 +13069,8 @@ ...@@ -13069,8 +13069,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 175
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -13088,8 +13088,8 @@ ...@@ -13088,8 +13088,8 @@
0, 0,
0, 0,
1, 1,
1, 0.5,
1, 0.5,
1 1
] ]
}, },
...@@ -13122,7 +13122,7 @@ ...@@ -13122,7 +13122,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "9c813e1e-91dc-4050-95c1-dce0bf4d3dd0"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -13358,7 +13358,7 @@ ...@@ -13358,7 +13358,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 56.04, "width": 92.04,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -13410,8 +13410,8 @@ ...@@ -13410,8 +13410,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "ig", "_string": "ow",
"_N$string": "ig", "_N$string": "ow",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -13453,8 +13453,8 @@ ...@@ -13453,8 +13453,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 144
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -13465,15 +13465,15 @@ ...@@ -13465,15 +13465,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
51.727, 72.653,
0, 0,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
1 1
] ]
}, },
...@@ -13506,7 +13506,7 @@ ...@@ -13506,7 +13506,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "f8ecef77-aaa3-4a38-a6cd-d6dfdfcc5798"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -13654,8 +13654,8 @@ ...@@ -13654,8 +13654,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 175
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -13666,15 +13666,15 @@ ...@@ -13666,15 +13666,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-54.297, -53.134,
80, 71.862,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.5,
1, 0.5,
1 1
] ]
}, },
...@@ -13707,7 +13707,7 @@ ...@@ -13707,7 +13707,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "9c813e1e-91dc-4050-95c1-dce0bf4d3dd0"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -13748,7 +13748,7 @@ ...@@ -13748,7 +13748,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 36, "width": 80.09,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -13800,8 +13800,8 @@ ...@@ -13800,8 +13800,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "it", "_string": "oa",
"_N$string": "it", "_N$string": "oa",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -13843,7 +13843,7 @@ ...@@ -13843,7 +13843,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 52, "width": 92.04,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -13855,8 +13855,8 @@ ...@@ -13855,8 +13855,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-80, -78.837,
-80, -63.724,
0, 0,
0, 0,
0, 0,
...@@ -13895,8 +13895,8 @@ ...@@ -13895,8 +13895,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "ix", "_string": "ow",
"_N$string": "ix", "_N$string": "ow",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -13938,8 +13938,8 @@ ...@@ -13938,8 +13938,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 144
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -13950,15 +13950,15 @@ ...@@ -13950,15 +13950,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
52.584, 71.185,
-80, -69.537,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
1 1
] ]
}, },
...@@ -13991,7 +13991,7 @@ ...@@ -13991,7 +13991,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "f8ecef77-aaa3-4a38-a6cd-d6dfdfcc5798"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -14434,8 +14434,8 @@ ...@@ -14434,8 +14434,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 109
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -14453,8 +14453,8 @@ ...@@ -14453,8 +14453,8 @@
0, 0,
0, 0,
1, 1,
1, 0.7,
1, 0.7,
1 1
] ]
}, },
...@@ -14487,7 +14487,7 @@ ...@@ -14487,7 +14487,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "10b8ca52-766b-4219-987c-fe0dc4bf98be"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -14528,7 +14528,7 @@ ...@@ -14528,7 +14528,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40.04, "width": 80.09,
"height": 151.2 "height": 151.2
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14541,7 +14541,7 @@ ...@@ -14541,7 +14541,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
80, 80,
0, 6.975,
0, 0,
0, 0,
0, 0,
...@@ -14580,8 +14580,8 @@ ...@@ -14580,8 +14580,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "o", "_string": "ue",
"_N$string": "o", "_N$string": "ue",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 120, "_lineHeight": 120,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -14824,7 +14824,7 @@ ...@@ -14824,7 +14824,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60.05, "width": 56.04,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14876,8 +14876,8 @@ ...@@ -14876,8 +14876,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "ot", "_string": "ui",
"_N$string": "ot", "_N$string": "ui",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -14919,8 +14919,8 @@ ...@@ -14919,8 +14919,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 174
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -14931,15 +14931,15 @@ ...@@ -14931,15 +14931,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
63.722, 70.697,
76.478, 66.015,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.6,
1, 0.6,
1 1
] ]
}, },
...@@ -14972,7 +14972,7 @@ ...@@ -14972,7 +14972,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "b6b1c7c7-0e7e-4408-96ab-c778ea168e6c"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -15013,7 +15013,7 @@ ...@@ -15013,7 +15013,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 60.05, "width": 92.04,
"height": 100.8 "height": 100.8
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -15026,7 +15026,7 @@ ...@@ -15026,7 +15026,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
80, 80,
-57.358, -51.545,
0, 0,
0, 0,
0, 0,
...@@ -15065,8 +15065,8 @@ ...@@ -15065,8 +15065,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "ot", "_string": "ew",
"_N$string": "ot", "_N$string": "ew",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -15108,8 +15108,8 @@ ...@@ -15108,8 +15108,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 199,
"height": 36 "height": 146
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -15121,14 +15121,14 @@ ...@@ -15121,14 +15121,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-63.722, -63.722,
-57.358, -60.846,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.6,
1, 0.6,
1 1
] ]
}, },
...@@ -15161,7 +15161,7 @@ ...@@ -15161,7 +15161,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "41c8f4f7-58a4-4c8d-8514-0f9746b20574"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -15303,8 +15303,8 @@ ...@@ -15303,8 +15303,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 200,
"height": 36 "height": 197
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -15316,14 +15316,14 @@ ...@@ -15316,14 +15316,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
65.435, 65.435,
3.488,
0, 0,
0, 0,
0, 0,
0, 0,
0,
1,
1,
1, 1,
0.5,
0.5,
1 1
] ]
}, },
...@@ -15356,7 +15356,7 @@ ...@@ -15356,7 +15356,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "02ee157f-d065-4471-9386-6c4083ea5813"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -15409,8 +15409,8 @@ ...@@ -15409,8 +15409,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-80, -68.374,
0, 8.138,
0, 0,
0, 0,
0, 0,
...@@ -15449,8 +15449,8 @@ ...@@ -15449,8 +15449,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "op", "_string": "oo",
"_N$string": "op", "_N$string": "oo",
"_fontSize": 72, "_fontSize": 72,
"_lineHeight": 80, "_lineHeight": 80,
"_enableWrapText": true, "_enableWrapText": true,
...@@ -15796,7 +15796,7 @@ ...@@ -15796,7 +15796,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "f4LZcqmKVCg5W8RGph1odJ" "_id": "ebhYLb1GtJ3o13sym/zbNy"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -15829,7 +15829,7 @@ ...@@ -15829,7 +15829,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "e3whCzR2xLZ4IzcLphY2Sa" "_id": "f7B/5mCMpIPomvE+JvVAKl"
}, },
{ {
"__type__": "cc.LabelOutline", "__type__": "cc.LabelOutline",
...@@ -15847,7 +15847,7 @@ ...@@ -15847,7 +15847,7 @@
"a": 255 "a": 255
}, },
"_width": 7, "_width": 7,
"_id": "b1P0B1NPZEHbvgGFNtdqaA" "_id": "8bkN0Y5+NH9r1SVC7hdM+n"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -16000,7 +16000,7 @@ ...@@ -16000,7 +16000,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "1aAOhcLpJJs6EHeyzD+Wd2" "_id": "99P4Vn2PhJu6UqxFQM2XoD"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -16033,7 +16033,7 @@ ...@@ -16033,7 +16033,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "5cSd5+fNtMbKqMszHPAkVa" "_id": "bdFUWzU6ZBqo0nNzu5uCFO"
}, },
{ {
"__type__": "cc.LabelOutline", "__type__": "cc.LabelOutline",
...@@ -16051,7 +16051,7 @@ ...@@ -16051,7 +16051,7 @@
"a": 255 "a": 255
}, },
"_width": 3, "_width": 3,
"_id": "33UzVC1r1DAZmAOLZCIPJ/" "_id": "7ftf3oH/RIT4FfL4mtOBLk"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -16149,9 +16149,6 @@ ...@@ -16149,9 +16149,6 @@
"_materials": [ "_materials": [
{ {
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
},
{
"__uuid__": "3a7bb79f-32fd-422e-ada2-96f518fed422"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
...@@ -17435,7 +17432,7 @@ ...@@ -17435,7 +17432,7 @@
"width": 1280, "width": 1280,
"height": 720 "height": 720
}, },
"_fitWidth": true, "_fitWidth": false,
"_fitHeight": true, "_fitHeight": true,
"_id": "25Ey4w3bRJfKxUwBuWGsp3" "_id": "25Ey4w3bRJfKxUwBuWGsp3"
}, },
......
...@@ -10,22 +10,6 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -10,22 +10,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
// this._imageResList.push({ url: this.data.pic_url }); // this._imageResList.push({ url: this.data.pic_url });
} }
orgId = 507;
async onLoadEnd() {
const middleLayer = cc.find('middleLayer');
if (middleLayer) {
this.orgId = middleLayer.getComponent('middleLayer').ORG_ID || 507;
}
if (this.orgId != 507) {
// 数字版
cc.find('Canvas/lxc').active = false;
}
await this.initData();
await this.initView();
this.initListener();
}
rows; rows;
kidInfo; kidInfo;
moreGameFolder: any; moreGameFolder: any;
...@@ -78,6 +62,22 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -78,6 +62,22 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.moreGameFolder = res.rows.find(item => item.name == 'more games'); this.moreGameFolder = res.rows.find(item => item.name == 'more games');
} }
orgId = 507;
async onLoadEnd() {
const middleLayer = cc.find('middleLayer');
if (middleLayer) {
this.orgId = middleLayer.getComponent('middleLayer').ORG_ID || 507;
}
if (this.orgId != 507) {
// 数字版
cc.find('Canvas/lxc').active = false;
}
await this.initData();
await this.initView();
this.initListener();
}
async initView() { async initView() {
const touchboard = cc.find('Canvas/touchboard'); const touchboard = cc.find('Canvas/touchboard');
const contant = cc.find('Canvas/touchboard/contant'); const contant = cc.find('Canvas/touchboard/contant');
......
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 840, "width": 199,
"height": 512, "height": 122,
"rawWidth": 840, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 122,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 799, "width": 200,
"height": 512, "height": 128,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"game": { "game": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 799, "width": 199,
"height": 512, "height": 128,
"rawWidth": 799, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 128,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 427, "width": 200,
"height": 512, "height": 240,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"gate": { "gate": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -0.5, "offsetX": -1,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 426, "width": 198,
"height": 512, "height": 240,
"rawWidth": 427, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 240,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 699, "width": 200,
"height": 512, "height": 146,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"tape": { "tape": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 699, "width": 199,
"height": 512, "height": 146,
"rawWidth": 699, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 146,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 768, "width": 200,
"height": 512, "height": 133,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"wave": { "wave": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 768, "width": 200,
"height": 512, "height": 133,
"rawWidth": 768, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 133,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 422, "width": 200,
"height": 512, "height": 243,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bike": { "bike": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 422, "width": 199,
"height": 512, "height": 243,
"rawWidth": 422, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 243,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 482, "width": 200,
"height": 512, "height": 212,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"five": { "five": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 482, "width": 199,
"height": 512, "height": 212,
"rawWidth": 482, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 212,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 409, "width": 200,
"height": 512, "height": 250,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"kite": { "kite": {
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": 0,
"offsetY": 0.5, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 409, "width": 200,
"height": 511, "height": 250,
"rawWidth": 409, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 250,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 409, "width": 200,
"height": 512, "height": 250,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"lime": { "lime": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 409, "width": 199,
"height": 512, "height": 250,
"rawWidth": 409, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 250,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 362, "width": 200,
"height": 512, "height": 283,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"nine": { "nine": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -1,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 362, "width": 198,
"height": 512, "height": 283,
"rawWidth": 362, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 283,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 592, "width": 200,
"height": 512, "height": 173,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"cube": { "cube": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 592, "width": 199,
"height": 512, "height": 173,
"rawWidth": 592, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 173,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 813, "width": 200,
"height": 512, "height": 126,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"home": { "home": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 813, "width": 199,
"height": 512, "height": 126,
"rawWidth": 813, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 126,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 244, "width": 200,
"height": 512, "height": 420,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"tube": { "tube": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -0.5, "offsetX": -1,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 243, "width": 198,
"height": 512, "height": 420,
"rawWidth": 244, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 420,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 571, "width": 200,
"height": 512, "height": 179,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bay": { "bay": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 571, "width": 200,
"height": 512, "height": 179,
"rawWidth": 571, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 179,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 500, "width": 200,
"height": 512, "height": 205,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"rain": { "rain": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 500, "width": 200,
"height": 512, "height": 205,
"rawWidth": 500, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 205,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 593, "width": 200,
"height": 512, "height": 173,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bee": { "bee": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 593, "width": 200,
"height": 512, "height": 173,
"rawWidth": 593, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 173,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 643, "width": 200,
"height": 512, "height": 159,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"candy": { "candy": {
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": 0,
"offsetY": 0, "offsetY": 4,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 643, "width": 200,
"height": 512, "height": 151,
"rawWidth": 643, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 159,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 389, "width": 200,
"height": 512, "height": 263,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"key": { "key": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 389, "width": 200,
"height": 512, "height": 263,
"rawWidth": 389, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 263,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 338, "width": 200,
"height": 512, "height": 303,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"leaf": { "leaf": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -1,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 338, "width": 198,
"height": 512, "height": 303,
"rawWidth": 338, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 303,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 473, "width": 200,
"height": 512, "height": 216,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"light": { "light": {
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
"rotated": false, "rotated": false,
"offsetX": -1, "offsetX": -1,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 2,
"trimY": 0, "trimY": 0,
"width": 471, "width": 194,
"height": 512, "height": 216,
"rawWidth": 473, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 216,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 1077, "width": 200,
"height": 512, "height": 95,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"pie": { "pie": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 3, "offsetX": 0,
"offsetY": 0, "offsetY": 0,
"trimX": 6, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 1071, "width": 200,
"height": 512, "height": 95,
"rawWidth": 1077, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 95,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 342, "width": 200,
"height": 512, "height": 299,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"spy": { "spy": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -0.5, "offsetX": -1,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 341, "width": 198,
"height": 512, "height": 299,
"rawWidth": 342, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 299,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 584, "width": 200,
"height": 512, "height": 175,
"rawWidth": 584, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 175,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 713, "width": 200,
"height": 512, "height": 144,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"bow": { "bow": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 713, "width": 200,
"height": 512, "height": 144,
"rawWidth": 713, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 144,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 941, "width": 200,
"height": 512, "height": 109,
"rawWidth": 941, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 109,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 589, "width": 200,
"height": 512, "height": 174,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"fruit": { "fruit": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 589, "width": 199,
"height": 512, "height": 174,
"rawWidth": 589, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 174,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 519, "width": 200,
"height": 512, "height": 197,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"moon": { "moon": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 519, "width": 200,
"height": 512, "height": 197,
"rawWidth": 519, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 197,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 686, "width": 200,
"height": 512, "height": 149,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"new": { "new": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 1.5, "offsetX": 0.5,
"offsetY": -1, "offsetY": -1.5,
"trimX": 3, "trimX": 1,
"trimY": 2, "trimY": 3,
"width": 683, "width": 199,
"height": 510, "height": 146,
"rawWidth": 686, "rawWidth": 200,
"rawHeight": 512, "rawHeight": 149,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment