Commit 2fbdb2a9 authored by asdf's avatar asdf

fix bugs

parent b94e21b6
{"name":"NewProject_2","isGlobal":0,"version":"5.5","armature":[{"name":"Armature","ik":[],"defaultActions":[{"gotoAndPlay":"newAnimation"}],"slot":[{"name":"图层_2","color":{},"parent":"root"},{"name":"眼1","displayIndex":2,"color":{},"z":1,"parent":"眼1"}],"bone":[{"name":"root","transform":{}},{"name":"眼1","transform":{"x":13.2,"y":-38.85},"parent":"root"}],"aabb":{"x":-68,"height":181,"y":-87,"width":131},"frameRate":24,"animation":[{"name":"newAnimation","frame":[],"duration":44,"slot":[{"name":"图层_2","colorFrame":[],"displayFrame":[]},{"name":"眼1","colorFrame":[],"displayFrame":[{"duration":20},{"duration":2},{"value":1,"duration":2},{"value":2,"duration":2},{"value":1,"duration":2},{"duration":16},{"duration":0}]}],"bone":[{"name":"root","scaleFrame":[],"translateFrame":[],"rotateFrame":[]},{"name":"眼1","scaleFrame":[],"translateFrame":[],"rotateFrame":[]}],"playTimes":0,"ffd":[],"ik":[]}],"type":"Armature","skin":[{"name":"","slot":[{"name":"图层_2","display":[{"name":"测试骨骼/图层_2","transform":{"x":-2.5,"y":3.5},"type":"image","path":"测试骨骼/图层_2"}]},{"name":"眼1","display":[{"name":"测试骨骼/眼1","transform":{"x":-14.7,"y":-1.65},"type":"image","path":"测试骨骼/眼1"},{"name":"测试骨骼/眼2","transform":{"x":-14.7,"y":-1.65},"type":"image","path":"测试骨骼/眼2"},{"name":"测试骨骼/眼3","transform":{"x":-14.7,"y":-1.65},"type":"image","path":"测试骨骼/眼3"}]}]}]}],"frameRate":24}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "e1623214-88d6-4d1e-a124-6d36cb382bce",
"subMetas": {}
}
\ No newline at end of file
{"name":"NewProject_2","SubTexture":[{"name":"测试骨骼/图层_2","x":1,"height":181,"y":1,"width":131},{"name":"测试骨骼/眼3","x":1,"height":15,"y":201,"width":43},{"name":"测试骨骼/眼2","x":1,"height":15,"y":218,"width":43},{"name":"测试骨骼/眼1","x":1,"height":15,"y":184,"width":43}],"imagePath":"NewProject_2_tex.png","height":256,"width":256}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "4791f23e-a9c9-4e6f-9366-55004bc2890a",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "7029a1cf-56e3-49b4-976d-5919e29829f9",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 256,
"height": 256,
"platformSettings": {},
"subMetas": {
"NewProject_2_tex": {
"ver": "1.0.4",
"uuid": "f621ad8c-a101-4f46-a241-46985d60f980",
"rawTextureUuid": "7029a1cf-56e3-49b4-976d-5919e29829f9",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -61.5,
"offsetY": 11,
"trimX": 1,
"trimY": 1,
"width": 131,
"height": 232,
"rawWidth": 256,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
This diff is collapsed.
export const DefaultData = {
"questionAudio": "http://staging-teach.cdn.ireadabc.com/70810ba6564a9f73f7cdce7ed180e3db.mp3",
"questionText": "123 234 345 456 567 678 789",
"questionList": [
{
"rightOptionIdx": 1,
"optionList": [
{
"text": "123 234 345",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
},
{
"text": "2342 2342",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
},
{
"text": "45234523453245324532543452354234",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/90fd9908a33a3d087ac53e6f7d794c18.mp3"
}
],
"pageAudio": "http://staging-teach.cdn.ireadabc.com/1d192b1cb2f2b1864ca55e903711081a.mp3"
},
{
"rightOptionIdx": 0,
"optionList": [
{
"text": "123 234 345",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
},
{
"text": "45234523453245324532543452354234",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/90fd9908a33a3d087ac53e6f7d794c18.mp3"
}
],
"pageAudio": "http://staging-teach.cdn.ireadabc.com/092d354f33b0147565b7b5e3634c28dd.mp3"
},
// {
// "rightOptionIdx": 0,
// "optionList": [
// {
// "text": "123 234 345",
// "optionDragonBone": {
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
// "name": "walkingfish_ske.json"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
// "name": "walkingfish_tex.json"
// },
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
// "name": "walkingfish_tex.png"
// }
// },
// "optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
// },
// {
// "text": "2342 23 42",
// "optionDragonBone": {
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
// "name": "walkingfish_ske.json"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
// "name": "walkingfish_tex.json"
// },
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
// "name": "walkingfish_tex.png"
// }
// },
// "optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
// },
// {
// "text": "45234523453245324532543452354234",
// "optionDragonBone": {
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
// "name": "walkingfish_ske.json"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
// "name": "walkingfish_tex.json"
// },
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
// "name": "walkingfish_tex.png"
// }
// },
// "optionAudio": "http://staging-teach.cdn.ireadabc.com/90fd9908a33a3d087ac53e6f7d794c18.mp3"
// }
// ],
// "pageAudio": "http://staging-teach.cdn.ireadabc.com/1d192b1cb2f2b1864ca55e903711081a.mp3"
// }
]
}
\ No newline at end of file
{
"ver": "1.0.8",
"uuid": "6fa9c94a-d3df-4f14-bf6b-b6aa701eb398",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
...@@ -63,7 +63,6 @@ cc.Class({ ...@@ -63,7 +63,6 @@ cc.Class({
} }
}, },
showAudioButton() { showAudioButton() {
this.nodMask.runAction(cc.fadeOut(1))
this.btnAudio.active = true; this.btnAudio.active = true;
this.playShowAudioButton(); this.playShowAudioButton();
}, },
...@@ -158,13 +157,15 @@ cc.Class({ ...@@ -158,13 +157,15 @@ cc.Class({
}, },
chooseRight() { chooseRight() {
this.nodMask.runAction(cc.fadeOut(1))
this.showLight(); this.showLight();
this.playAudioRight(); this.playAudioRight();
this.scene.onClickAnswer(this, this.isRight);
}, },
chooseWrong() { chooseWrong() {
this.showLight();
this.playAudioWrong(); this.playAudioWrong();
this.playShowCross(); this.playShowCross();
this.scene.onClickAnswer(this, this.isRight);
}, },
playAudioRight() { playAudioRight() {
...@@ -173,17 +174,19 @@ cc.Class({ ...@@ -173,17 +174,19 @@ cc.Class({
cc.audioEngine.setFinishCallback(id, () => { cc.audioEngine.setFinishCallback(id, () => {
GameData.audioCount--; GameData.audioCount--;
}) })
this.scene.onClickAnswer(this, this.isRight);
}, },
playAudioWrong() { playAudioWrong() {
GameData.audioCount++; GameData.audioCount++;
let id = cc.audioEngine.play(this.audWrong, false, 1); let id = cc.audioEngine.play(this.audWrong, false, 1);
cc.audioEngine.setFinishCallback(id, () => { cc.audioEngine.setFinishCallback(id, () => {
GameData.audioCount--; GameData.audioCount--;
this.scene.onClickAnswer(this, this.isRight);
}) })
}, },
playRotateNormal() {
this.node.runAction(cc.rotateTo(0.5, 0));
},
showLight() { showLight() {
this.nodLight.active = true; this.nodLight.active = true;
}, },
...@@ -252,7 +255,7 @@ cc.Class({ ...@@ -252,7 +255,7 @@ cc.Class({
this.playAudioOption((duration) => { this.playAudioOption((duration) => {
this.scheduleStep = 2; this.scheduleStep = 2;
this.scheduleDuration = duration / 2 / this.label.node.width * this.scheduleStep; this.scheduleDuration = duration / 2 / this.label.node.width * this.scheduleStep;
if(this.scheduleDuration < 0.05){ if (this.scheduleDuration < 0.05) {
this.scheduleDuration = 0.05; this.scheduleDuration = 0.05;
this.scheduleStep = this.scheduleDuration / duration * 2 * this.label.node.width; this.scheduleStep = this.scheduleDuration / duration * 2 * this.label.node.width;
} }
......
const saveKey = "DataKey_Cocos_FT12"; const saveKey = "DataKey_Cocos_FT12";
const BaseUI = require('BaseUI'); const BaseUI = require('BaseUI');
import { DefaultData } from './DefaultData';
import EventMgr from './EventMgr'; import EventMgr from './EventMgr';
cc.Class({ cc.Class({
...@@ -97,8 +98,7 @@ cc.Class({ ...@@ -97,8 +98,7 @@ cc.Class({
}, },
getDefaultData() { getDefaultData() {
let dataJson = '{"questionAudio":"http://staging-teach.cdn.ireadabc.com/d2a9d8815d0370dc3b9aa18987dee584.mp3","questionText":"123","questionList":[{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123 456 789 123 343","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]},{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]},{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]},{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]},{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]}]}'; let data = DefaultData;
let data = JSON.parse(dataJson);
return data; return data;
}, },
...@@ -136,8 +136,7 @@ cc.Class({ ...@@ -136,8 +136,7 @@ cc.Class({
loadEnd() { loadEnd() {
GameData.questionIndex = 0; GameData.questionIndex = 0;
this.questionList = []; this.questionList = [];
let optionList = this.data.questionList[GameData.questionIndex].optionList; for (let i = 0; i < this.data.questionList.length; i++) {
for (let i = 0; i < optionList.length; i++) {
this.questionList[i] = i; this.questionList[i] = i;
} }
// this.questionList[0] = 0; // this.questionList[0] = 0;
...@@ -342,7 +341,7 @@ cc.Class({ ...@@ -342,7 +341,7 @@ cc.Class({
}) })
) )
) )
itemAnswer.playRotateNormal();
target.runAction(cc.sequence( target.runAction(cc.sequence(
cc.spawn( cc.spawn(
cc.moveTo(0.5, 0, 0), cc.moveTo(0.5, 0, 0),
......
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