Commit 63aa9365 authored by 章红平's avatar 章红平

提交

parent 8f306f92
......@@ -1252,7 +1252,7 @@
"ctor": "Float64Array",
"array": [
0,
700,
800,
0,
0,
0,
......@@ -1587,7 +1587,7 @@
"ctor": "Float64Array",
"array": [
0,
700,
800,
0,
0,
0,
......@@ -1694,7 +1694,7 @@
"ctor": "Float64Array",
"array": [
0,
700,
800,
0,
0,
0,
......
......@@ -75,31 +75,28 @@
"__id__": 5
},
{
"__id__": 7
},
{
"__id__": 80
"__id__": 82
},
{
"__id__": 86
"__id__": 88
},
{
"__id__": 93
"__id__": 95
},
{
"__id__": 119
"__id__": 121
}
],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 123
},
{
"__id__": 122
"__id__": 124
},
{
"__id__": 123
"__id__": 125
}
],
"_prefab": null,
......@@ -248,100 +245,6 @@
"_alignWithScreen": true,
"_id": "81GN3uXINKVLeW4+iKSlim"
},
{
"__type__": "cc.Node",
"_name": "bgD",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 6
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 4000,
"height": 2000
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 1,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1200,
0,
0,
0,
0,
0,
1,
1.3,
1.3,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "54qVI6kCpPQ7MV1Ps0NJUJ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d1c082d1-8312-490b-9c9c-c0eb6811f0ff"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "79mxwxxvdLyYnMymS0KXWH"
},
{
"__type__": "cc.Node",
"_name": "bg",
......@@ -351,25 +254,22 @@
},
"_children": [
{
"__id__": 8
"__id__": 6
},
{
"__id__": 10
"__id__": 8
},
{
"__id__": 16
"__id__": 14
},
{
"__id__": 19
"__id__": 17
}
],
"_active": true,
"_components": [
{
"__id__": 78
},
{
"__id__": 79
"__id__": 81
}
],
"_prefab": null,
......@@ -425,13 +325,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 9
"__id__": 7
}
],
"_prefab": null,
......@@ -480,14 +380,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a8afs110xGG6Nm90qjORzM"
"_id": "da8o0aL0pIlqr6dW4Oubzi"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
"__id__": 6
},
"_enabled": true,
"_materials": [
......@@ -500,7 +400,7 @@
"_spriteFrame": {
"__uuid__": "d1c082d1-8312-490b-9c9c-c0eb6811f0ff"
},
"_type": 0,
"_type": 1,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
......@@ -512,27 +412,27 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "10PwmJTBxP84o+g9ibnfML"
"_id": "c3WzDI7nRJBq+8iENK7M0P"
},
{
"__type__": "cc.Node",
"_name": "topTittle",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 5
},
"_children": [
{
"__id__": 11
"__id__": 9
}
],
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 12
},
{
"__id__": 15
"__id__": 13
}
],
"_prefab": null,
......@@ -588,16 +488,16 @@
"_name": "New Label",
"_objFlags": 512,
"_parent": {
"__id__": 10
"__id__": 8
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 12
"__id__": 10
},
{
"__id__": 13
"__id__": 11
}
],
"_prefab": null,
......@@ -653,7 +553,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 9
},
"_enabled": true,
"_materials": [
......@@ -688,7 +588,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 9
},
"_enabled": true,
"_color": {
......@@ -706,7 +606,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
"__id__": 8
},
"_enabled": true,
"_materials": [
......@@ -738,7 +638,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
"__id__": 8
},
"_enabled": true,
"alignMode": 2,
......@@ -765,16 +665,16 @@
"_name": "stickers",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 5
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
"__id__": 15
},
{
"__id__": 18
"__id__": 16
}
],
"_prefab": null,
......@@ -830,14 +730,14 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 14
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_alignFlags": 33,
"_left": 0,
"_right": 0,
"_right": 183.442,
"_top": 16.72800000000001,
"_bottom": 0,
"_verticalCenter": 0,
......@@ -857,7 +757,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 14
},
"_enabled": true,
"stickerP": {
......@@ -883,27 +783,31 @@
"_name": "ui",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 5
},
"_children": [
{
"__id__": 20
"__id__": 18
},
{
"__id__": 42
"__id__": 41
},
{
"__id__": 64
},
{
"__id__": 71
"__id__": 72
},
{
"__id__": 75
"__id__": 77
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 80
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -957,33 +861,36 @@
"_name": "candle1",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 17
},
"_children": [
{
"__id__": 21
"__id__": 19
},
{
"__id__": 28
"__id__": 26
},
{
"__id__": 32
"__id__": 30
},
{
"__id__": 35
"__id__": 33
}
],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 37
},
{
"__id__": 40
"__id__": 38
},
{
"__id__": 39
}
],
"_prefab": {
"__id__": 41
"__id__": 40
},
"_opacity": 255,
"_color": {
......@@ -1037,24 +944,24 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 20
"__id__": 18
},
"_children": [
{
"__id__": 22
"__id__": 20
}
],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 23
},
{
"__id__": 26
"__id__": 24
}
],
"_prefab": {
"__id__": 27
"__id__": 25
},
"_opacity": 255,
"_color": {
......@@ -1108,17 +1015,17 @@
"_name": "body",
"_objFlags": 0,
"_parent": {
"__id__": 21
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 23
"__id__": 21
}
],
"_prefab": {
"__id__": 24
"__id__": 22
},
"_opacity": 255,
"_color": {
......@@ -1172,7 +1079,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 20
},
"_enabled": true,
"_materials": [
......@@ -1202,7 +1109,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 21
"__id__": 19
},
"asset": null,
"fileId": "bbKchDkVxKQLXFsnw+LeO0",
......@@ -1213,7 +1120,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 19
},
"_enabled": true,
"_materials": [
......@@ -1233,7 +1140,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 19
},
"_enabled": true,
"alignMode": 2,
......@@ -1258,7 +1165,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 21
"__id__": 19
},
"asset": null,
"fileId": "2855ZyugVOPI3vV0cxL3Ic",
......@@ -1269,20 +1176,20 @@
"_name": "candleBone1",
"_objFlags": 0,
"_parent": {
"__id__": 20
"__id__": 18
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 27
},
{
"__id__": 30
"__id__": 28
}
],
"_prefab": {
"__id__": 31
"__id__": 29
},
"_opacity": 255,
"_color": {
......@@ -1336,7 +1243,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 26
},
"_enabled": true,
"_materials": [
......@@ -1376,7 +1283,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 26
},
"_enabled": true,
"alignMode": 2,
......@@ -1401,7 +1308,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 20
"__id__": 18
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -1414,17 +1321,17 @@
"_name": "candleBone2",
"_objFlags": 0,
"_parent": {
"__id__": 20
"__id__": 18
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 33
"__id__": 31
}
],
"_prefab": {
"__id__": 34
"__id__": 32
},
"_opacity": 255,
"_color": {
......@@ -1478,7 +1385,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 30
},
"_enabled": true,
"_materials": [
......@@ -1516,7 +1423,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 20
"__id__": 18
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -1529,20 +1436,20 @@
"_name": "candleBone3",
"_objFlags": 0,
"_parent": {
"__id__": 20
"__id__": 18
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 34
},
{
"__id__": 37
"__id__": 35
}
],
"_prefab": {
"__id__": 38
"__id__": 36
},
"_opacity": 255,
"_color": {
......@@ -1596,7 +1503,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1636,7 +1543,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 33
},
"_enabled": true,
"alignMode": 2,
......@@ -1661,7 +1568,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 20
"__id__": 18
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -1674,18 +1581,18 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 18
},
"_enabled": true,
"label": null,
"dragon1": {
"__id__": 29
"__id__": 27
},
"dragon2": {
"__id__": 33
"__id__": 31
},
"dragon3": {
"__id__": 36
"__id__": 34
},
"text": "hello",
"_id": "74ru8AE9dAHYwo/t0e4oZl"
......@@ -1695,7 +1602,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 18
},
"_enabled": false,
"_materials": [
......@@ -1710,10 +1617,37 @@
"_N$inverted": false,
"_id": "4885eib/hJSIebeo4tcxdN"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 30,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "d3IGH7nypIGLZRWcde2cNt"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 20
"__id__": 18
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -1726,24 +1660,27 @@
"_name": "candle2",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 17
},
"_children": [
{
"__id__": 43
"__id__": 42
},
{
"__id__": 50
"__id__": 49
},
{
"__id__": 54
"__id__": 53
},
{
"__id__": 57
"__id__": 56
}
],
"_active": true,
"_components": [
{
"__id__": 60
},
{
"__id__": 61
},
......@@ -1806,24 +1743,24 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 41
},
"_children": [
{
"__id__": 44
"__id__": 43
}
],
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 46
},
{
"__id__": 48
"__id__": 47
}
],
"_prefab": {
"__id__": 49
"__id__": 48
},
"_opacity": 255,
"_color": {
......@@ -1877,17 +1814,17 @@
"_name": "body",
"_objFlags": 0,
"_parent": {
"__id__": 43
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 44
}
],
"_prefab": {
"__id__": 46
"__id__": 45
},
"_opacity": 255,
"_color": {
......@@ -1941,7 +1878,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -1971,7 +1908,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 43
"__id__": 42
},
"asset": null,
"fileId": "bbKchDkVxKQLXFsnw+LeO0",
......@@ -1982,7 +1919,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -2002,7 +1939,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 42
},
"_enabled": true,
"alignMode": 1,
......@@ -2027,7 +1964,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 43
"__id__": 42
},
"asset": null,
"fileId": "2855ZyugVOPI3vV0cxL3Ic",
......@@ -2038,20 +1975,20 @@
"_name": "candleBone1",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 50
},
{
"__id__": 52
"__id__": 51
}
],
"_prefab": {
"__id__": 53
"__id__": 52
},
"_opacity": 255,
"_color": {
......@@ -2105,7 +2042,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2145,7 +2082,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 49
},
"_enabled": true,
"alignMode": 2,
......@@ -2170,7 +2107,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 42
"__id__": 41
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -2183,17 +2120,17 @@
"_name": "candleBone2",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 41
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 55
"__id__": 54
}
],
"_prefab": {
"__id__": 56
"__id__": 55
},
"_opacity": 255,
"_color": {
......@@ -2247,7 +2184,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 53
},
"_enabled": true,
"_materials": [
......@@ -2285,7 +2222,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 42
"__id__": 41
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -2298,20 +2235,20 @@
"_name": "candleBone3",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 57
},
{
"__id__": 59
"__id__": 58
}
],
"_prefab": {
"__id__": 60
"__id__": 59
},
"_opacity": 255,
"_color": {
......@@ -2365,7 +2302,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2405,7 +2342,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 56
},
"_enabled": true,
"alignMode": 2,
......@@ -2430,7 +2367,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 42
"__id__": 41
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -2443,18 +2380,18 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 41
},
"_enabled": true,
"label": null,
"dragon1": {
"__id__": 51
"__id__": 50
},
"dragon2": {
"__id__": 55
"__id__": 54
},
"dragon3": {
"__id__": 58
"__id__": 57
},
"text": "hello",
"_id": "faAPIW9NNIWIhow3GpxUyf"
......@@ -2464,7 +2401,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 41
},
"_enabled": false,
"_materials": [
......@@ -2479,10 +2416,37 @@
"_N$inverted": false,
"_id": "f5RI5WIGZA1YbIAIhpgDOG"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 30,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "34EALPiNFFPKXJJIsclpIV"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 42
"__id__": 41
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -2495,7 +2459,7 @@
"_name": "musicBtn",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 17
},
"_children": [
{
......@@ -2511,7 +2475,10 @@
"__id__": 68
},
{
"__id__": 70
"__id__": 69
},
{
"__id__": 71
}
],
"_prefab": null,
......@@ -2538,7 +2505,7 @@
"ctor": "Float64Array",
"array": [
900,
-270,
-282,
0,
0,
0,
......@@ -2592,14 +2559,14 @@
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"x": 0,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-24,
0,
0,
0,
......@@ -2688,6 +2655,33 @@
"_atlas": null,
"_id": "20g6uVN/ZGK6Jsqz7cZsk4"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 30,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "70aALL/C1CeJTMfy1dCV1h"
},
{
"__type__": "cc.Button",
"_name": "",
......@@ -2702,7 +2696,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 69
"__id__": 70
}
],
"_N$interactable": true,
......@@ -2808,16 +2802,19 @@
"_name": "commitBTn",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 73
},
{
"__id__": 73
"__id__": 74
},
{
"__id__": 75
}
],
"_prefab": null,
......@@ -2844,7 +2841,7 @@
"ctor": "Float64Array",
"array": [
900,
-270,
-286,
0,
0,
0,
......@@ -2873,7 +2870,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -2900,12 +2897,39 @@
"_atlas": null,
"_id": "9bRBBnn0pIvrtkfkVRDFOf"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 30,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "adQ6sKm89KWIW7hJIGSQiT"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 72
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2914,7 +2938,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 74
"__id__": 76
}
],
"_N$interactable": true,
......@@ -2987,16 +3011,16 @@
"_name": "desk",
"_objFlags": 0,
"_parent": {
"__id__": 19
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 78
},
{
"__id__": 77
"__id__": 79
}
],
"_prefab": null,
......@@ -3052,7 +3076,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3084,7 +3108,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 77
},
"_enabled": true,
"alignMode": 2,
......@@ -3107,37 +3131,42 @@
"_id": "aeefOlJ1BOYbHz7gj5kndH"
},
{
"__type__": "cc.Mask",
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
"__id__": 17
},
"_enabled": false,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "95V27+vUBPQpTq3R8g10b0"
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_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": 1280,
"_originalHeight": 720,
"_id": "b01EbrachLRatzbUnxOCkV"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": false,
"alignMode": 2,
"_target": {
"__id__": 2
"__id__": 5
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
......@@ -3164,16 +3193,16 @@
},
"_children": [
{
"__id__": 81
"__id__": 83
}
],
"_active": true,
"_components": [
{
"__id__": 83
"__id__": 85
},
{
"__id__": 84
"__id__": 86
}
],
"_prefab": null,
......@@ -3229,13 +3258,13 @@
"_name": "start",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 84
}
],
"_prefab": null,
......@@ -3291,7 +3320,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -3323,7 +3352,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -3355,7 +3384,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 82
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3364,7 +3393,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 85
"__id__": 87
}
],
"_N$interactable": true,
......@@ -3420,7 +3449,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 80
"__id__": 82
},
"_id": "7cv2szxs5FLqj/Kto0Duci"
},
......@@ -3443,10 +3472,10 @@
},
"_children": [
{
"__id__": 87
"__id__": 89
},
{
"__id__": 90
"__id__": 92
}
],
"_active": false,
......@@ -3504,16 +3533,16 @@
"_name": "btn_left",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 90
},
{
"__id__": 89
"__id__": 91
}
],
"_prefab": null,
......@@ -3569,7 +3598,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -3601,7 +3630,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 89
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3669,16 +3698,16 @@
"_name": "btn_right",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 93
},
{
"__id__": 92
"__id__": 94
}
],
"_prefab": null,
......@@ -3734,7 +3763,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -3766,7 +3795,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 92
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3838,13 +3867,13 @@
},
"_children": [
{
"__id__": 94
"__id__": 96
},
{
"__id__": 97
"__id__": 99
},
{
"__id__": 100
"__id__": 102
}
],
"_active": false,
......@@ -3902,11 +3931,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 95
},
"_children": [
{
"__id__": 95
"__id__": 97
}
],
"_active": true,
......@@ -3964,13 +3993,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 94
"__id__": 96
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 98
}
],
"_prefab": null,
......@@ -4026,7 +4055,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -4061,11 +4090,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 95
},
"_children": [
{
"__id__": 98
"__id__": 100
}
],
"_active": true,
......@@ -4123,13 +4152,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 101
}
],
"_prefab": null,
......@@ -4185,7 +4214,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -4217,12 +4246,9 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 95
},
"_children": [
{
"__id__": 101
},
{
"__id__": 103
},
......@@ -4246,6 +4272,9 @@
},
{
"__id__": 117
},
{
"__id__": 119
}
],
"_active": true,
......@@ -4303,13 +4332,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 104
}
],
"_prefab": null,
......@@ -4365,7 +4394,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 103
},
"_enabled": true,
"_clip": {
......@@ -4384,13 +4413,13 @@
"_name": "err",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 106
}
],
"_prefab": null,
......@@ -4446,7 +4475,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 105
},
"_enabled": true,
"_clip": {
......@@ -4465,13 +4494,13 @@
"_name": "comeon",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 108
}
],
"_prefab": null,
......@@ -4527,7 +4556,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 107
},
"_enabled": true,
"_clip": {
......@@ -4546,13 +4575,13 @@
"_name": "suc",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
"__id__": 110
}
],
"_prefab": null,
......@@ -4608,7 +4637,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 109
},
"_enabled": true,
"_clip": {
......@@ -4627,13 +4656,13 @@
"_name": "in",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 112
}
],
"_prefab": null,
......@@ -4689,7 +4718,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 111
},
"_enabled": true,
"_clip": {
......@@ -4708,13 +4737,13 @@
"_name": "talkerr",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 114
}
],
"_prefab": null,
......@@ -4770,7 +4799,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 113
},
"_enabled": true,
"_clip": {
......@@ -4789,13 +4818,13 @@
"_name": "excellent",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 116
}
],
"_prefab": null,
......@@ -4851,7 +4880,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 115
},
"_enabled": true,
"_clip": {
......@@ -4870,13 +4899,13 @@
"_name": "allRigtht",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 118
}
],
"_prefab": null,
......@@ -4932,7 +4961,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 117
},
"_enabled": true,
"_clip": {
......@@ -4951,13 +4980,13 @@
"_name": "nicetry",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 102
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 120
}
],
"_prefab": null,
......@@ -5013,7 +5042,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 119
},
"_enabled": true,
"_clip": {
......@@ -5038,7 +5067,7 @@
"_active": false,
"_components": [
{
"__id__": 120
"__id__": 122
}
],
"_prefab": null,
......@@ -5094,7 +5123,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -5135,7 +5164,7 @@
"height": 720
},
"_fitWidth": true,
"_fitHeight": false,
"_fitHeight": true,
"_id": "59Cd0ovbdF4byw5sbjJDx7"
},
{
......@@ -5175,22 +5204,22 @@
"_enabled": true,
"canTouch": true,
"stickers": {
"__id__": 18
"__id__": 16
},
"candle1": {
"__id__": 20
"__id__": 18
},
"musicBtn": {
"__id__": 68
"__id__": 69
},
"musicIcon": {
"__uuid__": "b2d08afd-3668-4e85-9155-1f97a6c90d50"
},
"candle2": {
"__id__": 42
"__id__": 41
},
"redBtnN": {
"__id__": 71
"__id__": 72
},
"panel": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
......
......@@ -34,7 +34,7 @@ export default class cake_class_1 extends MyCocosSceneComponent {
talking: boolean = false;
addPreloadImage() {
// TODO 根据自己的配置预加载图片资源
this._imageResList.push({ url: this.data.pic_url });
......@@ -199,6 +199,18 @@ export default class cake_class_1 extends MyCocosSceneComponent {
this.initData();;
this.initListener();
}
start(): void {
let bgNode=cc.find("bg/bg",this.node);
let scaleX=cc.winSize.width/bgNode.width;
let scaleY=cc.winSize.height /bgNode.height;
if(scaleX>scaleY){
bgNode.scale=scaleX;
}else{
bgNode.scale=scaleY;
}
super.start();
}
dataCallBack() {
super.dataCallBack();
this.stickers.node.active = false;
......@@ -210,6 +222,7 @@ export default class cake_class_1 extends MyCocosSceneComponent {
let panel = cc.instantiate(this.panel);
panel.parent = cc.find("bg/ui", this.node)
panel.x = panel.width * 3 / 2;
panel.y=panel.height/2-cc.winSize.height/2
let panelS = panel.getComponent("panel")
panelS.initPanel(this.data.questions[this.questionIndex], this)
panelS.questionIndex = this.questionIndex;
......
......@@ -27,6 +27,7 @@ export class MyCocosSceneComponent extends cc.Component {
let screen_size = cc.view.getFrameSize().width / cc.view.getFrameSize().height
let design_size = cc.Canvas.instance.designResolution.width / cc.Canvas.instance.designResolution.height
let f = screen_size >= design_size
console.log("cc.view.getFrameSize().width",cc.view.getFrameSize().width,cc.Canvas.instance.designResolution.width)
cc.Canvas.instance.fitHeight = f
cc.Canvas.instance.fitWidth = !f
......
......@@ -26,10 +26,10 @@
"height": 720,
"rawWidth": 1280,
"rawHeight": 720,
"borderTop": 179,
"borderBottom": 166,
"borderLeft": 1023,
"borderRight": 118,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 280,
"borderRight": 280,
"subMetas": {}
}
}
......
......@@ -3,7 +3,7 @@
"uuid": "dbfea402-1da8-4a3f-8857-f08c75508f7c",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"filterMode": "point",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
......
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