Commit 9dae1f68 authored by yu's avatar yu

1

parent 2f71a204
......@@ -787,6 +787,8 @@ cc.Class({
if (card.data.audio) {
pg.audio.playAudioByUrlCall(card.data.audio).then((id) => {
let time = cc.audioEngine.getDuration(id);
if (time < 0.5) time = 0.5;
else if (time > 1) time = 1;
cc.tween(card).to(time / 2, { scale: 1.1 }).to(time / 2, { scale: 1 }).call(() => { return resolve("") }).start();
})
} else {
......@@ -799,7 +801,7 @@ cc.Class({
return new Promise((resolve, reject) => {
let card_group = cc.find("card_group", this.node);
let slider = cc.find("slider", card_group);
slider.action = true;
slider.active = true;
let handle = cc.find("Handle", slider);
handle.active = true;
let sl = slider.getComponent(cc.Slider)
......
......@@ -2,46 +2,117 @@ export const defaultData = {
"contentObj": {
"picArr": {
"cat": {
"start": "http://staging-teach.cdn.ireadabc.com/0913981cdeb2c6bc785de1054e80a500.mp3",
"record": "",
"wait": "http://staging-teach.cdn.ireadabc.com/fb1c9a86851f619d2199f8bf8c36476c.mp3",
"finish": "http://staging-teach.cdn.ireadabc.com/227c25a67e1398026bd6185bf9a6e87c.mp3"
"start": "http://staging-teach.cdn.ireadabc.com/7ff3292d46fb448ebbf571f848cbbda8.mp3",
"record": "http://staging-teach.cdn.ireadabc.com/3eb7436768734b48f91bba653ea6641c.mp3",
"wait": "http://staging-teach.cdn.ireadabc.com/9cee7663153c01230c91117afe05b408.mp3",
"finish": "http://staging-teach.cdn.ireadabc.com/9ced9ff29424b058fc060364f13aec17.mp3"
},
"tryagain": {
"one": "",
"two": "",
"three": ""
"one": "http://staging-teach.cdn.ireadabc.com/1c923d9ad42a500edceba37a985b49d5.mp3",
"two": "http://staging-teach.cdn.ireadabc.com/1c923d9ad42a500edceba37a985b49d5.mp3",
"three": "http://staging-teach.cdn.ireadabc.com/1c923d9ad42a500edceba37a985b49d5.mp3"
},
"list": [
{
"title": "",
"titleRed": [],
"title": "MONKEY",
"titleRed": [
null,
null,
1,
1
],
"titleObj": [
{
"card": "p",
"card": "M",
"color": "1",
"audio": "http://staging-teach.cdn.ireadabc.com/c693181b18d5b8e018cdd0dbbd8a8466.mp3"
},
{
"card": "O",
"color": "1",
"audio": "http://staging-teach.cdn.ireadabc.com/8b49fab1b1aa6c94e5fe5f783b9b624a.mp3"
},
{
"card": "N",
"color": "0",
// "audio": "http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3"
"audio": "http://staging-teach.cdn.ireadabc.com/3e89408da844b9fc5cad798a1f12ef44.mp3"
},
{
"card": "en",
"card": "K",
"color": "0",
"audio": "http://staging-teach.cdn.ireadabc.com/27d9cee1b2763faae9c7ac9f14d77e41.mp3"
},
{
"card": "E",
"color": "0",
"audio": "http://staging-teach.cdn.ireadabc.com/c693181b18d5b8e018cdd0dbbd8a8466.mp3"
},
{
"card": "Y",
"color": "1",
// "audio": "http://staging-teach.cdn.ireadabc.com/a855504f6ab7af375d881a9e16e61213.mp3"
"audio": "http://staging-teach.cdn.ireadabc.com/8b49fab1b1aa6c94e5fe5f783b9b624a.mp3"
}
],
"bgImg": "http://staging-teach.cdn.ireadabc.com/c81a7ae4d2499e038b2d349d289f640f.png",
"wordAudio": "http://staging-teach.cdn.ireadabc.com/ce3337620f22232dd15c29c66af57736.mp3",
"imgAni": {
"ske": {
"url": "http://staging-teach.cdn.ireadabc.com/eaa0764f57d08f9f2a1e356383726e7e.json",
"name": "bear加树枝_ske.json"
},
"tex": {
"url": "http://staging-teach.cdn.ireadabc.com/6743312bbfdcd6994d392645fc4ee038.json",
"name": "bear加树枝_tex.json"
},
"png": {
"url": "http://staging-teach.cdn.ireadabc.com/c81a7ae4d2499e038b2d349d289f640f.png",
"name": "bear加树枝_tex.png"
}
}
},
{
"title": "panda",
"titleRed": [
null,
1,
1
],
"titleObj": [
{
"card": "p",
"color": 1
},
{
"card": "a",
"color": 0
},
{
"card": "n",
"color": 0
},
{
"card": "d",
"color": 1
},
{
"card": "a",
"color": 1
}
],
"bgImg": "http://staging-teach.cdn.ireadabc.com/d5d3f7f4cf27a026fbb31c2ed52b5774.png",
"wordAudio": "http://staging-teach.cdn.ireadabc.com/fb1c9a86851f619d2199f8bf8c36476c.mp3",
"bgImg": "http://staging-teach.cdn.ireadabc.com/576b59c2884f213e759cf87a67879bd2.png",
"wordAudio": "http://staging-teach.cdn.ireadabc.com/7cba4edb49320a17b0db544780e0d0a9.mp3",
"imgAni": {
"ske": {
"url": "http://staging-teach.cdn.ireadabc.com/dc4febca2390ed2082cf29780f320aac.json",
"name": "弹弓动画1_ske.json"
"url": "http://staging-teach.cdn.ireadabc.com/75f58b408b79f4f2919f4e5adffaa9b8.json",
"name": "bird_ske.json"
},
"tex": {
"url": "http://staging-teach.cdn.ireadabc.com/41bdc84e6dac849ed13e18f04675c8da.json",
"name": "弹弓动画1_tex.json"
"url": "http://staging-teach.cdn.ireadabc.com/3d3b11b4d595dc6c76fd7ae22de3709f.json",
"name": "bird_tex.json"
},
"png": {
"url": "http://staging-teach.cdn.ireadabc.com/ba0023012458217fdc001a00734e5ee5.png",
"name": "弹弓动画1_tex.png"
"url": "http://staging-teach.cdn.ireadabc.com/576b59c2884f213e759cf87a67879bd2.png",
"name": "bird_tex.png"
}
}
}
......
......@@ -141,7 +141,7 @@
</div>
<div style="margin:10px">
<span>是否标红</span>
<nz-radio-group [(ngModel)]="obj.color">
<nz-radio-group [(ngModel)]="obj.color" (ngModelChange)="saveItem()">
<label nz-radio nzValue="1"></label>
<label nz-radio nzValue="0"></label>
</nz-radio-group>
......
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