Commit 7d60f118 authored by 章红平's avatar 章红平

提交

parent 47f2e458
{
"ver": "1.1.2",
"uuid": "99f4c5d2-b26b-46d9-8aab-526702d6e315",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"__type__": "cc.AnimationClip",
"_name": "musicing",
"_objFlags": 0,
"_native": "",
"_duration": 0.7666666666666667,
"sample": 60,
"speed": 1,
"wrapMode": 2,
"curveData": {
"paths": {
"icon": {
"comps": {
"cc.Sprite": {
"spriteFrame": [
{
"frame": 0,
"value": {
"__uuid__": "ab9af49e-0936-4b5d-a8e6-379b34b80073"
}
},
{
"frame": 0.25,
"value": {
"__uuid__": "b2d08afd-3668-4e85-9155-1f97a6c90d50"
}
},
{
"frame": 0.5,
"value": {
"__uuid__": "ab9af49e-0936-4b5d-a8e6-379b34b80073"
}
},
{
"frame": 0.75,
"value": {
"__uuid__": "b2d08afd-3668-4e85-9155-1f97a6c90d50"
}
}
]
}
}
}
}
},
"events": []
}
\ No newline at end of file
{
"ver": "2.1.0",
"uuid": "8a5f6cad-fd3d-4f85-8dc4-a3892a679f80",
"subMetas": {}
}
\ No newline at end of file
......@@ -404,7 +404,7 @@
{
"__type__": "cc.Node",
"_name": "picesP",
"_objFlags": 0,
"_objFlags": 512,
"_parent": {
"__id__": 2
},
......@@ -1175,8 +1175,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1500,
"height": 900
"width": 2000,
"height": 1500
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1252,7 +1252,7 @@
"ctor": "Float64Array",
"array": [
0,
507.609,
700,
0,
0,
0,
......
......@@ -78,28 +78,28 @@
"__id__": 7
},
{
"__id__": 79
"__id__": 80
},
{
"__id__": 85
"__id__": 86
},
{
"__id__": 92
"__id__": 93
},
{
"__id__": 118
"__id__": 119
}
],
"_active": true,
"_components": [
{
"__id__": 120
},
{
"__id__": 121
},
{
"__id__": 122
},
{
"__id__": 123
}
],
"_prefab": null,
......@@ -250,7 +250,7 @@
},
{
"__type__": "cc.Node",
"_name": "背景",
"_name": "bgD",
"_objFlags": 0,
"_parent": {
"__id__": 2
......@@ -273,27 +273,27 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1500,
"height": 900
"width": 4000,
"height": 2000
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"x": 1,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1200,
0,
0,
362.85545,
0,
0,
0,
1,
1,
1,
1.3,
1.3,
1
]
},
......@@ -328,7 +328,7 @@
"_spriteFrame": {
"__uuid__": "d1c082d1-8312-490b-9c9c-c0eb6811f0ff"
},
"_type": 0,
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
......@@ -366,10 +366,10 @@
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 78
},
{
"__id__": 78
"__id__": 79
}
],
"_prefab": null,
......@@ -422,7 +422,7 @@
},
{
"__type__": "cc.Node",
"_name": "背景",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -586,7 +586,7 @@
{
"__type__": "cc.Node",
"_name": "New Label",
"_objFlags": 0,
"_objFlags": 512,
"_parent": {
"__id__": 10
},
......@@ -624,7 +624,7 @@
"ctor": "Float64Array",
"array": [
0,
17.986,
24,
0,
0,
0,
......@@ -679,7 +679,7 @@
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 1,
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "84AqtyyYtILLbf5yIwVibM"
},
......@@ -896,10 +896,10 @@
"__id__": 64
},
{
"__id__": 70
"__id__": 71
},
{
"__id__": 74
"__id__": 75
}
],
"_active": true,
......@@ -1007,7 +1007,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-735.889,
-900,
-330,
0,
0,
......@@ -2509,6 +2509,9 @@
},
{
"__id__": 68
},
{
"__id__": 70
}
],
"_prefab": null,
......@@ -2534,7 +2537,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
800,
900,
-270,
0,
0,
......@@ -2704,8 +2707,8 @@
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 2,
"transition": 2,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
......@@ -2781,6 +2784,25 @@
"handler": "onClickMusic",
"customEventData": ""
},
{
"__type__": "cc.Animation",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
},
"_enabled": true,
"_defaultClip": {
"__uuid__": "8a5f6cad-fd3d-4f85-8dc4-a3892a679f80"
},
"_clips": [
{
"__uuid__": "8a5f6cad-fd3d-4f85-8dc4-a3892a679f80"
}
],
"playOnLoad": false,
"_id": "ebOR9wScJLG5LMPPsRLccX"
},
{
"__type__": "cc.Node",
"_name": "commitBTn",
......@@ -2789,13 +2811,13 @@
"__id__": 19
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 71
"__id__": 72
},
{
"__id__": 72
"__id__": 73
}
],
"_prefab": null,
......@@ -2821,7 +2843,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
850,
900,
-270,
0,
0,
......@@ -2851,7 +2873,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 71
},
"_enabled": true,
"_materials": [
......@@ -2883,7 +2905,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 71
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2892,7 +2914,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 73
"__id__": 74
}
],
"_N$interactable": true,
......@@ -2971,10 +2993,10 @@
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 76
},
{
"__id__": 76
"__id__": 77
}
],
"_prefab": null,
......@@ -2988,7 +3010,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1500,
"width": 2000,
"height": 35
},
"_anchorPoint": {
......@@ -3030,7 +3052,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3062,7 +3084,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 75
},
"_enabled": true,
"alignMode": 2,
......@@ -3091,7 +3113,7 @@
"node": {
"__id__": 7
},
"_enabled": true,
"_enabled": false,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
......@@ -3142,16 +3164,16 @@
},
"_children": [
{
"__id__": 80
"__id__": 81
}
],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 83
},
{
"__id__": 83
"__id__": 84
}
],
"_prefab": null,
......@@ -3165,8 +3187,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1500,
"height": 900
"width": 2000,
"height": 2000
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3207,13 +3229,13 @@
"_name": "start",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 80
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 82
}
],
"_prefab": null,
......@@ -3269,7 +3291,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -3301,7 +3323,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3333,7 +3355,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 80
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3342,7 +3364,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 84
"__id__": 85
}
],
"_N$interactable": true,
......@@ -3398,7 +3420,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 79
"__id__": 80
},
"_id": "7cv2szxs5FLqj/Kto0Duci"
},
......@@ -3421,10 +3443,10 @@
},
"_children": [
{
"__id__": 86
"__id__": 87
},
{
"__id__": 89
"__id__": 90
}
],
"_active": false,
......@@ -3482,16 +3504,16 @@
"_name": "btn_left",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 88
},
{
"__id__": 88
"__id__": 89
}
],
"_prefab": null,
......@@ -3547,7 +3569,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -3579,7 +3601,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 87
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3647,16 +3669,16 @@
"_name": "btn_right",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 91
},
{
"__id__": 91
"__id__": 92
}
],
"_prefab": null,
......@@ -3712,7 +3734,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -3744,7 +3766,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 90
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3816,13 +3838,13 @@
},
"_children": [
{
"__id__": 93
"__id__": 94
},
{
"__id__": 96
"__id__": 97
},
{
"__id__": 99
"__id__": 100
}
],
"_active": false,
......@@ -3880,11 +3902,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [
{
"__id__": 94
"__id__": 95
}
],
"_active": true,
......@@ -3942,13 +3964,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 94
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 96
}
],
"_prefab": null,
......@@ -4004,7 +4026,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4039,11 +4061,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [
{
"__id__": 97
"__id__": 98
}
],
"_active": true,
......@@ -4101,13 +4123,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 99
}
],
"_prefab": null,
......@@ -4163,7 +4185,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 98
},
"_enabled": true,
"_materials": [
......@@ -4195,35 +4217,35 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [
{
"__id__": 100
"__id__": 101
},
{
"__id__": 102
"__id__": 103
},
{
"__id__": 104
"__id__": 105
},
{
"__id__": 106
"__id__": 107
},
{
"__id__": 108
"__id__": 109
},
{
"__id__": 110
"__id__": 111
},
{
"__id__": 112
"__id__": 113
},
{
"__id__": 114
"__id__": 115
},
{
"__id__": 116
"__id__": 117
}
],
"_active": true,
......@@ -4281,13 +4303,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 102
}
],
"_prefab": null,
......@@ -4343,7 +4365,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 101
},
"_enabled": true,
"_clip": {
......@@ -4362,13 +4384,13 @@
"_name": "err",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 104
}
],
"_prefab": null,
......@@ -4424,7 +4446,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 103
},
"_enabled": true,
"_clip": {
......@@ -4443,13 +4465,13 @@
"_name": "comeon",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 105
"__id__": 106
}
],
"_prefab": null,
......@@ -4505,7 +4527,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 105
},
"_enabled": true,
"_clip": {
......@@ -4524,13 +4546,13 @@
"_name": "suc",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 108
}
],
"_prefab": null,
......@@ -4586,7 +4608,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 107
},
"_enabled": true,
"_clip": {
......@@ -4605,13 +4627,13 @@
"_name": "in",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 110
}
],
"_prefab": null,
......@@ -4667,7 +4689,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 109
},
"_enabled": true,
"_clip": {
......@@ -4686,13 +4708,13 @@
"_name": "talkerr",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 112
}
],
"_prefab": null,
......@@ -4748,7 +4770,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 111
},
"_enabled": true,
"_clip": {
......@@ -4767,13 +4789,13 @@
"_name": "excellent",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 114
}
],
"_prefab": null,
......@@ -4829,7 +4851,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 113
},
"_enabled": true,
"_clip": {
......@@ -4848,13 +4870,13 @@
"_name": "allRigtht",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 116
}
],
"_prefab": null,
......@@ -4910,7 +4932,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 115
},
"_enabled": true,
"_clip": {
......@@ -4929,13 +4951,13 @@
"_name": "nicetry",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 118
}
],
"_prefab": null,
......@@ -4991,7 +5013,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 117
},
"_enabled": true,
"_clip": {
......@@ -5016,7 +5038,7 @@
"_active": false,
"_components": [
{
"__id__": 119
"__id__": 120
}
],
"_prefab": null,
......@@ -5072,7 +5094,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -5161,11 +5183,14 @@
"musicBtn": {
"__id__": 68
},
"musicIcon": {
"__uuid__": "b2d08afd-3668-4e85-9155-1f97a6c90d50"
},
"candle2": {
"__id__": 42
},
"redBtnN": {
"__id__": 70
"__id__": 71
},
"panel": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
......
......@@ -15,6 +15,9 @@ export default class cake_class_1 extends MyCocosSceneComponent {
candle1: cc.Node = null
@property(cc.Button)
musicBtn: cc.Button = null
@property(cc.SpriteFrame)
musicIcon: cc.SpriteFrame = null
spriteFrame
@property(cc.Node)
candle2: cc.Node = null
@property(cc.Node)
......@@ -223,8 +226,13 @@ export default class cake_class_1 extends MyCocosSceneComponent {
}
onClickMusic() {
this.musicBtn.interactable = false
let animation=this.musicBtn.getComponent(cc.Animation);
animation.play("musicing");
this.playAudioByUrl(this.data.questions[this.questionIndex].audio, () => {
this.musicBtn.interactable = true
this.musicBtn.node.getChildByName("icon").getComponent(cc.Sprite).spriteFrame=this.musicIcon;
animation.stop("musicing");
})
}
changeTrue(panelS) {
......
......@@ -30,6 +30,6 @@ export const defaultData = {
"name": "d1_tex.png"
}
}, "choosewaitTime": 5, "testWaitTime": 3, "rightLetter": "a", "wrongLetter": "e"
}], "title": "asdf asdf fds saa",
}], "title": "asdf asddafafgaegeargdf fds saa",
"guideAudio": "http://staging-teach.cdn.ireadabc.com/40468ef6d120d03f83541b9344c6f9ea.mp3"
}
\ No newline at end of file
......@@ -51,7 +51,7 @@ export default class panel extends cc.Component {
// }, "waitTime": 12, "choosewaitTime": 5, "testWaitTime": 3, "rightLetter": "d", "wrongLetter": "b"
// }, }
initPanel(data, mainCtil) {
this.frameN.y = 700;
this.frameN.y = 1000;
this.frameN.off("click");
this.frameN.on("click", () => {
this.playDragon();
......@@ -265,7 +265,7 @@ export default class panel extends cc.Component {
.to(0.3, { y: -50 })
.to(0.1, { y: 0 })
.delay(1)
.to(0.3, { y: -500 })
.to(0.3, { y: -700 })
.call(() => {
block.active = false;
this.mainCtil.nextQuestion();
......@@ -303,7 +303,7 @@ export default class panel extends cc.Component {
.to(0.3, { y: -50 })
.to(0.1, { y: 0 })
.delay(1)
.to(0.3, { y: -500 })
.to(0.3, { y: -700 })
.start();
}else{
this.mainCtil.playLocalAudio("comeon")
......@@ -311,7 +311,7 @@ export default class panel extends cc.Component {
.to(0.3, { y: -50 })
.to(0.1, { y: 0 })
.delay(1)
.to(0.3, { y: -500 })
.to(0.3, { y: -700 })
.start();
}
})
......
......@@ -26,10 +26,10 @@
"height": 720,
"rawWidth": 1280,
"rawHeight": 720,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"borderTop": 179,
"borderBottom": 166,
"borderLeft": 1023,
"borderRight": 118,
"subMetas": {}
}
}
......
......@@ -3,7 +3,7 @@
"uuid": "e2d959e5-1ded-4bb5-a912-1b4147e72594",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"filterMode": "point",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
......
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