Commit e661981b authored by 李维's avatar 李维

增加绘图按钮位置可配置

parent 3215a93b
......@@ -30,11 +30,11 @@
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 104
}
],
"_prefab": {
"__id__": 101
"__id__": 105
},
"_opacity": 255,
"_color": {
......@@ -347,20 +347,23 @@
"__id__": 13
},
{
"__id__": 22
"__id__": 17
},
{
"__id__": 26
}
],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 101
},
{
"__id__": 98
"__id__": 102
}
],
"_prefab": {
"__id__": 99
"__id__": 103
},
"_opacity": 255,
"_color": {
......@@ -587,6 +590,184 @@
"fileId": "1fBHxQ/KZCkaHB1u9quXH+",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "Painter",
"_objFlags": 0,
"_parent": {
"__id__": 8
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 14
},
{
"__id__": 15
}
],
"_prefab": {
"__id__": 16
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 61,
"height": 66
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
46.5,
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": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e24fd2d0-5c35-4575-a145-32f8f20d223e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "6042751a-2c97-4cba-8feb-d1917e67a74b"
},
"fileId": "7cRAq8IT1Nf62/jvXGZFnn",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "Eraser",
......@@ -596,20 +777,20 @@
},
"_children": [
{
"__id__": 14
"__id__": 18
},
{
"__id__": 17
"__id__": 21
}
],
"_active": true,
"_components": [
{
"__id__": 20
"__id__": 24
}
],
"_prefab": {
"__id__": 21
"__id__": 25
},
"_opacity": 255,
"_color": {
......@@ -633,7 +814,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
46.5,
-34.5,
0,
0,
0,
......@@ -663,17 +844,17 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 15
"__id__": 19
}
],
"_prefab": {
"__id__": 16
"__id__": 20
},
"_opacity": 255,
"_color": {
......@@ -727,7 +908,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -770,17 +951,17 @@
"_name": "active",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 17
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 18
"__id__": 22
}
],
"_prefab": {
"__id__": 19
"__id__": 23
},
"_opacity": 255,
"_color": {
......@@ -834,7 +1015,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 21
},
"_enabled": true,
"_materials": [
......@@ -877,7 +1058,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 17
},
"_enabled": true,
"_normalMaterial": null,
......@@ -960,26 +1141,26 @@
},
"_children": [
{
"__id__": 23
"__id__": 27
},
{
"__id__": 52
"__id__": 56
},
{
"__id__": 55
"__id__": 59
}
],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 98
},
{
"__id__": 95
"__id__": 99
}
],
"_prefab": {
"__id__": 96
"__id__": 100
},
"_opacity": 255,
"_color": {
......@@ -1003,7 +1184,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-34.5,
-115.5,
0,
0,
0,
......@@ -1033,41 +1214,41 @@
"_name": "active_color",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 26
},
"_children": [
{
"__id__": 24
"__id__": 28
},
{
"__id__": 27
"__id__": 31
},
{
"__id__": 30
"__id__": 34
},
{
"__id__": 33
"__id__": 37
},
{
"__id__": 36
"__id__": 40
},
{
"__id__": 39
"__id__": 43
},
{
"__id__": 42
"__id__": 46
},
{
"__id__": 45
"__id__": 49
},
{
"__id__": 48
"__id__": 52
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 51
"__id__": 55
},
"_opacity": 255,
"_color": {
......@@ -1121,17 +1302,17 @@
"_name": "color_yellow",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 25
"__id__": 29
}
],
"_prefab": {
"__id__": 26
"__id__": 30
},
"_opacity": 255,
"_color": {
......@@ -1185,7 +1366,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 28
},
"_enabled": true,
"_materials": [
......@@ -1228,17 +1409,17 @@
"_name": "color_green",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 28
"__id__": 32
}
],
"_prefab": {
"__id__": 29
"__id__": 33
},
"_opacity": 255,
"_color": {
......@@ -1292,7 +1473,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 31
},
"_enabled": true,
"_materials": [
......@@ -1335,17 +1516,17 @@
"_name": "color_blue",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 35
}
],
"_prefab": {
"__id__": 32
"__id__": 36
},
"_opacity": 255,
"_color": {
......@@ -1399,7 +1580,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1442,17 +1623,17 @@
"_name": "color_purple",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 34
"__id__": 38
}
],
"_prefab": {
"__id__": 35
"__id__": 39
},
"_opacity": 255,
"_color": {
......@@ -1506,7 +1687,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1549,17 +1730,17 @@
"_name": "color_brown",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 37
"__id__": 41
}
],
"_prefab": {
"__id__": 38
"__id__": 42
},
"_opacity": 255,
"_color": {
......@@ -1613,7 +1794,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 40
},
"_enabled": true,
"_materials": [
......@@ -1656,17 +1837,17 @@
"_name": "color_pink",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 40
"__id__": 44
}
],
"_prefab": {
"__id__": 41
"__id__": 45
},
"_opacity": 255,
"_color": {
......@@ -1720,7 +1901,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -1763,17 +1944,17 @@
"_name": "color_orange",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 43
"__id__": 47
}
],
"_prefab": {
"__id__": 44
"__id__": 48
},
"_opacity": 255,
"_color": {
......@@ -1827,7 +2008,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 46
},
"_enabled": true,
"_materials": [
......@@ -1870,17 +2051,17 @@
"_name": "color_red",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 46
"__id__": 50
}
],
"_prefab": {
"__id__": 47
"__id__": 51
},
"_opacity": 255,
"_color": {
......@@ -1934,7 +2115,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -1977,17 +2158,17 @@
"_name": "color_black",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 27
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 49
"__id__": 53
}
],
"_prefab": {
"__id__": 50
"__id__": 54
},
"_opacity": 255,
"_color": {
......@@ -2041,7 +2222,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2095,17 +2276,17 @@
"_name": "bgPalette",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 26
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 53
"__id__": 57
}
],
"_prefab": {
"__id__": 54
"__id__": 58
},
"_opacity": 255,
"_color": {
......@@ -2159,7 +2340,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2202,12 +2383,9 @@
"_name": "btnColors",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 26
},
"_children": [
{
"__id__": 56
},
{
"__id__": 60
},
......@@ -2231,16 +2409,19 @@
},
{
"__id__": 88
},
{
"__id__": 92
}
],
"_active": false,
"_components": [
{
"__id__": 92
"__id__": 96
}
],
"_prefab": {
"__id__": 93
"__id__": 97
},
"_opacity": 255,
"_color": {
......@@ -2294,20 +2475,20 @@
"_name": "color_blue",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 61
},
{
"__id__": 58
"__id__": 62
}
],
"_prefab": {
"__id__": 59
"__id__": 63
},
"_opacity": 255,
"_color": {
......@@ -2361,7 +2542,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2393,7 +2574,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 60
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2472,20 +2653,20 @@
"_name": "color_black",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 65
},
{
"__id__": 62
"__id__": 66
}
],
"_prefab": {
"__id__": 63
"__id__": 67
},
"_opacity": 255,
"_color": {
......@@ -2539,7 +2720,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -2571,7 +2752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 64
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2650,20 +2831,20 @@
"_name": "color_orange",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 65
"__id__": 69
},
{
"__id__": 66
"__id__": 70
}
],
"_prefab": {
"__id__": 67
"__id__": 71
},
"_opacity": 255,
"_color": {
......@@ -2717,7 +2898,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -2749,7 +2930,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 68
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2828,20 +3009,20 @@
"_name": "color_brown",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 73
},
{
"__id__": 70
"__id__": 74
}
],
"_prefab": {
"__id__": 71
"__id__": 75
},
"_opacity": 255,
"_color": {
......@@ -2895,7 +3076,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -2927,7 +3108,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 72
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3006,20 +3187,20 @@
"_name": "color_green",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 77
},
{
"__id__": 74
"__id__": 78
}
],
"_prefab": {
"__id__": 75
"__id__": 79
},
"_opacity": 255,
"_color": {
......@@ -3073,7 +3254,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -3105,7 +3286,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 76
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3184,20 +3365,20 @@
"_name": "color_pink",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 81
},
{
"__id__": 78
"__id__": 82
}
],
"_prefab": {
"__id__": 79
"__id__": 83
},
"_opacity": 255,
"_color": {
......@@ -3251,7 +3432,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3283,7 +3464,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 80
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3362,20 +3543,20 @@
"_name": "color_purple",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 85
},
{
"__id__": 82
"__id__": 86
}
],
"_prefab": {
"__id__": 83
"__id__": 87
},
"_opacity": 255,
"_color": {
......@@ -3429,7 +3610,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -3461,7 +3642,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 84
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3540,20 +3721,20 @@
"_name": "color_red",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 89
},
{
"__id__": 86
"__id__": 90
}
],
"_prefab": {
"__id__": 87
"__id__": 91
},
"_opacity": 255,
"_color": {
......@@ -3607,7 +3788,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -3639,7 +3820,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 88
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3718,20 +3899,20 @@
"_name": "color_yellow",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 93
},
{
"__id__": 90
"__id__": 94
}
],
"_prefab": {
"__id__": 91
"__id__": 95
},
"_opacity": 255,
"_color": {
......@@ -3785,7 +3966,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -3817,7 +3998,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 92
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3896,7 +4077,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 59
},
"_enabled": true,
"_layoutSize": {
......@@ -3939,7 +4120,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 26
},
"_enabled": true,
"_materials": [
......@@ -3971,7 +4152,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 26
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4125,6 +4306,7 @@
"__id__": 1
},
"_enabled": true,
"painterOnTop": true,
"_id": ""
},
{
......
......@@ -64,8 +64,8 @@ export default class DrawingBoard extends cc.Component {
// @property(cc.Label)
// label: cc.Label = null;
// @property
// text: string = 'hello';
@property
painterOnCenter: boolean = false;
// LIFE-CYCLE CALLBACKS:
......@@ -141,7 +141,18 @@ export default class DrawingBoard extends cc.Component {
bgPalette.active = false;
})
const painterBtn = cc.find("btnStartPaint", this.node)
const painterBtnTop = cc.find("ToolBox/Painter", this.node)
const painterBtnCenter = cc.find("btnStartPaint", this.node)
let painterBtn = null;
if(this.painterOnCenter) {
painterBtn = painterBtnCenter;
painterBtnTop.active = false;
} else {
painterBtn = painterBtnTop;
painterBtnCenter.active = false;
}
painterBtn.on("click", ()=>{
eraserBtn.active = true; // 显示橡皮按钮
painterBtn.active = false; // 隐藏画笔按钮
......@@ -218,8 +229,17 @@ export default class DrawingBoard extends cc.Component {
}
initEventListener() {
const toolBox = cc.find("ToolBox", this.node)
const painterBtn = cc.find("btnStartPaint", this.node)
const toolBox = cc.find("ToolBox", this.node);
const painterBtnTop = cc.find("ToolBox/Painter", this.node)
const painterBtnCenter = cc.find("btnStartPaint", this.node)
let painterBtn = null;
if(this.painterOnCenter) {
painterBtn = painterBtnCenter;
} else {
painterBtn = painterBtnTop;
}
this.node.on("enable", ()=>{
toolBox.active = true;
painterBtn.active = true;
......
......@@ -114,28 +114,28 @@
"__id__": 962
},
{
"__id__": 1063
"__id__": 1067
},
{
"__id__": 1105
"__id__": 1109
},
{
"__id__": 1108
"__id__": 1112
},
{
"__id__": 1111
"__id__": 1115
}
],
"_active": true,
"_components": [
{
"__id__": 1120
"__id__": 1124
},
{
"__id__": 1121
"__id__": 1125
},
{
"__id__": 1122
"__id__": 1126
}
],
"_prefab": null,
......@@ -36805,11 +36805,11 @@
"_active": false,
"_components": [
{
"__id__": 1061
"__id__": 1065
}
],
"_prefab": {
"__id__": 1062
"__id__": 1066
},
"_opacity": 255,
"_color": {
......@@ -36856,7 +36856,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "8549FNjdtGepkOZvIY/Cs+"
"_id": "cceoIhRC9OUINDa+vHHzZM"
},
{
"__type__": "cc.Node",
......@@ -36916,7 +36916,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "bd30yVbLZJyaVCp7xoO6Jz"
"_id": "c4gG0bl6dNnJzwt0bKKEXg"
},
{
"__type__": "cc.PrefabInfo",
......@@ -36994,7 +36994,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "91A9Ztbk5Jb72WGYSTLZUU"
"_id": "1b+T52b71C357sXBsMZdJy"
},
{
"__type__": "cc.Sprite",
......@@ -37026,7 +37026,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "fe6teX1VVKs6tCWRmIzMLl"
"_id": "5fDxozKS9PkI4flWO6xMU5"
},
{
"__type__": "cc.Button",
......@@ -37094,7 +37094,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "45ft2hfqRLNJXXutb3P17M"
"_id": "d3v0dxmcVHxK0dG4BHkuDG"
},
{
"__type__": "cc.PrefabInfo",
......@@ -37122,20 +37122,23 @@
"__id__": 974
},
{
"__id__": 983
"__id__": 978
},
{
"__id__": 987
}
],
"_active": true,
"_components": [
{
"__id__": 1058
"__id__": 1062
},
{
"__id__": 1059
"__id__": 1063
}
],
"_prefab": {
"__id__": 1060
"__id__": 1064
},
"_opacity": 255,
"_color": {
......@@ -37182,7 +37185,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f9NAzg4oJDZaai67+f1evP"
"_id": "1c+oHmc2hEc4Nvx67ZwvQV"
},
{
"__type__": "cc.Node",
......@@ -37249,7 +37252,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "bfS7yFZPlEUZTxSva908I1"
"_id": "f9i9kYfYxJRZwpJzW118ZH"
},
{
"__type__": "cc.Sprite",
......@@ -37281,7 +37284,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "9c0oweXW5E6rK4Hh5kMj+4"
"_id": "231iTj/ehBiJyomVbFWR0z"
},
{
"__type__": "cc.Button",
......@@ -37349,7 +37352,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "60ca6wriZFgYJ/+ZgrnxM8"
"_id": "a05GKuFBBBi5OQGVoM40Va"
},
{
"__type__": "cc.PrefabInfo",
......@@ -37362,6 +37365,184 @@
"fileId": "1fBHxQ/KZCkaHB1u9quXH+",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "Painter",
"_objFlags": 0,
"_parent": {
"__id__": 969
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 975
},
{
"__id__": 976
}
],
"_prefab": {
"__id__": 977
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 61,
"height": 66
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
46.5,
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": "a5yHM8AKpMAIXECMkt1OAI"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 974
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e24fd2d0-5c35-4575-a145-32f8f20d223e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c8VhZJl+JOhKa4hjL1l2Tu"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 974
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "b7aUryT7dBX5rqnOLClDQx"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 962
},
"asset": {
"__uuid__": "6042751a-2c97-4cba-8feb-d1917e67a74b"
},
"fileId": "7cRAq8IT1Nf62/jvXGZFnn",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "Eraser",
......@@ -37371,20 +37552,20 @@
},
"_children": [
{
"__id__": 975
"__id__": 979
},
{
"__id__": 978
"__id__": 982
}
],
"_active": true,
"_components": [
{
"__id__": 981
"__id__": 985
}
],
"_prefab": {
"__id__": 982
"__id__": 986
},
"_opacity": 255,
"_color": {
......@@ -37408,7 +37589,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
46.5,
-34.5,
0,
0,
0,
......@@ -37431,24 +37612,24 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b9+YTDlcpD3YO+loOv0o0w"
"_id": "efPvkbGjtJUaOyfC1aTMYL"
},
{
"__type__": "cc.Node",
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 974
"__id__": 978
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 976
"__id__": 980
}
],
"_prefab": {
"__id__": 977
"__id__": 981
},
"_opacity": 255,
"_color": {
......@@ -37495,14 +37676,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "06Y0BzCulEUK81E6ZdGORr"
"_id": "c9vo07xW5HWqoDx9sGx+w+"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 975
"__id__": 979
},
"_enabled": true,
"_materials": [
......@@ -37527,7 +37708,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "39gNpyhHhMDJolisi7ZZVD"
"_id": "68HTnRTbtJEZ6fGI8JgCXr"
},
{
"__type__": "cc.PrefabInfo",
......@@ -37545,17 +37726,17 @@
"_name": "active",
"_objFlags": 0,
"_parent": {
"__id__": 974
"__id__": 978
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 979
"__id__": 983
}
],
"_prefab": {
"__id__": 980
"__id__": 984
},
"_opacity": 255,
"_color": {
......@@ -37602,14 +37783,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d6YtidA5pJ26aQGgG3CtvF"
"_id": "62b+x/QdFJOJAG6te1bBuD"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 978
"__id__": 982
},
"_enabled": true,
"_materials": [
......@@ -37634,7 +37815,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "dbPbHgYxhD57winLd5vgUu"
"_id": "6cQ/SNE6tAiZphhEakZ3X8"
},
{
"__type__": "cc.PrefabInfo",
......@@ -37652,7 +37833,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 974
"__id__": 978
},
"_enabled": true,
"_normalMaterial": null,
......@@ -37713,7 +37894,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "71pJhfv9xJIq4Y6WqGt+t1"
"_id": "4dpoqpUJRE35Iki9ueMWpg"
},
{
"__type__": "cc.PrefabInfo",
......@@ -37735,26 +37916,26 @@
},
"_children": [
{
"__id__": 984
"__id__": 988
},
{
"__id__": 1013
"__id__": 1017
},
{
"__id__": 1016
"__id__": 1020
}
],
"_active": true,
"_components": [
{
"__id__": 1055
"__id__": 1059
},
{
"__id__": 1056
"__id__": 1060
}
],
"_prefab": {
"__id__": 1057
"__id__": 1061
},
"_opacity": 255,
"_color": {
......@@ -37778,7 +37959,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-34.5,
-115.5,
0,
0,
0,
......@@ -37801,48 +37982,48 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "ebAp/QCPJKQJC/ow16gZ9J"
"_id": "11cpkAsOZGJ6qbRd5NP100"
},
{
"__type__": "cc.Node",
"_name": "active_color",
"_objFlags": 0,
"_parent": {
"__id__": 983
"__id__": 987
},
"_children": [
{
"__id__": 985
"__id__": 989
},
{
"__id__": 988
"__id__": 992
},
{
"__id__": 991
"__id__": 995
},
{
"__id__": 994
"__id__": 998
},
{
"__id__": 997
"__id__": 1001
},
{
"__id__": 1000
"__id__": 1004
},
{
"__id__": 1003
"__id__": 1007
},
{
"__id__": 1006
"__id__": 1010
},
{
"__id__": 1009
"__id__": 1013
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 1012
"__id__": 1016
},
"_opacity": 255,
"_color": {
......@@ -37889,24 +38070,24 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "8cGeRqdOVG3KsYuu9jXey5"
"_id": "a00CxgdxhH2Kon+gM+CR/H"
},
{
"__type__": "cc.Node",
"_name": "color_yellow",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 986
"__id__": 990
}
],
"_prefab": {
"__id__": 987
"__id__": 991
},
"_opacity": 255,
"_color": {
......@@ -37953,14 +38134,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "2df1+gxq9INoFQZOO4ru+G"
"_id": "5eie9csXRNCIBpdSI6LQGh"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 985
"__id__": 989
},
"_enabled": true,
"_materials": [
......@@ -37985,7 +38166,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "1aTiLG9l1FKLcNB92lbKC9"
"_id": "b9qA+aHWVN4Ye0WtGSXw4i"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38003,17 +38184,17 @@
"_name": "color_green",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 989
"__id__": 993
}
],
"_prefab": {
"__id__": 990
"__id__": 994
},
"_opacity": 255,
"_color": {
......@@ -38060,14 +38241,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d9m0JuHNNC05ONrM0jfq2m"
"_id": "74xVeyuShPNaOBL/k91urv"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 988
"__id__": 992
},
"_enabled": true,
"_materials": [
......@@ -38092,7 +38273,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "80XlWDevpPt7Lq1VJmBPfR"
"_id": "20x7cd2bFP5rXmz3YUsiUg"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38110,17 +38291,17 @@
"_name": "color_blue",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 992
"__id__": 996
}
],
"_prefab": {
"__id__": 993
"__id__": 997
},
"_opacity": 255,
"_color": {
......@@ -38167,14 +38348,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "c9/P31jIhKr490FccQanyT"
"_id": "90j5p+VeNKyaKkS2EAf2Q/"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 991
"__id__": 995
},
"_enabled": true,
"_materials": [
......@@ -38199,7 +38380,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "39YSiwt4RBzJE4+JuhGijx"
"_id": "f75MxzGxFL4Ypl9tnETqtt"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38217,17 +38398,17 @@
"_name": "color_purple",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 995
"__id__": 999
}
],
"_prefab": {
"__id__": 996
"__id__": 1000
},
"_opacity": 255,
"_color": {
......@@ -38274,14 +38455,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "725tNi8jtLBodxV6Ya96rO"
"_id": "1eqasdoF1BIZ6sFECtYu7W"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 994
"__id__": 998
},
"_enabled": true,
"_materials": [
......@@ -38306,7 +38487,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "73yQuY/LBLsZdPBhN5LDF3"
"_id": "1djdQliRxDkr2sBNb5c2DP"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38324,17 +38505,17 @@
"_name": "color_brown",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 998
"__id__": 1002
}
],
"_prefab": {
"__id__": 999
"__id__": 1003
},
"_opacity": 255,
"_color": {
......@@ -38381,14 +38562,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "27J9P84CxLTIM7+b3TR8fu"
"_id": "32dZdmqPBK7qRFEjUhmjpC"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 997
"__id__": 1001
},
"_enabled": true,
"_materials": [
......@@ -38413,7 +38594,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "25KusFr7pGZbowqbhcjWvd"
"_id": "90EC3P8rBIf6ewnD9n4hXs"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38431,17 +38612,17 @@
"_name": "color_pink",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 1001
"__id__": 1005
}
],
"_prefab": {
"__id__": 1002
"__id__": 1006
},
"_opacity": 255,
"_color": {
......@@ -38488,14 +38669,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "bej52NLJ9MG5Oma1hCDvi2"
"_id": "93yMgWR5RDK7/Qm3VrtYZO"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1000
"__id__": 1004
},
"_enabled": true,
"_materials": [
......@@ -38520,7 +38701,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "3bhKRud1tGiLqQSWoj8n7U"
"_id": "4btN+Rg2VK3YB8sD1JmLlI"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38538,17 +38719,17 @@
"_name": "color_orange",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 1004
"__id__": 1008
}
],
"_prefab": {
"__id__": 1005
"__id__": 1009
},
"_opacity": 255,
"_color": {
......@@ -38595,14 +38776,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "98uR5I+RhAtqU1Fi23WzJx"
"_id": "77XhPvg+5BjqfzqB0KeeTd"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1003
"__id__": 1007
},
"_enabled": true,
"_materials": [
......@@ -38627,7 +38808,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "43B8N9wmxMULDhgqDLJxZU"
"_id": "2bzTVfg+hHI7ASgn8rsrfP"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38645,17 +38826,17 @@
"_name": "color_red",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 1007
"__id__": 1011
}
],
"_prefab": {
"__id__": 1008
"__id__": 1012
},
"_opacity": 255,
"_color": {
......@@ -38702,14 +38883,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "43Btus97ZBm4trFJb8jwxE"
"_id": "fawViOOyBKEofv++HV+kHe"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1006
"__id__": 1010
},
"_enabled": true,
"_materials": [
......@@ -38734,7 +38915,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "83QAVUa1RInZDH0e1QKxU5"
"_id": "140WqpoBFHqbdSA1MMwMqj"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38752,17 +38933,17 @@
"_name": "color_black",
"_objFlags": 0,
"_parent": {
"__id__": 984
"__id__": 988
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 1010
"__id__": 1014
}
],
"_prefab": {
"__id__": 1011
"__id__": 1015
},
"_opacity": 255,
"_color": {
......@@ -38809,14 +38990,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "36ufmtTWRL7YbSo96mYKf7"
"_id": "935N4Rsp9DKoxuzqfXuZbu"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1009
"__id__": 1013
},
"_enabled": true,
"_materials": [
......@@ -38841,7 +39022,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "27sm6lBXFNULuR6T9GGA4W"
"_id": "31i24qXb9NDKZ3c9OLSV38"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38870,17 +39051,17 @@
"_name": "bgPalette",
"_objFlags": 0,
"_parent": {
"__id__": 983
"__id__": 987
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 1014
"__id__": 1018
}
],
"_prefab": {
"__id__": 1015
"__id__": 1019
},
"_opacity": 255,
"_color": {
......@@ -38927,14 +39108,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "33O3YEmrJNZoM+yrbjURm4"
"_id": "72OQHccjNFi62eu12ORiuE"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1013
"__id__": 1017
},
"_enabled": true,
"_materials": [
......@@ -38959,7 +39140,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a6TLWMnXZO3Iq01YhbfCxv"
"_id": "f5zTPq20xGg5O3YTUdF4Rb"
},
{
"__type__": "cc.PrefabInfo",
......@@ -38977,12 +39158,9 @@
"_name": "btnColors",
"_objFlags": 0,
"_parent": {
"__id__": 983
"__id__": 987
},
"_children": [
{
"__id__": 1017
},
{
"__id__": 1021
},
......@@ -39006,16 +39184,19 @@
},
{
"__id__": 1049
},
{
"__id__": 1053
}
],
"_active": false,
"_components": [
{
"__id__": 1053
"__id__": 1057
}
],
"_prefab": {
"__id__": 1054
"__id__": 1058
},
"_opacity": 255,
"_color": {
......@@ -39062,27 +39243,27 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "98jdILhPxJkJIfngiK/TV3"
"_id": "0dU55MkXtFXJO5N8j9UjwI"
},
{
"__type__": "cc.Node",
"_name": "color_blue",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1018
"__id__": 1022
},
{
"__id__": 1019
"__id__": 1023
}
],
"_prefab": {
"__id__": 1020
"__id__": 1024
},
"_opacity": 255,
"_color": {
......@@ -39129,14 +39310,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "45VCVpwMJH56c40fmFmcly"
"_id": "b0LcADFzRKr6ibheY02seQ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1017
"__id__": 1021
},
"_enabled": true,
"_materials": [
......@@ -39161,14 +39342,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "54DmPUTdBJY7kN4VnEJ+bB"
"_id": "6bijna+xBPe7uFxKTeaI+A"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1017
"__id__": 1021
},
"_enabled": true,
"_normalMaterial": null,
......@@ -39229,7 +39410,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "cbwH6nHQZBUIqXAwwAaT+r"
"_id": "f1nZbWwCxEjKPHdgDuMpxZ"
},
{
"__type__": "cc.PrefabInfo",
......@@ -39247,20 +39428,20 @@
"_name": "color_black",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1022
"__id__": 1026
},
{
"__id__": 1023
"__id__": 1027
}
],
"_prefab": {
"__id__": 1024
"__id__": 1028
},
"_opacity": 255,
"_color": {
......@@ -39307,14 +39488,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a6TmdBEmVCdLCLDgnCgg4g"
"_id": "de4yyWyn5DLrPzEyA9w2RY"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1021
"__id__": 1025
},
"_enabled": true,
"_materials": [
......@@ -39339,14 +39520,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "33E1UXFIRMTLS2O5IIdnN/"
"_id": "fbhFiomcxNG5/EjHX6gh+l"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1021
"__id__": 1025
},
"_enabled": true,
"_normalMaterial": null,
......@@ -39407,7 +39588,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "cb3RUay1dJj67PR+crfibq"
"_id": "41dm3B26pKMo3DM8sZ0iyc"
},
{
"__type__": "cc.PrefabInfo",
......@@ -39425,20 +39606,20 @@
"_name": "color_orange",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1026
"__id__": 1030
},
{
"__id__": 1027
"__id__": 1031
}
],
"_prefab": {
"__id__": 1028
"__id__": 1032
},
"_opacity": 255,
"_color": {
......@@ -39485,14 +39666,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "58XRuU6stFObJZci3NgyFF"
"_id": "67/qUxtfBAMZBt3eDWLR4O"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1025
"__id__": 1029
},
"_enabled": true,
"_materials": [
......@@ -39517,14 +39698,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "2a8+hON7VEbYZV+nlc0FdA"
"_id": "b3FXv3oVtBrLJgKTYECp56"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1025
"__id__": 1029
},
"_enabled": true,
"_normalMaterial": null,
......@@ -39585,7 +39766,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "a9BwyVj1xOG74KEB1FUaTQ"
"_id": "38onV1RRdFsrYe7G8bOnDn"
},
{
"__type__": "cc.PrefabInfo",
......@@ -39603,20 +39784,20 @@
"_name": "color_brown",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1030
"__id__": 1034
},
{
"__id__": 1031
"__id__": 1035
}
],
"_prefab": {
"__id__": 1032
"__id__": 1036
},
"_opacity": 255,
"_color": {
......@@ -39663,14 +39844,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "87XcmjC0JMFZM//lGD7prZ"
"_id": "5cE2f5pqtAN6yxbRXCj5hm"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1029
"__id__": 1033
},
"_enabled": true,
"_materials": [
......@@ -39695,14 +39876,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "edKqsQy1NMva8l+xSHX+nd"
"_id": "5bNdMLSyRAUL5VG+FGvfgM"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1029
"__id__": 1033
},
"_enabled": true,
"_normalMaterial": null,
......@@ -39763,7 +39944,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "cdhh2AcpZBvoLF6cWSrQcc"
"_id": "caP7OSHt1HYKKiC1iGpqRC"
},
{
"__type__": "cc.PrefabInfo",
......@@ -39781,20 +39962,20 @@
"_name": "color_green",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1034
"__id__": 1038
},
{
"__id__": 1035
"__id__": 1039
}
],
"_prefab": {
"__id__": 1036
"__id__": 1040
},
"_opacity": 255,
"_color": {
......@@ -39841,14 +40022,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b9YiXMkChMrooFsnXvBDTg"
"_id": "28cGQwCoJEKrrFaM9WrxPa"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1033
"__id__": 1037
},
"_enabled": true,
"_materials": [
......@@ -39873,14 +40054,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "62vYsVNUNK/pA9jocask3J"
"_id": "d2CsiHh3hGRK7gsBI9qdu0"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1033
"__id__": 1037
},
"_enabled": true,
"_normalMaterial": null,
......@@ -39941,7 +40122,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "b5r31AILBFDK7a+LPZXfRT"
"_id": "61hfUJmrpD0Yyx1Jnp0STo"
},
{
"__type__": "cc.PrefabInfo",
......@@ -39959,20 +40140,20 @@
"_name": "color_pink",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1038
"__id__": 1042
},
{
"__id__": 1039
"__id__": 1043
}
],
"_prefab": {
"__id__": 1040
"__id__": 1044
},
"_opacity": 255,
"_color": {
......@@ -40019,14 +40200,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d6GOMssdRINZHDg+U37LPe"
"_id": "8dtThobmNGQY1f9OCBZ7q7"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1037
"__id__": 1041
},
"_enabled": true,
"_materials": [
......@@ -40051,14 +40232,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b8owfG71hM35PGeaGg/Mz9"
"_id": "c84LGIGANM7ainNwDYfdJz"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1037
"__id__": 1041
},
"_enabled": true,
"_normalMaterial": null,
......@@ -40119,7 +40300,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "90RmF6UfxO77l+aImn36fp"
"_id": "b1z6Rb29FL9oB8FbgBNQBJ"
},
{
"__type__": "cc.PrefabInfo",
......@@ -40137,20 +40318,20 @@
"_name": "color_purple",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1042
"__id__": 1046
},
{
"__id__": 1043
"__id__": 1047
}
],
"_prefab": {
"__id__": 1044
"__id__": 1048
},
"_opacity": 255,
"_color": {
......@@ -40197,14 +40378,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "7ekZUUTllDM7xgM7s03c58"
"_id": "b5i8nPMjhEa5Zzydo2uccC"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1041
"__id__": 1045
},
"_enabled": true,
"_materials": [
......@@ -40229,14 +40410,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "05vOtwix9IArp5XIP+u3Lc"
"_id": "fb1FDdiXdJ9rM1uOjH/vMM"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1041
"__id__": 1045
},
"_enabled": true,
"_normalMaterial": null,
......@@ -40297,7 +40478,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "5095nY72xCEotmKKEnfZ+C"
"_id": "2cq3VS8fBObo4x6ZyX7MNJ"
},
{
"__type__": "cc.PrefabInfo",
......@@ -40315,20 +40496,20 @@
"_name": "color_red",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1046
"__id__": 1050
},
{
"__id__": 1047
"__id__": 1051
}
],
"_prefab": {
"__id__": 1048
"__id__": 1052
},
"_opacity": 255,
"_color": {
......@@ -40375,14 +40556,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "2eaCiZfOZPN4BXRpunfKSY"
"_id": "48ZTOtwNJKC5KFoYrgjPlz"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1045
"__id__": 1049
},
"_enabled": true,
"_materials": [
......@@ -40407,14 +40588,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "21bV4cn55LB75fUrqYRo/b"
"_id": "556lcc8xZDoafzssBk1KKE"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1045
"__id__": 1049
},
"_enabled": true,
"_normalMaterial": null,
......@@ -40475,7 +40656,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "b0tpRcjnhJQYMdpSbaSOel"
"_id": "easLpS67JNaa6ATUgIxXi4"
},
{
"__type__": "cc.PrefabInfo",
......@@ -40493,20 +40674,20 @@
"_name": "color_yellow",
"_objFlags": 0,
"_parent": {
"__id__": 1016
"__id__": 1020
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1050
"__id__": 1054
},
{
"__id__": 1051
"__id__": 1055
}
],
"_prefab": {
"__id__": 1052
"__id__": 1056
},
"_opacity": 255,
"_color": {
......@@ -40553,14 +40734,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "83wcAx6ZZLz5iOmM4OHdeT"
"_id": "30V/AufTZHTLpbiUY86//X"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1049
"__id__": 1053
},
"_enabled": true,
"_materials": [
......@@ -40585,14 +40766,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "792W3+NKNBbJGLdB0HncMb"
"_id": "5aPJReOc9Aa6HVtim+uRxZ"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1049
"__id__": 1053
},
"_enabled": true,
"_normalMaterial": null,
......@@ -40653,7 +40834,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "bcas+X5bhO+6WR7o2PLjLX"
"_id": "69q4dXEgJGJZiXy7z6pExs"
},
{
"__type__": "cc.PrefabInfo",
......@@ -40671,7 +40852,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1016
"__id__": 1020
},
"_enabled": true,
"_layoutSize": {
......@@ -40696,7 +40877,7 @@
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "76ppjC76pIH7KVPT/uSAbr"
"_id": "c5LIIBcyFJVokaJcUGlUr1"
},
{
"__type__": "cc.PrefabInfo",
......@@ -40714,7 +40895,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 983
"__id__": 987
},
"_enabled": true,
"_materials": [
......@@ -40739,14 +40920,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "61X4WzEAtAoaI37VS2HKGe"
"_id": "eeNkOCDdFKH7eTq2VHTZo7"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 983
"__id__": 987
},
"_enabled": true,
"_normalMaterial": null,
......@@ -40807,7 +40988,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "1aUNCx5NtNWLlJJsAXuPfb"
"_id": "be9whTtpdNgJck2f1vNjhC"
},
{
"__type__": "cc.PrefabInfo",
......@@ -40847,7 +41028,7 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "52qfpznHVEZ4WVi5Vb442T"
"_id": "28RSbz+fRLw6VkTmva7393"
},
{
"__type__": "cc.Layout",
......@@ -40879,7 +41060,7 @@
"_N$verticalDirection": 1,
"_N$horizontalDirection": 1,
"_N$affectedByScale": false,
"_id": "3c6EX0SOZNHI1IE0+tyy50"
"_id": "6dJCNTv1xEqIn9dTGPMNmX"
},
{
"__type__": "cc.PrefabInfo",
......@@ -40900,7 +41081,8 @@
"__id__": 962
},
"_enabled": true,
"_id": "32uFmnRR1HX4updXLLeBqi"
"painterOnTop": true,
"_id": "94sQo/5PlN57KVtbvHUC8Y"
},
{
"__type__": "cc.PrefabInfo",
......@@ -40922,13 +41104,13 @@
},
"_children": [
{
"__id__": 1064
"__id__": 1068
},
{
"__id__": 1067
"__id__": 1071
},
{
"__id__": 1100
"__id__": 1104
}
],
"_active": false,
......@@ -40986,11 +41168,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 1063
"__id__": 1067
},
"_children": [
{
"__id__": 1065
"__id__": 1069
}
],
"_active": true,
......@@ -41048,13 +41230,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 1064
"__id__": 1068
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1066
"__id__": 1070
}
],
"_prefab": null,
......@@ -41110,7 +41292,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1065
"__id__": 1069
},
"_enabled": true,
"_materials": [],
......@@ -41141,15 +41323,9 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 1063
"__id__": 1067
},
"_children": [
{
"__id__": 1068
},
{
"__id__": 1070
},
{
"__id__": 1072
},
......@@ -41191,6 +41367,12 @@
},
{
"__id__": 1098
},
{
"__id__": 1100
},
{
"__id__": 1102
}
],
"_active": true,
......@@ -41248,13 +41430,13 @@
"_name": "icon_PA_record",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1069
"__id__": 1073
}
],
"_prefab": null,
......@@ -41310,7 +41492,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1068
"__id__": 1072
},
"_enabled": true,
"_materials": [],
......@@ -41338,13 +41520,13 @@
"_name": "icon_PA_replay",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1071
"__id__": 1075
}
],
"_prefab": null,
......@@ -41400,7 +41582,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1070
"__id__": 1074
},
"_enabled": true,
"_materials": [],
......@@ -41428,13 +41610,13 @@
"_name": "icon_connect_end",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1073
"__id__": 1077
}
],
"_prefab": null,
......@@ -41490,7 +41672,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1072
"__id__": 1076
},
"_enabled": true,
"_materials": [],
......@@ -41518,13 +41700,13 @@
"_name": "icon_connect_start",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1075
"__id__": 1079
}
],
"_prefab": null,
......@@ -41580,7 +41762,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1074
"__id__": 1078
},
"_enabled": true,
"_materials": [],
......@@ -41608,13 +41790,13 @@
"_name": "icon_play_audio",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1077
"__id__": 1081
}
],
"_prefab": null,
......@@ -41670,7 +41852,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1076
"__id__": 1080
},
"_enabled": true,
"_materials": [],
......@@ -41698,13 +41880,13 @@
"_name": "btn_sound",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1079
"__id__": 1083
}
],
"_prefab": null,
......@@ -41760,7 +41942,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1078
"__id__": 1082
},
"_enabled": true,
"_materials": [],
......@@ -41788,13 +41970,13 @@
"_name": "btn_submit_disable",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1081
"__id__": 1085
}
],
"_prefab": null,
......@@ -41850,7 +42032,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1080
"__id__": 1084
},
"_enabled": true,
"_materials": [],
......@@ -41878,13 +42060,13 @@
"_name": "icon_answer_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1083
"__id__": 1087
}
],
"_prefab": null,
......@@ -41940,7 +42122,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1082
"__id__": 1086
},
"_enabled": true,
"_materials": [],
......@@ -41968,13 +42150,13 @@
"_name": "icon_answer_right",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1085
"__id__": 1089
}
],
"_prefab": null,
......@@ -42030,7 +42212,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1084
"__id__": 1088
},
"_enabled": true,
"_materials": [],
......@@ -42058,13 +42240,13 @@
"_name": "icon_laugh",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1087
"__id__": 1091
}
],
"_prefab": null,
......@@ -42120,7 +42302,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1086
"__id__": 1090
},
"_enabled": true,
"_materials": [],
......@@ -42148,13 +42330,13 @@
"_name": "icon_cry",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1089
"__id__": 1093
}
],
"_prefab": null,
......@@ -42210,7 +42392,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1088
"__id__": 1092
},
"_enabled": true,
"_materials": [],
......@@ -42238,13 +42420,13 @@
"_name": "btn_submit",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1091
"__id__": 1095
}
],
"_prefab": null,
......@@ -42300,7 +42482,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1090
"__id__": 1094
},
"_enabled": true,
"_materials": [],
......@@ -42328,13 +42510,13 @@
"_name": "btn_replay",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1093
"__id__": 1097
}
],
"_prefab": null,
......@@ -42390,7 +42572,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1092
"__id__": 1096
},
"_enabled": true,
"_materials": [],
......@@ -42418,13 +42600,13 @@
"_name": "icon_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1095
"__id__": 1099
}
],
"_prefab": null,
......@@ -42480,7 +42662,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1094
"__id__": 1098
},
"_enabled": true,
"_materials": [],
......@@ -42508,13 +42690,13 @@
"_name": "icon_right",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1097
"__id__": 1101
}
],
"_prefab": null,
......@@ -42570,7 +42752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1096
"__id__": 1100
},
"_enabled": true,
"_materials": [],
......@@ -42598,13 +42780,13 @@
"_name": "dot_rect",
"_objFlags": 0,
"_parent": {
"__id__": 1067
"__id__": 1071
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1099
"__id__": 1103
}
],
"_prefab": null,
......@@ -42660,7 +42842,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1098
"__id__": 1102
},
"_enabled": true,
"_materials": [],
......@@ -42688,14 +42870,14 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 1063
"__id__": 1067
},
"_children": [
{
"__id__": 1101
"__id__": 1105
},
{
"__id__": 1103
"__id__": 1107
}
],
"_active": true,
......@@ -42753,13 +42935,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 1100
"__id__": 1104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1102
"__id__": 1106
}
],
"_prefab": null,
......@@ -42815,7 +42997,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1101
"__id__": 1105
},
"_enabled": true,
"_clip": {
......@@ -42834,13 +43016,13 @@
"_name": "finish",
"_objFlags": 0,
"_parent": {
"__id__": 1100
"__id__": 1104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1104
"__id__": 1108
}
],
"_prefab": null,
......@@ -42896,7 +43078,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1103
"__id__": 1107
},
"_enabled": true,
"_clip": {
......@@ -42921,10 +43103,10 @@
"_active": false,
"_components": [
{
"__id__": 1106
"__id__": 1110
},
{
"__id__": 1107
"__id__": 1111
}
],
"_prefab": null,
......@@ -42980,7 +43162,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1105
"__id__": 1109
},
"_enabled": true,
"_defaultClip": {
......@@ -42999,7 +43181,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1105
"__id__": 1109
},
"_enabled": true,
"_materials": [
......@@ -43037,10 +43219,10 @@
"_active": false,
"_components": [
{
"__id__": 1109
"__id__": 1113
},
{
"__id__": 1110
"__id__": 1114
}
],
"_prefab": null,
......@@ -43096,7 +43278,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1108
"__id__": 1112
},
"_enabled": true,
"_defaultClip": {
......@@ -43115,7 +43297,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1108
"__id__": 1112
},
"_enabled": true,
"_materials": [
......@@ -43151,16 +43333,16 @@
},
"_children": [
{
"__id__": 1112
"__id__": 1116
},
{
"__id__": 1115
"__id__": 1119
}
],
"_active": false,
"_components": [
{
"__id__": 1119
"__id__": 1123
}
],
"_prefab": null,
......@@ -43216,16 +43398,16 @@
"_name": "videoPlayer",
"_objFlags": 0,
"_parent": {
"__id__": 1111
"__id__": 1115
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1113
"__id__": 1117
},
{
"__id__": 1114
"__id__": 1118
}
],
"_prefab": null,
......@@ -43281,7 +43463,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1112
"__id__": 1116
},
"_enabled": true,
"_resourceType": 0,
......@@ -43301,7 +43483,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1112
"__id__": 1116
},
"_enabled": true,
"alignMode": 1,
......@@ -43328,19 +43510,19 @@
"_name": "close",
"_objFlags": 0,
"_parent": {
"__id__": 1111
"__id__": 1115
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1116
"__id__": 1120
},
{
"__id__": 1117
"__id__": 1121
},
{
"__id__": 1118
"__id__": 1122
}
],
"_prefab": null,
......@@ -43396,12 +43578,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1115
"__id__": 1119
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 1111
"__id__": 1115
},
"_alignFlags": 33,
"_left": 0,
......@@ -43425,7 +43607,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1115
"__id__": 1119
},
"_enabled": true,
"_normalMaterial": null,
......@@ -43493,7 +43675,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1115
"__id__": 1119
},
"_enabled": true,
"_materials": [],
......@@ -43521,7 +43703,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1111
"__id__": 1115
},
"_enabled": true,
"alignMode": 1,
......@@ -43608,10 +43790,10 @@
"__id__": 200
},
"aniSpeaker": {
"__id__": 1105
"__id__": 1109
},
"aniVideoTips": {
"__id__": 1108
"__id__": 1112
},
"pronunciationAssessmentModal": {
"__id__": 856
......
......@@ -3125,6 +3125,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
setDrawingArea(contentData, hotZoneItemData, debugMode=false) {
const rect = this.newRectNode(hotZoneItemData, layer_4, debugMode);
const drawingBoard = cc.instantiate(this.drawingBoardTemplate);
const dbJS = drawingBoard.getComponent("DrawingBoard_DG_FAF")
dbJS.painterOnCenter = contentData.painterOnCenter ? true : false;
const uid = getUUID();
drawingBoard.uid = uid;
this.allDrawingBoards.push(drawingBoard);
......@@ -3163,6 +3165,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
setDrawingAreaWithCheck(contentData, hotZoneItemData, debugMode=false) {
const rect = this.newRectNode(hotZoneItemData, layer_4, debugMode);
const drawingBoard = cc.instantiate(this.drawingBoardTemplate);
const dbJS = drawingBoard.getComponent("DrawingBoard_DG_FAF")
dbJS.painterOnCenter = contentData.painterOnCenter ? true : false;
const uid = getUUID();
drawingBoard.uid = uid;
this.allDrawingBoards.push(drawingBoard);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -610,6 +610,11 @@
<label nz-checkbox [(ngModel)]="it.drawingCheckStrictEqual" (ngModelChange)="save()" style="margin-left: 10px;">颜色严格相等</label>
</div>
<div *ngIf="it.hotZoneType == DRAWING || it.hotZoneType == DRAWING_CHECK" style="margin: 10px 10px;">
<span style="display: inline-block; text-align: right; width: 150px;">绘图按钮在中间:</span>
<label nz-checkbox [(ngModel)]="it.painterOnCenter" (ngModelChange)="save()" style="margin-left: 10px;"></label>
</div>
<div *ngIf="it.hotZoneType != '' && it.hotZoneType != CROSSWORD_PUZZLE && it.hotZoneType != HOT_ZONE_RADIO && it.hotZoneType != HOT_ZONE_CHECKBOX && it.hotZoneType != CONNECTION && it.hotZoneType != CONNECTION_2LEVEL && it.hotZoneType != TEXT_SELECT && it.hotZoneType != MULTIPLE_TEXT_SELECT && it.hotZoneType != RIGHT_OR_WRONG && it.hotZoneType != TEXTINPUT_GROUP" style="margin: 10px 10px;">
<span style="display: inline-block; text-align: right; width: 150px;">关联热区:</span>
<nz-select nzShowSearch nzAllowClear [(ngModel)]="it.linkHotZoneIndex" style="width: 300px;" (ngModelChange)="save()">
......
......@@ -275,6 +275,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
drawingCheckCorrectColors: [], // 正确颜色 [评分画图题]
drawingCheckStrictEqual: false, // 严格相等 [评分画图题]
painterOnCenter: false, // 开启绘图按钮在绘画区中间 [评分画图题、画图题]
}
}
......
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