Commit 65b02298 authored by yu's avatar yu

1

parent bd179535
......@@ -441,6 +441,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "0fpufyVVpDsJXhdF0nqyQI"
......@@ -521,6 +522,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "51ctdulrJL762YJ+YJsG5h"
......@@ -601,6 +603,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "bcj8PE5t5C/bvzJrfJKep2"
......@@ -681,6 +684,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "adSvNME1VAJpo+Mcy1CKc4"
......@@ -761,6 +765,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "1dSsu5zCFICLt1HS8K3aX4"
......@@ -841,6 +846,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "3fGa2zmmBPponkVzm+ZTlT"
......@@ -921,6 +927,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "f3C2KOM5tKHaaYHaJOdXk8"
......@@ -1001,6 +1008,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "b8DA79vh9Mbb+bqRvZybPk"
......@@ -1081,6 +1089,7 @@
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "53anR5Nf9LHa35556rYf8+"
......@@ -1114,7 +1123,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1088,
"height": 800
"height": 825
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1126,7 +1135,7 @@
"ctor": "Float64Array",
"array": [
0,
0,
25,
0,
0,
0,
......@@ -1195,7 +1204,7 @@
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_top": -50,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -2959,7 +2968,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "a",
"_N$string": "a",
"_fontSize": 100,
......@@ -3020,7 +3028,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "apple",
"_N$string": "apple",
"_fontSize": 100,
......@@ -3582,7 +3589,7 @@
"ctor": "Float64Array",
"array": [
0,
0,
6,
0,
0,
0,
......@@ -3621,11 +3628,10 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "cba",
"_N$string": "cba",
"_fontSize": 100,
"_lineHeight": 100,
"_fontSize": 80,
"_lineHeight": 80,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f0adf7cd-b2db-4a5a-87fe-4d818a6a6b89"
......@@ -6722,7 +6728,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "",
"_N$string": "",
"_fontSize": 27,
......@@ -8496,7 +8501,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "animal1",
"_N$string": "animal1",
"_fontSize": 36,
......@@ -8862,7 +8866,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "plant",
"_N$string": "plant",
"_fontSize": 36,
......@@ -9225,7 +9228,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "food",
"_N$string": "food",
"_fontSize": 36,
......@@ -9805,7 +9807,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "Compare",
"_N$string": "Compare",
"_fontSize": 28,
......@@ -10394,7 +10395,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "test",
"_N$string": "test",
"_fontSize": 35,
......@@ -10558,7 +10558,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "rerg",
"_N$string": "rerg",
"_fontSize": 35,
......@@ -10757,7 +10756,6 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "rerg",
"_N$string": "rerg",
"_fontSize": 30,
......
......@@ -305,7 +305,9 @@ cc.Class({
this.initLayout()//完成后直接进入下一步
})
} else {
this.setMaoAni("begin");
pg.audio.playAudioByUrl(this._cat.start).then(() => {
this.setMaoAni("normal");
this._catStartPlayed = true;
pg.view.loadDB(carton, { ske: this._stageData.cartoonSke, tex: this._stageData.cartoonTex, png: this._stageData.cartoonPng }).then((animationName) => {
this.animationName = animationName;
......@@ -493,7 +495,11 @@ cc.Class({
pg.view.visible(bg_tryagain, false);
pg.audio.playAudioByUrl(this._cat.finish)
// pg.audio.playAudioByUrl(this._cat.finish)
this.setMaoAni("finish");
pg.audio.playAudioByUrl(this._cat.finish).then(() => {
this.setMaoAni("normal")
})
// this.playSFX("audio_finish");
// pg.view.visible(btn_picture, true);
pg.view.visible(btn_record, false);
......@@ -566,10 +572,12 @@ cc.Class({
audioFinished = true;
let time = cc.audioEngine.getDuration(id);
this.showSliderAction(time).then(() => {
if (aniFinished && audioFinished) {
this._playing = false;
resolve('');
}
pg.audio.playAudioByUrlCall(this._stageData.sound, () => {
if (aniFinished && audioFinished) {
this._playing = false;
resolve('');
}
})
});
})
} else {
......@@ -590,10 +598,12 @@ cc.Class({
audioFinished = true;
let time = cc.audioEngine.getDuration(id);
this.showSliderAction(time).then(() => {
if (aniFinished && audioFinished) {
this._playing = false;
resolve('');
}
pg.audio.playAudioByUrlCall(this._stageData.sound, () => {
if (aniFinished && audioFinished) {
this._playing = false;
resolve('');
}
})
});
})
}, 1000 * 2));
......@@ -706,6 +716,8 @@ cc.Class({
let card_group = cc.find("card_group", this.node);
let slider = cc.find("slider", card_group);
slider.action = true;
let handle = cc.find("Handle", slider);
handle.active = true;
let sl = slider.getComponent(cc.Slider)
sl.progress = 0;
let t = time / 10;
......@@ -722,6 +734,10 @@ cc.Class({
.to(t, { progress: 1 }).call(() => {
this.setCardColor(sl.progress);
this.hideBox();
let handle = cc.find("Handle", slider);
handle.active = false;
})
.delay(0.5).call(() => {
return resolve("")
})
.start();
......@@ -847,7 +863,9 @@ cc.Class({
onTouchCat() {
if (this._playing) return;
this._playing = true;
this.setMaoAni("begin");
pg.audio.playAudioByUrl(this._cat.wait).then(() => {
this.setMaoAni("normal");
this._playing = false;
})
},
......@@ -876,6 +894,11 @@ cc.Class({
},
setMaoAni(aniName) {
let mao_ske = cc.find("mao_ske", this.node);
let ske = mao_ske.getComponent(dragonBones.ArmatureDisplay).playAnimation(aniName);
},
......
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