Commit 21babf93 authored by Tt's avatar Tt

调整爪子效果

parent 6e31dbf7
......@@ -112,5 +112,5 @@ let question = [
]
1.背景图需要切图分开。
2.爪子动画需要提供
\ No newline at end of file
2.抓娃娃前start按钮提示,放大缩小。
3.爪子偏上锁定。 抓起卡片需要带着卡片一起运动。 卡片放大需要现在1.5倍左右。
\ No newline at end of file
......@@ -17,7 +17,7 @@
"__id__": 2
},
{
"__id__": 175
"__id__": 182
}
],
"_active": false,
......@@ -78,43 +78,43 @@
"__id__": 5
},
{
"__id__": 12
"__id__": 13
},
{
"__id__": 15
"__id__": 16
},
{
"__id__": 70
"__id__": 77
},
{
"__id__": 105
"__id__": 112
},
{
"__id__": 112
"__id__": 119
},
{
"__id__": 125
"__id__": 132
},
{
"__id__": 130
"__id__": 137
},
{
"__id__": 132
"__id__": 139
},
{
"__id__": 134
"__id__": 141
}
],
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 179
},
{
"__id__": 173
"__id__": 180
},
{
"__id__": 174
"__id__": 181
}
],
"_prefab": null,
......@@ -281,7 +281,7 @@
"_active": true,
"_components": [
{
"__id__": 11
"__id__": 12
}
],
"_prefab": null,
......@@ -461,6 +461,9 @@
"_components": [
{
"__id__": 10
},
{
"__id__": 11
}
],
"_prefab": null,
......@@ -475,7 +478,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1688,
"height": 780
"height": 1688
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -487,7 +490,7 @@
"ctor": "Float64Array",
"array": [
0,
0,
454,
0,
0,
0,
......@@ -543,6 +546,33 @@
"_atlas": null,
"_id": "b1tcAdTS9CUqKrAByP4SYG"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 44,
"_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": 1688,
"_originalHeight": 0,
"_id": "28IHS8YblM84JOCmK7uLHw"
},
{
"__type__": "cc.Widget",
"_name": "",
......@@ -581,10 +611,10 @@
"_active": false,
"_components": [
{
"__id__": 13
"__id__": 14
},
{
"__id__": 14
"__id__": 15
}
],
"_prefab": null,
......@@ -640,7 +670,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 13
},
"_enabled": true,
"alignMode": 1,
......@@ -667,7 +697,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 13
},
"_enabled": true,
"_normalMaterial": null,
......@@ -728,7 +758,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 12
"__id__": 13
},
"_id": "49gKv9YnNGGb71uG9nSzID"
},
......@@ -741,37 +771,37 @@
},
"_children": [
{
"__id__": 16
},
{
"__id__": 18
"__id__": 17
},
{
"__id__": 23
"__id__": 19
},
{
"__id__": 25
"__id__": 27
},
{
"__id__": 32
"__id__": 30
},
{
"__id__": 45
"__id__": 38
},
{
"__id__": 51
},
{
"__id__": 55
"__id__": 58
},
{
"__id__": 62
},
{
"__id__": 69
}
],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 76
}
],
"_prefab": null,
......@@ -827,13 +857,13 @@
"_name": "layout_item",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
"__id__": 18
}
],
"_prefab": null,
......@@ -889,7 +919,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 17
},
"_enabled": false,
"_materials": [
......@@ -909,18 +939,25 @@
"_name": "zhua",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [
{
"__id__": 19
"__id__": 20
},
{
"__id__": 21
"__id__": 22
},
{
"__id__": 24
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 26
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -974,13 +1011,13 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
"__id__": 21
}
],
"_prefab": null,
......@@ -1036,7 +1073,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 20
},
"_enabled": true,
"_materials": [
......@@ -1068,13 +1105,13 @@
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 18
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 23
}
],
"_prefab": null,
......@@ -1100,7 +1137,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0.435,
112.064,
0,
0,
......@@ -1130,7 +1167,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -1167,16 +1204,140 @@
},
{
"__type__": "cc.Node",
"_name": "bg_1",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 186,
"g": 186,
"b": 186,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 37,
"height": 1000
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-0.294,
59.198,
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": "52GVhgaEpI966kdem1fy4U"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "7cCSfBUhVL1KsOTQZxiTS9"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 85.32499999999999,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "46ek2WkktNvYKlrwjPxHv0"
},
{
"__type__": "cc.Node",
"_name": "bg_1",
"_objFlags": 0,
"_parent": {
"__id__": 16
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
},
{
"__id__": 29
}
],
"_prefab": null,
......@@ -1203,7 +1364,7 @@
"ctor": "Float64Array",
"array": [
0,
316.554,
316,
0,
0,
0,
......@@ -1232,7 +1393,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1259,22 +1420,52 @@
"_atlas": null,
"_id": "9cS1xYqqNEcLGzigl2K7ZF"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_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": "eddBZPH6ZMi7ZFt4Lf0rzM"
},
{
"__type__": "cc.Node",
"_name": "top",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [
{
"__id__": 26
"__id__": 31
}
],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 36
},
{
"__id__": 37
}
],
"_prefab": null,
......@@ -1330,17 +1521,17 @@
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 25
"__id__": 30
},
"_children": [
{
"__id__": 27
"__id__": 32
}
],
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 35
}
],
"_prefab": null,
......@@ -1396,16 +1587,16 @@
"_name": "label_round",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 31
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 28
"__id__": 33
},
{
"__id__": 29
"__id__": 34
}
],
"_prefab": null,
......@@ -1461,7 +1652,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1496,7 +1687,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 32
},
"_enabled": true,
"alignMode": 2,
......@@ -1523,7 +1714,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 31
},
"_enabled": true,
"_materials": [
......@@ -1558,7 +1749,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 30
},
"_enabled": true,
"_layoutSize": {
......@@ -1585,19 +1776,46 @@
"_N$affectedByScale": false,
"_id": "6cQwIe0NlL/ZPjtJzN9fIS"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 16.39699999999999,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "edgfXrZxxKUoRBXNhgjEKD"
},
{
"__type__": "cc.Node",
"_name": "item",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [
{
"__id__": 33
"__id__": 39
},
{
"__id__": 34
"__id__": 40
}
],
"_active": true,
......@@ -1655,7 +1873,7 @@
"_name": "layout_card",
"_objFlags": 0,
"_parent": {
"__id__": 32
"__id__": 38
},
"_children": [],
"_active": true,
......@@ -1713,23 +1931,23 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 32
"__id__": 38
},
"_children": [
{
"__id__": 35
"__id__": 41
},
{
"__id__": 37
"__id__": 43
},
{
"__id__": 39
"__id__": 45
},
{
"__id__": 41
"__id__": 47
},
{
"__id__": 43
"__id__": 49
}
],
"_active": true,
......@@ -1787,13 +2005,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 42
}
],
"_prefab": null,
......@@ -1849,7 +2067,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 41
},
"_enabled": true,
"_materials": [
......@@ -1881,13 +2099,13 @@
"_name": "text",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 44
}
],
"_prefab": null,
......@@ -1943,7 +2161,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -1976,13 +2194,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 46
}
],
"_prefab": null,
......@@ -2038,7 +2256,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2070,13 +2288,13 @@
"_name": "image_text_image",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 48
}
],
"_prefab": null,
......@@ -2132,7 +2350,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2164,13 +2382,13 @@
"_name": "image_text_text",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 50
}
],
"_prefab": null,
......@@ -2226,7 +2444,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2259,20 +2477,23 @@
"_name": "btn_start",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [
{
"__id__": 46
"__id__": 52
}
],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 54
},
{
"__id__": 49
"__id__": 55
},
{
"__id__": 57
}
],
"_prefab": null,
......@@ -2328,13 +2549,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 53
}
],
"_prefab": null,
......@@ -2390,7 +2611,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2422,7 +2643,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2444,7 +2665,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 51
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2453,7 +2674,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 50
"__id__": 56
}
],
"_N$interactable": true,
......@@ -2521,22 +2742,49 @@
"handler": "onTouchStart",
"customEventData": ""
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 21.103999999999985,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "24A3Lq+MBBsLsBRFcaGMi5"
},
{
"__type__": "cc.Node",
"_name": "item_little",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [
{
"__id__": 52
"__id__": 59
}
],
"_active": false,
"_components": [
{
"__id__": 54
"__id__": 61
}
],
"_prefab": null,
......@@ -2592,13 +2840,13 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 58
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 60
}
],
"_prefab": null,
......@@ -2654,7 +2902,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2686,7 +2934,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -2718,23 +2966,23 @@
"_name": "btn_last",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [
{
"__id__": 56
"__id__": 63
},
{
"__id__": 58
"__id__": 65
}
],
"_active": false,
"_components": [
{
"__id__": 60
"__id__": 67
},
{
"__id__": 61
"__id__": 68
}
],
"_prefab": null,
......@@ -2790,13 +3038,13 @@
"_name": "img_0",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 62
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 64
}
],
"_prefab": null,
......@@ -2852,7 +3100,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 63
},
"_enabled": true,
"_materials": [
......@@ -2884,13 +3132,13 @@
"_name": "img_1",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 62
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 66
}
],
"_prefab": null,
......@@ -2946,7 +3194,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -2978,7 +3226,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 62
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3046,7 +3294,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 62
},
"_enabled": true,
"alignMode": 1,
......@@ -3073,23 +3321,23 @@
"_name": "btn_next",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 16
},
"_children": [
{
"__id__": 63
"__id__": 70
},
{
"__id__": 65
"__id__": 72
}
],
"_active": false,
"_components": [
{
"__id__": 67
"__id__": 74
},
{
"__id__": 68
"__id__": 75
}
],
"_prefab": null,
......@@ -3145,13 +3393,13 @@
"_name": "img_0",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 69
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 71
}
],
"_prefab": null,
......@@ -3207,7 +3455,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3239,13 +3487,13 @@
"_name": "img_1",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 69
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 73
}
],
"_prefab": null,
......@@ -3301,7 +3549,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3333,7 +3581,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 69
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3401,7 +3649,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 69
},
"_enabled": true,
"alignMode": 1,
......@@ -3428,7 +3676,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 16
},
"_enabled": true,
"alignMode": 1,
......@@ -3459,25 +3707,25 @@
},
"_children": [
{
"__id__": 71
"__id__": 78
},
{
"__id__": 75
"__id__": 82
},
{
"__id__": 78
"__id__": 85
},
{
"__id__": 89
"__id__": 96
}
],
"_active": false,
"_components": [
{
"__id__": 103
"__id__": 110
},
{
"__id__": 104
"__id__": 111
}
],
"_prefab": null,
......@@ -3533,19 +3781,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 79
},
{
"__id__": 73
"__id__": 80
},
{
"__id__": 74
"__id__": 81
}
],
"_prefab": null,
......@@ -3601,7 +3849,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 78
},
"_enabled": true,
"_materials": [
......@@ -3633,7 +3881,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 78
},
"_enabled": true,
"alignMode": 1,
......@@ -3660,7 +3908,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 78
},
"_enabled": true,
"_id": "97pflT+i1AyY1PE58Dq3+A"
......@@ -3670,16 +3918,16 @@
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 83
},
{
"__id__": 77
"__id__": 84
}
],
"_prefab": null,
......@@ -3735,7 +3983,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -3767,7 +4015,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 82
},
"_enabled": true,
"alignMode": 1,
......@@ -3794,23 +4042,23 @@
"_name": "card",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 77
},
"_children": [
{
"__id__": 79
"__id__": 86
},
{
"__id__": 81
"__id__": 88
},
{
"__id__": 83
"__id__": 90
},
{
"__id__": 85
"__id__": 92
},
{
"__id__": 87
"__id__": 94
}
],
"_active": true,
......@@ -3868,13 +4116,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 87
}
],
"_prefab": null,
......@@ -3930,7 +4178,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -3962,13 +4210,13 @@
"_name": "text",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 85
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 82
"__id__": 89
}
],
"_prefab": null,
......@@ -4024,7 +4272,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4057,13 +4305,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 85
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 84
"__id__": 91
}
],
"_prefab": null,
......@@ -4119,7 +4367,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4151,13 +4399,13 @@
"_name": "image_text_image",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 85
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 86
"__id__": 93
}
],
"_prefab": null,
......@@ -4213,7 +4461,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4245,13 +4493,13 @@
"_name": "image_text_text",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 85
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 88
"__id__": 95
}
],
"_prefab": null,
......@@ -4307,7 +4555,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4340,14 +4588,14 @@
"_name": "btn_voice",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 77
},
"_children": [
{
"__id__": 90
"__id__": 97
},
{
"__id__": 92
"__id__": 99
}
],
"_active": true,
......@@ -4405,13 +4653,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 89
"__id__": 96
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 98
}
],
"_prefab": null,
......@@ -4467,7 +4715,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -4499,14 +4747,14 @@
"_name": "ing",
"_objFlags": 0,
"_parent": {
"__id__": 89
"__id__": 96
},
"_children": [
{
"__id__": 93
"__id__": 100
},
{
"__id__": 101
"__id__": 108
}
],
"_active": false,
......@@ -4564,23 +4812,23 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 99
},
"_children": [
{
"__id__": 94
"__id__": 101
},
{
"__id__": 96
"__id__": 103
},
{
"__id__": 98
"__id__": 105
}
],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 107
}
],
"_prefab": null,
......@@ -4636,13 +4884,13 @@
"_name": "fanka_img_circle1",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 100
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 95
"__id__": 102
}
],
"_prefab": null,
......@@ -4698,7 +4946,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 101
},
"_enabled": true,
"_materials": [
......@@ -4730,13 +4978,13 @@
"_name": "fanka_img_circle2",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 100
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 97
"__id__": 104
}
],
"_prefab": null,
......@@ -4792,7 +5040,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 103
},
"_enabled": true,
"_materials": [
......@@ -4824,13 +5072,13 @@
"_name": "fanka_img_circle3",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 100
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 99
"__id__": 106
}
],
"_prefab": null,
......@@ -4886,7 +5134,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -4918,18 +5166,18 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 100
},
"_enabled": true,
"imgList": [
{
"__id__": 94
"__id__": 101
},
{
"__id__": 96
"__id__": 103
},
{
"__id__": 98
"__id__": 105
}
],
"_id": "7eC6d9sttNuZu2bSqk1QTx"
......@@ -4939,13 +5187,13 @@
"_name": "ing",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 109
}
],
"_prefab": null,
......@@ -5001,7 +5249,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5033,7 +5281,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 77
},
"_enabled": false,
"_materials": [
......@@ -5065,7 +5313,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 77
},
"_enabled": true,
"alignMode": 1,
......@@ -5096,13 +5344,13 @@
},
"_children": [
{
"__id__": 106
"__id__": 113
},
{
"__id__": 108
"__id__": 115
},
{
"__id__": 110
"__id__": 117
}
],
"_active": true,
......@@ -5160,13 +5408,13 @@
"_name": "JJ_Excellent_ske",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 112
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 107
"__id__": 114
}
],
"_prefab": null,
......@@ -5222,7 +5470,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 113
},
"_enabled": true,
"_materials": [
......@@ -5262,13 +5510,13 @@
"_name": "JJ_Good_ske",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 112
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 109
"__id__": 116
}
],
"_prefab": null,
......@@ -5324,7 +5572,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5364,13 +5612,13 @@
"_name": "JJ_Tryagain_ske",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 112
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 111
"__id__": 118
}
],
"_prefab": null,
......@@ -5426,7 +5674,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 117
},
"_enabled": true,
"_materials": [
......@@ -5470,22 +5718,22 @@
},
"_children": [
{
"__id__": 113
"__id__": 120
},
{
"__id__": 115
"__id__": 122
},
{
"__id__": 117
"__id__": 124
},
{
"__id__": 119
"__id__": 126
},
{
"__id__": 121
"__id__": 128
},
{
"__id__": 123
"__id__": 130
}
],
"_active": false,
......@@ -5543,13 +5791,13 @@
"_name": "point_orange_normal",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 121
}
],
"_prefab": null,
......@@ -5605,7 +5853,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 120
},
"_enabled": true,
"_materials": [
......@@ -5637,13 +5885,13 @@
"_name": "point_orange_right",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 123
}
],
"_prefab": null,
......@@ -5699,7 +5947,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 122
},
"_enabled": true,
"_materials": [
......@@ -5731,13 +5979,13 @@
"_name": "point_orange_select_normal",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 125
}
],
"_prefab": null,
......@@ -5793,7 +6041,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 124
},
"_enabled": true,
"_materials": [
......@@ -5825,13 +6073,13 @@
"_name": "point_orange_select_right",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 127
}
],
"_prefab": null,
......@@ -5887,7 +6135,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 126
},
"_enabled": true,
"_materials": [
......@@ -5919,13 +6167,13 @@
"_name": "point_orange_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 129
}
],
"_prefab": null,
......@@ -5981,7 +6229,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
"__id__": 128
},
"_enabled": true,
"_materials": [
......@@ -6013,13 +6261,13 @@
"_name": "point_orange_select_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 131
}
],
"_prefab": null,
......@@ -6075,7 +6323,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6111,16 +6359,16 @@
},
"_children": [
{
"__id__": 126
"__id__": 133
}
],
"_active": false,
"_components": [
{
"__id__": 128
"__id__": 135
},
{
"__id__": 129
"__id__": 136
}
],
"_prefab": null,
......@@ -6176,13 +6424,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 125
"__id__": 132
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 134
}
],
"_prefab": null,
......@@ -6238,7 +6486,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 133
},
"_enabled": true,
"_materials": [
......@@ -6271,7 +6519,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6303,7 +6551,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 132
},
"_enabled": true,
"_layoutSize": {
......@@ -6341,7 +6589,7 @@
"_active": false,
"_components": [
{
"__id__": 131
"__id__": 138
}
],
"_prefab": null,
......@@ -6397,7 +6645,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 130
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6435,7 +6683,7 @@
"_active": false,
"_components": [
{
"__id__": 133
"__id__": 140
}
],
"_prefab": null,
......@@ -6491,7 +6739,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6527,13 +6775,13 @@
},
"_children": [
{
"__id__": 135
"__id__": 142
},
{
"__id__": 138
"__id__": 145
},
{
"__id__": 141
"__id__": 148
}
],
"_active": false,
......@@ -6591,11 +6839,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 141
},
"_children": [
{
"__id__": 136
"__id__": 143
}
],
"_active": true,
......@@ -6653,13 +6901,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 135
"__id__": 142
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 137
"__id__": 144
}
],
"_prefab": null,
......@@ -6715,7 +6963,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
"__id__": 143
},
"_enabled": true,
"_materials": [],
......@@ -6746,11 +6994,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 141
},
"_children": [
{
"__id__": 139
"__id__": 146
}
],
"_active": true,
......@@ -6808,13 +7056,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 138
"__id__": 145
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 140
"__id__": 147
}
],
"_prefab": null,
......@@ -6870,7 +7118,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 146
},
"_enabled": true,
"_materials": [],
......@@ -6898,53 +7146,53 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 141
},
"_children": [
{
"__id__": 142
"__id__": 149
},
{
"__id__": 144
"__id__": 151
},
{
"__id__": 146
"__id__": 153
},
{
"__id__": 148
"__id__": 155
},
{
"__id__": 150
"__id__": 157
},
{
"__id__": 152
"__id__": 159
},
{
"__id__": 154
"__id__": 161
},
{
"__id__": 156
"__id__": 163
},
{
"__id__": 158
"__id__": 165
},
{
"__id__": 160
"__id__": 167
},
{
"__id__": 162
"__id__": 169
},
{
"__id__": 164
"__id__": 171
},
{
"__id__": 166
"__id__": 173
},
{
"__id__": 168
"__id__": 175
},
{
"__id__": 170
"__id__": 177
}
],
"_active": true,
......@@ -7002,13 +7250,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 150
}
],
"_prefab": null,
......@@ -7064,7 +7312,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 149
},
"_enabled": true,
"_clip": {
......@@ -7083,13 +7331,13 @@
"_name": "tip",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
"__id__": 152
}
],
"_prefab": null,
......@@ -7145,7 +7393,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 151
},
"_enabled": true,
"_clip": {
......@@ -7164,13 +7412,13 @@
"_name": "tosmall",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 147
"__id__": 154
}
],
"_prefab": null,
......@@ -7226,7 +7474,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 153
},
"_enabled": true,
"_clip": {
......@@ -7245,13 +7493,13 @@
"_name": "pagenext",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 156
}
],
"_prefab": null,
......@@ -7307,7 +7555,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 155
},
"_enabled": true,
"_clip": {
......@@ -7326,13 +7574,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 151
"__id__": 158
}
],
"_prefab": null,
......@@ -7388,7 +7636,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 157
},
"_enabled": true,
"_clip": {
......@@ -7407,13 +7655,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 153
"__id__": 160
}
],
"_prefab": null,
......@@ -7469,7 +7717,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 159
},
"_enabled": true,
"_clip": {
......@@ -7488,13 +7736,13 @@
"_name": "touch_voice",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 162
}
],
"_prefab": null,
......@@ -7550,7 +7798,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 161
},
"_enabled": true,
"_clip": {
......@@ -7569,13 +7817,13 @@
"_name": "end",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 157
"__id__": 164
}
],
"_prefab": null,
......@@ -7631,7 +7879,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 163
},
"_enabled": true,
"_clip": {
......@@ -7650,13 +7898,13 @@
"_name": "fanka",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 166
}
],
"_prefab": null,
......@@ -7712,7 +7960,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 165
},
"_enabled": true,
"_clip": {
......@@ -7731,13 +7979,13 @@
"_name": "try",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 161
"__id__": 168
}
],
"_prefab": null,
......@@ -7793,7 +8041,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 167
},
"_enabled": true,
"_clip": {
......@@ -7812,13 +8060,13 @@
"_name": "wait",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 163
"__id__": 170
}
],
"_prefab": null,
......@@ -7874,7 +8122,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 169
},
"_enabled": true,
"_clip": {
......@@ -7893,13 +8141,13 @@
"_name": "excellent",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 165
"__id__": 172
}
],
"_prefab": null,
......@@ -7955,7 +8203,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 171
},
"_enabled": true,
"_clip": {
......@@ -7974,13 +8222,13 @@
"_name": "good",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 167
"__id__": 174
}
],
"_prefab": null,
......@@ -8036,7 +8284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 173
},
"_enabled": true,
"_clip": {
......@@ -8055,13 +8303,13 @@
"_name": "record_wrong",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 169
"__id__": 176
}
],
"_prefab": null,
......@@ -8117,7 +8365,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
"__id__": 175
},
"_enabled": true,
"_clip": {
......@@ -8136,13 +8384,13 @@
"_name": "record_right",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 171
"__id__": 178
}
],
"_prefab": null,
......@@ -8198,7 +8446,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 170
"__id__": 177
},
"_enabled": true,
"_clip": {
......@@ -8265,40 +8513,40 @@
},
"_enabled": true,
"label_round": {
"__id__": 27
"__id__": 32
},
"layout_item": {
"__id__": 16
"__id__": 17
},
"layer_item": {
"__id__": 32
"__id__": 38
},
"layer_item_little": {
"__id__": 51
"__id__": 58
},
"label_title": {
"__id__": 26
"__id__": 31
},
"layer_touch": {
"__id__": 12
"__id__": 13
},
"btn_last": {
"__id__": 55
"__id__": 62
},
"btn_next": {
"__id__": 62
"__id__": 69
},
"gou_node": {
"__id__": 18
"__id__": 19
},
"btn_start": {
"__id__": 45
"__id__": 51
},
"layout_record": {
"__id__": 70
"__id__": 77
},
"btn_close": {
"__id__": 75
"__id__": 82
},
"_id": "eaTVUpqahPfZeO9+sUI7RP"
},
......@@ -8311,34 +8559,34 @@
},
"_children": [
{
"__id__": 176
"__id__": 183
},
{
"__id__": 179
"__id__": 186
},
{
"__id__": 182
"__id__": 189
},
{
"__id__": 185
"__id__": 192
},
{
"__id__": 188
"__id__": 195
},
{
"__id__": 191
"__id__": 198
},
{
"__id__": 194
"__id__": 201
},
{
"__id__": 197
"__id__": 204
}
],
"_active": false,
"_components": [],
"_prefab": {
"__id__": 200
"__id__": 207
},
"_opacity": 255,
"_color": {
......@@ -8392,17 +8640,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 184
}
],
"_prefab": {
"__id__": 178
"__id__": 185
},
"_opacity": 255,
"_color": {
......@@ -8456,7 +8704,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 183
},
"_enabled": true,
"_materials": [
......@@ -8486,7 +8734,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -8499,17 +8747,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 180
"__id__": 187
}
],
"_prefab": {
"__id__": 181
"__id__": 188
},
"_opacity": 255,
"_color": {
......@@ -8563,7 +8811,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -8593,7 +8841,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -8606,17 +8854,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 183
"__id__": 190
}
],
"_prefab": {
"__id__": 184
"__id__": 191
},
"_opacity": 255,
"_color": {
......@@ -8670,7 +8918,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 189
},
"_enabled": true,
"_materials": [
......@@ -8700,7 +8948,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -8713,17 +8961,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 186
"__id__": 193
}
],
"_prefab": {
"__id__": 187
"__id__": 194
},
"_opacity": 255,
"_color": {
......@@ -8777,7 +9025,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 185
"__id__": 192
},
"_enabled": true,
"_materials": [
......@@ -8807,7 +9055,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -8820,17 +9068,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 189
"__id__": 196
}
],
"_prefab": {
"__id__": 190
"__id__": 197
},
"_opacity": 255,
"_color": {
......@@ -8884,7 +9132,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 188
"__id__": 195
},
"_enabled": true,
"_materials": [
......@@ -8914,7 +9162,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -8927,17 +9175,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 192
"__id__": 199
}
],
"_prefab": {
"__id__": 193
"__id__": 200
},
"_opacity": 255,
"_color": {
......@@ -8991,7 +9239,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 198
},
"_enabled": true,
"_materials": [
......@@ -9021,7 +9269,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -9034,17 +9282,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 195
"__id__": 202
}
],
"_prefab": {
"__id__": 196
"__id__": 203
},
"_opacity": 255,
"_color": {
......@@ -9098,7 +9346,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 194
"__id__": 201
},
"_enabled": true,
"_materials": [
......@@ -9128,7 +9376,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -9141,17 +9389,17 @@
"_name": "sahua",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 198
"__id__": 205
}
],
"_prefab": {
"__id__": 199
"__id__": 206
},
"_opacity": 255,
"_color": {
......@@ -9205,7 +9453,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 197
"__id__": 204
},
"_enabled": true,
"_materials": [
......@@ -9235,7 +9483,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......@@ -9246,7 +9494,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 175
"__id__": 182
},
"asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......
......@@ -65,7 +65,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
_cantouch = null;
private list: Array<{
questionAudio, image, letterList, recordData, isChose//用于判定对错 right wrong
title, questionAudio, image, letterList, recordData, isChose//用于判定对错 right wrong
}>;
private recordFlag: number;//录音模式
private score: number;
......@@ -126,6 +126,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.count = 0;
this.touchForbid = true;
this.voiceTouchForbid = true;
if (!this.CurrentData.title) this.label_title.active = false;
pg.view.setString(this.label_title, this.CurrentData.title)
this.gou_node.orgPos = cc.v2(this.gou_node)
let currentLayer = this.createLayer();
this.updateLayer(currentLayer, this.CurrentData, this.count)
......@@ -136,8 +138,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.layers.push(nextLayer)
// 循环播放三个卡片的tips
this.checkCardsTime = 0;
if (!this.data.title) this.label_title.active = false;
pg.view.setString(this.label_title, this.data.title)
}
@property(cc.Node)
label_title: cc.Node = null;
......@@ -150,6 +150,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
// 自动播放顶部音频
this.touchForbid = true;
cc.tween(this.btn_start).repeatForever(
cc.tween().to(0.5, { scale: 1.1 }).to(0.5, { scale: 1.0 })
).start();
this.scheduleOnce(() => {
this.touchForbid = false;
}, 0.1)
......@@ -529,6 +533,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
private btn_start: cc.Node = null;
onTouchStart(e) {
if (this.touchForbid) return;// 顶级禁止全部点击
cc.Tween.stopAllByTarget(this.btn_start)
this.btn_start.scale = 1;
this.touchForbid = true;
// 处理问题
let image = pg.view.find(this.btn_start, 'image');
......@@ -565,21 +571,22 @@ export default class SceneComponent extends MyCocosSceneComponent {
let ani = pg.view.playDBAnimation(pg.view.find(this.gou_node, 'ani'), 'newAnimation', 1);
ani.timeScale = 1;
})
.delay(0.7)
// 等待动画
.delay(1)
// 获取图片坐标后隐藏
.call(() => {
let ani = pg.view.playDBAnimation(pg.view.find(this.gou_node, 'ani'), 'newAnimation', 1);
ani.timeScale = -1;
this.touchForbid = false;
// showRecord 传递坐标 执行内部动画效果
this.showRecord(item);
})
.to(0.3, { y: item.y + item.height / 2 + 50 })
// 获取图片坐标后隐藏
.call(() => {
let ani = pg.view.playDBAnimation(pg.view.find(this.gou_node, 'ani'), 'newAnimation', 1);
ani.timeScale = -1;
})
.delay(1)
.call(() => {
pg.view.playDBAnimation(pg.view.find(this.gou_node, 'ani'), 'newAnimation', 1);
// pg.view.playDBAnimation(pg.view.find(this.gou_node, 'ani'), 'newAnimation', 1);
pg.view.visible(pg.view.find(this.gou_node, 'img'), true);
pg.view.visible(pg.view.find(this.gou_node, 'ani'), false);
})
......@@ -594,7 +601,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
@property(cc.Node)
private btn_close: cc.Node = null;
showRecord(item) {
let startPos = cc.v2(item);
cc.tween(item).to(0.3, { y: startPos.y + 50 }).call(() => {
item.active = false;
item.y = startPos.y;
this.layout_record.active = true;
// 卡片显示
let bg = pg.view.find(this.layout_record, 'bg')
......@@ -605,15 +618,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
let card = pg.view.find(this.layout_record, 'card')
this.updateCard(card, this.currentDt)
let startPos = cc.v2(item);
let endPos = cc.v2(card);
let startScale = item.width / card.width
card.scale = startScale;
card.x = startPos.x;
card.y = startPos.y;
cc.tween(card).to(0.5, { x: endPos.x, y: endPos.y, scale: 1 }).start();
card.y = startPos.y + 50;
cc.tween(card).delay(0.3).to(0.5, { x: endPos.x, y: endPos.y, scale: 1.7 }).start();
// 音频处理
let btn_voice = pg.view.find(this.layout_record, 'btn_voice')
......@@ -645,14 +656,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
.delay(1)
)
.start();
// this.btn_voice_time_id = setTimeout(() => {
// if (!this.node || !this.node.parent) return;
// // 摇晃mic
// this.playLocalAudio("wait")
// cc.tween(normal).to(0.25, { angle: -15 }).to(0.25, { angle: 0 }).to(0.25, { angle: 15 }).to(0.25, { angle: 0 }).start();
// }, 3000);
pg.view.touchOn(btn_voice, this.onTouchCardRecord, this)
}).start();
}
onTouchRecordClose() {
this.layout_record.active = false;
......
......@@ -8,7 +8,7 @@
"genMipmaps": false,
"packable": true,
"width": 1688,
"height": 780,
"height": 1688,
"platformSettings": {},
"subMetas": {
"bg_0_jj15_zww": {
......@@ -23,9 +23,9 @@
"trimX": 0,
"trimY": 0,
"width": 1688,
"height": 780,
"height": 1688,
"rawWidth": 1688,
"rawHeight": 780,
"rawHeight": 1688,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
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