Commit 1f46e160 authored by limingzhe's avatar limingzhe

fix: debug

parent a043bfbb
{"ver":"1.1.2","uuid":"3394706f-015e-4b30-b3da-f1e260ff228d","isBundle":false,"bundleName":"","priority":1,"compressionType":{},"optimizeHotUpdate":{},"inlineSpriteFrames":{},"isRemoteBundle":{"ios":false,"android":false},"subMetas":{}}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "3394706f-015e-4b30-b3da-f1e260ff228d",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {
"ios": false,
"android": false
},
"subMetas": {}
}
\ No newline at end of file
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 62
"__id__": 64
},
{
"__id__": 83
"__id__": 85
}
],
"_active": false,
......@@ -90,13 +90,13 @@
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 61
},
{
"__id__": 60
"__id__": 62
},
{
"__id__": 61
"__id__": 63
}
],
"_prefab": null,
......@@ -667,13 +667,13 @@
"__id__": 15
},
{
"__id__": 36
"__id__": 38
},
{
"__id__": 39
"__id__": 41
},
{
"__id__": 56
"__id__": 58
}
],
"_active": false,
......@@ -763,6 +763,9 @@
},
{
"__id__": 34
},
{
"__id__": 36
}
],
"_active": true,
......@@ -817,7 +820,7 @@
},
{
"__type__": "cc.Node",
"_name": "btn_sound",
"_name": "white",
"_objFlags": 0,
"_parent": {
"__id__": 15
......@@ -838,6 +841,96 @@
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 10,
"height": 10
},
"_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": "adpr2qbWNNFYriYbO5DIOF"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "3a26d24e-955a-4414-8603-c77f3d08a31a"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b8jO0CM1xHhqKCtztcpKoY"
},
{
"__type__": "cc.Node",
"_name": "btn_sound",
"_objFlags": 0,
"_parent": {
"__id__": 15
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 105,
......@@ -882,7 +975,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 18
},
"_enabled": true,
"_materials": [],
......@@ -916,7 +1009,7 @@
"_active": true,
"_components": [
{
"__id__": 19
"__id__": 21
}
],
"_prefab": null,
......@@ -972,7 +1065,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 20
},
"_enabled": true,
"_materials": [],
......@@ -1006,7 +1099,7 @@
"_active": true,
"_components": [
{
"__id__": 21
"__id__": 23
}
],
"_prefab": null,
......@@ -1062,7 +1155,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 22
},
"_enabled": true,
"_materials": [],
......@@ -1096,7 +1189,7 @@
"_active": true,
"_components": [
{
"__id__": 23
"__id__": 25
}
],
"_prefab": null,
......@@ -1152,7 +1245,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 24
},
"_enabled": true,
"_materials": [],
......@@ -1186,7 +1279,7 @@
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 27
}
],
"_prefab": null,
......@@ -1242,7 +1335,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 26
},
"_enabled": true,
"_materials": [],
......@@ -1276,7 +1369,7 @@
"_active": true,
"_components": [
{
"__id__": 27
"__id__": 29
}
],
"_prefab": null,
......@@ -1332,7 +1425,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 28
},
"_enabled": true,
"_materials": [],
......@@ -1366,7 +1459,7 @@
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 31
}
],
"_prefab": null,
......@@ -1422,7 +1515,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"_materials": [],
......@@ -1456,7 +1549,7 @@
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 33
}
],
"_prefab": null,
......@@ -1512,7 +1605,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 32
},
"_enabled": true,
"_materials": [],
......@@ -1546,7 +1639,7 @@
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 35
}
],
"_prefab": null,
......@@ -1602,7 +1695,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 34
},
"_enabled": true,
"_materials": [],
......@@ -1636,7 +1729,7 @@
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 37
}
],
"_prefab": null,
......@@ -1692,7 +1785,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 36
},
"_enabled": true,
"_materials": [],
......@@ -1724,7 +1817,7 @@
},
"_children": [
{
"__id__": 37
"__id__": 39
}
],
"_active": true,
......@@ -1782,13 +1875,13 @@
"_name": "BerlinSansFB",
"_objFlags": 0,
"_parent": {
"__id__": 36
"__id__": 38
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 40
}
],
"_prefab": null,
......@@ -1844,7 +1937,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1882,9 +1975,6 @@
"__id__": 14
},
"_children": [
{
"__id__": 40
},
{
"__id__": 42
},
......@@ -1905,6 +1995,9 @@
},
{
"__id__": 54
},
{
"__id__": 56
}
],
"_active": true,
......@@ -1962,13 +2055,13 @@
"_name": "help",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 43
}
],
"_prefab": null,
......@@ -2024,7 +2117,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 42
},
"_enabled": true,
"_clip": {
......@@ -2043,13 +2136,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 45
}
],
"_prefab": null,
......@@ -2105,7 +2198,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 44
},
"_enabled": true,
"_clip": {
......@@ -2124,13 +2217,13 @@
"_name": "select",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 47
}
],
"_prefab": null,
......@@ -2186,7 +2279,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 46
},
"_enabled": true,
"_clip": {
......@@ -2205,13 +2298,13 @@
"_name": "star_count",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 49
}
],
"_prefab": null,
......@@ -2267,7 +2360,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 48
},
"_enabled": true,
"_clip": {
......@@ -2286,13 +2379,13 @@
"_name": "finish",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 51
}
],
"_prefab": null,
......@@ -2348,7 +2441,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 50
},
"_enabled": true,
"_clip": {
......@@ -2367,13 +2460,13 @@
"_name": "big_star",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 53
}
],
"_prefab": null,
......@@ -2429,7 +2522,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 52
},
"_enabled": true,
"_clip": {
......@@ -2448,13 +2541,13 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 55
}
],
"_prefab": null,
......@@ -2510,7 +2603,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 54
},
"_enabled": true,
"_clip": {
......@@ -2529,13 +2622,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 57
}
],
"_prefab": null,
......@@ -2591,7 +2684,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 56
},
"_enabled": true,
"_clip": {
......@@ -2614,7 +2707,7 @@
},
"_children": [
{
"__id__": 57
"__id__": 59
}
],
"_active": true,
......@@ -2672,13 +2765,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 56
"__id__": 58
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 60
}
],
"_prefab": null,
......@@ -2734,7 +2827,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2834,19 +2927,19 @@
},
"_children": [
{
"__id__": 63
"__id__": 65
},
{
"__id__": 67
"__id__": 69
},
{
"__id__": 71
"__id__": 73
},
{
"__id__": 75
"__id__": 77
},
{
"__id__": 79
"__id__": 81
}
],
"_active": false,
......@@ -2904,11 +2997,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 64
},
"_children": [
{
"__id__": 64
"__id__": 66
}
],
"_active": true,
......@@ -2966,11 +3059,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 63
"__id__": 65
},
"_children": [
{
"__id__": 65
"__id__": 67
}
],
"_active": true,
......@@ -3028,13 +3121,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 68
}
],
"_prefab": null,
......@@ -3090,7 +3183,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3122,11 +3215,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 64
},
"_children": [
{
"__id__": 68
"__id__": 70
}
],
"_active": true,
......@@ -3184,11 +3277,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 69
},
"_children": [
{
"__id__": 69
"__id__": 71
}
],
"_active": true,
......@@ -3246,13 +3339,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 68
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 72
}
],
"_prefab": null,
......@@ -3308,7 +3401,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 71
},
"_enabled": true,
"_materials": [
......@@ -3340,11 +3433,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 64
},
"_children": [
{
"__id__": 72
"__id__": 74
}
],
"_active": true,
......@@ -3402,11 +3495,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 73
},
"_children": [
{
"__id__": 73
"__id__": 75
}
],
"_active": true,
......@@ -3464,13 +3557,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 76
}
],
"_prefab": null,
......@@ -3526,7 +3619,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3558,11 +3651,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 64
},
"_children": [
{
"__id__": 76
"__id__": 78
}
],
"_active": true,
......@@ -3620,11 +3713,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 77
},
"_children": [
{
"__id__": 77
"__id__": 79
}
],
"_active": true,
......@@ -3682,13 +3775,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 78
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 80
}
],
"_prefab": null,
......@@ -3744,7 +3837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3776,11 +3869,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 64
},
"_children": [
{
"__id__": 80
"__id__": 82
}
],
"_active": true,
......@@ -3838,11 +3931,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 81
},
"_children": [
{
"__id__": 81
"__id__": 83
}
],
"_active": true,
......@@ -3900,13 +3993,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 84
}
],
"_prefab": null,
......@@ -3962,7 +4055,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -3997,9 +4090,6 @@
"__id__": 1
},
"_children": [
{
"__id__": 84
},
{
"__id__": 86
},
......@@ -4020,6 +4110,9 @@
},
{
"__id__": 98
},
{
"__id__": 100
}
],
"_active": false,
......@@ -4077,13 +4170,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 87
}
],
"_prefab": null,
......@@ -4139,7 +4232,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -4171,13 +4264,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 89
}
],
"_prefab": null,
......@@ -4233,7 +4326,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4265,13 +4358,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 91
}
],
"_prefab": null,
......@@ -4327,7 +4420,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4359,13 +4452,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 93
}
],
"_prefab": null,
......@@ -4421,7 +4514,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4453,13 +4546,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 95
}
],
"_prefab": null,
......@@ -4515,7 +4608,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4547,13 +4640,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 97
}
],
"_prefab": null,
......@@ -4609,7 +4702,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4641,13 +4734,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 99
}
],
"_prefab": null,
......@@ -4703,7 +4796,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 98
},
"_enabled": true,
"_materials": [
......@@ -4735,13 +4828,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 101
}
],
"_prefab": null,
......@@ -4797,7 +4890,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 100
},
"_enabled": true,
"_materials": [
......
This source diff could not be displayed because it is too large. You can view the blob instead.
{
"ver": "2.3.5",
"uuid": "b703a63f-39e4-406c-abc4-511099f05da4",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 10,
"height": 10,
"platformSettings": {},
"subMetas": {
"white": {
"ver": "1.0.4",
"uuid": "3a26d24e-955a-4414-8603-c77f3d08a31a",
"rawTextureUuid": "b703a63f-39e4-406c-abc4-511099f05da4",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 10,
"height": 10,
"rawWidth": 10,
"rawHeight": 10,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
......@@ -198,7 +198,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
onItemImgUploadSuccess(e, item) {
item.pic_url = e.url;
this.loadHotZonePic(item.pic, e.url);
this.loadHotZonePic(item, item.pic, e.url);
this.refresh();
}
......@@ -418,7 +418,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
console.log('picUrl: ', picUrl);
if (picUrl) {
this.loadHotZonePic(pic, picUrl, saveData.imgScale);
this.loadHotZonePic(item, pic, picUrl, saveData.imgScale);
}
}
......@@ -1384,7 +1384,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
if (data.type == 'pic') {
let picUrl = data.pic_url;
if (picUrl) {
this.loadHotZonePic(item.pic, picUrl);
this.loadHotZonePic(item, item.pic, picUrl);
}
}
......@@ -1818,7 +1818,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
console.log("item: ", item);
}
private loadHotZonePic(pic: HotZoneImg, url, scale = null) {
private loadHotZonePic(item, pic: HotZoneImg, url, scale = null) {
let baseLen;
if (this.hotZoneImgSize) {
......@@ -1834,7 +1834,12 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy, OnChanges {
}
}
pic.setScaleXY(scale);
const w = item.width * item.scaleX;
const h = item.height * item.scaleY;
pic.setScaleXY(getMinScale(pic, w, h));
// pic.setScaleXY(scale);
});
}
......
......@@ -282,6 +282,38 @@
</div>
</div>
<div style="margin-top: 30px;"></div>
<h2>涂色组设置:</h2>
<div style="padding: 10px; border: 2px solid #ccc; border-radius: 10px; width: 350px;">
<div *ngFor="let hzItem of item.hotZoneItemArr; let i = index">
<div *ngIf="hzItem.gIdx == '5'" style="margin: 10px; display: flex; align-items: center;">
<div style="width: 300px; height: 70px; border: 1px solid #ccc; border-radius: 10px; padding: 5px; ">
<h3>item-{{i+1}}</h3>
<span>服务端标记区域:</span>
<a nz-dropdown [nzDropdownMenu]="menu4">
{{hzItem.drawItem ? 'draw-item-' + hzItem.drawItem : 'select drawItem'}}
<i nz-icon nzType="down"></i>
</a>
<nz-dropdown-menu #menu4="nzDropdownMenu">
<ul nz-menu nzSelectable>
<div *ngFor="let temp of item.hotZoneItemArr2; let j = index" (click)="saveDrawItem(hzItem, j+1)" >
<li *ngIf="temp.gIdx == '9' " nz-menu-item>draw-item-{{j+1}}</li>
</div>
</ul>
</nz-dropdown-menu>
</div>
</div>
</div>
</div>
<div *ngIf=" item.typeArr && item.typeArr.length > 1" style="margin-top: 30px;">
......
......@@ -181,6 +181,13 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
]
}
},
{
name: '涂色区域',
rect: true,
isCopy: true
// multRect : true
},
]
audioTypeArr = [
......@@ -271,6 +278,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
'1' : {gIdx: '1', name: '手写'},
'2' : {gIdx: '2', name: '画圈'},
'4' : {gIdx: '4', name: '符号'},
'5' : {gIdx: '5', name: '涂色'},
'6' : {gIdx: '6', name: '书写'},
}
......@@ -336,7 +344,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
this.save();
}
saveDrawItem(hzItem, itemId) {
hzItem.drawItem = itemId;
this.save();
}
addWrongAnswer() {
......
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