Commit d8a34880 authored by Chen Jiping's avatar Chen Jiping

feat:调整结束时没有拍照功能

parent 55a0b0a9
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
</app-audio-recorder> </app-audio-recorder>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<!--
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2" nzFor="guideAudioUrl3">CC引导音频3</nz-form-label> <nz-form-label [nzSpan]="2" nzFor="guideAudioUrl3">CC引导音频3</nz-form-label>
<nz-form-control [nzSpan]="4"> <nz-form-control [nzSpan]="4">
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
</app-audio-recorder> </app-audio-recorder>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
-->
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2">图片</nz-form-label> <nz-form-label [nzSpan]="2">图片</nz-form-label>
<nz-form-control [nzSpan]="4"> <nz-form-control [nzSpan]="4">
......
...@@ -81,19 +81,19 @@ ...@@ -81,19 +81,19 @@
"__id__": 35 "__id__": 35
}, },
{ {
"__id__": 63 "__id__": 61
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 67
}, },
{ {
"__id__": 70 "__id__": 68
}, },
{ {
"__id__": 71 "__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1623,7 +1623,7 @@ ...@@ -1623,7 +1623,7 @@
"__id__": 41 "__id__": 41
}, },
{ {
"__id__": 46 "__id__": 44
} }
], ],
"_active": false, "_active": false,
...@@ -1937,9 +1937,6 @@ ...@@ -1937,9 +1937,6 @@
"_children": [ "_children": [
{ {
"__id__": 42 "__id__": 42
},
{
"__id__": 44
} }
], ],
"_active": true, "_active": true,
...@@ -1992,94 +1989,6 @@ ...@@ -1992,94 +1989,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "53LUHHG2pEr79fyrvazXJs" "_id": "53LUHHG2pEr79fyrvazXJs"
}, },
{
"__type__": "cc.Node",
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 43
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 138,
"height": 141
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
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": "1blU2OArJIfoC9XfupGxJG"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "03GEWUEZJGyKormWgIWCtM"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_photo", "_name": "btn_photo",
...@@ -2091,7 +2000,7 @@ ...@@ -2091,7 +2000,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 43
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2147,13 +2056,15 @@ ...@@ -2147,13 +2056,15 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 44 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": null, "_spriteFrame": {
"__uuid__": "a3fb2157-3337-409b-84ca-bd8b9f6ebe0f"
},
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
...@@ -2176,6 +2087,9 @@ ...@@ -2176,6 +2087,9 @@
"__id__": 35 "__id__": 35
}, },
"_children": [ "_children": [
{
"__id__": 45
},
{ {
"__id__": 47 "__id__": 47
}, },
...@@ -2196,9 +2110,6 @@ ...@@ -2196,9 +2110,6 @@
}, },
{ {
"__id__": 59 "__id__": 59
},
{
"__id__": 61
} }
], ],
"_active": true, "_active": true,
...@@ -2256,13 +2167,13 @@ ...@@ -2256,13 +2167,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2318,7 +2229,7 @@ ...@@ -2318,7 +2229,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2337,13 +2248,13 @@ ...@@ -2337,13 +2248,13 @@
"_name": "osmo_tip", "_name": "osmo_tip",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2399,7 +2310,7 @@ ...@@ -2399,7 +2310,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 47
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -2416,13 +2327,13 @@ ...@@ -2416,13 +2327,13 @@
"_name": "tip_success", "_name": "tip_success",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2478,7 +2389,7 @@ ...@@ -2478,7 +2389,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -2495,13 +2406,13 @@ ...@@ -2495,13 +2406,13 @@
"_name": "begin", "_name": "begin",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 52
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2557,7 +2468,7 @@ ...@@ -2557,7 +2468,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -2574,13 +2485,13 @@ ...@@ -2574,13 +2485,13 @@
"_name": "tip_letter", "_name": "tip_letter",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2636,7 +2547,7 @@ ...@@ -2636,7 +2547,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 55 "__id__": 53
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -2653,13 +2564,13 @@ ...@@ -2653,13 +2564,13 @@
"_name": "tip_icon", "_name": "tip_icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 56
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2715,7 +2626,7 @@ ...@@ -2715,7 +2626,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -2732,13 +2643,13 @@ ...@@ -2732,13 +2643,13 @@
"_name": "tip_area", "_name": "tip_area",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2794,7 +2705,7 @@ ...@@ -2794,7 +2705,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -2811,13 +2722,13 @@ ...@@ -2811,13 +2722,13 @@
"_name": "default", "_name": "default",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 46 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2873,7 +2784,7 @@ ...@@ -2873,7 +2784,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -2894,13 +2805,13 @@ ...@@ -2894,13 +2805,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 64 "__id__": 62
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2956,17 +2867,17 @@ ...@@ -2956,17 +2867,17 @@
"_name": "catFrame", "_name": "catFrame",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 63 "__id__": 61
}, },
"_children": [ "_children": [
{ {
"__id__": 65 "__id__": 63
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 65
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3022,13 +2933,13 @@ ...@@ -3022,13 +2933,13 @@
"_name": "cat", "_name": "cat",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3084,7 +2995,7 @@ ...@@ -3084,7 +2995,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 65 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3124,7 +3035,7 @@ ...@@ -3124,7 +3035,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -3153,7 +3064,7 @@ ...@@ -3153,7 +3064,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"_cullingMask": 4294967295, "_cullingMask": 4294967295,
......
...@@ -343,7 +343,7 @@ cc.Class({ ...@@ -343,7 +343,7 @@ cc.Class({
textNode.wordNodeArr = wordNodeArr; textNode.wordNodeArr = wordNodeArr;
this.resetTextPosition(textNode); this.resetTextPosition(textNode, 40);
this._curIndex = 0; this._curIndex = 0;
...@@ -379,7 +379,7 @@ cc.Class({ ...@@ -379,7 +379,7 @@ cc.Class({
textNode.wordNodeArr = wordNodeArr; textNode.wordNodeArr = wordNodeArr;
this.resetTextPosition(textNode); this.resetTextPosition(textNode, 15);
this._curIndex = 0; this._curIndex = 0;
}, },
...@@ -510,13 +510,10 @@ cc.Class({ ...@@ -510,13 +510,10 @@ cc.Class({
/** /**
* 重新设置文字位置 * 重新设置文字位置
*/ */
resetTextPosition(textNode) { resetTextPosition(textNode, space = 40) {
let wordNodeArr = textNode.wordNodeArr; let wordNodeArr = textNode.wordNodeArr;
//间隔
let space = 40;
let tW = 0; let tW = 0;
for (let i = 0; i < wordNodeArr.length; ++i) { for (let i = 0; i < wordNodeArr.length; ++i) {
...@@ -566,10 +563,6 @@ cc.Class({ ...@@ -566,10 +563,6 @@ cc.Class({
console.log(' in showEnd'); console.log(' in showEnd');
if (this._curIndex < this.data.exercises.wordArr.length) {
return;
}
if (this._shown) { if (this._shown) {
return; return;
} }
...@@ -751,12 +744,14 @@ cc.Class({ ...@@ -751,12 +744,14 @@ cc.Class({
photoBtn: null, photoBtn: null,
initPhotoBtn() { initPhotoBtn() {
console.log("init photoBtn");
const canvas = cc.find('Canvas'); const canvas = cc.find('Canvas');
const photoBtn = this.getSprNode('btn_photo'); const photoBtn = this.getSprNode('btn_photo');
canvas.addChild(photoBtn); canvas.addChild(photoBtn);
photoBtn.scale = this._mapScaleMin; photoBtn.scale = this._mapScaleMin;
// photoBtn.x = 100; // photoBtn.x = 100;
photoBtn.y = -canvas.height / 2 + photoBtn.height / 2 * photoBtn.scaleY; photoBtn.y = -canvas.height / 2 + photoBtn.height / 2 * photoBtn.scaleY;
photoBtn.addComponent(cc.Button); photoBtn.addComponent(cc.Button);
...@@ -772,7 +767,7 @@ cc.Class({ ...@@ -772,7 +767,7 @@ cc.Class({
if (!this.photoBtn) { if (!this.photoBtn) {
this.initPhotoBtn(); this.initPhotoBtn();
} }
this.photoBtn.active = true; this.photoBtn.active = true;console.log(this.photoBtn);
}, },
hidePhotoBtn() { hidePhotoBtn() {
......
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