Commit 587ba882 authored by liujiaxin's avatar liujiaxin

fix: btn overlay

parent d64588c0
...@@ -169,16 +169,22 @@ cc.Class({ ...@@ -169,16 +169,22 @@ cc.Class({
pressedSF = b.pressedSprite; pressedSF = b.pressedSprite;
const anim = this.showImageNode.getChildByName('image').getComponent(cc.Animation); const anim = this.showImageNode.getChildByName('image').getComponent(cc.Animation);
let canClick = true; let canClick = true;
let b4ClickIsPlaying = false;
anim.on(cc.Animation.EventType.FINISHED, (evt, state) => { anim.on(cc.Animation.EventType.FINISHED, (evt, state) => {
const {width,height, scale} = this.showImageNode.getChildByName('image') const {width,height, scale} = this.showImageNode.getChildByName('image')
console.log(555, width,height, scale) // console.log(555, width,height, scale)
canClick = true; canClick = true;
if (state.name === 'popout') { if (state.name === 'popout') {
this.showImageNode.active = true; this.showImageNode.active = true;
} else { } else {
this.showImageNode.active = false; this.showImageNode.active = false;
this.lrc.resume();
if (b4ClickIsPlaying) {
this.lrc.resume();
b4ClickIsPlaying = false;
}
} }
}) })
this.showImageButton.on(cc.Node.EventType.TOUCH_START, (event) => { this.showImageButton.on(cc.Node.EventType.TOUCH_START, (event) => {
...@@ -189,6 +195,10 @@ cc.Class({ ...@@ -189,6 +195,10 @@ cc.Class({
this.showImageNode.active = true; this.showImageNode.active = true;
canClick = false; canClick = false;
const btn = event.currentTarget; const btn = event.currentTarget;
if (!b4ClickIsPlaying) {
b4ClickIsPlaying = this.lrc.isCurrentAudioSourcePlaying();
}
// const animClip = anim.getClips()[0] // const animClip = anim.getClips()[0]
const b = btn.getComponent(cc.Button); const b = btn.getComponent(cc.Button);
...@@ -262,6 +272,7 @@ cc.Class({ ...@@ -262,6 +272,7 @@ cc.Class({
setTimeout(() => { setTimeout(() => {
if (this.titleLable.node.width > this.titleLable.node.parent.width) { if (this.titleLable.node.width > this.titleLable.node.parent.width) {
this.titleLable.node.scale = this.titleLable.node.parent.width / this.titleLable.node.width; this.titleLable.node.scale = this.titleLable.node.parent.width / this.titleLable.node.width;
console.log('this.titleLable.node.scale', this.titleLable.node.scale);
} }
}, 0); }, 0);
} }
...@@ -303,6 +314,21 @@ cc.Class({ ...@@ -303,6 +314,21 @@ cc.Class({
// cc.log("This is a callback after the trigger event", event); // cc.log("This is a callback after the trigger event", event);
}) })
}); });
// const btn1 = cc.find('Canvas/BodyContainer/LRCComponent/buttons-group/mode3')
// btn1.actionStatus = this.BUTTON_STATUS.IDLE;
// btn1.addComponent(cc.Button)
// btn1.on('click', (event) => {
// const btn = event.currentTarget;
// this.buttonGroupChange(btn)
// // cc.log("This is a callback after the trigger event", event);
// }) ;
// const btn2 = cc.find('Canvas/BodyContainer/LRCComponent/buttons-group/mode1')
// btn2.actionStatus = this.BUTTON_STATUS.IDLE;
// btn2.on(cc.Node.EventType.TOUCH_START, (event) => {
// const btn = event.currentTarget;
// this.buttonGroupChange(btn)
// // cc.log("This is a callback after the trigger event", event);
// }) ;
}, },
...@@ -392,15 +418,20 @@ cc.Class({ ...@@ -392,15 +418,20 @@ cc.Class({
update (dt) { update (dt) {
if (this.lrc) { if (this.lrc) {
// const sts = this.lrc.getCurrentAudioState(); // const sts = this.lrc.getCurrentAudioState();
const sts = this.lrc.isCurrentAudioSourcePlaying(); const playing = this.lrc.isCurrentAudioSourcePlaying();
if (sts /*sts === cc.audioEngine.AudioState.PLAYING*/ ) { btnsts = this.BUTTON_STATUS.IDLE
this.setPlayButtonStatus(this.BUTTON_STATUS.ACTIVE); if (playing) {
// this.lastButtonStateCache = this.BUTTON_STATUS.ACTIVE btnsts = this.BUTTON_STATUS.ACTIVE
// this.setPlayButtonStatus(this.BUTTON_STATUS.ACTIVE);
} else { } else {
this.setPlayButtonStatus(this.BUTTON_STATUS.IDLE); // this.setPlayButtonStatus(this.BUTTON_STATUS.IDLE);
// this.lastButtonStateCache = this.BUTTON_STATUS.IDLE }
if (this.actionButton.node.buttonStatus === btnsts ) {
return
} }
this.setPlayButtonStatus(btnsts)
} }
}, },
}); });
...@@ -583,7 +583,7 @@ ...@@ -583,7 +583,7 @@
"__id__": 67 "__id__": 67
}, },
{ {
"__id__": 105 "__id__": 80
} }
], ],
"_active": true, "_active": true,
...@@ -2695,8 +2695,8 @@ ...@@ -2695,8 +2695,8 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "buttons-group", "_name": "karaoke",
"_objFlags": 0, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 12 "__id__": 12
}, },
...@@ -2705,33 +2705,33 @@ ...@@ -2705,33 +2705,33 @@
"__id__": 68 "__id__": 68
}, },
{ {
"__id__": 85 "__id__": 72
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 77
}, },
{ {
"__id__": 103 "__id__": 78
} }
], ],
"_prefab": { "_prefab": {
"__id__": 104 "__id__": 79
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 213, "r": 203,
"g": 26, "g": 132,
"b": 26, "b": 132,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 216, "width": 1000,
"height": 88 "height": 420
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2742,8 +2742,8 @@ ...@@ -2742,8 +2742,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
480, 0,
200, -50,
0, 0,
0, 0,
0, 0,
...@@ -2765,44 +2765,40 @@ ...@@ -2765,44 +2765,40 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "0cTf1XOIJPuJFvQMwwFxBn" "_id": "67cS3nq2dNAI7e7RDB0xEA"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "mode3", "_name": "New Sprite(Splash)",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 67 "__id__": 67
}, },
"_children": [ "_children": [],
"_active": false,
"_components": [
{ {
"__id__": 69 "__id__": 69
}, },
{ {
"__id__": 76 "__id__": 70
}
],
"_active": true,
"_components": [
{
"__id__": 83
} }
], ],
"_prefab": { "_prefab": {
"__id__": 84 "__id__": 71
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 212,
"g": 255, "g": 38,
"b": 255, "b": 38,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 88, "width": 1000,
"height": 88 "height": 420
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2813,7 +2809,7 @@ ...@@ -2813,7 +2809,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-64, 0,
0, 0,
0, 0,
0, 0,
...@@ -2836,108 +2832,113 @@ ...@@ -2836,108 +2832,113 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "b1zXZXIT1K5Z7CA7uCn/hV" "_id": "bcYuEKKppJioFBe4KKHgam"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Sprite",
"_name": "Background", "_name": "",
"_objFlags": 512, "_objFlags": 0,
"_parent": { "node": {
"__id__": 68 "__id__": 68
}, },
"_children": [ "_enabled": true,
{ "_materials": [
"__id__": 70
}
],
"_active": true,
"_components": [
{
"__id__": 73
},
{ {
"__id__": 74 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_prefab": { "_srcBlendFactor": 770,
"__id__": 75 "_dstBlendFactor": 771,
}, "_spriteFrame": {
"_opacity": 255, "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 88,
"height": 88
}, },
"_anchorPoint": { "_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0,
"y": 0.5 "y": 0
}, },
"_trs": { "_fillStart": 0,
"__type__": "TypedArray", "_fillRange": 0,
"ctor": "Float64Array", "_isTrimmedMode": true,
"array": [ "_atlas": null,
0, "_id": "1afQ67OxlGBI46KLX4Y4p4"
0, },
0, {
0, "__type__": "cc.Widget",
0, "_name": "",
0, "_objFlags": 0,
1, "node": {
1, "__id__": 68
1,
0
]
}, },
"_eulerAngles": { "_enabled": true,
"__type__": "cc.Vec3", "alignMode": 1,
"x": 0, "_target": null,
"y": 0, "_alignFlags": 45,
"z": 0 "_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "17nuA8Tx5GFJkqhB8u0NsX"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
}, },
"_skewX": 0, "asset": {
"_skewY": 0, "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
"_is3DNode": false, },
"_groupIndex": 0, "fileId": "bcYuEKKppJioFBe4KKHgam",
"groupIndex": 0, "sync": false
"_id": "e8H1dlCcVDlb7SkEpEeuIZ"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Label", "_name": "New RichText",
"_objFlags": 512, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 69 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 73
},
{
"__id__": 74
},
{
"__id__": 75
} }
], ],
"_prefab": { "_prefab": {
"__id__": 72 "__id__": 76
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 255,
"g": 0, "g": 255,
"b": 0, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 226,
"height": 40 "height": 63
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2971,100 +2972,128 @@ ...@@ -2971,100 +2972,128 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "54oB9BhFJMK6cLYf7aeCdO" "_id": "34sOR7YP1E2Zta0T8Y6T3E"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.RichText",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_fontFamily": "Arial",
{ "_isSystemFontUsed": false,
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$fontSize": 40,
"_N$fontFamily": "Arial", "_N$font": {
"_N$overflow": 1, "__uuid__": "93a20a41-6fa2-48bf-a60d-d30a22308f7b"
"_N$cacheMode": 1, },
"_id": "46SI3TMURNvr13+SNbD2SI" "_N$cacheMode": 0,
"_N$maxWidth": 226,
"_N$lineHeight": 50,
"_N$imageAtlas": null,
"_N$handleTouchEvent": true,
"_id": "f5bXY7Yr9OYIv8IMt724x1"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "4cc24w9gqdNwaX1eZmjSqRf",
"root": { "_name": "",
"__id__": 12 "_objFlags": 0,
}, "node": {
"asset": { "__id__": 72
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "c53tDz8b5IjpJ8V3Hg+1+n", "_enabled": false,
"sync": false "_id": "544b5tMglNpqVuwKwera+y"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "alignMode": 1,
{ "_target": null,
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "_alignFlags": 0,
} "_left": 387,
], "_right": 387,
"_srcBlendFactor": 770, "_top": 178.5,
"_dstBlendFactor": 771, "_bottom": 178.5,
"_spriteFrame": { "_verticalCenter": 0,
"__uuid__": "a8948df9-f5da-4a98-bd83-d77d7bcafcbe" "_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 226,
"_originalHeight": 63,
"_id": "3cjtK3QENP1JAm/p0iUz7G"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
}, },
"_type": 1, "asset": {
"_sizeMode": 0, "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
}, },
"_fillStart": 0, "fileId": "21xZVSV2xDlYXnBq6N2kS8",
"_fillRange": 0, "sync": false
"_isTrimmedMode": true, },
"_atlas": null, {
"_id": "e2C1f5cn1Bs46vf5XfVb9H" "__type__": "3c65ajMVotDt5OzlBpjNIaN",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
},
"_enabled": true,
"richText": {
"__id__": 73
},
"lrcBgColor": {
"__type__": "cc.Color",
"r": 20,
"g": 39,
"b": 61,
"a": 255
},
"lrcPlayedColor": {
"__type__": "cc.Color",
"r": 20,
"g": 39,
"b": 61,
"a": 255
},
"lrcPlayingColor": {
"__type__": "cc.Color",
"r": 255,
"g": 252,
"b": 165,
"a": 255
},
"_id": "67FQVTbcFMVpZdhORvoBMU"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 0, "_left": 140,
"_right": 0, "_right": 140,
"_top": 0, "_top": 200,
"_bottom": 0, "_bottom": 100,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -3073,9 +3102,9 @@ ...@@ -3073,9 +3102,9 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 100, "_originalWidth": 780,
"_originalHeight": 40, "_originalHeight": 420,
"_id": "0147ceihNPIaTFrrHK3i5V" "_id": "bfCss3cRJP3J81ZMY66sHN"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3085,32 +3114,177 @@ ...@@ -3085,32 +3114,177 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "c2SEYC64lKXYo7+qxSLsFb", "fileId": "9aRB846ypOLY3+HmxXkWS5",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "BackgroundActive", "_name": "buttons-group",
"_objFlags": 0,
"_parent": {
"__id__": 12
},
"_children": [
{
"__id__": 81
},
{
"__id__": 98
}
],
"_active": true,
"_components": [
{
"__id__": 115
},
{
"__id__": 116
}
],
"_prefab": {
"__id__": 117
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 213,
"g": 26,
"b": 26,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 216,
"height": 88
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
480,
200,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "0cTf1XOIJPuJFvQMwwFxBn"
},
{
"__type__": "cc.Node",
"_name": "mode3",
"_objFlags": 0,
"_parent": {
"__id__": 80
},
"_children": [
{
"__id__": 82
},
{
"__id__": 89
}
],
"_active": true,
"_components": [
{
"__id__": 96
}
],
"_prefab": {
"__id__": 97
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 88,
"height": 88
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-64,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b1zXZXIT1K5Z7CA7uCn/hV"
},
{
"__type__": "cc.Node",
"_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 68 "__id__": 81
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 83
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 86
}, },
{ {
"__id__": 81 "__id__": 87
} }
], ],
"_prefab": { "_prefab": {
"__id__": 82 "__id__": 88
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3143,7 +3317,7 @@ ...@@ -3143,7 +3317,7 @@
1, 1,
1, 1,
1, 1,
1 0
] ]
}, },
"_eulerAngles": { "_eulerAngles": {
...@@ -3157,24 +3331,24 @@ ...@@ -3157,24 +3331,24 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "c5/C/b0TpIK7sOIHTQY55Q" "_id": "e8H1dlCcVDlb7SkEpEeuIZ"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 76 "__id__": 82
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 84
} }
], ],
"_prefab": { "_prefab": {
"__id__": 79 "__id__": 85
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3221,14 +3395,14 @@ ...@@ -3221,14 +3395,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "102xzaSxNK/Kk9VnofHUzZ" "_id": "54oB9BhFJMK6cLYf7aeCdO"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3255,7 +3429,7 @@ ...@@ -3255,7 +3429,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 1, "_N$overflow": 1,
"_N$cacheMode": 1, "_N$cacheMode": 1,
"_id": "ce5l6WShpLyLN2qgZqbK3M" "_id": "46SI3TMURNvr13+SNbD2SI"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3265,7 +3439,7 @@ ...@@ -3265,7 +3439,7 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "c0JVKLaMtI6qzkV5nVcJ3S", "fileId": "c53tDz8b5IjpJ8V3Hg+1+n",
"sync": false "sync": false
}, },
{ {
...@@ -3273,7 +3447,7 @@ ...@@ -3273,7 +3447,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3284,7 +3458,7 @@ ...@@ -3284,7 +3458,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9de87776-45ff-4524-985b-f2abe254e9f7" "__uuid__": "a8948df9-f5da-4a98-bd83-d77d7bcafcbe"
}, },
"_type": 1, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -3298,14 +3472,14 @@ ...@@ -3298,14 +3472,14 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "eapM4Fu7FJZKsvYrq/QOdr" "_id": "e2C1f5cn1Bs46vf5XfVb9H"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3325,45 +3499,7 @@ ...@@ -3325,45 +3499,7 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 100, "_originalWidth": 100,
"_originalHeight": 40, "_originalHeight": 40,
"_id": "7enFLxA3xEtbVHlzapaDPM" "_id": "0147ceihNPIaTFrrHK3i5V"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
},
"asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
},
"fileId": "faDfOe6CdOgKQvsbAGFeXE",
"sync": false
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left": 0,
"_right": 0,
"_top": -1.5,
"_bottom": -1.5,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 45,
"_id": "28zMh0rA5BN6st0IKj/CVm"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3373,103 +3509,32 @@ ...@@ -3373,103 +3509,32 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "d2B0kecUtOfIdCwBahFr4K", "fileId": "c2SEYC64lKXYo7+qxSLsFb",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "mode1", "_name": "BackgroundActive",
"_objFlags": 0,
"_parent": {
"__id__": 67
},
"_children": [
{
"__id__": 86
},
{
"__id__": 93
}
],
"_active": true,
"_components": [
{
"__id__": 100
}
],
"_prefab": {
"__id__": 101
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 88,
"height": 88
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
64,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "7fnU6o4TFK+o1VPJLJhZ0e"
},
{
"__type__": "cc.Node",
"_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 85 "__id__": 81
}, },
"_children": [ "_children": [
{ {
"__id__": 87 "__id__": 90
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 93
}, },
{ {
"__id__": 91 "__id__": 94
} }
], ],
"_prefab": { "_prefab": {
"__id__": 92 "__id__": 95
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3502,7 +3567,7 @@ ...@@ -3502,7 +3567,7 @@
1, 1,
1, 1,
1, 1,
0 1
] ]
}, },
"_eulerAngles": { "_eulerAngles": {
...@@ -3516,24 +3581,24 @@ ...@@ -3516,24 +3581,24 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "b3dFTAj7tCk4hBw9X4/M1f" "_id": "c5/C/b0TpIK7sOIHTQY55Q"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 86 "__id__": 89
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 91
} }
], ],
"_prefab": { "_prefab": {
"__id__": 89 "__id__": 92
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3580,14 +3645,14 @@ ...@@ -3580,14 +3645,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "92ub6nANtOMoZTkIy+X2xd" "_id": "102xzaSxNK/Kk9VnofHUzZ"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3614,7 +3679,7 @@ ...@@ -3614,7 +3679,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 1, "_N$overflow": 1,
"_N$cacheMode": 1, "_N$cacheMode": 1,
"_id": "5asbdIiU5AWJLaDOZktQ0+" "_id": "ce5l6WShpLyLN2qgZqbK3M"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3624,7 +3689,7 @@ ...@@ -3624,7 +3689,7 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "cd4ZH81aZF36KYcwTlMzGK", "fileId": "c0JVKLaMtI6qzkV5nVcJ3S",
"sync": false "sync": false
}, },
{ {
...@@ -3632,7 +3697,7 @@ ...@@ -3632,7 +3697,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3643,7 +3708,7 @@ ...@@ -3643,7 +3708,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "5056ca8d-f3f2-40be-87a5-d5efcc42b638" "__uuid__": "9de87776-45ff-4524-985b-f2abe254e9f7"
}, },
"_type": 1, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -3657,14 +3722,14 @@ ...@@ -3657,14 +3722,14 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "59/6NTCANAa6rA44M86E5e" "_id": "eapM4Fu7FJZKsvYrq/QOdr"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3682,9 +3747,9 @@ ...@@ -3682,9 +3747,9 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 30, "_originalWidth": 100,
"_originalHeight": 60, "_originalHeight": 40,
"_id": "41M7qMpLxEwbj/dNTLTiIz" "_id": "7enFLxA3xEtbVHlzapaDPM"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3694,32 +3759,70 @@ ...@@ -3694,32 +3759,70 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "ffQEvzU25E67vgqa23/Ays", "fileId": "faDfOe6CdOgKQvsbAGFeXE",
"sync": false
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 8,
"_left": 0,
"_right": 0,
"_top": -1.5,
"_bottom": -1.5,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 45,
"_id": "28zMh0rA5BN6st0IKj/CVm"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
},
"asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
},
"fileId": "d2B0kecUtOfIdCwBahFr4K",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "BackgroundActive", "_name": "mode1",
"_objFlags": 512, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 85 "__id__": 80
}, },
"_children": [ "_children": [
{ {
"__id__": 94 "__id__": 99
},
{
"__id__": 106
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 97 "__id__": 113
},
{
"__id__": 98
} }
], ],
"_prefab": { "_prefab": {
"__id__": 99 "__id__": 114
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3743,7 +3846,7 @@ ...@@ -3743,7 +3846,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 64,
0, 0,
0, 0,
0, 0,
...@@ -3752,7 +3855,7 @@ ...@@ -3752,7 +3855,7 @@
1, 1,
1, 1,
1, 1,
0 1
] ]
}, },
"_eulerAngles": { "_eulerAngles": {
...@@ -3766,37 +3869,44 @@ ...@@ -3766,37 +3869,44 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "7c8bDFoXpL/rPnc6mX2GNz" "_id": "7fnU6o4TFK+o1VPJLJhZ0e"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Label", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 93 "__id__": 98
}, },
"_children": [], "_children": [
{
"__id__": 100
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 103
},
{
"__id__": 104
} }
], ],
"_prefab": { "_prefab": {
"__id__": 96 "__id__": 105
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 255,
"g": 0, "g": 255,
"b": 0, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 88,
"height": 40 "height": 88
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3816,7 +3926,7 @@ ...@@ -3816,7 +3926,7 @@
1, 1,
1, 1,
1, 1,
1 0
] ]
}, },
"_eulerAngles": { "_eulerAngles": {
...@@ -3830,16 +3940,80 @@ ...@@ -3830,16 +3940,80 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "f8E9gedENLj7HHx7YW6Cqn" "_id": "b3dFTAj7tCk4hBw9X4/M1f"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Node",
"_name": "", "_name": "Label",
"_objFlags": 0, "_objFlags": 512,
"node": { "_parent": {
"__id__": 94 "__id__": 99
}, },
"_enabled": true, "_children": [],
"_active": true,
"_components": [
{
"__id__": 101
}
],
"_prefab": {
"__id__": 102
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "92ub6nANtOMoZTkIy+X2xd"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
},
"_enabled": true,
"_materials": [ "_materials": [
{ {
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
...@@ -3864,7 +4038,7 @@ ...@@ -3864,7 +4038,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 1, "_N$overflow": 1,
"_N$cacheMode": 1, "_N$cacheMode": 1,
"_id": "9cueqZLYlAtJ+AUmdehZ95" "_id": "5asbdIiU5AWJLaDOZktQ0+"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -3874,7 +4048,7 @@ ...@@ -3874,7 +4048,7 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "1dmU5J3NRPL46bQ/v0pYZp", "fileId": "cd4ZH81aZF36KYcwTlMzGK",
"sync": false "sync": false
}, },
{ {
...@@ -3882,7 +4056,7 @@ ...@@ -3882,7 +4056,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3893,7 +4067,7 @@ ...@@ -3893,7 +4067,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3db8cc24-3cf8-412f-87ee-e4a3e96b08a3" "__uuid__": "5056ca8d-f3f2-40be-87a5-d5efcc42b638"
}, },
"_type": 1, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -3907,14 +4081,14 @@ ...@@ -3907,14 +4081,14 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "8bvs1pEnVAE7gfN+3GbKru" "_id": "59/6NTCANAa6rA44M86E5e"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3934,118 +4108,7 @@ ...@@ -3934,118 +4108,7 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 30, "_originalWidth": 30,
"_originalHeight": 60, "_originalHeight": 60,
"_id": "04bS8Lcv1NypT2W9et+1dw" "_id": "41M7qMpLxEwbj/dNTLTiIz"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
},
"asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
},
"fileId": "b8iQsun6BBm6OqqSa+yPm8",
"sync": false
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 32,
"_left": 0,
"_right": 0,
"_top": 9,
"_bottom": 9,
"_verticalCenter": 0,
"_horizontalCenter": 150,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 42,
"_id": "3d4A2ZHAtOarR1jbuQQvI1"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
},
"asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
},
"fileId": "93rioM0kxH3KYfueTdWPCt",
"sync": false
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
},
"_enabled": false,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "613Xqay6ZL97qiL0+6yJvM"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 216,
"height": 88
},
"_resize": 2,
"_N$layoutType": 1,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 40,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "49J+HMi1JIB7TTkOwU5GPY"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -4055,115 +4118,45 @@ ...@@ -4055,115 +4118,45 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "2651HMYRxEiawJdpENaZct", "fileId": "ffQEvzU25E67vgqa23/Ays",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "karaoke", "_name": "BackgroundActive",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 12 "__id__": 98
}, },
"_children": [ "_children": [
{ {
"__id__": 106 "__id__": 107
},
{
"__id__": 110
}
],
"_active": true,
"_components": [
{
"__id__": 115
},
{
"__id__": 116
} }
], ],
"_prefab": {
"__id__": 117
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 203,
"g": 132,
"b": 132,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1000,
"height": 420
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-50,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "67cS3nq2dNAI7e7RDB0xEA"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 105
},
"_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 110
}, },
{ {
"__id__": 108 "__id__": 111
} }
], ],
"_prefab": { "_prefab": {
"__id__": 109 "__id__": 112
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 212, "r": 255,
"g": 38, "g": 255,
"b": 38, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1000, "width": 88,
"height": 420 "height": 88
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4183,7 +4176,7 @@ ...@@ -4183,7 +4176,7 @@
1, 1,
1, 1,
1, 1,
1 0
] ]
}, },
"_eulerAngles": { "_eulerAngles": {
...@@ -4191,119 +4184,43 @@ ...@@ -4191,119 +4184,43 @@
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "bcYuEKKppJioFBe4KKHgam" "_id": "7c8bDFoXpL/rPnc6mX2GNz"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "1afQ67OxlGBI46KLX4Y4p4"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "17nuA8Tx5GFJkqhB8u0NsX"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
},
"asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
},
"fileId": "bcYuEKKppJioFBe4KKHgam",
"sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "New RichText", "_name": "Label",
"_objFlags": 0, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 105 "__id__": 106
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 108
},
{
"__id__": 112
},
{
"__id__": 113
} }
], ],
"_prefab": { "_prefab": {
"__id__": 114 "__id__": 109
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 0,
"g": 255, "g": 0,
"b": 255, "b": 0,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 226, "width": 100,
"height": 63 "height": 40
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4337,56 +4254,100 @@ ...@@ -4337,56 +4254,100 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "34sOR7YP1E2Zta0T8Y6T3E" "_id": "f8E9gedENLj7HHx7YW6Cqn"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.Label",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_fontFamily": "Arial", "_materials": [
"_isSystemFontUsed": false, {
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$fontSize": 40, "_N$verticalAlign": 1,
"_N$font": { "_N$fontFamily": "Arial",
"__uuid__": "93a20a41-6fa2-48bf-a60d-d30a22308f7b" "_N$overflow": 1,
"_N$cacheMode": 1,
"_id": "9cueqZLYlAtJ+AUmdehZ95"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
}, },
"_N$cacheMode": 0, "asset": {
"_N$maxWidth": 226, "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
"_N$lineHeight": 50, },
"_N$imageAtlas": null, "fileId": "1dmU5J3NRPL46bQ/v0pYZp",
"_N$handleTouchEvent": true, "sync": false
"_id": "f5bXY7Yr9OYIv8IMt724x1"
}, },
{ {
"__type__": "4cc24w9gqdNwaX1eZmjSqRf", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 106
}, },
"_enabled": false, "_enabled": true,
"_id": "544b5tMglNpqVuwKwera+y" "_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "3db8cc24-3cf8-412f-87ee-e4a3e96b08a3"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "8bvs1pEnVAE7gfN+3GbKru"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 0,
"_target": null, "_target": null,
"_alignFlags": 0, "_alignFlags": 45,
"_left": 387, "_left": 0,
"_right": 387, "_right": 0,
"_top": 178.5, "_top": 0,
"_bottom": 178.5, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -4395,9 +4356,9 @@ ...@@ -4395,9 +4356,9 @@
"_isAbsBottom": true, "_isAbsBottom": true,
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 226, "_originalWidth": 30,
"_originalHeight": 63, "_originalHeight": 60,
"_id": "3cjtK3QENP1JAm/p0iUz7G" "_id": "04bS8Lcv1NypT2W9et+1dw"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -4407,69 +4368,108 @@ ...@@ -4407,69 +4368,108 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "21xZVSV2xDlYXnBq6N2kS8", "fileId": "b8iQsun6BBm6OqqSa+yPm8",
"sync": false "sync": false
}, },
{ {
"__type__": "3c65ajMVotDt5OzlBpjNIaN", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"richText": { "alignMode": 1,
"__id__": 111 "_target": null,
"_alignFlags": 32,
"_left": 0,
"_right": 0,
"_top": 9,
"_bottom": 9,
"_verticalCenter": 0,
"_horizontalCenter": 150,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 42,
"_id": "3d4A2ZHAtOarR1jbuQQvI1"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 12
}, },
"lrcBgColor": { "asset": {
"__type__": "cc.Color", "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
"r": 20,
"g": 39,
"b": 61,
"a": 255
}, },
"lrcPlayedColor": { "fileId": "93rioM0kxH3KYfueTdWPCt",
"__type__": "cc.Color", "sync": false
"r": 20, },
"g": 39, {
"b": 61, "__type__": "cc.Sprite",
"a": 255 "_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
}, },
"lrcPlayingColor": { "_enabled": false,
"__type__": "cc.Color", "_materials": [
"r": 255, {
"g": 252, "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
"b": 165, }
"a": 255 ],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
}, },
"_id": "67FQVTbcFMVpZdhORvoBMU" "_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "613Xqay6ZL97qiL0+6yJvM"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Layout",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "_layoutSize": {
"_target": null, "__type__": "cc.Size",
"_alignFlags": 45, "width": 216,
"_left": 140, "height": 88
"_right": 140, },
"_top": 200, "_resize": 2,
"_bottom": 100, "_N$layoutType": 1,
"_verticalCenter": 0, "_N$cellSize": {
"_horizontalCenter": 0, "__type__": "cc.Size",
"_isAbsLeft": true, "width": 40,
"_isAbsRight": true, "height": 40
"_isAbsTop": true, },
"_isAbsBottom": true, "_N$startAxis": 0,
"_isAbsHorizontalCenter": true, "_N$paddingLeft": 0,
"_isAbsVerticalCenter": true, "_N$paddingRight": 0,
"_originalWidth": 780, "_N$paddingTop": 0,
"_originalHeight": 420, "_N$paddingBottom": 0,
"_id": "bfCss3cRJP3J81ZMY66sHN" "_N$spacingX": 40,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "49J+HMi1JIB7TTkOwU5GPY"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
...@@ -4479,7 +4479,7 @@ ...@@ -4479,7 +4479,7 @@
"asset": { "asset": {
"__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6" "__uuid__": "dfda5cd6-ea60-4dcd-aec2-e7e4bb1b05e6"
}, },
"fileId": "9aRB846ypOLY3+HmxXkWS5", "fileId": "2651HMYRxEiawJdpENaZct",
"sync": false "sync": false
}, },
{ {
...@@ -4491,7 +4491,7 @@ ...@@ -4491,7 +4491,7 @@
}, },
"_enabled": true, "_enabled": true,
"btnGroup": { "btnGroup": {
"__id__": 67 "__id__": 80
}, },
"actionButton": { "actionButton": {
"__id__": 33 "__id__": 33
...@@ -6364,7 +6364,7 @@ ...@@ -6364,7 +6364,7 @@
"node": { "node": {
"__id__": 151 "__id__": 151
}, },
"_enabled": false, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 0, "_alignFlags": 0,
......
...@@ -88,7 +88,7 @@ cc.Class({ ...@@ -88,7 +88,7 @@ cc.Class({
getDefaultData() { getDefaultData() {
const data = {"title":"aaaaa","pic_url":"http://staging-teach.cdn.ireadabc.com/7324245447e15cca42e0d4c88a32f88a.jpg","accompany_audio_url":"http://staging-teach.cdn.ireadabc.com/4a59032f9b5f726cb2cde2178a7f51fc.mp3", const data = {"title":"Listen number read and write","pic_url":"http://staging-teach.cdn.ireadabc.com/7324245447e15cca42e0d4c88a32f88a.jpg","accompany_audio_url":"http://staging-teach.cdn.ireadabc.com/4a59032f9b5f726cb2cde2178a7f51fc.mp3",
"lrcData":{ "lrcData":{
"audio_url":"http://staging-teach.cdn.ireadabc.com/1d1184717ebff259c72fedcb6b249431.mp3", "audio_url":"http://staging-teach.cdn.ireadabc.com/1d1184717ebff259c72fedcb6b249431.mp3",
"fontSize":50,"lineHeight":100, "fontSize":50,"lineHeight":100,
...@@ -98,7 +98,8 @@ cc.Class({ ...@@ -98,7 +98,8 @@ cc.Class({
{"time":19.31,"data":"挂在天上放光明","newLine":true}, {"time":19.31,"data":"挂在天上放光明","newLine":true},
{"time":23.62,"data":"好像许多小眼睛","newLine":true}, {"time":23.62,"data":"好像许多小眼睛","newLine":true},
{"time":27.93,"data":"一闪一闪亮晶晶","newLine":true}, {"time":27.93,"data":"一闪一闪亮晶晶","newLine":true},
{"time":32.32,"data":"满天都是小星星","newLine":true},{"time":41.1,"data":"一闪一闪亮晶晶","newLine":true},{"time":45.45,"data":"满天都是小星星","newLine":true},{"time":49.74,"data":"挂在天上放光明","newLine":true},{"time":54.16,"data":"好像许多小眼睛","newLine":true},{"time":58.39,"data":"一闪一闪亮晶晶","newLine":true},{"time":62.9,"data":"满天都是小星星","newLine":true},{"time":76.36,"data":"一闪一闪亮晶晶","newLine":true},{"time":80.28,"data":"满天都是小星星","newLine":true},{"time":84.65,"data":"挂在天上放光明","newLine":true},{"time":88.92,"data":"好像许多小眼睛","newLine":true},{"time":93.41,"data":"一闪一闪亮晶晶","newLine":true},{"time":97.72,"data":"满天都是小星星","newLine":true}]},"title_audio_url":"http://staging-teach.cdn.ireadabc.com/39065c5f63a31bd1433c1a046e407a98.mp3"} {"time":32.32,"data":"满天都是小星星","newLine":true},{"time":41.1,"data":"一闪一闪亮晶晶","newLine":true},{"time":45.45,"data":"满天都是小星星","newLine":true},{"time":49.74,"data":"挂在天上放光明","newLine":true},{"time":54.16,"data":"好像许多小眼睛","newLine":true},{"time":58.39,"data":"一闪一闪亮晶晶","newLine":true},{"time":62.9,"data":"满天都是小星星","newLine":true},{"time":76.36,"data":"一闪一闪亮晶晶","newLine":true},{"time":80.28,"data":"满天都是小星星","newLine":true},{"time":84.65,"data":"挂在天上放光明","newLine":true},{"time":88.92,"data":"好像许多小眼睛","newLine":true},{"time":93.41,"data":"一闪一闪亮晶晶","newLine":true},{"time":97.72,"data":"满天都是小星星","newLine":true}]},
"title_audio_url":"http://staging-teach.cdn.ireadabc.com/c42408cda175ea4b754b47bba6eeb692.mp3"}
// if (data.picArr) { // if (data.picArr) {
......
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