Commit 3599aaa8 authored by Lwd's avatar Lwd

aaaa

parent 1b98c460
...@@ -6,6 +6,7 @@ export class Course { ...@@ -6,6 +6,7 @@ export class Course {
title: string; title: string;
audio_url: string;
} }
export class Sheepfold { export class Sheepfold {
......
...@@ -8,6 +8,12 @@ ...@@ -8,6 +8,12 @@
</div> </div>
</div> </div>
<nz-form-control [nzSpan]="18">
<span>标题声音: </span>
<app-audio-recorder [audioUrl]="item.audio_url"
(audioUploaded)="onAudioUploadSuccess($event, item, 'audio_url')">
</app-audio-recorder>
</nz-form-control>
<nz-divider nzText="类别" nzOrientation="left"></nz-divider> <nz-divider nzText="类别" nzOrientation="left"></nz-divider>
<!-- <div nz-row> <!-- <div nz-row>
<nz-form-item> <nz-form-item>
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "41ef287f-ba46-4313-a114-676b6eae4bca", "uuid": "5c0041d0-ccbd-4069-bc12-73a47695ed52",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
This diff is collapsed.
...@@ -176,6 +176,15 @@ var game = cc.Class({ ...@@ -176,6 +176,15 @@ var game = cc.Class({
// this.setButtonState(); // this.setButtonState();
}, },
//播放标题音效
playAudioTitle: function () {
//获得播放路径
var path = g.data_mgr.data.audio_url;
g.res_mgr.playAudioByUrl(path, (url) => {
g.snd_mgr.playEffect(url, null);
});
},
//重置UI界面 //重置UI界面
resetUI: function () { resetUI: function () {
//移除所有子节点 //移除所有子节点
......
...@@ -99,7 +99,7 @@ cc.Class({ ...@@ -99,7 +99,7 @@ cc.Class({
var isIntersect_0 = contentArrPos_0.containsRect(posNode_1); var isIntersect_0 = contentArrPos_0.containsRect(posNode_1);
// console.log("坐标" + svLeftBottomPoint.x + "," + svLeftBottomPoint.y + "是否包含" + isIntersect_1); // console.log("坐标" + svLeftBottomPoint.x + "," + svLeftBottomPoint.y + "是否包含" + isIntersect_1);
if (isIntersect_1) { if (isIntersect_1) {
if (this.node.type == 1) { if (this.node.type == 2) {
this.Item_complete.active = true; this.Item_complete.active = true;
this.node.isComplent = true; this.node.isComplent = true;
g.data_mgr.nowNum -= 1; g.data_mgr.nowNum -= 1;
...@@ -128,7 +128,7 @@ cc.Class({ ...@@ -128,7 +128,7 @@ cc.Class({
console.log("被1包含" + isIntersect_1); console.log("被1包含" + isIntersect_1);
} else } else
if (isIntersect_0) { if (isIntersect_0) {
if (this.node.type == 2) { if (this.node.type == 1) {
this.Item_complete.active = true; this.Item_complete.active = true;
this.node.isComplent = true; this.node.isComplent = true;
g.data_mgr.nowNum -= 1; g.data_mgr.nowNum -= 1;
......
...@@ -13,7 +13,8 @@ g.data_mgr = { ...@@ -13,7 +13,8 @@ g.data_mgr = {
{ "id": "162373800016117r8ti", "word": "标题1" }, { "id": "162373800016117r8ti", "word": "标题1" },
{ "id": "1623738000162o9u566", "word": "标题2" }], { "id": "1623738000162o9u566", "word": "标题2" }],
"sheepArr": [{ "sheepfoldId": "162373800016117r8ti", "word": "aaa", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png" }, { "word": "aa", "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, { "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png", "word": "fgsdfg" }, { "sheepfoldId": "162373800016117r8ti", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png", "word": "gdfa" }], "sheepArr": [{ "sheepfoldId": "162373800016117r8ti", "word": "aaa", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png" }, { "word": "aa", "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png" }, { "sheepfoldId": "1623738000162o9u566", "picUrl": "http://staging-teach.cdn.ireadabc.com/be3debcc0598cfdde8a9e1ad2324743e.png", "word": "fgsdfg" }, { "sheepfoldId": "162373800016117r8ti", "picUrl": "http://staging-teach.cdn.ireadabc.com/77d34b5a7f2895e9319d4485a84a1b2b.png", "word": "gdfa" }],
"title": "asdfa" "title": "asdfa",
"audio_url": "http://staging-teach.cdn.ireadabc.com/032ce2b956871f7bc7b200d0ebbb7afc.mp3"
} }
const data = dataJson; const data = dataJson;
// const data = JSON.parse(dataJson); // const data = JSON.parse(dataJson);
......
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