Commit 1bc7a3ae authored by chenli's avatar chenli

修改

parent cda1e73d
...@@ -2,6 +2,5 @@ ...@@ -2,6 +2,5 @@
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "e8f9627a-f0ef-4f6b-9b2d-58518b0e701e", "uuid": "e8f9627a-f0ef-4f6b-9b2d-58518b0e701e",
"downloadMode": 0, "downloadMode": 0,
"duration": 3.761633,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
...@@ -2,6 +2,5 @@ ...@@ -2,6 +2,5 @@
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "11b780d3-4491-4f17-ab3d-a58660c33d54", "uuid": "11b780d3-4491-4f17-ab3d-a58660c33d54",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.2642,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
...@@ -745,7 +745,7 @@ ...@@ -745,7 +745,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "46c4adda-8b4b-4b06-8e05-b9e81b5171de" "__uuid__": "46c4adda-8b4b-4b06-8e05-b9e81b5171de"
...@@ -1093,7 +1093,7 @@ ...@@ -1093,7 +1093,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "6d5066e2-0484-4095-90de-bbbff72fc24c" "__uuid__": "6d5066e2-0484-4095-90de-bbbff72fc24c"
...@@ -5701,7 +5701,7 @@ ...@@ -5701,7 +5701,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, -5.1,
0, 0,
0, 0,
0, 0,
......
...@@ -62,7 +62,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -62,7 +62,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
private sprite_voice:cc.Node; private sprite_voice:cc.Node;
private sprite_voiceing:cc.Node; private sprite_voiceing:cc.Node;
private voiceing:boolean = false; private voiceing:boolean = false;
private voiceingTime:number = 0;
public startBlue:boolean = false; public startBlue:boolean = false;
private start_blueTime = 0; private start_blueTime = 0;
private rights:Array<boolean> = []; private rights:Array<boolean> = [];
...@@ -86,6 +86,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -86,6 +86,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
private comon_node:cc.Node; private comon_node:cc.Node;
public zhazha_node:cc.Node; public zhazha_node:cc.Node;
public startTest:boolean = false;
addPreloadImage() { addPreloadImage() {
// TODO 根据自己的配置预加载图片资源 // TODO 根据自己的配置预加载图片资源
// this._imageResList.push({ url: this.data.pic_url }); // this._imageResList.push({ url: this.data.pic_url });
...@@ -141,14 +143,24 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -141,14 +143,24 @@ export default class SceneComponent extends MyCocosSceneComponent {
return; return;
} }
lf.voiceing = true; lf.voiceing = true;
lf.voiceingTime = 0;
lf.sprite_voiceing.active = true; lf.sprite_voiceing.active = true;
lf.sprite_voice.active = false; lf.sprite_voice.active = true;
// let action = cc.blink(2,5);
// lf.sprite_voiceing.runAction(cc.repeatForever(action));
let action2 = cc.blink(2,5);
lf.sprite_voice.runAction(cc.repeatForever(action2));
lf.playAudioByUrl(this.data.questions[this.curIndex].audio,function(){ lf.playAudioByUrl(this.data.questions[this.curIndex].audio,function(){
lf.voiceing = false; lf.voiceing = false;
lf.sprite_voiceing.active = false; lf.sprite_voiceing.active = false;
lf.sprite_voice.active = true; lf.sprite_voice.active = true;
lf.sprite_voice.opacity = 255;
lf.sprite_voice.stopAllActions();
}); });
}) })
...@@ -160,6 +172,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -160,6 +172,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}) })
this.btn_ok.on('click', () => { this.btn_ok.on('click', () => {
if(lf.startTest == false) return;
lf.pinceOver(); lf.pinceOver();
}) })
} }
...@@ -331,6 +344,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -331,6 +344,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
//最终展示,展示当前 //最终展示,展示当前
next(){ next(){
this.startTest = false;
this.curIndex = this.curIndex + 1; this.curIndex = this.curIndex + 1;
if(this.curIndex >= this.data.questions.length){ if(this.curIndex >= this.data.questions.length){
this.gameOver(); this.gameOver();
...@@ -398,6 +412,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -398,6 +412,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
showBlueLaZhu(){ showBlueLaZhu(){
this.progress_blue.getChildByName("spine").y = 356;
this.progress_blue.getChildByName("spine").active = true;
this.progress_blue.getChildByName("spine_red").active = false; this.progress_blue.getChildByName("spine_red").active = false;
this.progress_blue.getComponent(cc.ProgressBar).progress = 1; this.progress_blue.getComponent(cc.ProgressBar).progress = 1;
...@@ -551,6 +568,20 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -551,6 +568,20 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.pinceOver(); this.pinceOver();
} }
} }
if(this.voiceing){
// this.voiceingTime = this.voiceingTime + dt;
// if(this.voiceingTime * 1000 >= 100){
// this.voiceingTime = 0;
// this.sprite_voiceing.active = true;
// this.sprite_voice.active = false;
// }
// else{
// this.sprite_voiceing.active = false;
// this.sprite_voice.active = true;
// }
}
} }
...@@ -582,6 +613,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -582,6 +613,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// this.pingceCallBack(90); // this.pingceCallBack(90);
this.log("pinceOver:"); this.log("pinceOver:");
if(!cc.sys.isBrowser){ if(!cc.sys.isBrowser){
let lf = this; let lf = this;
window["courseware"].stopTest((res) => { window["courseware"].stopTest((res) => {
...@@ -774,6 +806,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -774,6 +806,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
lf.playAudioByUrl(this.data.guideAudio,function(){ lf.playAudioByUrl(this.data.guideAudio,function(){
//开始录音 //开始录音
lf.startRedTime(); lf.startRedTime();
lf.startTest = true;
}); });
}) })
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"uuid": "95e00b83-b7c3-4648-abee-9576bd7f953e", "uuid": "95e00b83-b7c3-4648-abee-9576bd7f953e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "point",
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"uuid": "9c0653f7-d2c8-44dd-8a1c-72cc0eab9e9f", "uuid": "9c0653f7-d2c8-44dd-8a1c-72cc0eab9e9f",
"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