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 @@ ...@@ -404,7 +404,7 @@
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "picesP", "_name": "picesP",
"_objFlags": 0, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
...@@ -1175,8 +1175,8 @@ ...@@ -1175,8 +1175,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1500, "width": 2000,
"height": 900 "height": 1500
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1252,7 +1252,7 @@ ...@@ -1252,7 +1252,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
507.609, 700,
0, 0,
0, 0,
0, 0,
......
This diff is collapsed.
...@@ -15,6 +15,9 @@ export default class cake_class_1 extends MyCocosSceneComponent { ...@@ -15,6 +15,9 @@ export default class cake_class_1 extends MyCocosSceneComponent {
candle1: cc.Node = null candle1: cc.Node = null
@property(cc.Button) @property(cc.Button)
musicBtn: cc.Button = null musicBtn: cc.Button = null
@property(cc.SpriteFrame)
musicIcon: cc.SpriteFrame = null
spriteFrame
@property(cc.Node) @property(cc.Node)
candle2: cc.Node = null candle2: cc.Node = null
@property(cc.Node) @property(cc.Node)
...@@ -223,8 +226,13 @@ export default class cake_class_1 extends MyCocosSceneComponent { ...@@ -223,8 +226,13 @@ export default class cake_class_1 extends MyCocosSceneComponent {
} }
onClickMusic() { onClickMusic() {
this.musicBtn.interactable = false this.musicBtn.interactable = false
let animation=this.musicBtn.getComponent(cc.Animation);
animation.play("musicing");
this.playAudioByUrl(this.data.questions[this.questionIndex].audio, () => { this.playAudioByUrl(this.data.questions[this.questionIndex].audio, () => {
this.musicBtn.interactable = true this.musicBtn.interactable = true
this.musicBtn.node.getChildByName("icon").getComponent(cc.Sprite).spriteFrame=this.musicIcon;
animation.stop("musicing");
}) })
} }
changeTrue(panelS) { changeTrue(panelS) {
......
...@@ -30,6 +30,6 @@ export const defaultData = { ...@@ -30,6 +30,6 @@ export const defaultData = {
"name": "d1_tex.png" "name": "d1_tex.png"
} }
}, "choosewaitTime": 5, "testWaitTime": 3, "rightLetter": "a", "wrongLetter": "e" }, "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" "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 { ...@@ -51,7 +51,7 @@ export default class panel extends cc.Component {
// }, "waitTime": 12, "choosewaitTime": 5, "testWaitTime": 3, "rightLetter": "d", "wrongLetter": "b" // }, "waitTime": 12, "choosewaitTime": 5, "testWaitTime": 3, "rightLetter": "d", "wrongLetter": "b"
// }, } // }, }
initPanel(data, mainCtil) { initPanel(data, mainCtil) {
this.frameN.y = 700; this.frameN.y = 1000;
this.frameN.off("click"); this.frameN.off("click");
this.frameN.on("click", () => { this.frameN.on("click", () => {
this.playDragon(); this.playDragon();
...@@ -265,7 +265,7 @@ export default class panel extends cc.Component { ...@@ -265,7 +265,7 @@ export default class panel extends cc.Component {
.to(0.3, { y: -50 }) .to(0.3, { y: -50 })
.to(0.1, { y: 0 }) .to(0.1, { y: 0 })
.delay(1) .delay(1)
.to(0.3, { y: -500 }) .to(0.3, { y: -700 })
.call(() => { .call(() => {
block.active = false; block.active = false;
this.mainCtil.nextQuestion(); this.mainCtil.nextQuestion();
...@@ -303,7 +303,7 @@ export default class panel extends cc.Component { ...@@ -303,7 +303,7 @@ export default class panel extends cc.Component {
.to(0.3, { y: -50 }) .to(0.3, { y: -50 })
.to(0.1, { y: 0 }) .to(0.1, { y: 0 })
.delay(1) .delay(1)
.to(0.3, { y: -500 }) .to(0.3, { y: -700 })
.start(); .start();
}else{ }else{
this.mainCtil.playLocalAudio("comeon") this.mainCtil.playLocalAudio("comeon")
...@@ -311,7 +311,7 @@ export default class panel extends cc.Component { ...@@ -311,7 +311,7 @@ export default class panel extends cc.Component {
.to(0.3, { y: -50 }) .to(0.3, { y: -50 })
.to(0.1, { y: 0 }) .to(0.1, { y: 0 })
.delay(1) .delay(1)
.to(0.3, { y: -500 }) .to(0.3, { y: -700 })
.start(); .start();
} }
}) })
......
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"height": 720, "height": 720,
"rawWidth": 1280, "rawWidth": 1280,
"rawHeight": 720, "rawHeight": 720,
"borderTop": 0, "borderTop": 179,
"borderBottom": 0, "borderBottom": 166,
"borderLeft": 0, "borderLeft": 1023,
"borderRight": 0, "borderRight": 118,
"subMetas": {} "subMetas": {}
} }
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"uuid": "e2d959e5-1ded-4bb5-a912-1b4147e72594", "uuid": "e2d959e5-1ded-4bb5-a912-1b4147e72594",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "point",
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "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