Commit 3b719157 authored by asdf's avatar asdf

.

parent bd1ac5d6
{
"ver": "1.1.0",
"uuid": "5ae1822d-008f-4fda-994c-7e44bc02a4a1",
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "45471cc5-3d53-4068-99c4-591121300416", "uuid": "8572a45e-0e8f-457e-ad64-35c2740bf308",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
...@@ -84,17 +84,14 @@ ...@@ -84,17 +84,14 @@
"__id__": 56 "__id__": 56
}, },
{ {
"__id__": 62 "__id__": 63
}, },
{ {
"__id__": 65 "__id__": 66
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 75
},
{ {
"__id__": 76 "__id__": 76
}, },
...@@ -103,6 +100,9 @@ ...@@ -103,6 +100,9 @@
}, },
{ {
"__id__": 78 "__id__": 78
},
{
"__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2584,7 +2584,7 @@ ...@@ -2584,7 +2584,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2741,6 +2741,9 @@ ...@@ -2741,6 +2741,9 @@
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 60
},
{
"__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2754,8 +2757,8 @@ ...@@ -2754,8 +2757,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 244.23,
"height": 50.4 "height": 54.4
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2813,7 +2816,7 @@ ...@@ -2813,7 +2816,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "bbb7f5b8-6788-4f09-bb15-e32ab0dbbdcc" "__uuid__": "8572a45e-0e8f-457e-ad64-35c2740bf308"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -2827,6 +2830,24 @@ ...@@ -2827,6 +2830,24 @@
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "56vlLJPhpLjKH4qbIMtq8o" "_id": "56vlLJPhpLjKH4qbIMtq8o"
}, },
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
},
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 91,
"g": 104,
"b": 97,
"a": 255
},
"_width": 2,
"_id": "dbNXAM6W1JaKesBNS6fHvx"
},
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
...@@ -2865,10 +2886,10 @@ ...@@ -2865,10 +2886,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 64
}, },
{ {
"__id__": 64 "__id__": 65
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2924,7 +2945,7 @@ ...@@ -2924,7 +2945,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2956,7 +2977,7 @@ ...@@ -2956,7 +2977,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2987,19 +3008,19 @@ ...@@ -2987,19 +3008,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 66 "__id__": 67
}, },
{ {
"__id__": 68 "__id__": 69
}, },
{ {
"__id__": 70 "__id__": 71
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3055,13 +3076,13 @@ ...@@ -3055,13 +3076,13 @@
"_name": "oval-2", "_name": "oval-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 65 "__id__": 66
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 68
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3117,7 +3138,7 @@ ...@@ -3117,7 +3138,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3149,13 +3170,13 @@ ...@@ -3149,13 +3170,13 @@
"_name": "1", "_name": "1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 65 "__id__": 66
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3211,7 +3232,7 @@ ...@@ -3211,7 +3232,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 68 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3243,17 +3264,17 @@ ...@@ -3243,17 +3264,17 @@
"_name": "$btnAudio", "_name": "$btnAudio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 65 "__id__": 66
}, },
"_children": [ "_children": [
{ {
"__id__": 71 "__id__": 72
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3309,13 +3330,13 @@ ...@@ -3309,13 +3330,13 @@
"_name": "$sprAudio", "_name": "$sprAudio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 70 "__id__": 71
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 72 "__id__": 73
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3371,7 +3392,7 @@ ...@@ -3371,7 +3392,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3382,7 +3403,7 @@ ...@@ -3382,7 +3403,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "621af077-00ed-4f70-b28d-614b433de24d" "__uuid__": "3b4787fe-965f-44a1-9d5c-bda3b5c648bd"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -3403,7 +3424,7 @@ ...@@ -3403,7 +3424,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3476,7 +3497,7 @@ ...@@ -3476,7 +3497,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 70 "__id__": 71
}, },
"_id": "28Vhywz4hGv7Zkx2yg5cPL" "_id": "28Vhywz4hGv7Zkx2yg5cPL"
}, },
...@@ -3485,7 +3506,7 @@ ...@@ -3485,7 +3506,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 65 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"_id": "3ft1BDcvFF+ZAxrUAa65zn" "_id": "3ft1BDcvFF+ZAxrUAa65zn"
...@@ -3567,13 +3588,13 @@ ...@@ -3567,13 +3588,13 @@
}, },
"spfAudio": [ "spfAudio": [
{ {
"__uuid__": "621af077-00ed-4f70-b28d-614b433de24d" "__uuid__": "3b4787fe-965f-44a1-9d5c-bda3b5c648bd"
}, },
{ {
"__uuid__": "621af077-00ed-4f70-b28d-614b433de24d" "__uuid__": "3db72f65-884b-462d-b58e-b3dcae1b7536"
}, },
{ {
"__uuid__": "621af077-00ed-4f70-b28d-614b433de24d" "__uuid__": "ff2df05c-531b-4767-9c2c-f792b75426ba"
} }
], ],
"spfLeft": [ "spfLeft": [
......
...@@ -316,7 +316,7 @@ cc.Class({ ...@@ -316,7 +316,7 @@ cc.Class({
this.playAudio(() => { this.playAudio(() => {
cb && cb(); cb && cb();
this.unschedule(this.changeAudioSpfCb) this.unschedule(this.changeAudioSpfCb)
this.sprAudio.spriteFrame = this.spfAudio[1]; this.sprAudio.spriteFrame = this.spfAudio[2];
}); });
}, },
......
{
"ver": "2.3.5",
"uuid": "0e2d1239-828f-406a-8c17-1ca7878ac691",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 74,
"height": 82,
"platformSettings": {},
"subMetas": {
"play2": {
"ver": "1.0.4",
"uuid": "3db72f65-884b-462d-b58e-b3dcae1b7536",
"rawTextureUuid": "0e2d1239-828f-406a-8c17-1ca7878ac691",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 74,
"height": 82,
"rawWidth": 74,
"rawHeight": 82,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "3d180a43-e95e-4254-b5f3-08ef0432e944",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 74,
"height": 82,
"platformSettings": {},
"subMetas": {
"play_orange1": {
"ver": "1.0.4",
"uuid": "3b4787fe-965f-44a1-9d5c-bda3b5c648bd",
"rawTextureUuid": "3d180a43-e95e-4254-b5f3-08ef0432e944",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 74,
"height": 82,
"rawWidth": 74,
"rawHeight": 82,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "c370f1c7-d64a-4c7d-8246-0e071720b5c0",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 74,
"height": 82,
"platformSettings": {},
"subMetas": {
"play_orange2": {
"ver": "1.0.4",
"uuid": "ff2df05c-531b-4767-9c2c-f792b75426ba",
"rawTextureUuid": "c370f1c7-d64a-4c7d-8246-0e071720b5c0",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 74,
"height": 82,
"rawWidth": 74,
"rawHeight": 82,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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