Commit 28a68d4b authored by 李维's avatar 李维

Bug fix

parent 8fa6c8cc
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<div class="section-title" > <div class="section-title" >
正确选项 正确选项
<div style="text-align: center; float: right;"> <div style="text-align: center; float: right;">
<button nz-button nzType="primary" (click)="addChoice(item.correct)" [disabled]="(item.correct.length + item.incorrect.length)>=25" > <button nz-button nzType="primary" (click)="addChoice(item.correct)" [disabled]="(item.correct.length + item.incorrect.length)>=30" >
<i nz-icon nzType="plus-circle" nzTheme="outline"></i> <i nz-icon nzType="plus-circle" nzTheme="outline"></i>
添加 添加
</button> </button>
...@@ -96,6 +96,14 @@ ...@@ -96,6 +96,14 @@
</nz-radio-group> </nz-radio-group>
</div> </div>
</div> </div>
<div style="display: flex; margin-bottom: 10px;">
<div style="flex:1">
音频
</div>
<div style="flex:5">
<app-audio-recorder [audioUrl]="choiceItem.audio_url" (audioUploaded)="onUploadSuccessByItem($event, choiceItem, 'audio_url')" ></app-audio-recorder>
</div>
</div>
<div *ngIf="choiceItem.type=='Text'" style="display: flex; margin-bottom: 10px;"> <div *ngIf="choiceItem.type=='Text'" style="display: flex; margin-bottom: 10px;">
<div style="flex:1"> <div style="flex:1">
文字 文字
...@@ -114,14 +122,6 @@ ...@@ -114,14 +122,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div style="display: flex; margin-bottom: 10px;">
<div style="flex:1">
音频
</div>
<div style="flex:5">
<app-audio-recorder [audioUrl]="choiceItem.audio_url" (audioUploaded)="onUploadSuccessByItem($event, choiceItem, 'audio_url')" ></app-audio-recorder>
</div>
</div> -->
<button *ngIf="item.correct.length>1" style="margin-top: 10px; position: absolute; bottom: 10px; right: 10px;;" nz-button nzType="danger" (click)="deleteChoice(item.correct, choiceIndex)" > <button *ngIf="item.correct.length>1" style="margin-top: 10px; position: absolute; bottom: 10px; right: 10px;;" nz-button nzType="danger" (click)="deleteChoice(item.correct, choiceIndex)" >
<span>删除此选项</span> <span>删除此选项</span>
</button> </button>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<div class="section-title" > <div class="section-title" >
错误选项 错误选项
<div style="text-align: center; float: right;"> <div style="text-align: center; float: right;">
<button nz-button nzType="primary" (click)="addChoice(item.incorrect)" [disabled]="(item.correct.length + item.incorrect.length)>=25" > <button nz-button nzType="primary" (click)="addChoice(item.incorrect)" [disabled]="(item.correct.length + item.incorrect.length)>=30" >
<i nz-icon nzType="plus-circle" nzTheme="outline"></i> <i nz-icon nzType="plus-circle" nzTheme="outline"></i>
添加 添加
</button> </button>
......
...@@ -243,8 +243,8 @@ ...@@ -243,8 +243,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 40, "width": 160,
"height": 36 "height": 80
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -348,8 +348,8 @@ ...@@ -348,8 +348,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 180, "width": 165,
"height": 50.4 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 1,
0, 0,
0, 0,
0, 0,
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
"_children": [ "_children": [
{ {
"__id__": 2 "__id__": 2
},
{
"__id__": 76
} }
], ],
"_active": false, "_active": false,
...@@ -90,28 +93,34 @@ ...@@ -90,28 +93,34 @@
"__id__": 29 "__id__": 29
}, },
{ {
"__id__": 30 "__id__": 32
}, },
{ {
"__id__": 31 "__id__": 33
}, },
{ {
"__id__": 32 "__id__": 34
}, },
{ {
"__id__": 45 "__id__": 35
},
{
"__id__": 38
},
{
"__id__": 51
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 73
}, },
{ {
"__id__": 68 "__id__": 74
}, },
{ {
"__id__": 69 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -201,7 +210,7 @@ ...@@ -201,7 +210,7 @@
"array": [ "array": [
0, 0,
0, 0,
268.7709893503001, 497.96460717605225,
0, 0,
0, 0,
0, 0,
...@@ -1356,7 +1365,7 @@ ...@@ -1356,7 +1365,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_back", "_name": "btn_start",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
...@@ -1366,7 +1375,7 @@ ...@@ -1366,7 +1375,7 @@
"__id__": 27 "__id__": 27
} }
], ],
"_active": false, "_active": true,
"_components": [], "_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
...@@ -1379,8 +1388,8 @@ ...@@ -1379,8 +1388,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 73, "width": 366,
"height": 77 "height": 256
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1391,8 +1400,8 @@ ...@@ -1391,8 +1400,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-579.157, 0,
306.802, 46.761,
0, 0,
0, 0,
0, 0,
...@@ -1414,11 +1423,11 @@ ...@@ -1414,11 +1423,11 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "5cAnBTFXhPU7oIB44aVStp" "_id": "358dwWbvlJHZb527oRm1Kn"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_back", "_name": "btn_start",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 26
...@@ -1441,8 +1450,8 @@ ...@@ -1441,8 +1450,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 73, "width": 366,
"height": 77 "height": 256
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1476,7 +1485,7 @@ ...@@ -1476,7 +1485,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "d7XCBOEh9L4Y4YJkiLgTb6" "_id": "acxUZGcnRI4LYg51BH+HDV"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1494,7 +1503,7 @@ ...@@ -1494,7 +1503,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "eb12dc27-5940-4032-990f-25286dd0a8e0" "__uuid__": "0ddfe260-a85c-425a-9cca-5e6e5c516d31"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1508,17 +1517,21 @@ ...@@ -1508,17 +1517,21 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "07xz/l54xOPJlrregfnv2w" "_id": "15xd2XiyVJ7IcZAx0uR1ct"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bubble_group", "_name": "btn_back",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [
"_active": true, {
"__id__": 30
}
],
"_active": false,
"_components": [], "_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
...@@ -1531,8 +1544,8 @@ ...@@ -1531,8 +1544,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 73,
"height": 720 "height": 77
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1543,8 +1556,8 @@ ...@@ -1543,8 +1556,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, -579.157,
0, 306.802,
0, 0,
0, 0,
0, 0,
...@@ -1566,18 +1579,22 @@ ...@@ -1566,18 +1579,22 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "46xoK5kedLqrzwmjoCmiDn" "_id": "5cAnBTFXhPU7oIB44aVStp"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "star_group", "_name": "btn_back",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 29
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [], "_components": [
{
"__id__": 31
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1589,8 +1606,8 @@ ...@@ -1589,8 +1606,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 73,
"height": 0 "height": 77
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1602,7 +1619,7 @@ ...@@ -1602,7 +1619,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-500, 0,
0, 0,
0, 0,
0, 0,
...@@ -1624,11 +1641,43 @@ ...@@ -1624,11 +1641,43 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "86ZqOQZkxD5L0y9H+unQec" "_id": "d7XCBOEh9L4Y4YJkiLgTb6"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "eb12dc27-5940-4032-990f-25286dd0a8e0"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "07xz/l54xOPJlrregfnv2w"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "score_group", "_name": "bubble_group",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
...@@ -1647,8 +1696,8 @@ ...@@ -1647,8 +1696,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 1280,
"height": 0 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1659,7 +1708,7 @@ ...@@ -1659,7 +1708,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
600, 0,
0, 0,
0, 0,
0, 0,
...@@ -1682,35 +1731,16 @@ ...@@ -1682,35 +1731,16 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "98siPBSYBPIre9IkAmH4s4" "_id": "46xoK5kedLqrzwmjoCmiDn"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "RibbonNodeBase", "_name": "star_group",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [],
{
"__id__": 33
},
{
"__id__": 35
},
{
"__id__": 37
},
{
"__id__": 39
},
{
"__id__": 41
},
{
"__id__": 43
}
],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": null, "_prefab": null,
...@@ -1736,8 +1766,8 @@ ...@@ -1736,8 +1766,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1161.91, 0,
-743.57, -500,
0, 0,
0, 0,
0, 0,
...@@ -1759,35 +1789,31 @@ ...@@ -1759,35 +1789,31 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "ccyu+/5JVCCrcCSiC2bxgc" "_id": "86ZqOQZkxD5L0y9H+unQec"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_sahua", "_name": "score_group",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 32 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [],
{
"__id__": 34
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 251, "r": 255,
"g": 197, "g": 255,
"b": 13, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 36, "width": 0,
"height": 24 "height": 0
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1798,8 +1824,8 @@ ...@@ -1798,8 +1824,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
600,
0, 0,
100,
0, 0,
0, 0,
0, 0,
...@@ -1821,52 +1847,23 @@ ...@@ -1821,52 +1847,23 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "275666BphI7Ii5/DyIE/3T" "_id": "98siPBSYBPIre9IkAmH4s4"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a3cc433a-f6df-4267-a442-c0ac476ebaae"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b0iTaTuF5Aibax6SWByeSw"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_sahua", "_name": "layout",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 32 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 36 "__id__": 36
},
{
"__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1874,26 +1871,26 @@ ...@@ -1874,26 +1871,26 @@
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 82, "g": 255,
"b": 82, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 36, "width": 50,
"height": 24 "height": 500
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 1,
"y": 0.5 "y": 1
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 620,
59.33, 280,
0, 0,
0, 0,
0, 0,
...@@ -1915,61 +1912,165 @@ ...@@ -1915,61 +1912,165 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "5cyn1Q9IdMLa3Rdd7op5/F" "_id": "19vRdBex9BAb93G0pBtXmm"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Layout",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 35
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_layoutSize": {
{ "__type__": "cc.Size",
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "width": 300,
} "height": 200
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a3cc433a-f6df-4267-a442-c0ac476ebaae"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
}, },
"_fillStart": 0, "_resize": 0,
"_fillRange": 0, "_N$layoutType": 3,
"_isTrimmedMode": true, "_N$cellSize": {
"_atlas": null, "__type__": "cc.Size",
"_id": "d8hsv8doBNqogJznvFDeVD" "width": 40,
"height": 40
},
"_N$startAxis": 1,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 10,
"_N$spacingY": 10,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 1,
"_N$affectedByScale": true,
"_id": "d7qfw/i0NJ9pB/snc366FC"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Widget",
"_name": "bg_sahua", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "node": {
"__id__": 32 "__id__": 35
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_left": 0,
"_right": 20,
"_top": 80,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "91DO4r9z9MhKN2RWrnT2WM"
},
{
"__type__": "cc.Node",
"_name": "RibbonNodeBase",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 39
},
{
"__id__": 41
},
{
"__id__": 43
},
{
"__id__": 45
},
{
"__id__": 47
},
{
"__id__": 49
}
],
"_active": true,
"_components": [],
"_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": [
-1161.91,
-743.57,
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": "ccyu+/5JVCCrcCSiC2bxgc"
}, },
"_children": [],
"_active": true,
"_components": [
{ {
"__type__": "cc.Node",
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 38 "__id__": 38
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 83, "r": 251,
"g": 212, "g": 197,
"b": 244, "b": 13,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
...@@ -1987,7 +2088,7 @@ ...@@ -1987,7 +2088,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
19.413, 100,
0, 0,
0, 0,
0, 0,
...@@ -2009,14 +2110,14 @@ ...@@ -2009,14 +2110,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "aayLz++7FMOKDAsGfNq+Hv" "_id": "275666BphI7Ii5/DyIE/3T"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2041,29 +2142,29 @@ ...@@ -2041,29 +2142,29 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "24HJp8wMRK6Je6dFbBcyeU" "_id": "b0iTaTuF5Aibax6SWByeSw"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 32 "__id__": 38
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 157, "r": 255,
"g": 250, "g": 82,
"b": 36, "b": 82,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
...@@ -2081,7 +2182,7 @@ ...@@ -2081,7 +2182,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-18.998, 59.33,
0, 0,
0, 0,
0, 0,
...@@ -2103,14 +2204,14 @@ ...@@ -2103,14 +2204,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "19jFGBul5MeK3v8fxb/ReX" "_id": "5cyn1Q9IdMLa3Rdd7op5/F"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2135,29 +2236,29 @@ ...@@ -2135,29 +2236,29 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "a7ATPjIw1GFak6DVsyv8mi" "_id": "d8hsv8doBNqogJznvFDeVD"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 32 "__id__": 38
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 42 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 83,
"g": 82, "g": 212,
"b": 82, "b": 244,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
...@@ -2175,7 +2276,7 @@ ...@@ -2175,7 +2276,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-50.63, 19.413,
0, 0,
0, 0,
0, 0,
...@@ -2197,14 +2298,14 @@ ...@@ -2197,14 +2298,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "c7py2bHzRKYauGI2c9CICw" "_id": "aayLz++7FMOKDAsGfNq+Hv"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 41 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2229,29 +2330,29 @@ ...@@ -2229,29 +2330,29 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "faSGrYOCpG04UkXP0txKaQ" "_id": "24HJp8wMRK6Je6dFbBcyeU"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 32 "__id__": 38
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 83, "r": 157,
"g": 212, "g": 250,
"b": 244, "b": 36,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
...@@ -2269,7 +2370,7 @@ ...@@ -2269,7 +2370,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-86.782, -18.998,
0, 0,
0, 0,
0, 0,
...@@ -2291,14 +2392,14 @@ ...@@ -2291,14 +2392,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "ba5x2+ECZEFbh5y0GOyem5" "_id": "19jFGBul5MeK3v8fxb/ReX"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2323,41 +2424,35 @@ ...@@ -2323,41 +2424,35 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "0acDv6o9tIxKMFRqOZf/Ca" "_id": "a7ATPjIw1GFak6DVsyv8mi"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "res", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 38
},
"_children": [
{
"__id__": 46
},
{
"__id__": 47
}, },
"_children": [],
"_active": true,
"_components": [
{ {
"__id__": 50 "__id__": 48
} }
], ],
"_active": false,
"_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 255,
"g": 255, "g": 82,
"b": 255, "b": 82,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 36,
"height": 0 "height": 24
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2369,7 +2464,7 @@ ...@@ -2369,7 +2464,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, -50.63,
0, 0,
0, 0,
0, 0,
...@@ -2391,31 +2486,67 @@ ...@@ -2391,31 +2486,67 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "0aAzbH6R1E+6AmGRrkKa5O" "_id": "c7py2bHzRKYauGI2c9CICw"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a3cc433a-f6df-4267-a442-c0ac476ebaae"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "faSGrYOCpG04UkXP0txKaQ"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "font", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 45 "__id__": 38
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [], "_components": [
{
"__id__": 50
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 83,
"g": 255, "g": 212,
"b": 255, "b": 244,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 36,
"height": 0 "height": 24
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2427,7 +2558,165 @@ ...@@ -2427,7 +2558,165 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, -86.782,
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": "ba5x2+ECZEFbh5y0GOyem5"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a3cc433a-f6df-4267-a442-c0ac476ebaae"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "0acDv6o9tIxKMFRqOZf/Ca"
},
{
"__type__": "cc.Node",
"_name": "res",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 52
},
{
"__id__": 53
},
{
"__id__": 56
}
],
"_active": false,
"_components": [],
"_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": "0aAzbH6R1E+6AmGRrkKa5O"
},
{
"__type__": "cc.Node",
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [],
"_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,
0, 0,
...@@ -2456,11 +2745,11 @@ ...@@ -2456,11 +2745,11 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 45 "__id__": 51
}, },
"_children": [ "_children": [
{ {
"__id__": 48 "__id__": 54
} }
], ],
"_active": true, "_active": true,
...@@ -2518,13 +2807,13 @@ ...@@ -2518,13 +2807,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 53
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2580,7 +2869,7 @@ ...@@ -2580,7 +2869,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 48 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -2608,32 +2897,32 @@ ...@@ -2608,32 +2897,32 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 45 "__id__": 51
}, },
"_children": [ "_children": [
{ {
"__id__": 51 "__id__": 57
}, },
{ {
"__id__": 53 "__id__": 59
}, },
{ {
"__id__": 55 "__id__": 61
}, },
{ {
"__id__": 57 "__id__": 63
}, },
{ {
"__id__": 59 "__id__": 65
}, },
{ {
"__id__": 61 "__id__": 67
}, },
{ {
"__id__": 63 "__id__": 69
}, },
{ {
"__id__": 65 "__id__": 71
} }
], ],
"_active": true, "_active": true,
...@@ -2691,13 +2980,13 @@ ...@@ -2691,13 +2980,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2753,7 +3042,7 @@ ...@@ -2753,7 +3042,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2771,13 +3060,13 @@ ...@@ -2771,13 +3060,13 @@
"_name": "出现", "_name": "出现",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2833,7 +3122,7 @@ ...@@ -2833,7 +3122,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2851,13 +3140,13 @@ ...@@ -2851,13 +3140,13 @@
"_name": "正确", "_name": "正确",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2913,7 +3202,7 @@ ...@@ -2913,7 +3202,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 55 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -2931,13 +3220,13 @@ ...@@ -2931,13 +3220,13 @@
"_name": "错误泡泡爆炸", "_name": "错误泡泡爆炸",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2993,7 +3282,7 @@ ...@@ -2993,7 +3282,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -3011,13 +3300,13 @@ ...@@ -3011,13 +3300,13 @@
"_name": "按钮", "_name": "按钮",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3073,7 +3362,7 @@ ...@@ -3073,7 +3362,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -3091,13 +3380,13 @@ ...@@ -3091,13 +3380,13 @@
"_name": "大星", "_name": "大星",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 68
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3153,7 +3442,7 @@ ...@@ -3153,7 +3442,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -3171,13 +3460,13 @@ ...@@ -3171,13 +3460,13 @@
"_name": "题数", "_name": "题数",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3233,7 +3522,7 @@ ...@@ -3233,7 +3522,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -3251,13 +3540,13 @@ ...@@ -3251,13 +3540,13 @@
"_name": "撒花", "_name": "撒花",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 72
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3313,7 +3602,7 @@ ...@@ -3313,7 +3602,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 65 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -3388,5 +3677,295 @@ ...@@ -3388,5 +3677,295 @@
"__uuid__": "22b14cf4-f840-4245-b8f0-191b685e7250" "__uuid__": "22b14cf4-f840-4245-b8f0-191b685e7250"
}, },
"_id": "e687yyoRBIzZAOVRL8Sseh" "_id": "e687yyoRBIzZAOVRL8Sseh"
},
{
"__type__": "cc.Node",
"_name": "StarBase",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [
{
"__id__": 77
}
],
"_active": true,
"_components": [
{
"__id__": 81
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 62,
"height": 66
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
193.71,
-148.73,
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": "7c7vV3Y6VDlKP3k7Y9od5M"
},
{
"__type__": "cc.Node",
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 76
},
"_children": [
{
"__id__": 78
}
],
"_active": false,
"_components": [
{
"__id__": 80
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 62,
"height": 69
},
"_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": "aaEgeEy/9Le58AY6Irj3ZF"
},
{
"__type__": "cc.Node",
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 278,
"height": 275
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
-0.7071067811865475,
0.7071067811865476,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": -90
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "13WVHWbn5KGo6FWT/3IaSq"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "0d4e8ab5-1e48-4a70-b5f3-41ac05264cbf"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "82y0cTRFxIHprqwai0VjA1"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "87136bc7-13f1-4c93-a705-396b8d9281b2"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "21pnYJi1lMw55l+sv/NSKx"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e3fc5cc3-7007-4f39-a4f7-854a16e06883"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "4bZ7kz+q9EPLyAhsej3lwe"
} }
] ]
\ No newline at end of file
...@@ -24,6 +24,7 @@ export default class GameLogic { ...@@ -24,6 +24,7 @@ export default class GameLogic {
m_stopMoving = false; m_stopMoving = false;
m_maxScale = 1; m_maxScale = 1;
m_isPlayingAudio = false; m_isPlayingAudio = false;
m_sysIntervalId = null;
constructor(formData, systemOption) { constructor(formData, systemOption) {
this.g_systemOption = systemOption; this.g_systemOption = systemOption;
...@@ -53,16 +54,8 @@ export default class GameLogic { ...@@ -53,16 +54,8 @@ export default class GameLogic {
this.resetPosition(); this.resetPosition();
this.addEventLinstener(); this.addEventLinstener();
if(this.nextQuestion()) {
if(this.g_formData.dataArray.length>1) {
this.initStar()
}
this.g_cartoon.initDragEvent() this.g_cartoon.initDragEvent()
this.enableClick("Sysyem_init"); this.enableClick("Sysyem_init");
// this.hideAir();
this.systemTick();
this.releaseBubbles()
}
cc.view.setResizeCallback(() => { cc.view.setResizeCallback(() => {
this.initBg(); this.initBg();
...@@ -75,6 +68,7 @@ export default class GameLogic { ...@@ -75,6 +68,7 @@ export default class GameLogic {
this.g_cartoon.initCartoonElement("audio", this.g_cartoon.getNodeByPath(`Canvas/speaker`)); this.g_cartoon.initCartoonElement("audio", this.g_cartoon.getNodeByPath(`Canvas/speaker`));
this.g_cartoon.initCartoonElement("back", this.g_cartoon.getNodeByPath(`Canvas/btn_back/btn_back`)); this.g_cartoon.initCartoonElement("back", this.g_cartoon.getNodeByPath(`Canvas/btn_back/btn_back`));
this.g_cartoon.initCartoonElement("restart", this.g_cartoon.getNodeByPath(`Canvas/btn_restart/btn_restart`)); this.g_cartoon.initCartoonElement("restart", this.g_cartoon.getNodeByPath(`Canvas/btn_restart/btn_restart`));
this.g_cartoon.initCartoonElement("start", this.g_cartoon.getNodeByPath(`Canvas/btn_start/btn_start`));
this.g_cartoon.initCartoonElement("lion", this.g_cartoon.getNodeByPath(`Canvas/lion/DB`)); this.g_cartoon.initCartoonElement("lion", this.g_cartoon.getNodeByPath(`Canvas/lion/DB`));
} }
...@@ -129,12 +123,34 @@ export default class GameLogic { ...@@ -129,12 +123,34 @@ export default class GameLogic {
}) })
}) })
const btn_start = this.g_cartoon.getCartoonElement("start")
this.g_cartoon.subscribeTouchEvent("start", _=>{
if(!this.g_enableClick) {
return
}
this.g_cartoon.tweenChange(btn_start.node, {scaleX: 0, scaleY: 0}, 0.2, _=>{
this.enableClick("start")
if(this.nextQuestion()) {
if(this.g_formData.dataArray.length>1) {
this.initStar()
}
this.releaseBubbles()
}
})
})
const btn_lion = this.g_cartoon.getCartoonElement("lion") const btn_lion = this.g_cartoon.getCartoonElement("lion")
btn_lion.play = () => { btn_lion.play = (aniName) => {
if(aniName) {
aniName = "play"
} else {
aniName = "normal"
}
let a = btn_lion.node.getComponent(dragonBones.ArmatureDisplay) let a = btn_lion.node.getComponent(dragonBones.ArmatureDisplay)
a.playAnimation('play', 1); a.playAnimation(aniName, 1);
setTimeout(() => { setTimeout(() => {
a.playAnimation('normal', -1); a.playAnimation(aniName, -1);
}, 3200); }, 3200);
} }
...@@ -185,6 +201,16 @@ export default class GameLogic { ...@@ -185,6 +201,16 @@ export default class GameLogic {
} }
} }
btn_speaker.playAudio = () => {
if(btn_speaker.node.active) {
btn_speaker.startAni()
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestionIndex].audio_url1, ()=>{
this.m_isPlayingAudio = false;
btn_speaker.stopAni();
})
}
}
this.g_cartoon.subscribeTouchEvent("audio", _=>{ this.g_cartoon.subscribeTouchEvent("audio", _=>{
if(!this.g_enableClick) { if(!this.g_enableClick) {
return return
...@@ -195,11 +221,7 @@ export default class GameLogic { ...@@ -195,11 +221,7 @@ export default class GameLogic {
this.g_cartoon.stopAllAudio() this.g_cartoon.stopAllAudio()
} else { } else {
this.m_isPlayingAudio = true; this.m_isPlayingAudio = true;
btn_speaker.startAni() btn_speaker.playAudio();
this.g_cartoon.playAudio(this.g_formData.dataArray[this.m_currentQuestionIndex].audio_url1, ()=>{
this.m_isPlayingAudio = false;
btn_speaker.stopAni();
})
} }
}) })
} }
...@@ -221,18 +243,25 @@ export default class GameLogic { ...@@ -221,18 +243,25 @@ export default class GameLogic {
this.m_rightAns = 0; this.m_rightAns = 0;
this.m_stopMoving = false; this.m_stopMoving = false;
if(this.g_formData.dataArray.length>1) { if(this.g_formData.dataArray.length>1) {
this.cleanScore();
this.initStar(); this.initStar();
} }
this.nextQuestion() this.nextQuestion()
this.releaseBubbles(); this.releaseBubbles();
} }
resetSystemTick() {
if(this.m_sysIntervalId) {
clearInterval(this.m_sysIntervalId);
this.m_sysIntervalId = null;
}
this.systemTick()
}
systemTick() { systemTick() {
let maxNum = this.m_bubblesAll.length; let maxNum = this.m_bubblesAll.length;
let maxX = cc.winSize.width / 2; let maxX = cc.winSize.width / 2;
let maxY = cc.winSize.height / 2; let maxY = cc.winSize.height / 2;
setInterval(()=>{ this.m_sysIntervalId = setInterval(()=>{
this.m_bubblesAll.forEach((bubble, index_x)=>{ this.m_bubblesAll.forEach((bubble, index_x)=>{
if(!this.m_stopMoving && bubble.move.enable && !bubble.move.fix) { if(!this.m_stopMoving && bubble.move.enable && !bubble.move.fix) {
bubble.move.x += bubble.move.vX bubble.move.x += bubble.move.vX
...@@ -292,70 +321,72 @@ export default class GameLogic { ...@@ -292,70 +321,72 @@ export default class GameLogic {
} }
initStar() { initStar() {
const starGroup = this.g_cartoon.getNodeByPath(`Canvas/star_group`) // const starGroup = this.g_cartoon.getNodeByPath(`Canvas/star_group`)
const scoreGroup = this.g_cartoon.getNodeByPath(`Canvas/score_group`) // const scoreGroup = this.g_cartoon.getNodeByPath(`Canvas/score_group`)
const scoreAll = [] // const scoreAll = []
const num = this.g_formData.dataArray.length; const num = this.g_formData.dataArray.length;
if(num>9) { // if(num>9) {
scoreGroup.scale = 0.6 // scoreGroup.scale = 0.6
} // }
for(let i=0; i<this.g_formData.dataArray.length; i++) { // for(let i=0; i<this.g_formData.dataArray.length; i++) {
const star = cc.instantiate(this.g_systemOption.prefabs.star); // const star = cc.instantiate(this.g_systemOption.prefabs.star);
star.parent = starGroup; // star.parent = starGroup;
this.g_cartoon.setCartoonElement(`star_${i}`, star) // this.g_cartoon.setCartoonElement(`star_${i}`, star)
const score = cc.instantiate(this.g_systemOption.prefabs.score); // const score = cc.instantiate(this.g_systemOption.prefabs.score);
score.parent = scoreGroup; // score.parent = scoreGroup;
this.g_cartoon.setCartoonElement(`score_${i}`, score) // this.g_cartoon.setCartoonElement(`score_${i}`, score)
scoreAll.push(score) // scoreAll.push(score)
} // }
let startY = (scoreAll.length * 66) / 2; // let startY = (scoreAll.length * 66) / 2;
scoreAll.forEach((score, index)=>{ // scoreAll.forEach((score, index)=>{
score.y = startY // score.y = startY
startY -= 66 + 10 // startY -= 66 + 10
}) // })
}
this.setStart(num)
addStar(callback) { }
if(this.g_formData.dataArray.length<=1) {
if(callback) { // addStar(callback) {
callback() // if(this.g_formData.dataArray.length<=1) {
} // if(callback) {
return; // callback()
} // }
// return;
const star = this.g_cartoon.getCartoonElement(`star_${this.m_currentQuestionIndex}`); // }
const score = this.g_cartoon.getCartoonElement(`score_${this.m_currentQuestionIndex}`);
const score_b = score.node.getChildByName("b") // const star = this.g_cartoon.getCartoonElement(`star_${this.m_currentQuestionIndex}`);
const starGroup = this.g_cartoon.getNodeByPath(`Canvas/star_group`); // const score = this.g_cartoon.getCartoonElement(`score_${this.m_currentQuestionIndex}`);
const scoreGroup = this.g_cartoon.getNodeByPath(`Canvas/score_group`); // const score_b = score.node.getChildByName("b")
// const starGroup = this.g_cartoon.getNodeByPath(`Canvas/star_group`);
this.g_cartoon.playAudio("大星") // const scoreGroup = this.g_cartoon.getNodeByPath(`Canvas/score_group`);
this.g_cartoon.tweenChange(star.node, {y: 380}, 1, ()=>{
setTimeout(() => { // this.g_cartoon.playAudio("大星")
const worldPos = starGroup.convertToWorldSpaceAR(cc.v2(star.node.x, star.node.y)); // this.g_cartoon.tweenChange(star.node, {y: 380}, 1, ()=>{
const localPos = scoreGroup.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y)); // setTimeout(() => {
// const worldPos = starGroup.convertToWorldSpaceAR(cc.v2(star.node.x, star.node.y));
star.node.parent = scoreGroup; // const localPos = scoreGroup.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y));
star.node.x = localPos.x;
star.node.y = localPos.y; // star.node.parent = scoreGroup;
// star.node.x = localPos.x;
this.g_cartoon.tweenChange(star.node, {x: score.node.x, y: score.node.y, scale: 0.2}, 0.8, _=>{ // star.node.y = localPos.y;
score_b.active = true;
score_b.scaleX = 0; // this.g_cartoon.tweenChange(star.node, {x: score.node.x, y: score.node.y, scale: 0.2}, 0.8, _=>{
score_b.scaleY = 0; // score_b.active = true;
star.node.destroy(); // score_b.scaleX = 0;
this.g_cartoon.tweenChange(score_b, {scale: 1}, 0.1, _=>{ // score_b.scaleY = 0;
if(callback) { // star.node.destroy();
callback() // this.g_cartoon.tweenChange(score_b, {scale: 1}, 0.1, _=>{
} // if(callback) {
}) // callback()
}) // }
}, 1000); // })
}) // })
} // }, 1000);
// })
// }
nextQuestion() { nextQuestion() {
this.m_currentQuestionIndex++; this.m_currentQuestionIndex++;
...@@ -373,12 +404,14 @@ export default class GameLogic { ...@@ -373,12 +404,14 @@ export default class GameLogic {
} }
const btn_lion = this.g_cartoon.getCartoonElement("lion") const btn_lion = this.g_cartoon.getCartoonElement("lion")
btn_lion.play(); btn_lion.play(false);
const rightNum = this.g_formData.dataArray[this.m_currentQuestionIndex].correct.length; const rightNum = this.g_formData.dataArray[this.m_currentQuestionIndex].correct.length;
const wrongNum = this.g_formData.dataArray[this.m_currentQuestionIndex].incorrect.length; const wrongNum = this.g_formData.dataArray[this.m_currentQuestionIndex].incorrect.length;
const bubbleNum = rightNum + wrongNum; const bubbleNum = rightNum + wrongNum;
const bubbleParent = this.g_cartoon.getNodeByPath(`Canvas/bubble_group`) const bubbleParent = this.g_cartoon.getNodeByPath(`Canvas/bubble_group`)
this.m_bubblesAll = JSON.parse(JSON.stringify([]));
this.m_rightAns = 0;
const scale = bubbleNum<=15?1:0.7; const scale = bubbleNum<=15?1:0.7;
for(let i=0; i<bubbleNum; i++) { for(let i=0; i<bubbleNum; i++) {
...@@ -434,7 +467,7 @@ export default class GameLogic { ...@@ -434,7 +467,7 @@ export default class GameLogic {
if(item.type == 'Image') { if(item.type == 'Image') {
let image = bubble.node.getChildByName("image_container") let image = bubble.node.getChildByName("image_container")
image.active = true; image.active = true;
this.g_cartoon.mountImageToNode(item.image_url, image, 120, 120) this.g_cartoon.mountImageToNode(item.image_url, image, 160, 80)
} else { } else {
let text = bubble.node.getChildByName("text_container") let text = bubble.node.getChildByName("text_container")
text.active = true; text.active = true;
...@@ -457,15 +490,16 @@ export default class GameLogic { ...@@ -457,15 +490,16 @@ export default class GameLogic {
const btn_speaker = this.g_cartoon.getCartoonElement("audio"); const btn_speaker = this.g_cartoon.getCartoonElement("audio");
this.g_cartoon.stopAllAudio(); this.g_cartoon.stopAllAudio();
btn_speaker.stopAni(); btn_speaker.stopAni();
if(bubble.isRight) { if(bubble.isRight) {
this.g_cartoon.playAudio("正确"); this.g_cartoon.playAudio("正确")
clickBubble.boom().then(_=>{ clickBubble.boom().then(_=>{
bubble.node.active = false; bubble.node.active = false;
if(item.audio_url) {
this.g_cartoon.playAudio(item.audio_url, _=>{
this.m_rightAns++; this.m_rightAns++;
if(this.m_rightAns>=rightNum) { if(this.m_rightAns>=rightNum) {
this.m_stopMoving = true; this.m_stopMoving = true;
this.addStar(_=>{ this.showStar(this.m_currentQuestionIndex, _=>{
this.destroyBubbles().then(_=>{ this.destroyBubbles().then(_=>{
if(!this.nextQuestion()) { if(!this.nextQuestion()) {
this.endGame() this.endGame()
...@@ -478,10 +512,29 @@ export default class GameLogic { ...@@ -478,10 +512,29 @@ export default class GameLogic {
this.enableClick("Destroy") this.enableClick("Destroy")
} }
}) })
} else {
this.m_rightAns++;
if(this.m_rightAns>=rightNum) {
this.m_stopMoving = true;
this.showStar(this.m_currentQuestionIndex, _=>{
this.destroyBubbles().then(_=>{
if(!this.nextQuestion()) {
this.endGame()
} else {
this.releaseBubbles();
}
})
})
} else {
this.enableClick("Destroy")
}
}
})
} else { } else {
this.m_stopMoving = true; this.m_stopMoving = true;
clickBubble.shake(_=>{ clickBubble.shake(_=>{
this.m_stopMoving = false; this.m_stopMoving = false;
this.resetSystemTick();
this.enableClick(`bubble_${i}`) this.enableClick(`bubble_${i}`)
}) })
this.g_cartoon.playAudio("错误泡泡爆炸"); this.g_cartoon.playAudio("错误泡泡爆炸");
...@@ -532,8 +585,8 @@ export default class GameLogic { ...@@ -532,8 +585,8 @@ export default class GameLogic {
] ]
let scaleIndex = this.m_bubblesAll.length<=15?0:1; let scaleIndex = this.m_bubblesAll.length<=15?0:1;
let startx = cc.winSize.width / 2 let startx = cc.winSize.width / 2 - 220
let starty = -cc.winSize.height / 2 let starty = -cc.winSize.height / 2 + 200
const vArr = [ const vArr = [
{vX: -0.5, vY: 0.5 }, {vX: 0.5, vY: -0.5 }, {vX: -0.5, vY: -0.5 }, {vX: 0.5, vY: 0.5 } {vX: -0.5, vY: 0.5 }, {vX: 0.5, vY: -0.5 }, {vX: -0.5, vY: -0.5 }, {vX: 0.5, vY: 0.5 }
] ]
...@@ -560,25 +613,25 @@ export default class GameLogic { ...@@ -560,25 +613,25 @@ export default class GameLogic {
pAll.push(_p) pAll.push(_p)
} }
}) })
const btn_lion = this.g_cartoon.getCartoonElement("lion")
btn_lion.play(true);
const btn_speaker = this.g_cartoon.getCartoonElement("audio");
Promise.all(pAll).then(_=>{ Promise.all(pAll).then(_=>{
this.m_stopMoving = false; this.m_stopMoving = false;
btn_lion.play(false);
btn_speaker.playAudio();
this.m_bubblesAll.forEach(bubble=>{ this.m_bubblesAll.forEach(bubble=>{
if(!bubble.move.fix) { if(!bubble.move.fix) {
bubble.move.enable = true; bubble.move.enable = true;
} }
}) })
this.resetSystemTick();
}) })
} }
cleanScore() {
const scoreGroup = this.g_cartoon.getNodeByPath(`Canvas/score_group`);
const scoreAll = []
for(let i=0; i<this.g_formData.dataArray.length; i++) {
const _score = this.g_cartoon.getCartoonElement(`score_${i}`)
_score.node.destroy();
}
}
fireworks() { fireworks() {
this.showFireworks( this.showFireworks(
cc.find('Canvas/background/background'), cc.find('Canvas/background/background'),
...@@ -688,6 +741,108 @@ export default class GameLogic { ...@@ -688,6 +741,108 @@ export default class GameLogic {
setStart(number) {
if (!number) {
number = 0;
}
let length = number;
const starLayout = cc.find('Canvas/layout');
starLayout.removeAllChildren();
const paddingY = starLayout.getComponent(cc.Layout).spacingY;
for (let i = 0; i < length; i++) {
const starBase = cc.instantiate(cc.find('StarBase'));
starBase.name = `starBase_${i}`;
starBase.scale = this.Between(0.5, (starLayout.height / length - paddingY) / starBase.height, 1);
starBase.parent = starLayout;
}
}
showStar(currentStarIdx, callback) {
if (!currentStarIdx) {
currentStarIdx = 0;
}
const starBase = cc.find(`Canvas/layout/starBase_${currentStarIdx}`);
if (!starBase) {
return;
}
const star = starBase.getChildByName('Star');
const starBig = star.getChildByName('StarBig');
starBig.scale = 1;
star.active = true;
star.scaleX = 0.7 / starBase.scale;
star.scaleY = 1 / starBase.scale;
star.angle = 90;
const canvas = cc.find('Canvas');
const startPos = this.exchangeNodePos(star.parent, canvas, cc.v2(0, -canvas.height / 2));
const middlePos = this.exchangeNodePos(star.parent, canvas, cc.v2(0, -canvas.height / 4));
star.x = startPos.x;
star.y = startPos.y - starBig.height;
console.log('middlePos = ' + JSON.stringify(middlePos));
const time = 1;
cc.tween(star)
.to(0.3, { y: middlePos.y + 80 }, { easing: 'quadOut' })
.to(0.1, { y: middlePos.y + 40, scaleX: 1.2 / starBase.scale, scaleY: 0.8 / starBase.scale }, { easing: 'quadOut' })
.to(0.1, { y: middlePos.y, scaleX: 1 / starBase.scale, scaleY: 1 / starBase.scale }, { easing: 'quadOut' })
.delay(0.1)
.to(0.8, { angle: -720, scale: 1 })
.start();
cc.tween(star)
.delay(0.6)
.to(0.8, { x: 0 }, { easing: 'quadIn' })
.start();
cc.tween(star)
.delay(0.6)
.to(0.8, { y: 0 }, { easing: 'quadOut' })
.start();
cc.tween(starBig)
.delay(0.6)
.to(0.8, { scale: 0 }, { easing: 'quadOut' })
.call(() => {
// this.checkGameEnd();
if(callback) {
callback()
}
})
.start();
}
Between(a, b, c) {
return [a, b, c].sort()[1];
}
exchangeNodePos(targetNode, baseNode, basePos) {
return targetNode.convertToNodeSpaceAR(baseNode.convertToWorldSpaceAR(cc.v2(basePos.x, basePos.y)));
}
// Common function // Common function
maskLayer = null; maskLayer = null;
initMaskLayer() { initMaskLayer() {
......
...@@ -112,6 +112,7 @@ cc.Class({ ...@@ -112,6 +112,7 @@ cc.Class({
getData(cb) { getData(cb) {
cb(this.getDefaultData()); cb(this.getDefaultData());
// cc.loader.load( "http://www.datalist.com.cn:8060/json/DataKey_dfzx_ppp", function( err, res) { // cc.loader.load( "http://www.datalist.com.cn:8060/json/DataKey_dfzx_ppp", function( err, res) {
// console.log(res)
// if(err) { // if(err) {
// cb(this.getDefaultData()); // cb(this.getDefaultData());
// } else { // } else {
...@@ -121,8 +122,7 @@ cc.Class({ ...@@ -121,8 +122,7 @@ cc.Class({
}, },
getDefaultData() { getDefaultData() {
const dataJson = '{ "contentObj": { "version": "1.0", "key": "DataKey_dfzx_ppp", "question": {}, "dataArray": [ { "correct": [ { "type": "Text", "text": "Demo", "audio_url": "", "image_url": "" } ], "incorrect": [], "audio_url1": "" } ] } }'
const dataJson = '{"pic_url":"http://staging-teach.cdn.ireadabc.com/ed94332a503c31e0908bd4c6923a2665.png","pic_url_2":"http://staging-teach.cdn.ireadabc.com/5fb60317ade0195d35ad8034d5370a7f.png","text":"This is a test label.","audio_url":"http://staging-teach.cdn.ireadabc.com/f47f1d7b5c160fe1c59500d180346240.mp3"}'
const data = JSON.parse(dataJson); const data = JSON.parse(dataJson);
return data; return data;
}, },
......
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