Commit 2dca574a authored by 章红平's avatar 章红平

提交

parent fc1579f3
......@@ -78,22 +78,22 @@
"__id__": 9
},
{
"__id__": 101
"__id__": 100
},
{
"__id__": 123
"__id__": 122
}
],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 124
},
{
"__id__": 126
"__id__": 125
},
{
"__id__": 127
"__id__": 126
}
],
"_prefab": null,
......@@ -446,28 +446,19 @@
"__id__": 10
},
{
"__id__": 20
},
{
"__id__": 23
},
{
"__id__": 26
},
{
"__id__": 30
"__id__": 29
},
{
"__id__": 86
"__id__": 85
},
{
"__id__": 88
"__id__": 87
}
],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 99
}
],
"_prefab": null,
......@@ -520,7 +511,7 @@
},
{
"__type__": "cc.Node",
"_name": "timeN",
"_name": "top",
"_objFlags": 0,
"_parent": {
"__id__": 9
......@@ -530,13 +521,19 @@
"__id__": 11
},
{
"__id__": 15
"__id__": 20
},
{
"__id__": 24
},
{
"__id__": 26
}
],
"_active": true,
"_components": [
{
"__id__": 19
"__id__": 28
}
],
"_prefab": null,
......@@ -562,8 +559,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
517,
405,
0,
375,
0,
0,
0,
......@@ -585,11 +582,11 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "43Hg+G9plCJ73U3jZvl+EP"
"_id": "59MnQKxvJJ+5XFdVhxEyaB"
},
{
"__type__": "cc.Node",
"_name": "bg_time",
"_name": "timeN",
"_objFlags": 0,
"_parent": {
"__id__": 10
......@@ -597,12 +594,77 @@
"_children": [
{
"__id__": 12
},
{
"__id__": 16
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
530.566,
24.289,
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": "43Hg+G9plCJ73U3jZvl+EP"
},
{
"__type__": "cc.Node",
"_name": "bg_time",
"_objFlags": 0,
"_parent": {
"__id__": 11
},
"_children": [
{
"__id__": 13
}
],
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 15
}
],
"_prefab": null,
......@@ -658,13 +720,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 11
"__id__": 12
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 13
"__id__": 14
}
],
"_prefab": null,
......@@ -720,7 +782,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 13
},
"_enabled": true,
"_materials": [
......@@ -755,7 +817,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 12
},
"_enabled": true,
"_materials": [
......@@ -787,17 +849,17 @@
"_name": "bg_time2",
"_objFlags": 0,
"_parent": {
"__id__": 10
"__id__": 11
},
"_children": [
{
"__id__": 16
"__id__": 17
}
],
"_active": true,
"_components": [
{
"__id__": 18
"__id__": 19
}
],
"_prefab": null,
......@@ -853,13 +915,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
"__id__": 18
}
],
"_prefab": null,
......@@ -915,7 +977,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 17
},
"_enabled": true,
"_materials": [
......@@ -950,7 +1012,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 16
},
"_enabled": true,
"_materials": [
......@@ -977,48 +1039,22 @@
"_atlas": null,
"_id": "66KZPZPslP5rkr0odXTf5o"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_left": 0,
"_right": 150,
"_top": -30,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "edGTjmu/xCuLoiuBCVVgiu"
},
{
"__type__": "cc.Node",
"_name": "bg_left",
"_name": "bg_title",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 10
},
"_children": [],
"_active": true,
"_components": [
"_children": [
{
"__id__": 21
},
}
],
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 23
}
],
"_prefab": null,
......@@ -1032,8 +1068,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 213,
"height": 78
"width": 332,
"height": 111
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1044,8 +1080,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-560.5,
336,
-389.689,
-53.607,
0,
0,
0,
......@@ -1067,97 +1103,35 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "0eBMUh1hNCqabRL79t65QM"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "fd226d83-7ac8-4c82-bb4d-9c252fa91f34"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "8cTouH9nVPN7PUyD+esZ4V"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_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": "a8gNCHBZFPX5ecFWtDP+1q"
"_id": "1f1bIoETZE2IW9jncz3OLX"
},
{
"__type__": "cc.Node",
"_name": "bg_right",
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 24
},
{
"__id__": 25
"__id__": 22
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 246,
"g": 199,
"b": 166,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 656,
"height": 192
"width": 200,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1168,8 +1142,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
339,
279,
0,
-14.009,
0,
0,
0,
......@@ -1191,14 +1165,49 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "100ydVpaFOK7RWbPuC58yk"
"_id": "387SnUqrZAcIEuXX3ykP1Y"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "欢乐对对碰",
"_N$string": "欢乐对对碰",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "f2f5eb42-3351-48a8-b13c-c227428165d0"
},
"_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": "2aarwM/I5A64q97XcX4L8n"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 20
},
"_enabled": true,
"_materials": [
......@@ -1209,7 +1218,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e285e71f-c807-4b4c-bcec-f9a43b7640fc"
"__uuid__": "e1293fb8-eea1-41a4-a517-bf88cf6a4df7"
},
"_type": 0,
"_sizeMode": 1,
......@@ -1223,51 +1232,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "ab8y+TqwNJZaAZ1ItrKbF9"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_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": "24qzByuf5MHa6kRE1k/WLS"
"_id": "15xTdFKYJB9JX5jXzLCpZT"
},
{
"__type__": "cc.Node",
"_name": "bg_title",
"_name": "bg_left",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 10
},
"_children": [
{
"__id__": 27
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 25
}
],
"_prefab": null,
......@@ -1281,20 +1259,20 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 332,
"height": 111
"width": 213,
"height": 78
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"x": 0,
"y": 1
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-389.689,
321.393,
-667,
0,
0,
0,
0,
......@@ -1316,47 +1294,79 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "1f1bIoETZE2IW9jncz3OLX"
"_id": "0eBMUh1hNCqabRL79t65QM"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "fd226d83-7ac8-4c82-bb4d-9c252fa91f34"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "8cTouH9nVPN7PUyD+esZ4V"
},
{
"__type__": "cc.Node",
"_name": "New Label",
"_name": "bg_right",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 10
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 27
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 246,
"g": 199,
"b": 166,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 200,
"height": 50.4
"width": 656,
"height": 192
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
"x": 1,
"y": 1
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
667,
0,
-14.009,
0,
0,
0,
......@@ -1378,42 +1388,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "387SnUqrZAcIEuXX3ykP1Y"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "欢乐对对碰",
"_N$string": "欢乐对对碰",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "f2f5eb42-3351-48a8-b13c-c227428165d0"
},
"_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": "2aarwM/I5A64q97XcX4L8n"
"_id": "100ydVpaFOK7RWbPuC58yk"
},
{
"__type__": "cc.Sprite",
......@@ -1431,7 +1406,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e1293fb8-eea1-41a4-a517-bf88cf6a4df7"
"__uuid__": "e285e71f-c807-4b4c-bcec-f9a43b7640fc"
},
"_type": 0,
"_sizeMode": 1,
......@@ -1445,7 +1420,36 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "15xTdFKYJB9JX5jXzLCpZT"
"_id": "ab8y+TqwNJZaAZ1ItrKbF9"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
},
"_enabled": true,
"alignMode": 1,
"_target": {
"__id__": 2
},
"_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": "c7ZEi0EFNJlaFpJPYWsI3q"
},
{
"__type__": "cc.Node",
......@@ -1456,19 +1460,19 @@
},
"_children": [
{
"__id__": 31
"__id__": 30
},
{
"__id__": 42
"__id__": 41
},
{
"__id__": 53
"__id__": 52
},
{
"__id__": 64
"__id__": 63
},
{
"__id__": 75
"__id__": 74
}
],
"_active": true,
......@@ -1526,23 +1530,23 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 32
"__id__": 31
},
{
"__id__": 35
"__id__": 34
},
{
"__id__": 38
"__id__": 37
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 41
"__id__": 40
},
"_opacity": 255,
"_color": {
......@@ -1596,17 +1600,17 @@
"_name": "bg_card",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 32
}
],
"_prefab": {
"__id__": 34
"__id__": 33
},
"_opacity": 255,
"_color": {
......@@ -1660,7 +1664,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 31
},
"_enabled": true,
"_materials": [
......@@ -1690,7 +1694,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 31
"__id__": 30
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -1703,17 +1707,17 @@
"_name": "bg_crad-back",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 35
}
],
"_prefab": {
"__id__": 37
"__id__": 36
},
"_opacity": 255,
"_color": {
......@@ -1767,7 +1771,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1797,7 +1801,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 31
"__id__": 30
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -1810,17 +1814,17 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 30
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 38
}
],
"_prefab": {
"__id__": 40
"__id__": 39
},
"_opacity": 255,
"_color": {
......@@ -1874,7 +1878,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1902,7 +1906,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 31
"__id__": 30
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -1913,7 +1917,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 31
"__id__": 30
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -1926,23 +1930,23 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 43
"__id__": 42
},
{
"__id__": 46
"__id__": 45
},
{
"__id__": 49
"__id__": 48
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 52
"__id__": 51
},
"_opacity": 255,
"_color": {
......@@ -1996,17 +2000,17 @@
"_name": "bg_card",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 43
}
],
"_prefab": {
"__id__": 45
"__id__": 44
},
"_opacity": 255,
"_color": {
......@@ -2060,7 +2064,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -2090,7 +2094,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 42
"__id__": 41
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2103,17 +2107,17 @@
"_name": "bg_crad-back",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 46
}
],
"_prefab": {
"__id__": 48
"__id__": 47
},
"_opacity": 255,
"_color": {
......@@ -2167,7 +2171,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2197,7 +2201,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 42
"__id__": 41
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2210,17 +2214,17 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 41
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 49
}
],
"_prefab": {
"__id__": 51
"__id__": 50
},
"_opacity": 255,
"_color": {
......@@ -2274,7 +2278,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2302,7 +2306,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 42
"__id__": 41
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2313,7 +2317,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 42
"__id__": 41
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2326,23 +2330,23 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 54
"__id__": 53
},
{
"__id__": 57
"__id__": 56
},
{
"__id__": 60
"__id__": 59
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 63
"__id__": 62
},
"_opacity": 255,
"_color": {
......@@ -2396,17 +2400,17 @@
"_name": "bg_card",
"_objFlags": 0,
"_parent": {
"__id__": 53
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 54
}
],
"_prefab": {
"__id__": 56
"__id__": 55
},
"_opacity": 255,
"_color": {
......@@ -2460,7 +2464,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 53
},
"_enabled": true,
"_materials": [
......@@ -2490,7 +2494,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 53
"__id__": 52
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2503,17 +2507,17 @@
"_name": "bg_crad-back",
"_objFlags": 0,
"_parent": {
"__id__": 53
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 57
}
],
"_prefab": {
"__id__": 59
"__id__": 58
},
"_opacity": 255,
"_color": {
......@@ -2567,7 +2571,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 56
},
"_enabled": true,
"_materials": [
......@@ -2597,7 +2601,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 53
"__id__": 52
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2610,17 +2614,17 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 53
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 60
}
],
"_prefab": {
"__id__": 62
"__id__": 61
},
"_opacity": 255,
"_color": {
......@@ -2674,7 +2678,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2702,7 +2706,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 53
"__id__": 52
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2713,7 +2717,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 53
"__id__": 52
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2726,23 +2730,23 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 65
"__id__": 64
},
{
"__id__": 68
"__id__": 67
},
{
"__id__": 71
"__id__": 70
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 74
"__id__": 73
},
"_opacity": 255,
"_color": {
......@@ -2796,17 +2800,17 @@
"_name": "bg_card",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 63
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 65
}
],
"_prefab": {
"__id__": 67
"__id__": 66
},
"_opacity": 255,
"_color": {
......@@ -2860,7 +2864,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -2890,7 +2894,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 64
"__id__": 63
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -2903,17 +2907,17 @@
"_name": "bg_crad-back",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 63
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 68
}
],
"_prefab": {
"__id__": 70
"__id__": 69
},
"_opacity": 255,
"_color": {
......@@ -2967,7 +2971,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -2997,7 +3001,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 64
"__id__": 63
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -3010,17 +3014,17 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 63
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 71
}
],
"_prefab": {
"__id__": 73
"__id__": 72
},
"_opacity": 255,
"_color": {
......@@ -3074,7 +3078,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3102,7 +3106,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 64
"__id__": 63
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -3113,7 +3117,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 64
"__id__": 63
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -3126,23 +3130,23 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 29
},
"_children": [
{
"__id__": 76
"__id__": 75
},
{
"__id__": 79
"__id__": 78
},
{
"__id__": 82
"__id__": 81
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 85
"__id__": 84
},
"_opacity": 255,
"_color": {
......@@ -3196,17 +3200,17 @@
"_name": "bg_card",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 76
}
],
"_prefab": {
"__id__": 78
"__id__": 77
},
"_opacity": 255,
"_color": {
......@@ -3260,7 +3264,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3290,7 +3294,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 75
"__id__": 74
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -3303,17 +3307,17 @@
"_name": "bg_crad-back",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 79
}
],
"_prefab": {
"__id__": 81
"__id__": 80
},
"_opacity": 255,
"_color": {
......@@ -3367,7 +3371,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 78
},
"_enabled": true,
"_materials": [
......@@ -3397,7 +3401,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 75
"__id__": 74
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -3410,17 +3414,17 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 83
"__id__": 82
}
],
"_prefab": {
"__id__": 84
"__id__": 83
},
"_opacity": 255,
"_color": {
......@@ -3474,7 +3478,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -3502,7 +3506,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 75
"__id__": 74
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -3513,7 +3517,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 75
"__id__": 74
},
"asset": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
......@@ -3532,7 +3536,7 @@
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 86
}
],
"_prefab": null,
......@@ -3588,7 +3592,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -3622,19 +3626,19 @@
},
"_children": [
{
"__id__": 89
"__id__": 88
},
{
"__id__": 91
"__id__": 90
},
{
"__id__": 95
"__id__": 94
}
],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 98
}
],
"_prefab": null,
......@@ -3688,15 +3692,15 @@
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_objFlags": 512,
"_parent": {
"__id__": 88
"__id__": 87
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 89
}
],
"_prefab": null,
......@@ -3752,7 +3756,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -3784,17 +3788,17 @@
"_name": "bg_tip",
"_objFlags": 0,
"_parent": {
"__id__": 88
"__id__": 87
},
"_children": [
{
"__id__": 92
"__id__": 91
}
],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 93
}
],
"_prefab": null,
......@@ -3850,13 +3854,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 90
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 92
}
],
"_prefab": null,
......@@ -3912,7 +3916,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -3947,7 +3951,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -3979,16 +3983,16 @@
"_name": "btn_start",
"_objFlags": 0,
"_parent": {
"__id__": 88
"__id__": 87
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 95
},
{
"__id__": 97
"__id__": 96
}
],
"_prefab": null,
......@@ -4044,7 +4048,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4076,7 +4080,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 94
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4085,7 +4089,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 98
"__id__": 97
}
],
"_N$interactable": true,
......@@ -4158,7 +4162,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 87
},
"_enabled": true,
"alignMode": 2,
......@@ -4187,7 +4191,7 @@
"node": {
"__id__": 9
},
"_enabled": true,
"_enabled": false,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
......@@ -4209,13 +4213,13 @@
},
"_children": [
{
"__id__": 102
"__id__": 101
},
{
"__id__": 105
"__id__": 104
},
{
"__id__": 112
"__id__": 111
}
],
"_active": false,
......@@ -4273,11 +4277,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 100
},
"_children": [
{
"__id__": 103
"__id__": 102
}
],
"_active": true,
......@@ -4333,15 +4337,15 @@
{
"__type__": "cc.Node",
"_name": "BRLNSDB",
"_objFlags": 0,
"_objFlags": 512,
"_parent": {
"__id__": 102
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 103
}
],
"_prefab": null,
......@@ -4397,7 +4401,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 102
},
"_enabled": true,
"_materials": [],
......@@ -4428,17 +4432,17 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 100
},
"_children": [
{
"__id__": 106
"__id__": 105
},
{
"__id__": 108
"__id__": 107
},
{
"__id__": 110
"__id__": 109
}
],
"_active": true,
......@@ -4496,13 +4500,13 @@
"_name": "1",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 106
}
],
"_prefab": null,
......@@ -4558,7 +4562,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 105
},
"_enabled": true,
"_materials": [],
......@@ -4586,13 +4590,13 @@
"_name": "2",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 108
}
],
"_prefab": null,
......@@ -4648,7 +4652,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 107
},
"_enabled": true,
"_materials": [],
......@@ -4676,13 +4680,13 @@
"_name": "3",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 110
}
],
"_prefab": null,
......@@ -4738,7 +4742,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 109
},
"_enabled": true,
"_materials": [],
......@@ -4766,23 +4770,23 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 100
},
"_children": [
{
"__id__": 113
"__id__": 112
},
{
"__id__": 115
"__id__": 114
},
{
"__id__": 117
"__id__": 116
},
{
"__id__": 119
"__id__": 118
},
{
"__id__": 121
"__id__": 120
}
],
"_active": true,
......@@ -4840,13 +4844,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 111
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 113
}
],
"_prefab": null,
......@@ -4902,7 +4906,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 112
},
"_enabled": true,
"_clip": {
......@@ -4921,13 +4925,13 @@
"_name": "time2",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 111
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 115
}
],
"_prefab": null,
......@@ -4983,7 +4987,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 114
},
"_enabled": true,
"_clip": {
......@@ -5002,13 +5006,13 @@
"_name": "time1",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 111
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 117
}
],
"_prefab": null,
......@@ -5064,7 +5068,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 116
},
"_enabled": true,
"_clip": {
......@@ -5083,13 +5087,13 @@
"_name": "false",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 111
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 119
}
],
"_prefab": null,
......@@ -5145,7 +5149,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 118
},
"_enabled": true,
"_clip": {
......@@ -5164,13 +5168,13 @@
"_name": "true",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 111
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 121
}
],
"_prefab": null,
......@@ -5226,7 +5230,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
"__id__": 120
},
"_enabled": true,
"_clip": {
......@@ -5251,7 +5255,7 @@
"_active": false,
"_components": [
{
"__id__": 124
"__id__": 123
}
],
"_prefab": null,
......@@ -5307,7 +5311,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 122
},
"_enabled": true,
"_materials": [
......@@ -5387,22 +5391,22 @@
},
"_enabled": true,
"cardParentN": {
"__id__": 30
"__id__": 29
},
"cardP": {
"__uuid__": "282fcbdc-d3bf-489b-84b9-56358c5441cb"
},
"tittleLabel": {
"__id__": 28
"__id__": 22
},
"tipLabel": {
"__id__": 93
"__id__": 92
},
"tipN": {
"__id__": 88
"__id__": 87
},
"countDown": {
"__id__": 86
"__id__": 85
},
"_id": "eaTVUpqahPfZeO9+sUI7RP"
}
......
......@@ -54,7 +54,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
super.start();
this.initBg();
this.initData();
// cc.find("Canvas/uiP/timeN").active=false;
// cc.find("Canvas/uiP/top/timeN").active=false;
}
_cantouch = null;
......@@ -71,6 +71,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
const bgNode = cc.find('Canvas/bg');
bgNode.scale = this._mapScaleMax;
cc.find('Canvas/uiP').scale = this._mapScaleMin;
// cc.find('Canvas/uiP/top').y=this._frameSize.height/4;
}
initCards() {
let data=this.getRandomCardData();
......@@ -140,9 +141,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
return data
}
initTime(){
// cc.find("Canvas/uiP/timeN").active=true;
let timeN=cc.find("Canvas/uiP/timeN/bg_time");
let timeN1=cc.find("Canvas/uiP/timeN/bg_time2");
// cc.find("Canvas/uiP/top/timeN").active=true;
let timeN=cc.find("Canvas/uiP/top/timeN/bg_time");
let timeN1=cc.find("Canvas/uiP/top/timeN/bg_time2");
this.watchTime=this.data.questions[0].watchTime;
this.gameTime=this.data.questions[0].gameTime;
let numTime= this.watchTime;
......@@ -152,8 +153,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
timeN1.active=false;
}
updateTime(){
let timeN=cc.find("Canvas/uiP/timeN/bg_time");
let timeN1=cc.find("Canvas/uiP/timeN/bg_time2");
let timeN=cc.find("Canvas/uiP/top/timeN/bg_time");
let timeN1=cc.find("Canvas/uiP/top/timeN/bg_time2");
let numTime=this.watchTime;
if(this.gameState=="game")numTime=this.gameTime;
timeN.getComponentInChildren(cc.Label).string=numTime;
......@@ -280,7 +281,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
clearntervals(){
// cc.find("Canvas/uiP/timeN").active=false;
// cc.find("Canvas/uiP/top/timeN").active=false;
if(this.watchInterval){
clearInterval(this.watchInterval);
}
......
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