Commit edf8b6e5 authored by Tt's avatar Tt

修改完成

parent da901f3e
...@@ -2787,13 +2787,13 @@ ...@@ -2787,13 +2787,13 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 180, "width": 280,
"height": 100 "height": 280
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0.5,
"y": 0.5 "y": 0.3
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
......
...@@ -135,7 +135,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -135,7 +135,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let anis = db.getAnimationNames(db.armatureName); let anis = db.getAnimationNames(db.armatureName);
db.playAnimation(anis[0], 0); db.playAnimation(anis[0], 0);
cc.tween(start_ske).by(0.5, { x: -500 }).call(() => { cc.tween(start_ske).by(0.5, { x: -500 }).call(() => {
pg.audio.playAudioByUrl(Game.getIns().startAudio).then(() => { pg.audio.playAudioByUrlThen(Game.getIns().startAudio).then(() => {
cc.tween(start_ske).delay(1).by(0.5, { x: 500 }).call(() => { cc.tween(start_ske).delay(1).by(0.5, { x: 500 }).call(() => {
this.layout_start.active = false; this.layout_start.active = false;
resolve(''); resolve('');
...@@ -220,10 +220,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -220,10 +220,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
item.scaleX = -1; item.scaleX = -1;
text.scaleX = -1; text.scaleX = -1;
item.active = true; item.active = true;
cc.tween(item).repeatForever(cc.tween().by(21 * 3, { x: sceneWidth + 400 }).call(() => { cc.tween(item).repeatForever(cc.tween().by(21 * 2.5, { x: sceneWidth + 150 }).call(() => {
item.scaleX = -item.scaleX; item.scaleX = -item.scaleX;
text.scaleX = -text.scaleX; text.scaleX = -text.scaleX;
}).by(21 * 3, { x: - sceneWidth - 400 }).call(() => { }).by(21 * 2.5, { x: - sceneWidth - 50 }).call(() => {
item.scaleX = -item.scaleX; item.scaleX = -item.scaleX;
text.scaleX = -text.scaleX; text.scaleX = -text.scaleX;
})).start(); })).start();
...@@ -233,10 +233,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -233,10 +233,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
item.scaleX = 1; item.scaleX = 1;
text.scaleX = 1; text.scaleX = 1;
item.active = true; item.active = true;
cc.tween(item).repeatForever(cc.tween().by(21 * 3, { x: -sceneWidth - 400 }).call(() => { cc.tween(item).repeatForever(cc.tween().by(21 * 2.5, { x: -sceneWidth - 150 }).call(() => {
item.scaleX = -item.scaleX; item.scaleX = -item.scaleX;
text.scaleX = -text.scaleX; text.scaleX = -text.scaleX;
}).by(21 * 3, { x: 1920 + 400 }).call(() => { }).by(21 * 2.5, { x: 1920 + 50 }).call(() => {
item.scaleX = -item.scaleX; item.scaleX = -item.scaleX;
text.scaleX = -text.scaleX; text.scaleX = -text.scaleX;
})).start(); })).start();
......
export const defaultData = { export const defaultData = {
"audioName": "", "title": "Choose and fishing. ",
"imgAni": { "imgAni": {
"ske": { "ske": {
"url": "http://staging-teach.cdn.ireadabc.com/4ec3da85d888ad3c5c57e10fca728499.json", "url": "http://staging-teach.cdn.ireadabc.com/8ecba7014a461f031de0df1b60ba317a.json",
"name": "鱼1_ske.json" "name": "niao_ske.json"
}, },
"tex": { "tex": {
"url": "http://staging-teach.cdn.ireadabc.com/2c52380a3f3cdd3f5d38870bee2c9ffd.json", "url": "http://staging-teach.cdn.ireadabc.com/3508c660236613991535b5bf65b53ac0.json",
"name": "鱼1_tex.json" "name": "niao_tex.json"
}, },
"png": { "png": {
"url": "http://staging-teach.cdn.ireadabc.com/3ca112e3bb312d5e9b7182bbb97c616d.png", "url": "http://staging-teach.cdn.ireadabc.com/3f0fe926fd4513d621fca7eee24eb5d9.png",
"name": "鱼1_tex.png" "name": "niao_tex.png"
} }
}, },
"startAudio": "http://staging-teach.cdn.ireadabc.com/67421bf397cf214254db34427b4f53da_l.mp3", "startAudio": "http://staging-teach.cdn.ireadabc.com/215800e17214add98a0a888ace25d2ac_l.mp3",
"title": "分类钓鱼", "audioName": "",
"questions": "questions": [
[ {
{ "title": "左侧船",
"title": "左侧船", "text": "f", "audio": "http://staging-teach.cdn.ireadabc.com/67421bf397cf214254db34427b4f53da_l.mp3", "text": "a",
"options": [ "audio": "",
{ "audioName": "",
"type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/685adfecfead4414398dc7b71e8521f4_l.mp3", "audioName": "正确.mp3", "text": "fish", "right": false "options": [
}, { {
"type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/685adfecfead4414398dc7b71e8521f4_l.mp3", "audioName": "正确.mp3", "text": "fame", "right": false "type": "txt",
}, { "image": "",
"type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/685adfecfead4414398dc7b71e8521f4_l.mp3", "audioName": "正确.mp3", "text": "frame", "right": false "audio": "",
}, { "audioName": "",
"type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/685adfecfead4414398dc7b71e8521f4_l.mp3", "audioName": "正确.mp3", "text": "fake", "right": false "text": "friend",
}, { "right": false
"type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/685adfecfead4414398dc7b71e8521f4_l.mp3", "audioName": "正确.mp3", "text": "fafa", "right": false },
}], {
"audioName": "榨汁.mp3" "type": "txt",
}, "image": "",
{ "audio": "",
"title": "右侧船", "text": "d", "audio": "http://staging-teach.cdn.ireadabc.com/9fa2cc5655c343747db5680e84b462f4_l.mp3", "options": [{ "type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3", "audioName": "错误.mp3", "text": "ded", "right": false }, { "type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3", "audioName": "错误.mp3", "text": "door", "right": false }, { "type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3", "audioName": "错误.mp3", "text": "dude", "right": false }, { "type": "txt", "image": "", "audio": "http://staging-teach.cdn.ireadabc.com/3656883821fc547da4af0253476ab9be_l.mp3", "audioName": "错误.mp3", "text": "down", "right": false }], "audioName": "倒橙汁.mp3" "audioName": "",
}] "text": "pen",
} "right": false
\ No newline at end of file },
{
"type": "txt",
"image": "",
"audio": "",
"audioName": "",
"text": "rubber",
"right": false
},
{
"type": "txt",
"image": "",
"audio": "",
"audioName": "",
"text": "teacher",
"right": false
},
{
"type": "txt",
"image": "",
"audio": "",
"audioName": "",
"text": "bag",
"right": false
},
{
"type": "txt",
"image": "",
"audio": "",
"audioName": "",
"text": "cat",
"right": false
}
]
},
{
"title": "右侧船",
"text": "an",
"audio": "",
"audioName": "",
"options": [
{
"type": "txt",
"image": "",
"audio": "",
"audioName": "",
"text": "egg",
"right": false
},
{
"type": "txt",
"image": "",
"audio": "",
"audioName": "",
"text": "octopus",
"right": false
},
{
"type": "txt",
"image": "",
"audio": "",
"audioName": "",
"text": "alligator",
"right": false
},
{
"type": "txt",
"image": "",
"audio": "",
"audioName": "",
"text": "elephant",
"right": false
}
]
}
]
}
\ No newline at end of file
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