Commit 77bc0c82 authored by jeff's avatar jeff

更新

parent e7835d3b
......@@ -144,6 +144,17 @@ export class CustomHotZoneComponent1 implements OnInit, OnDestroy, OnChanges {
this.init();
}
@Input()
set colorType(num: string) {
this.bgItem.colorType = num
if (this.bgItem.colorType == '0') {
this.bgItem.url = 'http://staging-teach.cdn.ireadabc.com/b90a006ba41723ec11970051e92f43e0.png'
} else {
this.bgItem.url = 'http://staging-teach.cdn.ireadabc.com/5716af983b610b43b13efbdefec93a51.png'
}
this.bg.load(this.bgItem.url)
}
onResize(event) {
this.winResizeEventStream.next();
}
......@@ -192,16 +203,19 @@ export class CustomHotZoneComponent1 implements OnInit, OnDestroy, OnChanges {
this.refresh();
}
refreshBackground(callBack = null) {
if (!this.bg) {
this.bg = new MySprite(this.ctx);
this.renderArr.push(this.bg);
}
if (!this.bgItem.url) {
this.bgItem.url = 'http://staging-teach.cdn.ireadabc.com/b90a006ba41723ec11970051e92f43e0.png';
if (!this.bgItem.colorType) {
this.bgItem.colorType = '0'
}
if (this.bgItem.colorType == '0') {
this.bgItem.url = 'http://staging-teach.cdn.ireadabc.com/b90a006ba41723ec11970051e92f43e0.png'
} else {
this.bgItem.url = 'http://staging-teach.cdn.ireadabc.com/5716af983b610b43b13efbdefec93a51.png'
}
const bg = this.bg;
......
<div class="model-content">
<div style="padding: 10px;">
<div style="padding: 10px">
<!--
......@@ -17,10 +17,18 @@
</div>
-->
<div style="display: flex;justify-content: center; ">
<h5 style="padding-right: 5px;">背景颜色</h5>
<nz-radio-group [(ngModel)]="colorType" (ngModelChange)="onRadioChange()">
<label nz-radio nzValue="0">颜色1</label>
<label nz-radio nzValue="1">颜色2</label>
</nz-radio-group>
</div>
<div *ngFor='let data of item ;index as i'>
<span> 卡片{{i+1}}</span>
<app-custom-hot-zone-mini [bgItem]="data.bgItem" [hotZoneItemArr]="data.hotZoneItemArr"
[customTypeGroupArr]="customTypeGroupArr" (save)="saveHotZone(data, $event)" (del)="delHotZone(i)">
[customTypeGroupArr]="customTypeGroupArr" (save)="saveHotZone(data, $event)" (del)="delHotZone(i)"
[colorType]="colorType">
</app-custom-hot-zone-mini>
</div>
<div style="margin-top: 20px; width: 100%; display: inline-flex; align-items: center;justify-content: center;">
......
......@@ -19,7 +19,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
name: '句子音频',
action: {
type: 'text',
audio:true,
audio: true,
option: [
['fontColor', '#000000'],
['fontSize', '100']
......@@ -27,10 +27,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
}
},
{
name: '点击区域',
name: '填空区域',
action: {
type: 'text',
aduio:false,
aduio: false,
option: [
['fontColor', '#000000'],
['fontSize', '100']
......@@ -47,29 +47,15 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
}
createShell() {
this.item.wordList.push({
word: '',
audio: '',
backWord: '',
backWordAudio: '',
});
this.save();
}
removeShell(idx) {
this.item.wordList.splice(idx, 1);
this.save();
}
ngOnInit() {
this.item = [];
this.item = {};
// 获取存储的数据
(<any>window).courseware.getData((data) => {
if (data && data.length) {
if (data) {
this.item = data;
}
......@@ -92,6 +78,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
}
colorType = '0'
onRadioChange() {
this.save()
}
/** 保存按钮 */
saveHotZone(group, e) {
console.log('e: ', e);
......@@ -117,6 +109,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
* 储存数据
*/
save() {
for (let one of this.item) {
one.bgItem.colorType = this.colorType
}
(<any>window).courseware.setData(this.item, null, this.saveKey);
this.refresh();
......
......@@ -3,8 +3,10 @@ cc.Class({
properties: {
playBtn: cc.Node,
pauseBtn: cc.Node,
label: cc.Label,
tiao: cc.Node
tiao: cc.Node,
moveBtn: cc.Node
},
onload() {
this._clip = null
......@@ -12,49 +14,99 @@ cc.Class({
this._audioId = null
this._totoalTime = null
this._nowTime = null
this._pause == false
},
onEnable() {
cc.systemEvent.on('stopBgMusic', this.onEvent, this)
this.moveBtn.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this)
this.moveBtn.on(cc.Node.EventType.TOUCH_MOVE, this.onTouchMove, this)
this.moveBtn.on(cc.Node.EventType.TOUCH_END, this.onTouchEnd, this)
this.moveBtn.on(cc.Node.EventType.TOUCH_CANCEL, this.onTouchEnd, this)
this.schedule(this.onTimeLoop)
},
onDisable() {
cc.systemEvent.off('stopBgMusic', this.onEvent, this)
this.moveBtn.off(cc.Node.EventType.TOUCH_START, this.onTouchStart, this)
this.moveBtn.off(cc.Node.EventType.TOUCH_MOVE, this.onTouchMove, this)
this.moveBtn.off(cc.Node.EventType.TOUCH_END, this.onTouchEnd, this)
this.moveBtn.on(cc.Node.EventType.TOUCH_CANCEL, this.onTouchEnd, this)
this.unschedule(this.onTimeLoop)
},
init(url) {
this.stopAudio()
this.playBtn.children[0].active = false
this.playBtn.children[1].active = true
this.playBtn.active = true
this.pauseBtn.active = false
cc.assetManager.loadRemote(url, (err, audioClip) => {
if (err) return
this.clip = audioClip
this._totoalTime = audioClip.duration
this.label.string = '0:00/' + this.transTime(this._totoalTime)
this.tiao.children[0].getComponent(cc.Sprite).fillRange = 0
this.tiao.children[1].x =12
this.tiao.children[1].x = 12
})
},
onTouchStart() {
if (this._audioId == null) return
if (this._play) {
this._pause = true
this._play = false
cc.audioEngine.pause(this._audioId)
}
},
/** 触摸移动 */
onTouchMove(e) {
if (this._audioId == null) return
let dis = e.getPreviousLocation().sub(e.getLocation())
dis = this.moveBtn.x - dis.x
if (dis < 12) dis = 12
else if (dis > 376) dis = 376
let scale = (dis - 12) / 364
this.moveBtn.x = dis
this.tiao.children[0].getComponent(cc.Sprite).fillRange = scale
this.tiao.children[1].x = 12 + 364 * scale
this._nowTime = this._totoalTime * scale
this.label.string = this.transTime(this._nowTime) + '/' + this.transTime(this._totoalTime)
},
onTouchEnd() {
if (this._pause) {
this._play = true
this._pause = false
cc.audioEngine.resume(this._audioId)
}
cc.audioEngine.setCurrentTime(this._audioId, this._totoalTime * (this.moveBtn.x - 12) / 364)
},
onPlay() {
this._play = !this._play
this.playBtn.children[0].active = this._play
this.playBtn.children[1].active = !this._play
if (this._play) {
if (this._audioId != null) {
cc.audioEngine.resume(this._audioId)
} else {
this._audioId = cc.audioEngine.play(this.clip, false, 0.8);
cc.audioEngine.setFinishCallback(this._audioId, this.stopAudio.bind(this));
this._nowTime = 0
}
cc.systemEvent.emit('stopWordsMusic')
this.schedule(this.onTimeLoop)
this.pauseBtn.active = true
this.playBtn.active = false
this._play = true
if (this._audioId != null) {
cc.audioEngine.resume(this._audioId)
} else {
this.stopAudio()
this._audioId = cc.audioEngine.play(this.clip)
cc.audioEngine.setFinishCallback(this._audioId, this.stopAudio.bind(this));
this._nowTime = 0
}
cc.systemEvent.emit('stopWordsMusic')
},
onPause() {
this.pauseBtn.active = false
this.playBtn.active = true
this._play = false
cc.audioEngine.pause(this._audioId)
},
/** 定时回调 */
onTimeLoop(dt) {
if (!this._play) return
this._nowTime += dt
this.label.string = this.transTime(this._nowTime) + '/' + this.transTime(this._totoalTime)
if (this._nowTime > this._totoalTime) this._nowTime = this._totoalTime
......@@ -70,11 +122,7 @@ cc.Class({
onStopAudio() {
if (this._nowTime < this._totoalTime) {
cc.audioEngine.pause(this._audioId)
this._play = false
this.playBtn.children[0].active = false
this.playBtn.children[1].active = true
this.unscheduleAllCallbacks()
this.onPause()
} else {
this.stopAudio()
}
......@@ -82,14 +130,15 @@ cc.Class({
stopAudio() {
if (this._audioId != null) {
cc.audioEngine.stop(this._audioId)
this._audioId = null
this.unscheduleAllCallbacks()
cc.audioEngine.stop(this._audioId)
this._play = false
this.playBtn.children[0].active = false
this.playBtn.children[1].active = true
this.tiao.children[0].getComponent(cc.Sprite).fillRange = 1
this.tiao.children[1].x = 12 + 364 * 1
this.pauseBtn.active = false
this.playBtn.active = true
// this._nowTime = 0
// this.label.string = this.transTime(this._nowTime) + '/' + this.transTime(this._totoalTime)
// this.tiao.children[0].getComponent(cc.Sprite).fillRange = 0
// this.tiao.children[1].x = 12
}
},
......
......@@ -84,19 +84,19 @@
"__id__": 21
},
{
"__id__": 40
"__id__": 43
}
],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 62
},
{
"__id__": 59
"__id__": 63
},
{
"__id__": 60
"__id__": 64
}
],
"_prefab": null,
......@@ -949,19 +949,22 @@
"__id__": 22
},
{
"__id__": 24
"__id__": 25
},
{
"__id__": 31
"__id__": 27
},
{
"__id__": 35
"__id__": 34
},
{
"__id__": 38
}
],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 42
}
],
"_prefab": null,
......@@ -1014,7 +1017,7 @@
},
{
"__type__": "cc.Node",
"_name": "bg_bottom",
"_name": "bg_buttondi",
"_objFlags": 0,
"_parent": {
"__id__": 21
......@@ -1024,6 +1027,130 @@
"_components": [
{
"__id__": 23
},
{
"__id__": 24
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 300,
"height": 103
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
4,
8.5,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "dfnhGQ2EBKSo58kp5iT07h"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "631eb6da-0394-49df-baf0-61935087f2bc"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "fa/pNEGT9MU5IlMu3YiLgv"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "a0T1BE35FKz70VBqCjl76Z"
},
{
"__type__": "cc.Node",
"_name": "bg_bottom",
"_objFlags": 0,
"_parent": {
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 26
}
],
"_prefab": null,
......@@ -1079,7 +1206,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 25
},
"_enabled": true,
"_materials": [
......@@ -1115,16 +1242,16 @@
},
"_children": [
{
"__id__": 25
"__id__": 28
},
{
"__id__": 27
"__id__": 30
}
],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 32
}
],
"_prefab": null,
......@@ -1180,13 +1307,13 @@
"_name": "show",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 26
"__id__": 29
}
],
"_prefab": null,
......@@ -1242,7 +1369,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 28
},
"_enabled": true,
"_materials": [
......@@ -1274,13 +1401,13 @@
"_name": "btn_replay",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 31
}
],
"_prefab": null,
......@@ -1336,7 +1463,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 30
},
"_enabled": true,
"_materials": [
......@@ -1368,7 +1495,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 27
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1377,7 +1504,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 30
"__id__": 33
}
],
"_N$interactable": true,
......@@ -1456,10 +1583,10 @@
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 35
},
{
"__id__": 34
"__id__": 37
}
],
"_prefab": null,
......@@ -1485,7 +1612,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
18,
23,
-3,
0,
0,
......@@ -1515,7 +1642,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 34
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1524,7 +1651,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 33
"__id__": 36
}
],
"_N$interactable": true,
......@@ -1597,7 +1724,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1635,10 +1762,10 @@
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 39
},
{
"__id__": 38
"__id__": 41
}
],
"_prefab": null,
......@@ -1694,7 +1821,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 38
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1703,7 +1830,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 37
"__id__": 40
}
],
"_N$interactable": true,
......@@ -1776,7 +1903,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 38
},
"_enabled": true,
"_materials": [
......@@ -1839,22 +1966,25 @@
},
"_children": [
{
"__id__": 41
"__id__": 44
},
{
"__id__": 48
},
{
"__id__": 54
"__id__": 52
},
{
"__id__": 58
}
],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 60
},
{
"__id__": 57
"__id__": 61
}
],
"_prefab": null,
......@@ -1905,87 +2035,21 @@
"groupIndex": 0,
"_id": "73LZP/ZUhPjb95BiJ/JUtb"
},
{
"__type__": "cc.Node",
"_name": "btnPlay",
"_objFlags": 0,
"_parent": {
"__id__": 40
},
"_children": [
{
"__id__": 42
},
{
"__id__": 44
}
],
"_active": true,
"_components": [
{
"__id__": 46
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 73,
"height": 73
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-204.199,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "6aSd82eBdJ3KE8dWlnKkyV"
},
{
"__type__": "cc.Node",
"_name": "btn_stop",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 43
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 43
"__id__": 45
},
{
"__id__": 46
}
],
"_prefab": null,
......@@ -2011,7 +2075,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-204.199,
0,
0,
0,
......@@ -2020,7 +2084,7 @@
1,
1,
1,
1
0
]
},
"_eulerAngles": {
......@@ -2041,7 +2105,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2068,18 +2132,103 @@
"_atlas": null,
"_id": "9bUdEmv89LM7Ch2zikGZxE"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 47
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 3,
"transition": 3,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "97jutpWnVATraXjj/E62Kk"
},
{
"__type__": "cc.ClickEvent",
"target": {
"__id__": 43
},
"component": "",
"_componentId": "a5d5cl9cN9CA5tELIOHf6uI",
"handler": "onPause",
"customEventData": ""
},
{
"__type__": "cc.Node",
"_name": "btn_next",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 49
},
{
"__id__": 50
}
],
"_prefab": null,
......@@ -2105,7 +2254,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-204.199,
0,
0,
0,
......@@ -2114,7 +2263,7 @@
1,
1,
1,
1
0
]
},
"_eulerAngles": {
......@@ -2135,7 +2284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2167,22 +2316,22 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 48
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 47
"__id__": 51
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$transition": 3,
"transition": 3,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
......@@ -2232,12 +2381,12 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "76GOqNaq9B0oiRUsO6Ux3u"
"_id": "43pLacLP1Ogpgs3rJXiCnU"
},
{
"__type__": "cc.ClickEvent",
"target": {
"__id__": 40
"__id__": 43
},
"component": "",
"_componentId": "a5d5cl9cN9CA5tELIOHf6uI",
......@@ -2249,20 +2398,20 @@
"_name": "bg_tiaodi",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 43
},
"_children": [
{
"__id__": 49
"__id__": 53
},
{
"__id__": 51
"__id__": 55
}
],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 57
}
],
"_prefab": null,
......@@ -2318,13 +2467,13 @@
"_name": "bg_tiao",
"_objFlags": 0,
"_parent": {
"__id__": 48
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 54
}
],
"_prefab": null,
......@@ -2380,7 +2529,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 53
},
"_enabled": true,
"_materials": [
......@@ -2412,13 +2561,13 @@
"_name": "icon_move",
"_objFlags": 0,
"_parent": {
"__id__": 48
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 56
}
],
"_prefab": null,
......@@ -2474,7 +2623,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2506,7 +2655,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2538,13 +2687,13 @@
"_name": "time",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 59
}
],
"_prefab": null,
......@@ -2600,7 +2749,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -2633,7 +2782,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 43
},
"_enabled": true,
"alignMode": 1,
......@@ -2660,17 +2809,23 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 43
},
"_enabled": true,
"playBtn": {
"__id__": 41
"__id__": 48
},
"pauseBtn": {
"__id__": 44
},
"label": {
"__id__": 55
"__id__": 59
},
"tiao": {
"__id__": 48
"__id__": 52
},
"moveBtn": {
"__id__": 55
},
"_id": "bc9MPqChFDCJsvpOdf++gN"
},
......@@ -2733,16 +2888,19 @@
"__id__": 15
},
"leftNode": {
"__id__": 31
"__id__": 34
},
"rightNode": {
"__id__": 35
"__id__": 38
},
"checkNode": {
"__id__": 24
"__id__": 27
},
"bgNode": {
"__id__": 5
},
"bgAudioNode": {
"__id__": 40
"__id__": 43
},
"btnClip": {
"__uuid__": "39ef1939-3bf9-4d21-a67a-bc1dede521a9"
......@@ -2750,6 +2908,14 @@
"tipClip": {
"__uuid__": "e0bcf4cc-35a7-4d61-b202-8dd49299c2c0"
},
"buttomBgs": [
{
"__id__": 22
},
{
"__id__": 25
}
],
"_id": "a1ibU1vO9Nwbfwjsm/NgGR"
}
]
\ No newline at end of file
......@@ -24,9 +24,11 @@ cc.Class({
type: cc.Node,
default: null
},
bgNode: cc.Node,
bgAudioNode: cc.Node,
btnClip: cc.AudioClip,
tipClip: cc.AudioClip
tipClip: cc.AudioClip,
buttomBgs: [cc.Node]
},
// 生命周期 onLoad
......@@ -107,7 +109,7 @@ cc.Class({
},
getDefaultData() {
const dataJson = ' [{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/b90a006ba41723ec11970051e92f43e0.png","rect":{"x":125.28,"y":0,"width":508.44,"height":286},"bgAudioUrl":"http://staging-teach.cdn.ireadabc.com/c8a7dd49a778b0b6dd509aac0ef437ff.mp3"},"hotZoneItemArr":[{"id":"1620909579034","index":0,"itemType":"text","fontScale":0.59296875,"imgScale":1,"mapScale":0.59296875,"gIdx":"0","actionData_":{"type":"text","changeOption":[["fontColor","#000000"],["fontSize","60"]],"text":"aaaaaaaaaaaaaa","audio_url":"http://staging-teach.cdn.ireadabc.com/c8a7dd49a778b0b6dd509aac0ef437ff.mp3"},"rect":{"width":292.76,"height":35.58,"x":12.63,"y":26.79}},{"id":"1620915585437","index":1,"pic_url":"http://staging-teach.cdn.ireadabc.com/31bde9b15582618fa5db4ac7cbc275b4.gif","itemType":"pic","fontScale":0.59296875,"imgScale":0.14977973568281938,"mapScale":0.59296875,"gIdx":"2","actionData_":{"type":"text","changeOption":[["fontColor","#000000"],["fontSize","100"]],"text":"bbbbbbbbbbb"},"rect":{"x":328.41,"y":11,"width":161.61,"height":68}},{"id":"1620920750092","index":2,"itemType":"text","fontScale":0.59296875,"imgScale":1,"mapScale":0.59296875,"gIdx":"0","actionData_":{"type":"text","changeOption":[["fontColor","#000000"],["fontSize","100"]],"text":"嗯?","audio_url":"http://staging-teach.cdn.ireadabc.com/7df4cc83a6c76dc6f0a526d07e6f1987.mp3"},"rect":{"width":118.58,"height":59.3,"x":203.93,"y":129.35}}]},{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/b90a006ba41723ec11970051e92f43e0.png","bgAudioUrl":"http://staging-teach.cdn.ireadabc.com/8f73a6b73a217d25ca4f4a2e234c1513.mp3","rect":{"x":222.44,"y":0,"width":903.11,"height":508}},"hotZoneItemArr":[{"id":"1620920863432","index":0,"pic_url":"http://staging-teach.cdn.ireadabc.com/335dea1b83498b0c7c05be637dc13dad.jpeg","itemType":"text","fontScale":1.053125,"imgScale":0.22391857506361323,"mapScale":1.053125,"gIdx":"0","actionData_":{"type":"text","changeOption":[["fontColor","#FF0000"],["fontSize","100"]],"text":"This is a test"},"rect":{"width":558.89,"height":105.31,"x":13.12,"y":6.34}},{"id":"1620920877342","index":1,"itemType":"text","fontScale":1.053125,"imgScale":1,"mapScale":1.053125,"gIdx":"1","actionData_":{"type":"text","changeOption":[["fontColor","#0000FF"],["fontSize","100"]],"text":"you are so good"},"rect":{"width":734.29,"height":105.31,"x":106.43,"y":151.34}},{"id":"1620922839187","index":2,"itemType":"text","fontScale":1.053125,"imgScale":1,"mapScale":1.053125,"gIdx":"0","actionData_":{"type":"text","changeOption":[["fontColor","#000000"],["fontSize","100"]],"text":"_______________"},"rect":{"width":728.12,"height":105.31,"x":109.5,"y":170.34}}]}]'
const dataJson = ' [{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/5716af983b610b43b13efbdefec93a51.png","rect":{"x":222.44,"y":0,"width":903.11,"height":508},"bgAudioUrl":"http://staging-teach.cdn.ireadabc.com/c8a7dd49a778b0b6dd509aac0ef437ff.mp3","colorType":"1"},"hotZoneItemArr":[{"id":"1620909579034","index":0,"itemType":"text","fontScale":1.053125,"imgScale":1,"mapScale":1.053125,"gIdx":"0","actionData_":{"type":"text","changeOption":[["fontColor","#000000"],["fontSize","60"]],"text":"aaaaaaaaaaaaaa","audio_url":"http://staging-teach.cdn.ireadabc.com/c8a7dd49a778b0b6dd509aac0ef437ff.mp3"},"rect":{"width":520,"height":63.19,"x":22.44,"y":47.59}},{"id":"1620915585437","index":1,"pic_url":"http://staging-teach.cdn.ireadabc.com/31bde9b15582618fa5db4ac7cbc275b4.gif","itemType":"pic","fontScale":1.053125,"imgScale":0.14977973568281938,"mapScale":1.053125,"gIdx":"2","actionData_":{"type":"text","changeOption":[["fontColor","#000000"],["fontSize","100"]],"text":"bbbbbbbbbbb"},"rect":{"x":646.06,"y":45.93,"width":161.61,"height":68}},{"id":"1620920750092","index":2,"itemType":"text","fontScale":1.053125,"imgScale":1,"mapScale":1.053125,"gIdx":"0","actionData_":{"type":"text","changeOption":[["fontColor","#000000"],["fontSize","100"]],"text":"嗯?","audio_url":"http://staging-teach.cdn.ireadabc.com/7df4cc83a6c76dc6f0a526d07e6f1987.mp3"},"rect":{"width":210.62,"height":105.31,"x":362.26,"y":229.77}}]},{"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/5716af983b610b43b13efbdefec93a51.png","bgAudioUrl":"http://staging-teach.cdn.ireadabc.com/8f73a6b73a217d25ca4f4a2e234c1513.mp3","rect":{"x":222.44,"y":0,"width":903.11,"height":508},"colorType":"1"},"hotZoneItemArr":[{"id":"1620920863432","index":0,"pic_url":"http://staging-teach.cdn.ireadabc.com/335dea1b83498b0c7c05be637dc13dad.jpeg","itemType":"text","fontScale":1.053125,"imgScale":0.22391857506361323,"mapScale":1.053125,"gIdx":"0","actionData_":{"type":"text","changeOption":[["fontColor","#FF0000"],["fontSize","100"]],"text":"This is a test"},"rect":{"width":558.89,"height":105.31,"x":13.12,"y":6.34}},{"id":"1620920877342","index":1,"itemType":"text","fontScale":1.053125,"imgScale":1,"mapScale":1.053125,"gIdx":"1","actionData_":{"type":"text","changeOption":[["fontColor","#0000FF"],["fontSize","100"]],"text":"you are so good"},"rect":{"width":734.29,"height":105.31,"x":106.44,"y":151.34}},{"id":"1620922839187","index":2,"itemType":"text","fontScale":1.053125,"imgScale":1,"mapScale":1.053125,"gIdx":"0","actionData_":{"type":"text","changeOption":[["fontColor","#000000"],["fontSize","100"]],"text":"_______________"},"rect":{"width":728.12,"height":105.31,"x":109.51,"y":170.34}}]}]'
const data = JSON.parse(dataJson);
return data;
},
......@@ -176,6 +178,15 @@ cc.Class({
this.leftNode.active = false
this.rightNode.active = true
}
if (this.data[0].bgItem.colorType == '1') {
this.buttomBgs[0].active = true
this.buttomBgs[1].active = false
this.bgNode.color = cc.color('#b9d7f5')
} else {
this.buttomBgs[0].active = false
this.buttomBgs[1].active = true
this.bgNode.color = cc.color('#C5F4BB')
}
this.setContent(this.picNode, this.data[0])
},
curPage: null,
......@@ -219,8 +230,6 @@ cc.Class({
cc.audioEngine.play(this.btnClip, false, 0.8)
},
/** 左移动 */
leftMove() {
this.stopAudio()
......@@ -282,6 +291,7 @@ cc.Class({
return
}
picNode.getComponent('picNode').initWithData(data)
let url = data.bgItem.bgAudioUrl
if (url && url != '') {
this.bgAudioNode.active = true
......@@ -295,9 +305,13 @@ cc.Class({
/** 点击切换答案显示 */
onCheckall() {
cc.audioEngine.playEffect(this.btnClip)
cc.audioEngine.playEffect(this.tipClip)
this.answerState = !this.answerState
if (this.answerState) {
cc.audioEngine.playEffect(this.btnClip)
cc.audioEngine.playEffect(this.tipClip)
} else {
cc.audioEngine.playEffect(this.btnClip)
}
this.checkNode.children[0].active = this.answerState
this.checkNode.children[1].active = !this.answerState
cc.systemEvent.emit('changeAnswerState', this.answerState)
......
......@@ -32,9 +32,13 @@ export default class NewClass extends cc.Component {
this.node.removeAllChildren()
// let one = new cc.Node()
// one.removeFromParent()
let one = new cc.Label()
one
// cc.audioEngine.setFinishCallback()
let one = new cc.AudioClip()
this.unscheduleAllCallbacks()
this.node.on(cc.Node.EventType.TOUCH_MOVE)
}
onTouchMove(e:cc.Event.EventTouch){
let dis = e.getPreviousLocation().sub(e.getLocationInView())
}
......
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