Commit cc807d03 authored by Lwd's avatar Lwd

commit

parent 40b78b58
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 470 "__id__": 471
}, },
{ {
"__id__": 496 "__id__": 497
} }
], ],
"_active": false, "_active": false,
...@@ -81,14 +81,11 @@ ...@@ -81,14 +81,11 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 463 "__id__": 464
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 465
},
{ {
"__id__": 466 "__id__": 466
}, },
...@@ -100,6 +97,9 @@ ...@@ -100,6 +97,9 @@
}, },
{ {
"__id__": 469 "__id__": 469
},
{
"__id__": 470
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
"__id__": 8 "__id__": 8
}, },
{ {
"__id__": 459 "__id__": 460
} }
], ],
"_active": true, "_active": true,
...@@ -437,22 +437,22 @@ ...@@ -437,22 +437,22 @@
"__id__": 290 "__id__": 290
}, },
{ {
"__id__": 419 "__id__": 420
}, },
{ {
"__id__": 422 "__id__": 423
}, },
{ {
"__id__": 425 "__id__": 426
}, },
{ {
"__id__": 439 "__id__": 440
}, },
{ {
"__id__": 453 "__id__": 454
}, },
{ {
"__id__": 458 "__id__": 459
} }
], ],
"_active": true, "_active": true,
...@@ -2239,7 +2239,7 @@ ...@@ -2239,7 +2239,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 200,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -2291,11 +2291,11 @@ ...@@ -2291,11 +2291,11 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Animal", "_string": "Animalaa1",
"_N$string": "Animal", "_N$string": "Animalaa1",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -2307,7 +2307,7 @@ ...@@ -2307,7 +2307,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "5a0vxOp1FPIJHdqyqK0Qnp" "_id": "5a0vxOp1FPIJHdqyqK0Qnp"
}, },
...@@ -3128,7 +3128,7 @@ ...@@ -3128,7 +3128,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 200,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3180,11 +3180,11 @@ ...@@ -3180,11 +3180,11 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Animal", "_string": "Animalaa1",
"_N$string": "Animal", "_N$string": "Animalaa1",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -3196,7 +3196,7 @@ ...@@ -3196,7 +3196,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "8bU89X4XhFy7Jdf79rBJSl" "_id": "8bU89X4XhFy7Jdf79rBJSl"
}, },
...@@ -4017,7 +4017,7 @@ ...@@ -4017,7 +4017,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 200,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4069,11 +4069,11 @@ ...@@ -4069,11 +4069,11 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Animal", "_string": "Animalaa1",
"_N$string": "Animal", "_N$string": "Animalaa1",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -4085,7 +4085,7 @@ ...@@ -4085,7 +4085,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "b6aKal0sZOA60KzpxKRW5M" "_id": "b6aKal0sZOA60KzpxKRW5M"
}, },
...@@ -5043,7 +5043,7 @@ ...@@ -5043,7 +5043,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 170,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -5095,11 +5095,11 @@ ...@@ -5095,11 +5095,11 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Animal", "_string": "Animalaaa",
"_N$string": "Animal", "_N$string": "Animalaaa",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -5111,7 +5111,7 @@ ...@@ -5111,7 +5111,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "fbPI1GjytKe4ob0u9xFfYU" "_id": "fbPI1GjytKe4ob0u9xFfYU"
}, },
...@@ -5932,7 +5932,7 @@ ...@@ -5932,7 +5932,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 170,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -5984,11 +5984,11 @@ ...@@ -5984,11 +5984,11 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Animal", "_string": "Animalaaa",
"_N$string": "Animal", "_N$string": "Animalaaa",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -6000,7 +6000,7 @@ ...@@ -6000,7 +6000,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "9dxVHcst1Dh44OJ0HEHMuq" "_id": "9dxVHcst1Dh44OJ0HEHMuq"
}, },
...@@ -6821,7 +6821,7 @@ ...@@ -6821,7 +6821,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 170,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -6873,11 +6873,11 @@ ...@@ -6873,11 +6873,11 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Animal", "_string": "Animalaaa",
"_N$string": "Animal", "_N$string": "Animalaaa",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -6889,7 +6889,7 @@ ...@@ -6889,7 +6889,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "b2nlpcFlFH56nRGhmGKdfj" "_id": "b2nlpcFlFH56nRGhmGKdfj"
}, },
...@@ -7710,7 +7710,7 @@ ...@@ -7710,7 +7710,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 170,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -7762,11 +7762,11 @@ ...@@ -7762,11 +7762,11 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Animal", "_string": "Animalaaa",
"_N$string": "Animal", "_N$string": "Animalaaa",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -7778,7 +7778,7 @@ ...@@ -7778,7 +7778,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "73Kz25bqlD64pMXrz/aKDd" "_id": "73Kz25bqlD64pMXrz/aKDd"
}, },
...@@ -8739,7 +8739,7 @@ ...@@ -8739,7 +8739,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 125,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -8795,7 +8795,7 @@ ...@@ -8795,7 +8795,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -8807,7 +8807,7 @@ ...@@ -8807,7 +8807,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "22pNmIixFOoop3KSl7Z6DW" "_id": "22pNmIixFOoop3KSl7Z6DW"
}, },
...@@ -9628,7 +9628,7 @@ ...@@ -9628,7 +9628,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 125,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -9684,7 +9684,7 @@ ...@@ -9684,7 +9684,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -9696,7 +9696,7 @@ ...@@ -9696,7 +9696,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "08TdlAgDhNhLxo6R+HGKS1" "_id": "08TdlAgDhNhLxo6R+HGKS1"
}, },
...@@ -10517,7 +10517,7 @@ ...@@ -10517,7 +10517,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 125,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -10573,7 +10573,7 @@ ...@@ -10573,7 +10573,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -10585,7 +10585,7 @@ ...@@ -10585,7 +10585,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "3c6rp/VwVLLLwa4uYEGsYL" "_id": "3c6rp/VwVLLLwa4uYEGsYL"
}, },
...@@ -11406,7 +11406,7 @@ ...@@ -11406,7 +11406,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 125,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -11462,7 +11462,7 @@ ...@@ -11462,7 +11462,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -11474,7 +11474,7 @@ ...@@ -11474,7 +11474,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "15MJ9nlbVMYbTgU4lev7jV" "_id": "15MJ9nlbVMYbTgU4lev7jV"
}, },
...@@ -12295,7 +12295,7 @@ ...@@ -12295,7 +12295,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 125,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -12351,7 +12351,7 @@ ...@@ -12351,7 +12351,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -12363,7 +12363,7 @@ ...@@ -12363,7 +12363,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "acsm90qGRC5rA2/sooBCg1" "_id": "acsm90qGRC5rA2/sooBCg1"
}, },
...@@ -12502,28 +12502,28 @@ ...@@ -12502,28 +12502,28 @@
"__id__": 291 "__id__": 291
}, },
{ {
"__id__": 312 "__id__": 313
}, },
{ {
"__id__": 333 "__id__": 334
}, },
{ {
"__id__": 354 "__id__": 355
}, },
{ {
"__id__": 375 "__id__": 376
}, },
{ {
"__id__": 396 "__id__": 397
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 417 "__id__": 418
}, },
{ {
"__id__": 418 "__id__": 419
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12590,15 +12590,18 @@ ...@@ -12590,15 +12590,18 @@
}, },
{ {
"__id__": 307 "__id__": 307
},
{
"__id__": 310
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 310 "__id__": 311
}, },
{ {
"__id__": 311 "__id__": 312
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13327,7 +13330,7 @@ ...@@ -13327,7 +13330,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 100,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -13383,7 +13386,7 @@ ...@@ -13383,7 +13386,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -13395,7 +13398,7 @@ ...@@ -13395,7 +13398,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "c5eyZ9gR5CR55N3HKuDmin" "_id": "c5eyZ9gR5CR55N3HKuDmin"
}, },
...@@ -13417,6 +13420,64 @@ ...@@ -13417,6 +13420,64 @@
"_width": 3, "_width": 3,
"_id": "27YKc8DS1DEYk6dtNA6wpw" "_id": "27YKc8DS1DEYk6dtNA6wpw"
}, },
{
"__type__": "cc.Node",
"_name": "itemFrame",
"_objFlags": 0,
"_parent": {
"__id__": 291
},
"_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": 110,
"height": 61
},
"_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": "d8jxLK61JMobqCo4Pm5+Ko"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -13472,22 +13533,22 @@ ...@@ -13472,22 +13533,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 313 "__id__": 314
}, },
{ {
"__id__": 326 "__id__": 327
}, },
{ {
"__id__": 328 "__id__": 329
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 331 "__id__": 332
}, },
{ {
"__id__": 332 "__id__": 333
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13543,23 +13604,23 @@ ...@@ -13543,23 +13604,23 @@
"_name": "scrollView", "_name": "scrollView",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 312 "__id__": 313
}, },
"_children": [ "_children": [
{ {
"__id__": 314 "__id__": 315
}, },
{ {
"__id__": 320 "__id__": 321
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 318 "__id__": 319
}, },
{ {
"__id__": 325 "__id__": 326
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13615,20 +13676,20 @@ ...@@ -13615,20 +13676,20 @@
"_name": "scrollBar", "_name": "scrollBar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 313 "__id__": 314
}, },
"_children": [ "_children": [
{ {
"__id__": 315 "__id__": 316
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 317 "__id__": 318
}, },
{ {
"__id__": 324 "__id__": 325
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13684,13 +13745,13 @@ ...@@ -13684,13 +13745,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 314 "__id__": 315
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 316 "__id__": 317
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13746,7 +13807,7 @@ ...@@ -13746,7 +13807,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 315 "__id__": 316
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -13778,18 +13839,18 @@ ...@@ -13778,18 +13839,18 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 314 "__id__": 315
}, },
"_enabled": true, "_enabled": true,
"_scrollView": { "_scrollView": {
"__id__": 318 "__id__": 319
}, },
"_touching": false, "_touching": false,
"_opacity": 255, "_opacity": 255,
"enableAutoHide": true, "enableAutoHide": true,
"autoHideTime": 1, "autoHideTime": 1,
"_N$handle": { "_N$handle": {
"__id__": 316 "__id__": 317
}, },
"_N$direction": 1, "_N$direction": 1,
"_id": "ab6JeoFuBBEqLYctzdajTy" "_id": "ab6JeoFuBBEqLYctzdajTy"
...@@ -13799,7 +13860,7 @@ ...@@ -13799,7 +13860,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 313 "__id__": 314
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -13811,14 +13872,14 @@ ...@@ -13811,14 +13872,14 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 319 "__id__": 320
}, },
"content": { "content": {
"__id__": 319 "__id__": 320
}, },
"_N$horizontalScrollBar": null, "_N$horizontalScrollBar": null,
"_N$verticalScrollBar": { "_N$verticalScrollBar": {
"__id__": 317 "__id__": 318
}, },
"_id": "17nSZwD49O6bvIXlvD8i3T" "_id": "17nSZwD49O6bvIXlvD8i3T"
}, },
...@@ -13827,13 +13888,13 @@ ...@@ -13827,13 +13888,13 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 320 "__id__": 321
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 323 "__id__": 324
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13889,20 +13950,20 @@ ...@@ -13889,20 +13950,20 @@
"_name": "view", "_name": "view",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 313 "__id__": 314
}, },
"_children": [ "_children": [
{ {
"__id__": 319 "__id__": 320
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 321 "__id__": 322
}, },
{ {
"__id__": 322 "__id__": 323
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -13958,7 +14019,7 @@ ...@@ -13958,7 +14019,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 320 "__id__": 321
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -13978,7 +14039,7 @@ ...@@ -13978,7 +14039,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 320 "__id__": 321
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -14005,7 +14066,7 @@ ...@@ -14005,7 +14066,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 319 "__id__": 320
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -14037,7 +14098,7 @@ ...@@ -14037,7 +14098,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 314 "__id__": 315
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -14064,7 +14125,7 @@ ...@@ -14064,7 +14125,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 313 "__id__": 314
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -14091,13 +14152,13 @@ ...@@ -14091,13 +14152,13 @@
"_name": "db", "_name": "db",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 312 "__id__": 313
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 327 "__id__": 328
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14153,7 +14214,7 @@ ...@@ -14153,7 +14214,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 326 "__id__": 327
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14193,16 +14254,16 @@ ...@@ -14193,16 +14254,16 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 312 "__id__": 313
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 329 "__id__": 330
}, },
{ {
"__id__": 330 "__id__": 331
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14216,7 +14277,7 @@ ...@@ -14216,7 +14277,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 100,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -14258,7 +14319,7 @@ ...@@ -14258,7 +14319,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 328 "__id__": 329
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14272,7 +14333,7 @@ ...@@ -14272,7 +14333,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -14284,7 +14345,7 @@ ...@@ -14284,7 +14345,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "ba7WR+GxJIsK/JfauLUSCe" "_id": "ba7WR+GxJIsK/JfauLUSCe"
}, },
...@@ -14293,7 +14354,7 @@ ...@@ -14293,7 +14354,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 328 "__id__": 329
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -14311,7 +14372,7 @@ ...@@ -14311,7 +14372,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 312 "__id__": 313
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14343,12 +14404,12 @@ ...@@ -14343,12 +14404,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 312 "__id__": 313
}, },
"_enabled": true, "_enabled": true,
"setAnswerId": "1", "setAnswerId": "1",
"labTitle": { "labTitle": {
"__id__": 329 "__id__": 330
}, },
"_id": "a0FnS283FI/Zs6KlNXoKep" "_id": "a0FnS283FI/Zs6KlNXoKep"
}, },
...@@ -14361,22 +14422,22 @@ ...@@ -14361,22 +14422,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 334 "__id__": 335
}, },
{ {
"__id__": 347 "__id__": 348
}, },
{ {
"__id__": 349 "__id__": 350
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 352 "__id__": 353
}, },
{ {
"__id__": 353 "__id__": 354
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14432,23 +14493,23 @@ ...@@ -14432,23 +14493,23 @@
"_name": "scrollView", "_name": "scrollView",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 333 "__id__": 334
}, },
"_children": [ "_children": [
{ {
"__id__": 335 "__id__": 336
}, },
{ {
"__id__": 341 "__id__": 342
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 339 "__id__": 340
}, },
{ {
"__id__": 346 "__id__": 347
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14504,20 +14565,20 @@ ...@@ -14504,20 +14565,20 @@
"_name": "scrollBar", "_name": "scrollBar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 334 "__id__": 335
}, },
"_children": [ "_children": [
{ {
"__id__": 336 "__id__": 337
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 338 "__id__": 339
}, },
{ {
"__id__": 345 "__id__": 346
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14573,13 +14634,13 @@ ...@@ -14573,13 +14634,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 335 "__id__": 336
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 337 "__id__": 338
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14635,7 +14696,7 @@ ...@@ -14635,7 +14696,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 336 "__id__": 337
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -14667,18 +14728,18 @@ ...@@ -14667,18 +14728,18 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 335 "__id__": 336
}, },
"_enabled": true, "_enabled": true,
"_scrollView": { "_scrollView": {
"__id__": 339 "__id__": 340
}, },
"_touching": false, "_touching": false,
"_opacity": 255, "_opacity": 255,
"enableAutoHide": true, "enableAutoHide": true,
"autoHideTime": 1, "autoHideTime": 1,
"_N$handle": { "_N$handle": {
"__id__": 337 "__id__": 338
}, },
"_N$direction": 1, "_N$direction": 1,
"_id": "f7GfZop0REPri5KWfjYdcr" "_id": "f7GfZop0REPri5KWfjYdcr"
...@@ -14688,7 +14749,7 @@ ...@@ -14688,7 +14749,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 334 "__id__": 335
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -14700,14 +14761,14 @@ ...@@ -14700,14 +14761,14 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 340 "__id__": 341
}, },
"content": { "content": {
"__id__": 340 "__id__": 341
}, },
"_N$horizontalScrollBar": null, "_N$horizontalScrollBar": null,
"_N$verticalScrollBar": { "_N$verticalScrollBar": {
"__id__": 338 "__id__": 339
}, },
"_id": "36YXSw59BACp21eukW7z34" "_id": "36YXSw59BACp21eukW7z34"
}, },
...@@ -14716,13 +14777,13 @@ ...@@ -14716,13 +14777,13 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 341 "__id__": 342
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 344 "__id__": 345
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14778,20 +14839,20 @@ ...@@ -14778,20 +14839,20 @@
"_name": "view", "_name": "view",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 334 "__id__": 335
}, },
"_children": [ "_children": [
{ {
"__id__": 340 "__id__": 341
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 342 "__id__": 343
}, },
{ {
"__id__": 343 "__id__": 344
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -14847,7 +14908,7 @@ ...@@ -14847,7 +14908,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 341 "__id__": 342
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -14867,7 +14928,7 @@ ...@@ -14867,7 +14928,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 341 "__id__": 342
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -14894,7 +14955,7 @@ ...@@ -14894,7 +14955,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 340 "__id__": 341
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -14926,7 +14987,7 @@ ...@@ -14926,7 +14987,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 335 "__id__": 336
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -14953,7 +15014,7 @@ ...@@ -14953,7 +15014,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 334 "__id__": 335
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -14980,13 +15041,13 @@ ...@@ -14980,13 +15041,13 @@
"_name": "db", "_name": "db",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 333 "__id__": 334
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 348 "__id__": 349
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15042,7 +15103,7 @@ ...@@ -15042,7 +15103,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 347 "__id__": 348
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -15082,16 +15143,16 @@ ...@@ -15082,16 +15143,16 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 333 "__id__": 334
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 350 "__id__": 351
}, },
{ {
"__id__": 351 "__id__": 352
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15105,7 +15166,7 @@ ...@@ -15105,7 +15166,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 100,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -15147,7 +15208,7 @@ ...@@ -15147,7 +15208,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 349 "__id__": 350
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -15161,7 +15222,7 @@ ...@@ -15161,7 +15222,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -15173,7 +15234,7 @@ ...@@ -15173,7 +15234,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "fe36GhTilKFpw9Jl03We7h" "_id": "fe36GhTilKFpw9Jl03We7h"
}, },
...@@ -15182,7 +15243,7 @@ ...@@ -15182,7 +15243,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 349 "__id__": 350
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -15200,7 +15261,7 @@ ...@@ -15200,7 +15261,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 333 "__id__": 334
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -15232,12 +15293,12 @@ ...@@ -15232,12 +15293,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 333 "__id__": 334
}, },
"_enabled": true, "_enabled": true,
"setAnswerId": "2", "setAnswerId": "2",
"labTitle": { "labTitle": {
"__id__": 350 "__id__": 351
}, },
"_id": "8fuVq0naJLjpEM2/+SRicS" "_id": "8fuVq0naJLjpEM2/+SRicS"
}, },
...@@ -15250,22 +15311,22 @@ ...@@ -15250,22 +15311,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 355 "__id__": 356
}, },
{ {
"__id__": 368 "__id__": 369
}, },
{ {
"__id__": 370 "__id__": 371
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 373 "__id__": 374
}, },
{ {
"__id__": 374 "__id__": 375
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15321,23 +15382,23 @@ ...@@ -15321,23 +15382,23 @@
"_name": "scrollView", "_name": "scrollView",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 354 "__id__": 355
}, },
"_children": [ "_children": [
{ {
"__id__": 356 "__id__": 357
}, },
{ {
"__id__": 362 "__id__": 363
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 360 "__id__": 361
}, },
{ {
"__id__": 367 "__id__": 368
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15393,20 +15454,20 @@ ...@@ -15393,20 +15454,20 @@
"_name": "scrollBar", "_name": "scrollBar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 355 "__id__": 356
}, },
"_children": [ "_children": [
{ {
"__id__": 357 "__id__": 358
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 359 "__id__": 360
}, },
{ {
"__id__": 366 "__id__": 367
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15462,13 +15523,13 @@ ...@@ -15462,13 +15523,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 356 "__id__": 357
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 358 "__id__": 359
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15524,7 +15585,7 @@ ...@@ -15524,7 +15585,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 357 "__id__": 358
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -15556,18 +15617,18 @@ ...@@ -15556,18 +15617,18 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 356 "__id__": 357
}, },
"_enabled": true, "_enabled": true,
"_scrollView": { "_scrollView": {
"__id__": 360 "__id__": 361
}, },
"_touching": false, "_touching": false,
"_opacity": 255, "_opacity": 255,
"enableAutoHide": true, "enableAutoHide": true,
"autoHideTime": 1, "autoHideTime": 1,
"_N$handle": { "_N$handle": {
"__id__": 358 "__id__": 359
}, },
"_N$direction": 1, "_N$direction": 1,
"_id": "24wlbDyb1GKpp8IlLX1QsU" "_id": "24wlbDyb1GKpp8IlLX1QsU"
...@@ -15577,7 +15638,7 @@ ...@@ -15577,7 +15638,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 355 "__id__": 356
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -15589,14 +15650,14 @@ ...@@ -15589,14 +15650,14 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 361 "__id__": 362
}, },
"content": { "content": {
"__id__": 361 "__id__": 362
}, },
"_N$horizontalScrollBar": null, "_N$horizontalScrollBar": null,
"_N$verticalScrollBar": { "_N$verticalScrollBar": {
"__id__": 359 "__id__": 360
}, },
"_id": "a19Wi27fdIgLlbXA3yVgYt" "_id": "a19Wi27fdIgLlbXA3yVgYt"
}, },
...@@ -15605,13 +15666,13 @@ ...@@ -15605,13 +15666,13 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 362 "__id__": 363
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 365 "__id__": 366
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15667,20 +15728,20 @@ ...@@ -15667,20 +15728,20 @@
"_name": "view", "_name": "view",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 355 "__id__": 356
}, },
"_children": [ "_children": [
{ {
"__id__": 361 "__id__": 362
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 363 "__id__": 364
}, },
{ {
"__id__": 364 "__id__": 365
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15736,7 +15797,7 @@ ...@@ -15736,7 +15797,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 362 "__id__": 363
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -15756,7 +15817,7 @@ ...@@ -15756,7 +15817,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 362 "__id__": 363
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -15783,7 +15844,7 @@ ...@@ -15783,7 +15844,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 361 "__id__": 362
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -15815,7 +15876,7 @@ ...@@ -15815,7 +15876,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 356 "__id__": 357
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -15842,7 +15903,7 @@ ...@@ -15842,7 +15903,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 355 "__id__": 356
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -15869,13 +15930,13 @@ ...@@ -15869,13 +15930,13 @@
"_name": "db", "_name": "db",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 354 "__id__": 355
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 369 "__id__": 370
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15931,7 +15992,7 @@ ...@@ -15931,7 +15992,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 368 "__id__": 369
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -15971,16 +16032,16 @@ ...@@ -15971,16 +16032,16 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 354 "__id__": 355
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 371 "__id__": 372
}, },
{ {
"__id__": 372 "__id__": 373
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -15994,7 +16055,7 @@ ...@@ -15994,7 +16055,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 100,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -16036,7 +16097,7 @@ ...@@ -16036,7 +16097,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 370 "__id__": 371
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -16050,7 +16111,7 @@ ...@@ -16050,7 +16111,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -16062,7 +16123,7 @@ ...@@ -16062,7 +16123,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "28sJcyCsBN37/NologHGcl" "_id": "28sJcyCsBN37/NologHGcl"
}, },
...@@ -16071,7 +16132,7 @@ ...@@ -16071,7 +16132,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 370 "__id__": 371
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -16089,7 +16150,7 @@ ...@@ -16089,7 +16150,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 354 "__id__": 355
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -16121,12 +16182,12 @@ ...@@ -16121,12 +16182,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 354 "__id__": 355
}, },
"_enabled": true, "_enabled": true,
"setAnswerId": "3", "setAnswerId": "3",
"labTitle": { "labTitle": {
"__id__": 371 "__id__": 372
}, },
"_id": "cdVz4VjGBKTaC09maCDLj4" "_id": "cdVz4VjGBKTaC09maCDLj4"
}, },
...@@ -16139,22 +16200,22 @@ ...@@ -16139,22 +16200,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 376 "__id__": 377
}, },
{ {
"__id__": 389 "__id__": 390
}, },
{ {
"__id__": 391 "__id__": 392
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 394 "__id__": 395
}, },
{ {
"__id__": 395 "__id__": 396
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -16210,23 +16271,23 @@ ...@@ -16210,23 +16271,23 @@
"_name": "scrollView", "_name": "scrollView",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 375 "__id__": 376
}, },
"_children": [ "_children": [
{ {
"__id__": 377 "__id__": 378
}, },
{ {
"__id__": 383 "__id__": 384
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 381 "__id__": 382
}, },
{ {
"__id__": 388 "__id__": 389
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -16282,20 +16343,20 @@ ...@@ -16282,20 +16343,20 @@
"_name": "scrollBar", "_name": "scrollBar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 376 "__id__": 377
}, },
"_children": [ "_children": [
{ {
"__id__": 378 "__id__": 379
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 380 "__id__": 381
}, },
{ {
"__id__": 387 "__id__": 388
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -16351,13 +16412,13 @@ ...@@ -16351,13 +16412,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 377 "__id__": 378
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 379 "__id__": 380
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -16413,7 +16474,7 @@ ...@@ -16413,7 +16474,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 378 "__id__": 379
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -16445,18 +16506,18 @@ ...@@ -16445,18 +16506,18 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 377 "__id__": 378
}, },
"_enabled": true, "_enabled": true,
"_scrollView": { "_scrollView": {
"__id__": 381 "__id__": 382
}, },
"_touching": false, "_touching": false,
"_opacity": 255, "_opacity": 255,
"enableAutoHide": true, "enableAutoHide": true,
"autoHideTime": 1, "autoHideTime": 1,
"_N$handle": { "_N$handle": {
"__id__": 379 "__id__": 380
}, },
"_N$direction": 1, "_N$direction": 1,
"_id": "86Ag8TquJOfq0kKDyTIO4X" "_id": "86Ag8TquJOfq0kKDyTIO4X"
...@@ -16466,7 +16527,7 @@ ...@@ -16466,7 +16527,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 376 "__id__": 377
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -16478,14 +16539,14 @@ ...@@ -16478,14 +16539,14 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 382 "__id__": 383
}, },
"content": { "content": {
"__id__": 382 "__id__": 383
}, },
"_N$horizontalScrollBar": null, "_N$horizontalScrollBar": null,
"_N$verticalScrollBar": { "_N$verticalScrollBar": {
"__id__": 380 "__id__": 381
}, },
"_id": "7alCo77ARBXqmm8XkdvOCT" "_id": "7alCo77ARBXqmm8XkdvOCT"
}, },
...@@ -16494,13 +16555,13 @@ ...@@ -16494,13 +16555,13 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 383 "__id__": 384
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 386 "__id__": 387
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -16556,20 +16617,20 @@ ...@@ -16556,20 +16617,20 @@
"_name": "view", "_name": "view",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 376 "__id__": 377
}, },
"_children": [ "_children": [
{ {
"__id__": 382 "__id__": 383
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 384 "__id__": 385
}, },
{ {
"__id__": 385 "__id__": 386
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -16625,7 +16686,7 @@ ...@@ -16625,7 +16686,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 383 "__id__": 384
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -16645,7 +16706,7 @@ ...@@ -16645,7 +16706,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 383 "__id__": 384
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -16672,7 +16733,7 @@ ...@@ -16672,7 +16733,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 382 "__id__": 383
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -16704,7 +16765,7 @@ ...@@ -16704,7 +16765,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 377 "__id__": 378
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -16731,7 +16792,7 @@ ...@@ -16731,7 +16792,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 376 "__id__": 377
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -16758,13 +16819,13 @@ ...@@ -16758,13 +16819,13 @@
"_name": "db", "_name": "db",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 375 "__id__": 376
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 390 "__id__": 391
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -16820,7 +16881,7 @@ ...@@ -16820,7 +16881,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 389 "__id__": 390
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -16860,16 +16921,16 @@ ...@@ -16860,16 +16921,16 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 375 "__id__": 376
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 392 "__id__": 393
}, },
{ {
"__id__": 393 "__id__": 394
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -16883,7 +16944,7 @@ ...@@ -16883,7 +16944,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 100,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -16925,7 +16986,7 @@ ...@@ -16925,7 +16986,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 391 "__id__": 392
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -16939,7 +17000,7 @@ ...@@ -16939,7 +17000,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -16951,7 +17012,7 @@ ...@@ -16951,7 +17012,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "930MGylIBAbrRY1NjzHcC5" "_id": "930MGylIBAbrRY1NjzHcC5"
}, },
...@@ -16960,7 +17021,7 @@ ...@@ -16960,7 +17021,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 391 "__id__": 392
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -16978,7 +17039,7 @@ ...@@ -16978,7 +17039,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 375 "__id__": 376
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -17010,12 +17071,12 @@ ...@@ -17010,12 +17071,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 375 "__id__": 376
}, },
"_enabled": true, "_enabled": true,
"setAnswerId": "4", "setAnswerId": "4",
"labTitle": { "labTitle": {
"__id__": 392 "__id__": 393
}, },
"_id": "c3p3LmlzdHlIcvlJozxagn" "_id": "c3p3LmlzdHlIcvlJozxagn"
}, },
...@@ -17028,22 +17089,22 @@ ...@@ -17028,22 +17089,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 397 "__id__": 398
}, },
{ {
"__id__": 410 "__id__": 411
}, },
{ {
"__id__": 412 "__id__": 413
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 415 "__id__": 416
}, },
{ {
"__id__": 416 "__id__": 417
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -17099,23 +17160,23 @@ ...@@ -17099,23 +17160,23 @@
"_name": "scrollView", "_name": "scrollView",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 396 "__id__": 397
}, },
"_children": [ "_children": [
{ {
"__id__": 398 "__id__": 399
}, },
{ {
"__id__": 404 "__id__": 405
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 402 "__id__": 403
}, },
{ {
"__id__": 409 "__id__": 410
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -17171,20 +17232,20 @@ ...@@ -17171,20 +17232,20 @@
"_name": "scrollBar", "_name": "scrollBar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 397 "__id__": 398
}, },
"_children": [ "_children": [
{ {
"__id__": 399 "__id__": 400
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 401 "__id__": 402
}, },
{ {
"__id__": 408 "__id__": 409
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -17240,13 +17301,13 @@ ...@@ -17240,13 +17301,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 398 "__id__": 399
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 400 "__id__": 401
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -17302,7 +17363,7 @@ ...@@ -17302,7 +17363,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 399 "__id__": 400
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -17334,18 +17395,18 @@ ...@@ -17334,18 +17395,18 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 398 "__id__": 399
}, },
"_enabled": true, "_enabled": true,
"_scrollView": { "_scrollView": {
"__id__": 402 "__id__": 403
}, },
"_touching": false, "_touching": false,
"_opacity": 255, "_opacity": 255,
"enableAutoHide": true, "enableAutoHide": true,
"autoHideTime": 1, "autoHideTime": 1,
"_N$handle": { "_N$handle": {
"__id__": 400 "__id__": 401
}, },
"_N$direction": 1, "_N$direction": 1,
"_id": "510kHN/UhAh6DELf150ucx" "_id": "510kHN/UhAh6DELf150ucx"
...@@ -17355,7 +17416,7 @@ ...@@ -17355,7 +17416,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 397 "__id__": 398
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -17367,14 +17428,14 @@ ...@@ -17367,14 +17428,14 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 403 "__id__": 404
}, },
"content": { "content": {
"__id__": 403 "__id__": 404
}, },
"_N$horizontalScrollBar": null, "_N$horizontalScrollBar": null,
"_N$verticalScrollBar": { "_N$verticalScrollBar": {
"__id__": 401 "__id__": 402
}, },
"_id": "21+sAeRiNNfbT+uZeYDpmp" "_id": "21+sAeRiNNfbT+uZeYDpmp"
}, },
...@@ -17383,13 +17444,13 @@ ...@@ -17383,13 +17444,13 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 404 "__id__": 405
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 407 "__id__": 408
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -17445,20 +17506,20 @@ ...@@ -17445,20 +17506,20 @@
"_name": "view", "_name": "view",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 397 "__id__": 398
}, },
"_children": [ "_children": [
{ {
"__id__": 403 "__id__": 404
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 405 "__id__": 406
}, },
{ {
"__id__": 406 "__id__": 407
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -17514,7 +17575,7 @@ ...@@ -17514,7 +17575,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 404 "__id__": 405
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -17534,7 +17595,7 @@ ...@@ -17534,7 +17595,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 404 "__id__": 405
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -17561,7 +17622,7 @@ ...@@ -17561,7 +17622,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 403 "__id__": 404
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -17593,7 +17654,7 @@ ...@@ -17593,7 +17654,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 398 "__id__": 399
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -17620,7 +17681,7 @@ ...@@ -17620,7 +17681,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 397 "__id__": 398
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -17647,13 +17708,13 @@ ...@@ -17647,13 +17708,13 @@
"_name": "db", "_name": "db",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 396 "__id__": 397
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 411 "__id__": 412
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -17709,7 +17770,7 @@ ...@@ -17709,7 +17770,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 410 "__id__": 411
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -17749,16 +17810,16 @@ ...@@ -17749,16 +17810,16 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 396 "__id__": 397
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 413 "__id__": 414
}, },
{ {
"__id__": 414 "__id__": 415
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -17772,7 +17833,7 @@ ...@@ -17772,7 +17833,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 129.1, "width": 100,
"height": 56.4 "height": 56.4
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -17814,7 +17875,7 @@ ...@@ -17814,7 +17875,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 412 "__id__": 413
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -17828,7 +17889,7 @@ ...@@ -17828,7 +17889,7 @@
"_N$string": "Animal", "_N$string": "Animal",
"_fontSize": 36, "_fontSize": 36,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca" "__uuid__": "4fe6019f-f84c-439f-97b8-a4cfe2ddc7ca"
}, },
...@@ -17840,7 +17901,7 @@ ...@@ -17840,7 +17901,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "a2AbEH5D1MF4lcbhM2jDpD" "_id": "a2AbEH5D1MF4lcbhM2jDpD"
}, },
...@@ -17849,7 +17910,7 @@ ...@@ -17849,7 +17910,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 412 "__id__": 413
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -17867,7 +17928,7 @@ ...@@ -17867,7 +17928,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 396 "__id__": 397
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -17899,12 +17960,12 @@ ...@@ -17899,12 +17960,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 396 "__id__": 397
}, },
"_enabled": true, "_enabled": true,
"setAnswerId": "5", "setAnswerId": "5",
"labTitle": { "labTitle": {
"__id__": 413 "__id__": 414
}, },
"_id": "89Cq0Z499GsLa1klPzZs6w" "_id": "89Cq0Z499GsLa1klPzZs6w"
}, },
...@@ -17978,10 +18039,10 @@ ...@@ -17978,10 +18039,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 420 "__id__": 421
}, },
{ {
"__id__": 421 "__id__": 422
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -18037,7 +18098,7 @@ ...@@ -18037,7 +18098,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 419 "__id__": 420
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -18069,7 +18130,7 @@ ...@@ -18069,7 +18130,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 419 "__id__": 420
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -18102,10 +18163,10 @@ ...@@ -18102,10 +18163,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 423 "__id__": 424
}, },
{ {
"__id__": 424 "__id__": 425
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -18161,7 +18222,7 @@ ...@@ -18161,7 +18222,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 422 "__id__": 423
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -18193,7 +18254,7 @@ ...@@ -18193,7 +18254,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 422 "__id__": 423
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -18224,7 +18285,7 @@ ...@@ -18224,7 +18285,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 426 "__id__": 427
} }
], ],
"_active": false, "_active": false,
...@@ -18282,29 +18343,29 @@ ...@@ -18282,29 +18343,29 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 425 "__id__": 426
}, },
"_children": [ "_children": [
{ {
"__id__": 427 "__id__": 428
}, },
{ {
"__id__": 429 "__id__": 430
}, },
{ {
"__id__": 431 "__id__": 432
}, },
{ {
"__id__": 435 "__id__": 436
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 437 "__id__": 438
}, },
{ {
"__id__": 438 "__id__": 439
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -18360,13 +18421,13 @@ ...@@ -18360,13 +18421,13 @@
"_name": "item_bg3", "_name": "item_bg3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 426 "__id__": 427
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 428 "__id__": 429
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -18380,8 +18441,8 @@ ...@@ -18380,8 +18441,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 110, "width": 120,
"height": 61 "height": 64
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -18422,7 +18483,7 @@ ...@@ -18422,7 +18483,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 427 "__id__": 428
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -18430,7 +18491,7 @@ ...@@ -18430,7 +18491,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7cc1176f-4e77-4587-bad7-3ef22aacbb7e" "__uuid__": "7cc1176f-4e77-4587-bad7-3ef22aacbb7e"
...@@ -18454,13 +18515,13 @@ ...@@ -18454,13 +18515,13 @@
"_name": "name", "_name": "name",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 426 "__id__": 427
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 430 "__id__": 431
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -18516,7 +18577,7 @@ ...@@ -18516,7 +18577,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 429 "__id__": 430
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -18551,17 +18612,17 @@ ...@@ -18551,17 +18612,17 @@
"_name": "red", "_name": "red",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 426 "__id__": 427
}, },
"_children": [ "_children": [
{ {
"__id__": 432 "__id__": 433
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 434 "__id__": 435
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -18617,13 +18678,13 @@ ...@@ -18617,13 +18678,13 @@
"_name": "name", "_name": "name",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 431 "__id__": 432
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 433 "__id__": 434
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -18679,7 +18740,7 @@ ...@@ -18679,7 +18740,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 432 "__id__": 433
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -18714,7 +18775,7 @@ ...@@ -18714,7 +18775,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 431 "__id__": 432
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -18746,13 +18807,13 @@ ...@@ -18746,13 +18807,13 @@
"_name": "photo", "_name": "photo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 426 "__id__": 427
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 436 "__id__": 437
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -18808,7 +18869,7 @@ ...@@ -18808,7 +18869,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 435 "__id__": 436
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -18838,7 +18899,7 @@ ...@@ -18838,7 +18899,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 426 "__id__": 427
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -18870,20 +18931,20 @@ ...@@ -18870,20 +18931,20 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 426 "__id__": 427
}, },
"_enabled": true, "_enabled": true,
"Item_name": { "Item_name": {
"__id__": 430 "__id__": 431
}, },
"Item_redName": { "Item_redName": {
"__id__": 433 "__id__": 434
}, },
"Item_photo": { "Item_photo": {
"__id__": 435 "__id__": 436
}, },
"Item_complete": { "Item_complete": {
"__id__": 427 "__id__": 428
}, },
"_id": "c6/2WIOWRJ1bavF5ytftPN" "_id": "c6/2WIOWRJ1bavF5ytftPN"
}, },
...@@ -18896,7 +18957,7 @@ ...@@ -18896,7 +18957,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 440 "__id__": 441
} }
], ],
"_active": false, "_active": false,
...@@ -18954,29 +19015,29 @@ ...@@ -18954,29 +19015,29 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 439 "__id__": 440
}, },
"_children": [ "_children": [
{ {
"__id__": 441 "__id__": 442
}, },
{ {
"__id__": 443 "__id__": 444
}, },
{ {
"__id__": 445 "__id__": 446
}, },
{ {
"__id__": 449 "__id__": 450
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 451 "__id__": 452
}, },
{ {
"__id__": 452 "__id__": 453
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19032,13 +19093,13 @@ ...@@ -19032,13 +19093,13 @@
"_name": "item_bg3", "_name": "item_bg3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 440 "__id__": 441
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 442 "__id__": 443
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19094,7 +19155,7 @@ ...@@ -19094,7 +19155,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 441 "__id__": 442
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -19126,13 +19187,13 @@ ...@@ -19126,13 +19187,13 @@
"_name": "name", "_name": "name",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 440 "__id__": 441
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 444 "__id__": 445
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19188,7 +19249,7 @@ ...@@ -19188,7 +19249,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 443 "__id__": 444
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -19223,17 +19284,17 @@ ...@@ -19223,17 +19284,17 @@
"_name": "red", "_name": "red",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 440 "__id__": 441
}, },
"_children": [ "_children": [
{ {
"__id__": 446 "__id__": 447
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 448 "__id__": 449
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19289,13 +19350,13 @@ ...@@ -19289,13 +19350,13 @@
"_name": "name", "_name": "name",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 445 "__id__": 446
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 447 "__id__": 448
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19351,7 +19412,7 @@ ...@@ -19351,7 +19412,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 446 "__id__": 447
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -19386,7 +19447,7 @@ ...@@ -19386,7 +19447,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 445 "__id__": 446
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -19418,13 +19479,13 @@ ...@@ -19418,13 +19479,13 @@
"_name": "photo", "_name": "photo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 440 "__id__": 441
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 450 "__id__": 451
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19480,7 +19541,7 @@ ...@@ -19480,7 +19541,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 449 "__id__": 450
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -19512,7 +19573,7 @@ ...@@ -19512,7 +19573,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 440 "__id__": 441
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -19520,7 +19581,7 @@ ...@@ -19520,7 +19581,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 1, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "b4b3adb0-395b-4a27-bbbb-7b8f6bbc8cc4" "__uuid__": "b4b3adb0-395b-4a27-bbbb-7b8f6bbc8cc4"
...@@ -19544,20 +19605,20 @@ ...@@ -19544,20 +19605,20 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 440 "__id__": 441
}, },
"_enabled": true, "_enabled": true,
"Item_name": { "Item_name": {
"__id__": 444 "__id__": 445
}, },
"Item_redName": { "Item_redName": {
"__id__": 447 "__id__": 448
}, },
"Item_photo": { "Item_photo": {
"__id__": 449 "__id__": 450
}, },
"Item_complete": { "Item_complete": {
"__id__": 441 "__id__": 442
}, },
"_id": "d3S/vW/XNO7Z5Jrqs6S78C" "_id": "d3S/vW/XNO7Z5Jrqs6S78C"
}, },
...@@ -19571,14 +19632,14 @@ ...@@ -19571,14 +19632,14 @@
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 454
},
{ {
"__id__": 455 "__id__": 455
}, },
{ {
"__id__": 456 "__id__": 456
},
{
"__id__": 457
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19634,7 +19695,7 @@ ...@@ -19634,7 +19695,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 453 "__id__": 454
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -19666,7 +19727,7 @@ ...@@ -19666,7 +19727,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 453 "__id__": 454
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -19693,7 +19754,7 @@ ...@@ -19693,7 +19754,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 453 "__id__": 454
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -19702,7 +19763,7 @@ ...@@ -19702,7 +19763,7 @@
"zoomScale": 0.95, "zoomScale": 0.95,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 457 "__id__": 458
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -19839,10 +19900,10 @@ ...@@ -19839,10 +19900,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 460 "__id__": 461
}, },
{ {
"__id__": 461 "__id__": 462
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -19898,7 +19959,7 @@ ...@@ -19898,7 +19959,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 459 "__id__": 460
}, },
"_enabled": true, "_enabled": true,
"_id": "80PylZIy9EbJR4/AZl0xgK" "_id": "80PylZIy9EbJR4/AZl0xgK"
...@@ -19908,7 +19969,7 @@ ...@@ -19908,7 +19969,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 459 "__id__": 460
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -19917,7 +19978,7 @@ ...@@ -19917,7 +19978,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 462 "__id__": 463
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -19996,7 +20057,7 @@ ...@@ -19996,7 +20057,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 464 "__id__": 465
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20052,7 +20113,7 @@ ...@@ -20052,7 +20113,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 463 "__id__": 464
}, },
"_enabled": true, "_enabled": true,
"eff_btn": { "eff_btn": {
...@@ -20135,21 +20196,21 @@ ...@@ -20135,21 +20196,21 @@
"_enabled": true, "_enabled": true,
"Item_0": [ "Item_0": [
{ {
"__id__": 425 "__id__": 426
}, },
{ {
"__id__": 439 "__id__": 440
}, },
{ {
"__id__": 458 "__id__": 459
} }
], ],
"contentArr_2": [ "contentArr_2": [
{ {
"__id__": 419 "__id__": 420
}, },
{ {
"__id__": 422 "__id__": 423
} }
], ],
"contentArr_1": [ "contentArr_1": [
...@@ -20198,7 +20259,7 @@ ...@@ -20198,7 +20259,7 @@
} }
], ],
"canvasView": { "canvasView": {
"__id__": 465 "__id__": 466
}, },
"isCanvas": true, "isCanvas": true,
"_id": "5eOVDDzARGnoMLcNXyk5ml" "_id": "5eOVDDzARGnoMLcNXyk5ml"
...@@ -20222,19 +20283,19 @@ ...@@ -20222,19 +20283,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 471 "__id__": 472
}, },
{ {
"__id__": 476 "__id__": 477
}, },
{ {
"__id__": 481 "__id__": 482
}, },
{ {
"__id__": 486 "__id__": 487
}, },
{ {
"__id__": 491 "__id__": 492
} }
], ],
"_active": true, "_active": true,
...@@ -20292,11 +20353,11 @@ ...@@ -20292,11 +20353,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 470 "__id__": 471
}, },
"_children": [ "_children": [
{ {
"__id__": 472 "__id__": 473
} }
], ],
"_active": true, "_active": true,
...@@ -20354,17 +20415,17 @@ ...@@ -20354,17 +20415,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 471 "__id__": 472
}, },
"_children": [ "_children": [
{ {
"__id__": 473 "__id__": 474
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 475 "__id__": 476
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20420,13 +20481,13 @@ ...@@ -20420,13 +20481,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 472 "__id__": 473
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 474 "__id__": 475
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20482,7 +20543,7 @@ ...@@ -20482,7 +20543,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 473 "__id__": 474
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -20514,7 +20575,7 @@ ...@@ -20514,7 +20575,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 472 "__id__": 473
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -20536,11 +20597,11 @@ ...@@ -20536,11 +20597,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 470 "__id__": 471
}, },
"_children": [ "_children": [
{ {
"__id__": 477 "__id__": 478
} }
], ],
"_active": true, "_active": true,
...@@ -20598,17 +20659,17 @@ ...@@ -20598,17 +20659,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 476 "__id__": 477
}, },
"_children": [ "_children": [
{ {
"__id__": 478 "__id__": 479
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 480 "__id__": 481
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20664,13 +20725,13 @@ ...@@ -20664,13 +20725,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 477 "__id__": 478
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 479 "__id__": 480
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20726,7 +20787,7 @@ ...@@ -20726,7 +20787,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 478 "__id__": 479
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -20758,7 +20819,7 @@ ...@@ -20758,7 +20819,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 477 "__id__": 478
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -20780,11 +20841,11 @@ ...@@ -20780,11 +20841,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 470 "__id__": 471
}, },
"_children": [ "_children": [
{ {
"__id__": 482 "__id__": 483
} }
], ],
"_active": true, "_active": true,
...@@ -20842,17 +20903,17 @@ ...@@ -20842,17 +20903,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 481 "__id__": 482
}, },
"_children": [ "_children": [
{ {
"__id__": 483 "__id__": 484
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 485 "__id__": 486
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20908,13 +20969,13 @@ ...@@ -20908,13 +20969,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 482 "__id__": 483
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 484 "__id__": 485
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -20970,7 +21031,7 @@ ...@@ -20970,7 +21031,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 483 "__id__": 484
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21002,7 +21063,7 @@ ...@@ -21002,7 +21063,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 482 "__id__": 483
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21024,11 +21085,11 @@ ...@@ -21024,11 +21085,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 470 "__id__": 471
}, },
"_children": [ "_children": [
{ {
"__id__": 487 "__id__": 488
} }
], ],
"_active": true, "_active": true,
...@@ -21086,17 +21147,17 @@ ...@@ -21086,17 +21147,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 486 "__id__": 487
}, },
"_children": [ "_children": [
{ {
"__id__": 488 "__id__": 489
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 490 "__id__": 491
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21152,13 +21213,13 @@ ...@@ -21152,13 +21213,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 487 "__id__": 488
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 489 "__id__": 490
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21214,7 +21275,7 @@ ...@@ -21214,7 +21275,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 488 "__id__": 489
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21246,7 +21307,7 @@ ...@@ -21246,7 +21307,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 487 "__id__": 488
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21268,11 +21329,11 @@ ...@@ -21268,11 +21329,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 470 "__id__": 471
}, },
"_children": [ "_children": [
{ {
"__id__": 492 "__id__": 493
} }
], ],
"_active": true, "_active": true,
...@@ -21330,17 +21391,17 @@ ...@@ -21330,17 +21391,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 491 "__id__": 492
}, },
"_children": [ "_children": [
{ {
"__id__": 493 "__id__": 494
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 495 "__id__": 496
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21396,13 +21457,13 @@ ...@@ -21396,13 +21457,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 492 "__id__": 493
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 494 "__id__": 495
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21458,7 +21519,7 @@ ...@@ -21458,7 +21519,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 493 "__id__": 494
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21490,7 +21551,7 @@ ...@@ -21490,7 +21551,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 492 "__id__": 493
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21516,19 +21577,19 @@ ...@@ -21516,19 +21577,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 497 "__id__": 498
}, },
{ {
"__id__": 499 "__id__": 500
}, },
{ {
"__id__": 501 "__id__": 502
}, },
{ {
"__id__": 503 "__id__": 504
}, },
{ {
"__id__": 505 "__id__": 506
} }
], ],
"_active": true, "_active": true,
...@@ -21586,13 +21647,13 @@ ...@@ -21586,13 +21647,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 496 "__id__": 497
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 498 "__id__": 499
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21648,7 +21709,7 @@ ...@@ -21648,7 +21709,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 497 "__id__": 498
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21680,13 +21741,13 @@ ...@@ -21680,13 +21741,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 496 "__id__": 497
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 500 "__id__": 501
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21742,7 +21803,7 @@ ...@@ -21742,7 +21803,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 499 "__id__": 500
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21774,13 +21835,13 @@ ...@@ -21774,13 +21835,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 496 "__id__": 497
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 502 "__id__": 503
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21836,7 +21897,7 @@ ...@@ -21836,7 +21897,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 501 "__id__": 502
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21868,13 +21929,13 @@ ...@@ -21868,13 +21929,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 496 "__id__": 497
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 504 "__id__": 505
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -21930,7 +21991,7 @@ ...@@ -21930,7 +21991,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 503 "__id__": 504
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -21962,13 +22023,13 @@ ...@@ -21962,13 +22023,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 496 "__id__": 497
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 506 "__id__": 507
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -22024,7 +22085,7 @@ ...@@ -22024,7 +22085,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 505 "__id__": 506
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"height": 45, "height": 45,
"rawWidth": 84, "rawWidth": 84,
"rawHeight": 45, "rawHeight": 45,
"borderTop": 0, "borderTop": 18,
"borderBottom": 0, "borderBottom": 23,
"borderLeft": 0, "borderLeft": 31,
"borderRight": 0, "borderRight": 32,
"subMetas": {} "subMetas": {}
} }
} }
......
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