Commit f99af5c5 authored by 范雪寒's avatar 范雪寒

feat: 屏幕适配

parent 9adff6a1
......@@ -17,22 +17,22 @@
"__id__": 2
},
{
"__id__": 73
"__id__": 72
},
{
"__id__": 81
"__id__": 80
},
{
"__id__": 89
"__id__": 88
},
{
"__id__": 97
"__id__": 96
},
{
"__id__": 105
"__id__": 104
},
{
"__id__": 113
"__id__": 112
}
],
"_active": false,
......@@ -93,19 +93,19 @@
"__id__": 5
},
{
"__id__": 41
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 69
},
{
"__id__": 71
"__id__": 70
},
{
"__id__": 72
"__id__": 71
}
],
"_prefab": null,
......@@ -269,19 +269,19 @@
"__id__": 14
},
{
"__id__": 17
"__id__": 16
},
{
"__id__": 28
"__id__": 27
}
],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 38
},
{
"__id__": 40
"__id__": 39
}
],
"_prefab": null,
......@@ -531,7 +531,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "79BArUQdpIJLWSs1+xCTbA"
"_id": "69Dcpp8eFNnbwrM/J44u6v"
},
{
"__type__": "cc.Label",
......@@ -567,7 +567,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "56IHItTQBGcLk8IFfqzOxW"
"_id": "abhw1UiR5AeYvNYsCAxqY3"
},
{
"__type__": "cc.LabelOutline",
......@@ -585,7 +585,7 @@
"a": 255
},
"_width": 3,
"_id": "05n2+lBURNbZnYDQGDTX6c"
"_id": "875hz83SpPR5WT5LbWn7Fp"
},
{
"__type__": "cc.RichText",
......@@ -681,9 +681,6 @@
"_components": [
{
"__id__": 15
},
{
"__id__": 16
}
],
"_prefab": null,
......@@ -766,33 +763,6 @@
"_atlas": null,
"_id": "c2MlwdXNZI77hjAramznzA"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 18,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": -30,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "cb99MpqDRMMLYyfl6YIQ3b"
},
{
"__type__": "cc.Node",
"_name": "BtnBigLetter",
......@@ -802,19 +772,19 @@
},
"_children": [
{
"__id__": 18
"__id__": 17
},
{
"__id__": 22
"__id__": 21
}
],
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 25
},
{
"__id__": 27
"__id__": 26
}
],
"_prefab": null,
......@@ -870,17 +840,17 @@
"_name": "Img_normal",
"_objFlags": 0,
"_parent": {
"__id__": 17
"__id__": 16
},
"_children": [
{
"__id__": 19
"__id__": 18
}
],
"_active": false,
"_components": [
{
"__id__": 21
"__id__": 20
}
],
"_prefab": null,
......@@ -936,13 +906,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
"__id__": 19
}
],
"_prefab": null,
......@@ -998,7 +968,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -1034,7 +1004,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 17
},
"_enabled": true,
"_materials": [
......@@ -1066,17 +1036,17 @@
"_name": "Img_selected",
"_objFlags": 0,
"_parent": {
"__id__": 17
"__id__": 16
},
"_children": [
{
"__id__": 23
"__id__": 22
}
],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 24
}
],
"_prefab": null,
......@@ -1132,13 +1102,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 24
"__id__": 23
}
],
"_prefab": null,
......@@ -1194,7 +1164,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -1230,7 +1200,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 21
},
"_enabled": true,
"_materials": [
......@@ -1262,7 +1232,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 16
},
"_enabled": true,
"alignMode": 1,
......@@ -1289,7 +1259,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 16
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1361,19 +1331,19 @@
},
"_children": [
{
"__id__": 29
"__id__": 28
},
{
"__id__": 33
"__id__": 32
}
],
"_active": true,
"_components": [
{
"__id__": 37
"__id__": 36
},
{
"__id__": 38
"__id__": 37
}
],
"_prefab": null,
......@@ -1429,17 +1399,17 @@
"_name": "Img_normal",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 27
},
"_children": [
{
"__id__": 30
"__id__": 29
}
],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 31
}
],
"_prefab": null,
......@@ -1495,13 +1465,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 29
"__id__": 28
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 30
}
],
"_prefab": null,
......@@ -1557,7 +1527,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1593,7 +1563,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 28
},
"_enabled": true,
"_materials": [
......@@ -1625,17 +1595,17 @@
"_name": "Img_selected",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 27
},
"_children": [
{
"__id__": 34
"__id__": 33
}
],
"_active": false,
"_components": [
{
"__id__": 36
"__id__": 35
}
],
"_prefab": null,
......@@ -1691,13 +1661,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 34
}
],
"_prefab": null,
......@@ -1753,7 +1723,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1789,7 +1759,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1821,7 +1791,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 27
},
"_enabled": true,
"alignMode": 1,
......@@ -1848,7 +1818,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 27
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1979,16 +1949,16 @@
},
"_children": [
{
"__id__": 42
"__id__": 41
},
{
"__id__": 49
"__id__": 48
},
{
"__id__": 56
"__id__": 55
},
{
"__id__": 63
"__id__": 62
}
],
"_active": false,
......@@ -2046,17 +2016,17 @@
"_name": "BtnBack",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 40
},
"_children": [
{
"__id__": 43
"__id__": 42
}
],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 47
}
],
"_prefab": null,
......@@ -2112,20 +2082,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 42
"__id__": 41
},
"_children": [
{
"__id__": 44
"__id__": 43
}
],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 45
},
{
"__id__": 47
"__id__": 46
}
],
"_prefab": null,
......@@ -2181,13 +2151,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 43
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 44
}
],
"_prefab": null,
......@@ -2243,7 +2213,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2277,7 +2247,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -2309,7 +2279,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 42
},
"_enabled": true,
"alignMode": 0,
......@@ -2336,7 +2306,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 41
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2409,7 +2379,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 43
"__id__": 42
},
"_id": "fcpMWF0v9IAIXbr9+kx3KE"
},
......@@ -2418,17 +2388,17 @@
"_name": "BtnNext",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 40
},
"_children": [
{
"__id__": 50
"__id__": 49
}
],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 54
}
],
"_prefab": null,
......@@ -2484,20 +2454,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 49
"__id__": 48
},
"_children": [
{
"__id__": 51
"__id__": 50
}
],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 52
},
{
"__id__": 54
"__id__": 53
}
],
"_prefab": null,
......@@ -2553,13 +2523,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 50
"__id__": 49
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 51
}
],
"_prefab": null,
......@@ -2615,7 +2585,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2649,7 +2619,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2681,7 +2651,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 49
},
"_enabled": true,
"alignMode": 0,
......@@ -2708,7 +2678,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 48
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2781,7 +2751,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 50
"__id__": 49
},
"_id": "8426suuGpGy7903qU+X14u"
},
......@@ -2790,17 +2760,17 @@
"_name": "BtnShow",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 40
},
"_children": [
{
"__id__": 57
"__id__": 56
}
],
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 61
}
],
"_prefab": null,
......@@ -2856,20 +2826,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 56
"__id__": 55
},
"_children": [
{
"__id__": 58
"__id__": 57
}
],
"_active": true,
"_components": [
{
"__id__": 60
"__id__": 59
},
{
"__id__": 61
"__id__": 60
}
],
"_prefab": null,
......@@ -2925,13 +2895,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 57
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 58
}
],
"_prefab": null,
......@@ -2987,7 +2957,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -3021,7 +2991,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -3053,7 +3023,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 56
},
"_enabled": true,
"alignMode": 0,
......@@ -3080,7 +3050,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 55
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3153,7 +3123,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 57
"__id__": 56
},
"_id": "75dr1AmE1DsLgu8tT2bpB3"
},
......@@ -3162,17 +3132,17 @@
"_name": "BtnSave",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 40
},
"_children": [
{
"__id__": 64
"__id__": 63
}
],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 68
}
],
"_prefab": null,
......@@ -3228,20 +3198,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 63
"__id__": 62
},
"_children": [
{
"__id__": 65
"__id__": 64
}
],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 66
},
{
"__id__": 68
"__id__": 67
}
],
"_prefab": null,
......@@ -3297,13 +3267,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 64
"__id__": 63
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 65
}
],
"_prefab": null,
......@@ -3359,7 +3329,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3393,7 +3363,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 63
},
"_enabled": true,
"_materials": [
......@@ -3425,7 +3395,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 63
},
"_enabled": true,
"alignMode": 0,
......@@ -3452,7 +3422,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 62
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3525,7 +3495,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 64
"__id__": 63
},
"_id": "4dAyTgmEpN8bByPACF39UA"
},
......@@ -3592,13 +3562,13 @@
},
"_children": [
{
"__id__": 74
"__id__": 73
}
],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 79
}
],
"_prefab": null,
......@@ -3654,20 +3624,20 @@
"_name": "LetterMask",
"_objFlags": 0,
"_parent": {
"__id__": 73
"__id__": 72
},
"_children": [
{
"__id__": 75
"__id__": 74
},
{
"__id__": 77
"__id__": 76
}
],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 78
}
],
"_prefab": null,
......@@ -3723,13 +3693,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 74
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 75
}
],
"_prefab": null,
......@@ -3785,7 +3755,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -3817,13 +3787,13 @@
"_name": "DrawNode",
"_objFlags": 0,
"_parent": {
"__id__": 74
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 77
}
],
"_prefab": null,
......@@ -3879,7 +3849,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -3912,7 +3882,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3934,7 +3904,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3970,13 +3940,13 @@
},
"_children": [
{
"__id__": 82
"__id__": 81
}
],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 87
}
],
"_prefab": null,
......@@ -4032,20 +4002,20 @@
"_name": "LetterMask",
"_objFlags": 0,
"_parent": {
"__id__": 81
"__id__": 80
},
"_children": [
{
"__id__": 83
"__id__": 82
},
{
"__id__": 85
"__id__": 84
}
],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 86
}
],
"_prefab": null,
......@@ -4101,13 +4071,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 81
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 83
}
],
"_prefab": null,
......@@ -4163,7 +4133,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -4195,13 +4165,13 @@
"_name": "DrawNode",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 81
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 85
}
],
"_prefab": null,
......@@ -4257,7 +4227,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -4290,7 +4260,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -4312,7 +4282,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -4348,13 +4318,13 @@
},
"_children": [
{
"__id__": 90
"__id__": 89
}
],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 95
}
],
"_prefab": null,
......@@ -4410,20 +4380,20 @@
"_name": "LetterMask",
"_objFlags": 0,
"_parent": {
"__id__": 89
"__id__": 88
},
"_children": [
{
"__id__": 91
"__id__": 90
},
{
"__id__": 93
"__id__": 92
}
],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 94
}
],
"_prefab": null,
......@@ -4479,13 +4449,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 92
"__id__": 91
}
],
"_prefab": null,
......@@ -4541,7 +4511,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4573,13 +4543,13 @@
"_name": "DrawNode",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 93
}
],
"_prefab": null,
......@@ -4635,7 +4605,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4668,7 +4638,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4690,7 +4660,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4726,13 +4696,13 @@
},
"_children": [
{
"__id__": 98
"__id__": 97
}
],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 103
}
],
"_prefab": null,
......@@ -4788,20 +4758,20 @@
"_name": "LetterMask",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 96
},
"_children": [
{
"__id__": 99
"__id__": 98
},
{
"__id__": 101
"__id__": 100
}
],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 102
}
],
"_prefab": null,
......@@ -4857,13 +4827,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 99
}
],
"_prefab": null,
......@@ -4919,7 +4889,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 98
},
"_enabled": true,
"_materials": [
......@@ -4951,13 +4921,13 @@
"_name": "DrawNode",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 97
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 101
}
],
"_prefab": null,
......@@ -5013,7 +4983,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -5046,7 +5016,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -5068,7 +5038,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -5104,13 +5074,13 @@
},
"_children": [
{
"__id__": 106
"__id__": 105
}
],
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 111
}
],
"_prefab": null,
......@@ -5166,20 +5136,20 @@
"_name": "LetterMask",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 104
},
"_children": [
{
"__id__": 107
"__id__": 106
},
{
"__id__": 109
"__id__": 108
}
],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 110
}
],
"_prefab": null,
......@@ -5235,13 +5205,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 106
"__id__": 105
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
"__id__": 107
}
],
"_prefab": null,
......@@ -5297,7 +5267,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 106
},
"_enabled": true,
"_materials": [
......@@ -5329,13 +5299,13 @@
"_name": "DrawNode",
"_objFlags": 0,
"_parent": {
"__id__": 106
"__id__": 105
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 109
}
],
"_prefab": null,
......@@ -5391,7 +5361,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5424,7 +5394,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -5446,7 +5416,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 104
},
"_enabled": true,
"_materials": [
......@@ -5482,13 +5452,13 @@
},
"_children": [
{
"__id__": 114
"__id__": 113
}
],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 119
}
],
"_prefab": null,
......@@ -5544,20 +5514,20 @@
"_name": "LetterMask",
"_objFlags": 0,
"_parent": {
"__id__": 113
"__id__": 112
},
"_children": [
{
"__id__": 115
"__id__": 114
},
{
"__id__": 117
"__id__": 116
}
],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 118
}
],
"_prefab": null,
......@@ -5613,13 +5583,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 115
}
],
"_prefab": null,
......@@ -5675,7 +5645,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 114
},
"_enabled": true,
"_materials": [
......@@ -5707,13 +5677,13 @@
"_name": "DrawNode",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 117
}
],
"_prefab": null,
......@@ -5769,7 +5739,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 116
},
"_enabled": true,
"_materials": [
......@@ -5802,7 +5772,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 113
},
"_enabled": true,
"_materials": [
......@@ -5824,7 +5794,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 112
},
"_enabled": true,
"_materials": [
......
......@@ -84,7 +84,6 @@ cc.Class({
this.initView();
this.initListener();
this.showLetterAnimation();
this.startEditMode();
},
......@@ -109,7 +108,7 @@ cc.Class({
letter: null,
initView() {
// this.debugMode = true;
this.setLetter(this.data.letter);
this.setLetter(this.data.letter);
},
setLetter(letter) {
......@@ -118,6 +117,26 @@ cc.Class({
this.updateLetterBtnLabel();
this.addDrawLetter(this.letter);
cc.find('Canvas').on('size-changed', () => {
this.onSizeChanged();
});
this.onSizeChanged();
},
onSizeChanged() {
this.node.getComponent(cc.Widget).updateAlignment();
const currentSize = { width: this.node.width, height: this.node.height };
console.log('currentSize = ' + JSON.stringify(currentSize));
const frameSize = cc.view.getFrameSize();
console.log('frameSize = ' + JSON.stringify(frameSize));
const designSize = cc.view.getDesignResolutionSize();
console.log('designSize = ' + JSON.stringify(designSize));
const letterBg = cc.find('Canvas/bg/Img_letter_bg');
const scale = (designSize.width / designSize.height) / (frameSize.width / frameSize.height);
letterBg.scale = Math.min(scale, 1);
},
updateLetterBtnLabel() {
......
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