Commit 36c49c43 authored by jeff's avatar jeff

更新

parent 10061acf
......@@ -58,6 +58,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
if (data && data.length) {
this.item = data;
}
this.colorType = data.length ? data[0].bgItem.colorType : '0'
this.init();
this.changeDetectorRef.markForCheck();
......
......@@ -84,19 +84,19 @@
"__id__": 21
},
{
"__id__": 43
"__id__": 42
}
],
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 61
},
{
"__id__": 63
"__id__": 62
},
{
"__id__": 64
"__id__": 63
}
],
"_prefab": null,
......@@ -949,22 +949,22 @@
"__id__": 22
},
{
"__id__": 25
"__id__": 24
},
{
"__id__": 27
"__id__": 26
},
{
"__id__": 34
"__id__": 33
},
{
"__id__": 38
"__id__": 37
}
],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 41
}
],
"_prefab": null,
......@@ -1027,9 +1027,6 @@
"_components": [
{
"__id__": 23
},
{
"__id__": 24
}
],
"_prefab": null,
......@@ -1099,7 +1096,7 @@
"__uuid__": "631eb6da-0394-49df-baf0-61935087f2bc"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 2,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -1112,33 +1109,6 @@
"_atlas": null,
"_id": "fa/pNEGT9MU5IlMu3YiLgv"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 36,
"_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": "a0T1BE35FKz70VBqCjl76Z"
},
{
"__type__": "cc.Node",
"_name": "bg_bottom",
......@@ -1150,7 +1120,7 @@
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 25
}
],
"_prefab": null,
......@@ -1206,7 +1176,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 24
},
"_enabled": true,
"_materials": [
......@@ -1242,16 +1212,16 @@
},
"_children": [
{
"__id__": 28
"__id__": 27
},
{
"__id__": 30
"__id__": 29
}
],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 31
}
],
"_prefab": null,
......@@ -1307,13 +1277,13 @@
"_name": "show",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 26
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 29
"__id__": 28
}
],
"_prefab": null,
......@@ -1369,7 +1339,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1401,13 +1371,13 @@
"_name": "btn_replay",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 26
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 30
}
],
"_prefab": null,
......@@ -1463,7 +1433,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1495,7 +1465,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 26
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1504,7 +1474,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 33
"__id__": 32
}
],
"_N$interactable": true,
......@@ -1583,10 +1553,10 @@
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 34
},
{
"__id__": 37
"__id__": 36
}
],
"_prefab": null,
......@@ -1642,7 +1612,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 33
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1651,7 +1621,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 36
"__id__": 35
}
],
"_N$interactable": true,
......@@ -1724,7 +1694,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1762,10 +1732,10 @@
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 38
},
{
"__id__": 41
"__id__": 40
}
],
"_prefab": null,
......@@ -1821,7 +1791,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 37
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1830,7 +1800,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 40
"__id__": 39
}
],
"_N$interactable": true,
......@@ -1903,7 +1873,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1966,25 +1936,25 @@
},
"_children": [
{
"__id__": 44
"__id__": 43
},
{
"__id__": 48
"__id__": 47
},
{
"__id__": 52
"__id__": 51
},
{
"__id__": 58
"__id__": 57
}
],
"_active": true,
"_components": [
{
"__id__": 60
"__id__": 59
},
{
"__id__": 61
"__id__": 60
}
],
"_prefab": null,
......@@ -2040,16 +2010,16 @@
"_name": "btn_stop",
"_objFlags": 0,
"_parent": {
"__id__": 43
"__id__": 42
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 45
"__id__": 44
},
{
"__id__": 46
"__id__": 45
}
],
"_prefab": null,
......@@ -2105,7 +2075,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2137,7 +2107,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 43
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2146,7 +2116,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 47
"__id__": 46
}
],
"_N$interactable": true,
......@@ -2207,7 +2177,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
"__id__": 43
"__id__": 42
},
"component": "",
"_componentId": "a5d5cl9cN9CA5tELIOHf6uI",
......@@ -2219,16 +2189,16 @@
"_name": "btn_next",
"_objFlags": 0,
"_parent": {
"__id__": 43
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 48
},
{
"__id__": 50
"__id__": 49
}
],
"_prefab": null,
......@@ -2284,7 +2254,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2316,7 +2286,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 47
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2325,7 +2295,7 @@
"zoomScale": 1.1,
"clickEvents": [
{
"__id__": 51
"__id__": 50
}
],
"_N$interactable": true,
......@@ -2386,7 +2356,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
"__id__": 43
"__id__": 42
},
"component": "",
"_componentId": "a5d5cl9cN9CA5tELIOHf6uI",
......@@ -2398,20 +2368,20 @@
"_name": "bg_tiaodi",
"_objFlags": 0,
"_parent": {
"__id__": 43
"__id__": 42
},
"_children": [
{
"__id__": 53
"__id__": 52
},
{
"__id__": 55
"__id__": 54
}
],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 56
}
],
"_prefab": null,
......@@ -2467,13 +2437,13 @@
"_name": "bg_tiao",
"_objFlags": 0,
"_parent": {
"__id__": 52
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 53
}
],
"_prefab": null,
......@@ -2529,7 +2499,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2561,13 +2531,13 @@
"_name": "icon_move",
"_objFlags": 0,
"_parent": {
"__id__": 52
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 55
}
],
"_prefab": null,
......@@ -2623,7 +2593,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2655,7 +2625,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2687,13 +2657,13 @@
"_name": "time",
"_objFlags": 0,
"_parent": {
"__id__": 43
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 58
}
],
"_prefab": null,
......@@ -2749,7 +2719,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2782,7 +2752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 42
},
"_enabled": true,
"alignMode": 1,
......@@ -2809,23 +2779,23 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 42
},
"_enabled": true,
"playBtn": {
"__id__": 48
"__id__": 47
},
"pauseBtn": {
"__id__": 44
"__id__": 43
},
"label": {
"__id__": 59
"__id__": 58
},
"tiao": {
"__id__": 52
"__id__": 51
},
"moveBtn": {
"__id__": 55
"__id__": 54
},
"_id": "bc9MPqChFDCJsvpOdf++gN"
},
......@@ -2888,19 +2858,19 @@
"__id__": 15
},
"leftNode": {
"__id__": 34
"__id__": 33
},
"rightNode": {
"__id__": 38
"__id__": 37
},
"checkNode": {
"__id__": 27
"__id__": 26
},
"bgNode": {
"__id__": 5
},
"bgAudioNode": {
"__id__": 43
"__id__": 42
},
"btnClip": {
"__uuid__": "39ef1939-3bf9-4d21-a67a-bc1dede521a9"
......@@ -2913,7 +2883,7 @@
"__id__": 22
},
{
"__id__": 25
"__id__": 24
}
],
"_id": "a1ibU1vO9Nwbfwjsm/NgGR"
......
{
"ver": "2.3.5",
"uuid": "01cbdb4c-8e1f-47b6-8039-8c33abaf8cdf",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 300,
"height": 103,
"platformSettings": {},
"subMetas": {
"bg_buttondi": {
"ver": "1.0.4",
"uuid": "631eb6da-0394-49df-baf0-61935087f2bc",
"rawTextureUuid": "01cbdb4c-8e1f-47b6-8039-8c33abaf8cdf",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 300,
"height": 103,
"rawWidth": 300,
"rawHeight": 103,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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