Commit 1dee227d authored by 李维's avatar 李维

添加文字选项两列配置

parent dd63da7c
......@@ -27,11 +27,11 @@
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 98
}
],
"_prefab": {
"__id__": 81
"__id__": 99
},
"_opacity": 255,
"_color": {
......@@ -218,11 +218,11 @@
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 96
}
],
"_prefab": {
"__id__": 79
"__id__": 97
},
"_opacity": 255,
"_color": {
......@@ -744,14 +744,764 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
"__id__": 7
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 6
},
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "514b53e7-dff5-4f5f-b85d-5b12abff8873"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "c2OYwxDYFNA4nfuyx+ZyKN",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "list",
"_objFlags": 0,
"_parent": {
"__id__": 6
},
"_children": [
{
"__id__": 22
},
{
"__id__": 40
},
{
"__id__": 58
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 95
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1200,
"height": 380
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-60,
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.Node",
"_name": "layout_options",
"_objFlags": 0,
"_parent": {
"__id__": 21
},
"_children": [
{
"__id__": 23
}
],
"_active": false,
"_components": [
{
"__id__": 37
},
{
"__id__": 38
}
],
"_prefab": {
"__id__": 39
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1200,
"height": 380
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 1
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-600,
190,
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.Node",
"_name": "item_tempate",
"_objFlags": 0,
"_parent": {
"__id__": 22
},
"_children": [
{
"__id__": 24
},
{
"__id__": 28
},
{
"__id__": 31
}
],
"_active": false,
"_components": [
{
"__id__": 35
}
],
"_prefab": {
"__id__": 36
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1200,
"height": 120
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
600,
-60,
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.Node",
"_name": "line_top",
"_objFlags": 0,
"_parent": {
"__id__": 23
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
},
{
"__id__": 26
}
],
"_prefab": {
"__id__": 27
},
"_opacity": 128,
"_color": {
"__type__": "cc.Color",
"r": 143,
"g": 204,
"b": 249,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1100,
"height": 1
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
50,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "514b53e7-dff5-4f5f-b85d-5b12abff8873"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 40,
"_left": 50,
"_right": 50,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1200,
"_originalHeight": 0,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "71B7P00TRJhZTUdd+0GJM2",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "text",
"_objFlags": 0,
"_parent": {
"__id__": 23
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
}
],
"_prefab": {
"__id__": 30
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 51,
"g": 51,
"b": 51,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 91.23,
"height": 73.08
},
"_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": ""
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "red",
"_N$string": "red",
"_fontSize": 58,
"_lineHeight": 58,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "d0f6efe4-3b7c-490b-8726-299cb7b73bc3"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "79+0xTFFdMNbMPbs5f2wKl",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "line_bottom",
"_objFlags": 0,
"_parent": {
"__id__": 23
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 32
},
{
"__id__": 33
}
],
"_prefab": {
"__id__": 34
},
"_opacity": 128,
"_color": {
"__type__": "cc.Color",
"r": 143,
"g": 204,
"b": 249,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1200,
"height": 1
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-50,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "514b53e7-dff5-4f5f-b85d-5b12abff8873"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 40,
"_left": 50,
"_right": 50,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1200,
"_originalHeight": 0,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "1ayqMQF8pPIJsypD+Tj9hX",
"sync": false
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_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__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "43M0qAOatLAqpcP/cXI99s",
"sync": false
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 6
"__id__": 21
},
"_alignFlags": 1,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
......@@ -764,40 +1514,40 @@
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_originalWidth": 300,
"_originalHeight": 200,
"_id": ""
},
{
"__type__": "cc.Sprite",
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
"__id__": 22
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "514b53e7-dff5-4f5f-b85d-5b12abff8873"
"_layoutSize": {
"__type__": "cc.Size",
"width": 1200,
"height": 380
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
"_resize": 0,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": ""
},
{
......@@ -808,99 +1558,32 @@
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "c2OYwxDYFNA4nfuyx+ZyKN",
"fileId": "a90SuvXyRNvZtZvMzm8tpA",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "list",
"_objFlags": 0,
"_parent": {
"__id__": 6
},
"_children": [
{
"__id__": 22
},
{
"__id__": 40
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 77
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1200,
"height": 380
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-60,
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.Node",
"_name": "layout_options",
"_name": "layout_options_col2",
"_objFlags": 0,
"_parent": {
"__id__": 21
},
"_children": [
{
"__id__": 23
"__id__": 41
}
],
"_active": false,
"_components": [
{
"__id__": 37
"__id__": 55
},
{
"__id__": 38
"__id__": 56
}
],
"_prefab": {
"__id__": 39
"__id__": 57
},
"_opacity": 255,
"_color": {
......@@ -954,27 +1637,27 @@
"_name": "item_tempate",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 40
},
"_children": [
{
"__id__": 24
"__id__": 42
},
{
"__id__": 28
"__id__": 46
},
{
"__id__": 31
"__id__": 49
}
],
"_active": false,
"_components": [
{
"__id__": 35
"__id__": 53
}
],
"_prefab": {
"__id__": 36
"__id__": 54
},
"_opacity": 255,
"_color": {
......@@ -986,7 +1669,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1200,
"width": 500,
"height": 120
},
"_anchorPoint": {
......@@ -998,7 +1681,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
600,
300,
-60,
0,
0,
......@@ -1028,20 +1711,20 @@
"_name": "line_top",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 43
},
{
"__id__": 26
"__id__": 44
}
],
"_prefab": {
"__id__": 27
"__id__": 45
},
"_opacity": 128,
"_color": {
......@@ -1053,7 +1736,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1100,
"width": 500,
"height": 1
},
"_anchorPoint": {
......@@ -1095,7 +1778,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -1127,7 +1810,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 42
},
"_enabled": true,
"alignMode": 1,
......@@ -1157,7 +1840,7 @@
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "71B7P00TRJhZTUdd+0GJM2",
"fileId": "bbDCqTY+dHj4O+qkn0oBqH",
"sync": false
},
{
......@@ -1165,17 +1848,17 @@
"_name": "text",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 47
}
],
"_prefab": {
"__id__": 30
"__id__": 48
},
"_opacity": 255,
"_color": {
......@@ -1229,7 +1912,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 46
},
"_enabled": true,
"_materials": [
......@@ -1267,7 +1950,7 @@
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "79+0xTFFdMNbMPbs5f2wKl",
"fileId": "7fTioYtkJFobngM0bsxtLk",
"sync": false
},
{
......@@ -1275,20 +1958,20 @@
"_name": "line_bottom",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 41
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 32
"__id__": 50
},
{
"__id__": 33
"__id__": 51
}
],
"_prefab": {
"__id__": 34
"__id__": 52
},
"_opacity": 128,
"_color": {
......@@ -1342,7 +2025,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -1374,7 +2057,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 49
},
"_enabled": true,
"alignMode": 1,
......@@ -1404,7 +2087,7 @@
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "1ayqMQF8pPIJsypD+Tj9hX",
"fileId": "5fDaBmaItNoq3K6wNI5gh1",
"sync": false
},
{
......@@ -1412,7 +2095,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 41
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1483,7 +2166,7 @@
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "43M0qAOatLAqpcP/cXI99s",
"fileId": "4ehKGZmd9OmaLXNz+YM/XZ",
"sync": false
},
{
......@@ -1491,7 +2174,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 40
},
"_enabled": true,
"alignMode": 1,
......@@ -1520,7 +2203,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 40
},
"_enabled": true,
"_layoutSize": {
......@@ -1529,7 +2212,7 @@
"height": 380
},
"_resize": 0,
"_N$layoutType": 2,
"_N$layoutType": 3,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
......@@ -1555,7 +2238,7 @@
"asset": {
"__uuid__": "5df55558-61c8-45bd-8838-81235266b1bb"
},
"fileId": "a90SuvXyRNvZtZvMzm8tpA",
"fileId": "73nE3d+6lOWJFp3Qc6/lfx",
"sync": false
},
{
......@@ -1567,20 +2250,20 @@
},
"_children": [
{
"__id__": 41
"__id__": 59
},
{
"__id__": 58
"__id__": 76
}
],
"_active": false,
"_components": [
{
"__id__": 75
"__id__": 93
}
],
"_prefab": {
"__id__": 76
"__id__": 94
},
"_opacity": 255,
"_color": {
......@@ -1634,36 +2317,36 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 58
},
"_children": [
{
"__id__": 42
"__id__": 60
},
{
"__id__": 45
"__id__": 63
},
{
"__id__": 48
"__id__": 66
},
{
"__id__": 51
"__id__": 69
}
],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 72
},
{
"__id__": 55
"__id__": 73
},
{
"__id__": 56
"__id__": 74
}
],
"_prefab": {
"__id__": 57
"__id__": 75
},
"_opacity": 255,
"_color": {
......@@ -1717,17 +2400,17 @@
"_name": "icon_right",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 61
}
],
"_prefab": {
"__id__": 44
"__id__": 62
},
"_opacity": 255,
"_color": {
......@@ -1781,7 +2464,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -1824,17 +2507,17 @@
"_name": "icon_laugh",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 46
"__id__": 64
}
],
"_prefab": {
"__id__": 47
"__id__": 65
},
"_opacity": 255,
"_color": {
......@@ -1888,7 +2571,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 63
},
"_enabled": true,
"_materials": [
......@@ -1931,17 +2614,17 @@
"_name": "text_true",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 49
"__id__": 67
}
],
"_prefab": {
"__id__": 50
"__id__": 68
},
"_opacity": 255,
"_color": {
......@@ -1995,7 +2678,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -2039,17 +2722,17 @@
"_name": "text_yes",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 59
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 52
"__id__": 70
}
],
"_prefab": {
"__id__": 53
"__id__": 71
},
"_opacity": 255,
"_color": {
......@@ -2103,7 +2786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 69
},
"_enabled": true,
"_materials": [
......@@ -2147,7 +2830,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2177,7 +2860,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 59
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2245,7 +2928,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 59
},
"_enabled": true,
"alignMode": 1,
......@@ -2283,36 +2966,36 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 40
"__id__": 58
},
"_children": [
{
"__id__": 59
"__id__": 77
},
{
"__id__": 62
"__id__": 80
},
{
"__id__": 65
"__id__": 83
},
{
"__id__": 68
"__id__": 86
}
],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 89
},
{
"__id__": 72
"__id__": 90
},
{
"__id__": 73
"__id__": 91
}
],
"_prefab": {
"__id__": 74
"__id__": 92
},
"_opacity": 255,
"_color": {
......@@ -2366,17 +3049,17 @@
"_name": "icon_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 60
"__id__": 78
}
],
"_prefab": {
"__id__": 61
"__id__": 79
},
"_opacity": 255,
"_color": {
......@@ -2430,7 +3113,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -2473,17 +3156,17 @@
"_name": "icon_cry",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 76
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 63
"__id__": 81
}
],
"_prefab": {
"__id__": 64
"__id__": 82
},
"_opacity": 255,
"_color": {
......@@ -2537,7 +3220,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -2580,17 +3263,17 @@
"_name": "text_false",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 76
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 66
"__id__": 84
}
],
"_prefab": {
"__id__": 67
"__id__": 85
},
"_opacity": 255,
"_color": {
......@@ -2644,7 +3327,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -2688,17 +3371,17 @@
"_name": "text_no",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 76
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 69
"__id__": 87
}
],
"_prefab": {
"__id__": 70
"__id__": 88
},
"_opacity": 255,
"_color": {
......@@ -2752,7 +3435,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -2796,7 +3479,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -2826,7 +3509,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 76
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2894,7 +3577,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 76
},
"_enabled": true,
"alignMode": 1,
......@@ -2932,7 +3615,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 58
},
"_enabled": true,
"alignMode": 1,
......
......@@ -62,8 +62,8 @@ export default class NewClass extends cc.Component {
this.hide();
})
this.node.on("show", (option, type="textList") => {
this.show(option, type);
this.node.on("show", (option, type="textList", col2=false) => {
this.show(option, type, col2);
})
const rightWrongLayout = cc.find("center/list/layout_right_wrong", this.node);
......@@ -80,7 +80,7 @@ export default class NewClass extends cc.Component {
})
}
show(option, type) {
show(option, type, col2) {
this.node.opacity = 0;
this.node.active = true;
cc.tween(this.node).to(0.1, {
......@@ -92,16 +92,25 @@ export default class NewClass extends cc.Component {
if(type == "textList") {
this.initTitle("请选择答案");
const listLayout = cc.find("center/list/layout_options", this.node);
const itemTemplate = cc.find("center/list/layout_options/item_tempate", this.node);
const layoutName = col2 ? "layout_options_col2" : "layout_options"
const listLayout = cc.find(`center/list/${layoutName}`, this.node);
const itemTemplate = cc.find(`center/list/${layoutName}/item_tempate`, this.node);
listLayout.active = true;
option.forEach((item, index) => {
const optionNode = cc.instantiate(itemTemplate);
// 第一个选项不显示顶部分隔条
if(index == 0) {
cc.find("line_top", optionNode).active = false;
if(col2) {
if(index == 0 || index == 1) {
cc.find("line_top", optionNode).active = false;
}
} else {
if(index == 0) {
cc.find("line_top", optionNode).active = false;
}
}
optionNode.name = `option_${index}`
const text = cc.find("text", optionNode);
text.getComponent(cc.Label).string = item.label;
......@@ -181,6 +190,7 @@ export default class NewClass extends cc.Component {
opacity: 0
}).call(()=>{
const listLayout = cc.find("center/list/layout_options", this.node);
const listLayout_col2 = cc.find("center/list/layout_options_col2", this.node);
const rightWrongLayout = cc.find("center/list/layout_right_wrong", this.node);
listLayout.active = false;
rightWrongLayout.active = false;
......@@ -192,6 +202,12 @@ export default class NewClass extends cc.Component {
child.destroy();
}
})
listLayout_col2.children.forEach(child=>{
if(child.name != "item_tempate") {
child.destroy();
}
})
}).start();
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2828,7 +2828,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
lastText = rect.cleanLast()
}
let selectData = await this.asyncShowSelectModal(optionList, "textList");
let selectData = await this.asyncShowSelectModal(optionList, "textList", contentData.oplistCol2?true:false);
// 如果点击了取消 则还原上次显示
const inputLabel = this.newInputTextNode(selectData?selectData.value:lastText, 0);
inputLabel.x = rect.width / 2;
......@@ -4385,7 +4385,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
"Mustn't": "[@AC(Mustnot)]",
"must not": "[@AC(mustnot)]",
"mustn't": "[@AC(mustnot)]",
}
for(let contraction in contractionTemplate) {
......@@ -4396,9 +4395,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
// 同步方式显示选择模态框
asyncShowSelectModal(option, type) {
asyncShowSelectModal(option, type, col2) {
return new Promise((resovle, reject) => {
this.selectModal.emit("show", option, type);
this.selectModal.emit("show", option, type, col2);
this.onSelectedCallback = (target, e) => {
if(e == undefined) {
// 点击了取消
......
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.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -615,6 +615,11 @@
</nz-select>
<label nz-checkbox [(ngModel)]="it.drawingCheckStrictEqual" (ngModelChange)="save()" style="margin-left: 10px;">颜色严格相等</label>
</div>
<div *ngIf="it.hotZoneType == TEXT_SELECT" style="margin: 10px 10px;">
<span style="display: inline-block; text-align: right; width: 150px;">两列选项:</span>
<label nz-checkbox [(ngModel)]="it.oplistCol2" (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>
......
......@@ -276,6 +276,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
drawingCheckCorrectColors: [], // 正确颜色 [评分画图题]
drawingCheckStrictEqual: false, // 严格相等 [评分画图题]
painterOnCenter: false, // 开启绘图按钮在绘画区中间 [评分画图题、画图题]
oplistCol2: 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