Commit a41a6d6f authored by Tt's avatar Tt

小迪配置增加

parent 19534f5f
...@@ -97,18 +97,21 @@ ...@@ -97,18 +97,21 @@
}, },
{ {
"__id__": 211 "__id__": 211
},
{
"__id__": 232
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 232 "__id__": 241
}, },
{ {
"__id__": 233 "__id__": 242
}, },
{ {
"__id__": 234 "__id__": 243
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11718,6 +11721,414 @@ ...@@ -11718,6 +11721,414 @@
"_atlas": null, "_atlas": null,
"_id": "82tkonEylGzIRRYKwyfnsg" "_id": "82tkonEylGzIRRYKwyfnsg"
}, },
{
"__type__": "cc.Node",
"_name": "xiaodi",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 233
},
{
"__id__": 235
}
],
"_active": true,
"_components": [
{
"__id__": 239
},
{
"__id__": 240
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_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": "feuwJKszFDepQaLSSLA5Vt"
},
{
"__type__": "cc.Node",
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 232
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 234
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 715,
"height": 943
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
495.934,
-172.815,
0,
0,
0,
0,
1,
0.35,
0.35,
0.4
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a8vPGqIUlIVbHBhOX6VzXm"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 233
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "1f3903cb-1d5e-4e59-8440-b4cc1eb2e9d7#6588a98c-c9fc-47e6-9992-d9f5e712b6de",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "1f3903cb-1d5e-4e59-8440-b4cc1eb2e9d7"
},
"_N$dragonAtlasAsset": {
"__uuid__": "6588a98c-c9fc-47e6-9992-d9f5e712b6de"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 0,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "cf0VHy74tIxqW/4bHmukFE"
},
{
"__type__": "cc.Node",
"_name": "btn_go",
"_objFlags": 0,
"_parent": {
"__id__": 232
},
"_children": [
{
"__id__": 236
}
],
"_active": true,
"_components": [
{
"__id__": 238
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 257,
"height": 166
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
504.797,
95.957,
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": "e56yMoJB9OS6FKCWcMVdUO"
},
{
"__type__": "cc.Node",
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 235
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 237
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 97.87,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
14.079,
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": "2fwjqwG21HN5HnNMhUUG4i"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 236
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "42mLGwUOtDG51AOm4vGlKa"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 235
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a53cbf71-f5e8-413f-8ca5-5d78b08c2680"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "dcZ0PjePJF86cXbxC4ZF6N"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 232
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": 640,
"_top": 0,
"_bottom": 360,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "00bx+6V3NBeaQbXKozHHq7"
},
{
"__type__": "e017eRNFHBMTbexFU40o12M",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 232
},
"_enabled": true,
"aniRole": {
"__id__": 233
},
"moveX": 500,
"_id": "f661ySz6BKjo3VO641D27J"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
......
export const defaultData = { export const defaultData = {
"npcAudioText": "退出",
"npcAudio": "http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2_l.mp3",
"npcAudioName": "paomo_hy11_plp.mp3",
"npcAudioEnd": "http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2_l.mp3",
"npcAudioEndName": "paomo_hy11_plp.mp3",
"score": 5, "score": 5,
"top": { "top": {
"image": "http://staging-teach.cdn.ireadabc.com/00557f0ccc97e8396a3512a11def67bc.png", "image": "http://staging-teach.cdn.ireadabc.com/00557f0ccc97e8396a3512a11def67bc.png",
......
...@@ -78,7 +78,35 @@ ...@@ -78,7 +78,35 @@
<div class="border-dashed" style="margin: 20px;width: 1000px;"> <div class="border-dashed" style="margin: 20px;width: 1000px;">
<span style="font-size: 20px;">选项分数: </span> <span style="font-size: 20px;">选项分数: </span>
<input type="text" nz-input [(ngModel)]="item.score" (blur)="save()"> <input type="text" nz-input [(ngModel)]="item.score" (blur)="save()">
<span style="font-size: 20px;">标题文字: </span>
<span style="font-size: 20px;">开始音频: </span>
<div style="display:flex ;">
<div>
<app-audio-recorder [audioUrl]="item.npcAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'npcAudio',item,'npcAudioName')">
</app-audio-recorder>
</div>
<div style="margin: 5px">
<span>{{ item.npcAudioName}}</span>
</div>
</div>
<span style="font-size: 20px;">结束按钮文字: </span>
<input type="text" nz-input [(ngModel)]="item.npcAudioText" (blur)="save()">
<span style="font-size: 20px;">结束音频: </span>
<div style="display:flex ;">
<div>
<app-audio-recorder [audioUrl]="item.npcAudioEnd"
(audioUploaded)="onAudioUploadSuccess($event, 'npcAudioEnd',item,'npcAudioEndName')">
</app-audio-recorder>
</div>
<div style="margin: 5px">
<span>{{ item.npcAudioEndName}}</span>
</div>
</div>
<!-- <span style="font-size: 20px;">标题文字: </span>
<input type="text" nz-input [(ngModel)]="item.top.text" (blur)="save()"> <input type="text" nz-input [(ngModel)]="item.top.text" (blur)="save()">
<span style="font-size: 20px;">标题图片: </span> <span style="font-size: 20px;">标题图片: </span>
<div style="width:300px"> <div style="width:300px">
...@@ -94,7 +122,7 @@ ...@@ -94,7 +122,7 @@
<div style="margin: 5px"> <div style="margin: 5px">
<span>{{ item.audioName}}</span> <span>{{ item.audioName}}</span>
</div> </div>
</div> </div> -->
</div> </div>
<!-- 题目区 --> <!-- 题目区 -->
<div style="margin: 20px;width: 1000px;"> <div style="margin: 20px;width: 1000px;">
......
...@@ -20,6 +20,11 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O ...@@ -20,6 +20,11 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
text: "1", text: "1",
audio: "", audio: "",
}, },
npcAudioText: "",
npcAudio: "",
npcAudioName: "",
npcAudioEnd: "",
npcAudioEndName: "",
//1 ~ 6 个 //1 ~ 6 个
questions: [], questions: [],
}; };
......
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