Commit 7c94c4d1 authored by 李维's avatar 李维

完成判断对错逻辑

parent d1a0b3fe
...@@ -88,21 +88,18 @@ ...@@ -88,21 +88,18 @@
}, },
{ {
"__id__": 206 "__id__": 206
},
{
"__id__": 218
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 221 "__id__": 218
}, },
{ {
"__id__": 222 "__id__": 219
}, },
{ {
"__id__": 223 "__id__": 220
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6285,7 +6282,7 @@ ...@@ -6285,7 +6282,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1920, "width": 1920,
"height": -3800 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8422,163 +8419,6 @@ ...@@ -8422,163 +8419,6 @@
"preload": false, "preload": false,
"_id": "dey05oKrBIspvsDa6pOIQz" "_id": "dey05oKrBIspvsDa6pOIQz"
}, },
{
"__type__": "cc.Node",
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 219
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_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": "91i2wGBUNO/aVEV0M402zJ"
},
{
"__type__": "cc.Node",
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 218
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 220
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 22.25,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
50,
50,
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": "6cCRKENvFE5I9978OAy3iB"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 219
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "3",
"_N$string": "3",
"_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": "d8hatUvWxAi5F+od2lb3r1"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
......
This diff is collapsed.
...@@ -135,172 +135,4 @@ ...@@ -135,172 +135,4 @@
// "typeArr": [] // "typeArr": []
// } // }
export const defaultData = { export const defaultData = {"hotZoneConfigArr":[{"linkHotZoneIndex":0,"contentList":[{"index":0,"text":"item-1"}],"hotZoneType":"2","audio_url":"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3","score":"1"},{"linkHotZoneIndex":1,"contentList":[{"index":0,"text":"1","isCorrect":true},{"text":"2","image_url":"","hotZoneIndex":null,"score":0},{"text":"3","image_url":"","hotZoneIndex":null,"score":0}],"hotZoneType":"0","score":"1"},{"linkHotZoneIndex":2,"contentList":[{"index":0,"text":"item-1","selectHotZoneIndex":2,"isCorrect":true},{"text":"","image_url":"","hotZoneIndex":null,"score":0,"selectHotZoneIndex":3}],"hotZoneType":"3","score":"2"},{"linkHotZoneIndex":4,"contentList":[{"index":0,"text":"item-1"}],"hotZoneType":"4","inputText":"Hello World"},{"linkHotZoneIndex":9,"contentList":[{"index":0,"text":"1"},{"text":"2","image_url":"","hotZoneIndex":null,"score":0},{"text":"3","image_url":"","hotZoneIndex":null,"score":0,"isCorrect":true}],"hotZoneType":"0","score":"1"},{"linkHotZoneIndex":10,"contentList":[{"index":0,"text":"1"},{"text":"2","image_url":"","hotZoneIndex":null,"score":0},{"text":"3","image_url":"","hotZoneIndex":null,"score":0,"isCorrect":true}],"hotZoneType":"0","score":"1"}],"scoreConfigArr":[{"linkHotZoneIndex":7,"linkHotZoneIndexArr":[4,5,1]},{"linkHotZoneIndex":8,"linkHotZoneIndexArr":[2]}],"bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/5c84b987ea2291c8d6013fffd39dda32.png","rect":{"x":208.36755646817255,"y":0,"width":1361.264887063655,"height":1916}},"hotZoneItemArr":[{"index":0,"itemType":"rect","itemName":"1-音频","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":505.14,"y":248.57,"width":51.78,"height":51.78}},{"index":1,"itemType":"rect","itemName":"1-1选项","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":260.6,"y":512.66,"width":46.04,"height":46.04}},{"index":2,"itemType":"rect","itemName":"2-1Alex","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":189.26,"y":659.38,"width":71.35,"height":42.58}},{"index":3,"itemType":"rect","itemName":"2-1Anna","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":269.81,"y":660.52,"width":89.75,"height":40.27}},{"index":4,"itemType":"rect","itemName":"3-1输入文本","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":567.86,"y":1207.14,"width":230.14,"height":44.88}},{"index":5,"itemType":"rect","itemName":"提交按钮","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":768.9,"y":1737.78,"width":172.6,"height":51.78}},{"index":6,"itemType":"rect","itemName":"重做按钮","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":399.37,"y":1740.94,"width":151.9,"height":47.18}},{"index":7,"itemType":"rect","itemName":"1得分","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":1197.33,"y":249.71,"width":85.15,"height":47.18}},{"index":8,"itemType":"rect","itemName":"2得分","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":1197.33,"y":598.4,"width":87.45,"height":44.88}},{"index":9,"itemType":"rect","itemName":"1-2选项","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":457.71,"y":513.38,"width":42.93,"height":42.93}},{"index":10,"itemType":"rect","itemName":"1-3选项","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.3890625,"imgScale":1,"mapScale":1.3890625,"rect":{"x":648.63,"y":511,"width":50,"height":50}}],"submitHotZoneIndex":5,"replayHotZoneIndex":6}
hotZoneConfigArr: [ \ No newline at end of file
{
linkHotZoneIndex: 0,
contentList: [{ index: 0, text: "item-1" }],
hotZoneType: "2",
audio_url:
"http://staging-teach.cdn.ireadabc.com/2bf96923b83ee0c5f20930386ce07384.mp3",
score: "1",
},
{
linkHotZoneIndex: 1,
contentList: [
{ index: 0, text: "1", isCorrect: true },
{ text: "2", image_url: "", hotZoneIndex: null, score: 0 },
{ text: "3", image_url: "", hotZoneIndex: null, score: 0 },
],
hotZoneType: "0",
score: "1",
},
{
linkHotZoneIndex: 2,
contentList: [
{ index: 0, text: "item-1", selectHotZoneIndex: 2, isCorrect: true },
{
text: "",
image_url: "",
hotZoneIndex: null,
score: 0,
selectHotZoneIndex: 3,
},
],
hotZoneType: "3",
score: "2",
},
{
linkHotZoneIndex: 4,
contentList: [{ index: 0, text: "item-1" }],
hotZoneType: "4",
inputText: "Hello World",
score: "1",
},
],
scoreConfigArr: [
{ linkHotZoneIndex: 7, linkHotZoneIndexArr: [1] },
{ linkHotZoneIndex: 8, linkHotZoneIndexArr: [2, 3] },
],
bgItem: {
url: "http://staging-teach.cdn.ireadabc.com/5c84b987ea2291c8d6013fffd39dda32.png",
rect: {
x: 178.53182751540032,
y: 0,
width: 1182.9363449691994,
height: 1665,
},
},
hotZoneItemArr: [
{
index: 0,
itemType: "rect",
itemName: "1-音频",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 438.97, y: 216, width: 45, height: 45 },
},
{
index: 1,
itemType: "rect",
itemName: "1-1选项",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 226.47, y: 445.5, width: 40, height: 40 },
},
{
index: 2,
itemType: "rect",
itemName: "2-1Alex",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 164.47, y: 573, width: 62, height: 37 },
},
{
index: 3,
itemType: "rect",
itemName: "2-1Anna",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 234.47, y: 574, width: 78, height: 35 },
},
{
index: 4,
itemType: "rect",
itemName: "3-1输入文本",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 493.47, y: 1049, width: 200, height: 39 },
},
{
index: 5,
itemType: "rect",
itemName: "提交按钮",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 553.47, y: 1511, width: 150, height: 45 },
},
{
index: 6,
itemType: "rect",
itemName: "重做按钮",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 755.47, y: 1512, width: 132, height: 41 },
},
{
index: 7,
itemType: "rect",
itemName: "1得分",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 1040.47, y: 217, width: 74, height: 41 },
},
{
index: 8,
itemType: "rect",
itemName: "2得分",
fontSize: 50,
fontName: "BRLNSR_1",
fontColor: "#8f3758",
fontScale: 1.203125,
imgScale: 1,
mapScale: 1.203125,
rect: { x: 1040.47, y: 520, width: 76, height: 39 },
},
],
submitHotZoneIndex: 5,
replayHotZoneIndex: 6,
};
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<div style="margin: 10px 10px;"> <div style="margin: 10px 10px;">
<span style="display: inline-block; text-align: right; width: 150px;">包含分数的热区:</span> <span style="display: inline-block; text-align: right; width: 150px;">包含分数的热区:</span>
<nz-select [(ngModel)]="it.linkHotZoneIndexArr" nzMode="multiple" style="width: 300px;" (ngModelChange)="save()"> <nz-select [(ngModel)]="it.linkHotZoneIndexArr" nzMode="multiple" style="width: 300px;" (ngModelChange)="save()">
<nz-option *ngFor="let itOPtion of item.hotZoneItemArr" [nzValue]="itOPtion.index" [nzLabel]="itOPtion.index + 1"></nz-option> <nz-option *ngFor="let itOPtion of item.hotZoneConfigArr; let i=index;" [nzValue]="i" [nzLabel]="i + 1"></nz-option>
</nz-select> </nz-select>
</div> </div>
</div> </div>
......
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