Commit d2409335 authored by Tt's avatar Tt

爪子流程完毕

parent 4cba23aa
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 172 "__id__": 175
} }
], ],
"_active": false, "_active": false,
...@@ -84,37 +84,37 @@ ...@@ -84,37 +84,37 @@
"__id__": 15 "__id__": 15
}, },
{ {
"__id__": 67 "__id__": 70
}, },
{ {
"__id__": 102 "__id__": 105
}, },
{ {
"__id__": 109 "__id__": 112
}, },
{ {
"__id__": 122 "__id__": 125
}, },
{ {
"__id__": 127 "__id__": 130
}, },
{ {
"__id__": 129 "__id__": 132
}, },
{ {
"__id__": 131 "__id__": 134
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 169 "__id__": 172
}, },
{ {
"__id__": 170 "__id__": 173
}, },
{ {
"__id__": 171 "__id__": 174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -747,31 +747,31 @@ ...@@ -747,31 +747,31 @@
"__id__": 18 "__id__": 18
}, },
{ {
"__id__": 20 "__id__": 23
}, },
{ {
"__id__": 22 "__id__": 25
}, },
{ {
"__id__": 29 "__id__": 32
}, },
{ {
"__id__": 42 "__id__": 45
}, },
{ {
"__id__": 48 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 55
}, },
{ {
"__id__": 59 "__id__": 62
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -911,13 +911,16 @@ ...@@ -911,13 +911,16 @@
"_parent": { "_parent": {
"__id__": 15 "__id__": 15
}, },
"_children": [], "_children": [
"_active": true,
"_components": [
{ {
"__id__": 19 "__id__": 19
},
{
"__id__": 21
} }
], ],
"_active": true,
"_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -966,12 +969,74 @@ ...@@ -966,12 +969,74 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "f5KXenGcBOMqqPNMvKZHfa" "_id": "f5KXenGcBOMqqPNMvKZHfa"
}, },
{
"__type__": "cc.Node",
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 18
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 202,
"height": 228
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "8agkTv1+1B6rB9Zex6EuIO"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -996,7 +1061,109 @@ ...@@ -996,7 +1061,109 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "32OWodg51C3KaONE7RPjqS" "_id": "6cLWwZXHlN+I6T8oAn0nft"
},
{
"__type__": "cc.Node",
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 18
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 22
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 202,
"height": 228
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
112.064,
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": "adfEUEohdHTYJWUPIyupPy"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "newAnimation",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": 1,
"premultipliedAlpha": false,
"_armatureKey": "5ea62525-dedc-4341-bcd3-40e236741149#5ccd4b2c-5401-4873-9ab8-5cfddbb70a71",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "5ea62525-dedc-4341-bcd3-40e236741149"
},
"_N$dragonAtlasAsset": {
"__uuid__": "5ccd4b2c-5401-4873-9ab8-5cfddbb70a71"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "6dUZv0MatGbK49byK8ls4g"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1009,7 +1176,7 @@ ...@@ -1009,7 +1176,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1065,7 +1232,7 @@ ...@@ -1065,7 +1232,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1101,13 +1268,13 @@ ...@@ -1101,13 +1268,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 23 "__id__": 26
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 31
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1163,17 +1330,17 @@ ...@@ -1163,17 +1330,17 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22 "__id__": 25
}, },
"_children": [ "_children": [
{ {
"__id__": 24 "__id__": 27
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 27 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1229,16 +1396,16 @@ ...@@ -1229,16 +1396,16 @@
"_name": "label_round", "_name": "label_round",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 23 "__id__": 26
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 28
}, },
{ {
"__id__": 26 "__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1294,7 +1461,7 @@ ...@@ -1294,7 +1461,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 24 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1329,7 +1496,7 @@ ...@@ -1329,7 +1496,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 24 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -1356,7 +1523,7 @@ ...@@ -1356,7 +1523,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1391,7 +1558,7 @@ ...@@ -1391,7 +1558,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -1427,10 +1594,10 @@ ...@@ -1427,10 +1594,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 30 "__id__": 33
}, },
{ {
"__id__": 31 "__id__": 34
} }
], ],
"_active": true, "_active": true,
...@@ -1488,7 +1655,7 @@ ...@@ -1488,7 +1655,7 @@
"_name": "layout_card", "_name": "layout_card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 32
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -1546,23 +1713,23 @@ ...@@ -1546,23 +1713,23 @@
"_name": "card", "_name": "card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 32
}, },
"_children": [ "_children": [
{ {
"__id__": 32 "__id__": 35
}, },
{ {
"__id__": 34 "__id__": 37
}, },
{ {
"__id__": 36 "__id__": 39
}, },
{ {
"__id__": 38 "__id__": 41
}, },
{ {
"__id__": 40 "__id__": 43
} }
], ],
"_active": true, "_active": true,
...@@ -1620,13 +1787,13 @@ ...@@ -1620,13 +1787,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 31 "__id__": 34
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 36
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1682,7 +1849,7 @@ ...@@ -1682,7 +1849,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 35
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1714,13 +1881,13 @@ ...@@ -1714,13 +1881,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 31 "__id__": 34
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 38
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1776,7 +1943,7 @@ ...@@ -1776,7 +1943,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1809,13 +1976,13 @@ ...@@ -1809,13 +1976,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 31 "__id__": 34
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1871,7 +2038,7 @@ ...@@ -1871,7 +2038,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1903,13 +2070,13 @@ ...@@ -1903,13 +2070,13 @@
"_name": "image_text_image", "_name": "image_text_image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 31 "__id__": 34
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1965,7 +2132,7 @@ ...@@ -1965,7 +2132,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1997,13 +2164,13 @@ ...@@ -1997,13 +2164,13 @@
"_name": "image_text_text", "_name": "image_text_text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 31 "__id__": 34
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2059,7 +2226,7 @@ ...@@ -2059,7 +2226,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2096,16 +2263,16 @@ ...@@ -2096,16 +2263,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 43 "__id__": 46
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 48
}, },
{ {
"__id__": 46 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2161,13 +2328,13 @@ ...@@ -2161,13 +2328,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 42 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2223,7 +2390,7 @@ ...@@ -2223,7 +2390,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 46
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2255,7 +2422,7 @@ ...@@ -2255,7 +2422,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2277,7 +2444,7 @@ ...@@ -2277,7 +2444,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2286,7 +2453,7 @@ ...@@ -2286,7 +2453,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 47 "__id__": 50
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2363,13 +2530,13 @@ ...@@ -2363,13 +2530,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 49 "__id__": 52
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2425,13 +2592,13 @@ ...@@ -2425,13 +2592,13 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 48 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2487,7 +2654,7 @@ ...@@ -2487,7 +2654,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2519,7 +2686,7 @@ ...@@ -2519,7 +2686,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 48 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2555,19 +2722,19 @@ ...@@ -2555,19 +2722,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 53 "__id__": 56
}, },
{ {
"__id__": 55 "__id__": 58
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 60
}, },
{ {
"__id__": 58 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2623,13 +2790,13 @@ ...@@ -2623,13 +2790,13 @@
"_name": "img_0", "_name": "img_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 52 "__id__": 55
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2685,7 +2852,7 @@ ...@@ -2685,7 +2852,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2717,13 +2884,13 @@ ...@@ -2717,13 +2884,13 @@
"_name": "img_1", "_name": "img_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 52 "__id__": 55
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2779,7 +2946,7 @@ ...@@ -2779,7 +2946,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 55 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2811,7 +2978,7 @@ ...@@ -2811,7 +2978,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2879,7 +3046,7 @@ ...@@ -2879,7 +3046,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2910,19 +3077,19 @@ ...@@ -2910,19 +3077,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 60 "__id__": 63
}, },
{ {
"__id__": 62 "__id__": 65
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 67
}, },
{ {
"__id__": 65 "__id__": 68
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2978,13 +3145,13 @@ ...@@ -2978,13 +3145,13 @@
"_name": "img_0", "_name": "img_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 59 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3040,7 +3207,7 @@ ...@@ -3040,7 +3207,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3072,13 +3239,13 @@ ...@@ -3072,13 +3239,13 @@
"_name": "img_1", "_name": "img_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 59 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3134,7 +3301,7 @@ ...@@ -3134,7 +3301,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3166,7 +3333,7 @@ ...@@ -3166,7 +3333,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3234,7 +3401,7 @@ ...@@ -3234,7 +3401,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3292,25 +3459,25 @@ ...@@ -3292,25 +3459,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 68 "__id__": 71
}, },
{ {
"__id__": 72 "__id__": 75
}, },
{ {
"__id__": 75 "__id__": 78
}, },
{ {
"__id__": 86 "__id__": 89
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 103
}, },
{ {
"__id__": 101 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3366,19 +3533,19 @@ ...@@ -3366,19 +3533,19 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 67 "__id__": 70
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 72
}, },
{ {
"__id__": 70 "__id__": 73
}, },
{ {
"__id__": 71 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3434,7 +3601,7 @@ ...@@ -3434,7 +3601,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 68 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3466,7 +3633,7 @@ ...@@ -3466,7 +3633,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 68 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3493,7 +3660,7 @@ ...@@ -3493,7 +3660,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 68 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_id": "97pflT+i1AyY1PE58Dq3+A" "_id": "97pflT+i1AyY1PE58Dq3+A"
...@@ -3503,16 +3670,16 @@ ...@@ -3503,16 +3670,16 @@
"_name": "btn_close", "_name": "btn_close",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 67 "__id__": 70
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 76
}, },
{ {
"__id__": 74 "__id__": 77
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3568,7 +3735,7 @@ ...@@ -3568,7 +3735,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3600,7 +3767,7 @@ ...@@ -3600,7 +3767,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3627,23 +3794,23 @@ ...@@ -3627,23 +3794,23 @@
"_name": "card", "_name": "card",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 67 "__id__": 70
}, },
"_children": [ "_children": [
{ {
"__id__": 76 "__id__": 79
}, },
{ {
"__id__": 78 "__id__": 81
}, },
{ {
"__id__": 80 "__id__": 83
}, },
{ {
"__id__": 82 "__id__": 85
}, },
{ {
"__id__": 84 "__id__": 87
} }
], ],
"_active": true, "_active": true,
...@@ -3701,13 +3868,13 @@ ...@@ -3701,13 +3868,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3763,7 +3930,7 @@ ...@@ -3763,7 +3930,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 79
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3795,13 +3962,13 @@ ...@@ -3795,13 +3962,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3857,7 +4024,7 @@ ...@@ -3857,7 +4024,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3890,13 +4057,13 @@ ...@@ -3890,13 +4057,13 @@
"_name": "image", "_name": "image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 84
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3952,7 +4119,7 @@ ...@@ -3952,7 +4119,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 80 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3984,13 +4151,13 @@ ...@@ -3984,13 +4151,13 @@
"_name": "image_text_image", "_name": "image_text_image",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 86
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4046,7 +4213,7 @@ ...@@ -4046,7 +4213,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4078,13 +4245,13 @@ ...@@ -4078,13 +4245,13 @@
"_name": "image_text_text", "_name": "image_text_text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 85 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4140,7 +4307,7 @@ ...@@ -4140,7 +4307,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4173,14 +4340,14 @@ ...@@ -4173,14 +4340,14 @@
"_name": "btn_voice", "_name": "btn_voice",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 67 "__id__": 70
}, },
"_children": [ "_children": [
{ {
"__id__": 87 "__id__": 90
}, },
{ {
"__id__": 89 "__id__": 92
} }
], ],
"_active": true, "_active": true,
...@@ -4238,13 +4405,13 @@ ...@@ -4238,13 +4405,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 86 "__id__": 89
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 91
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4300,7 +4467,7 @@ ...@@ -4300,7 +4467,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4332,14 +4499,14 @@ ...@@ -4332,14 +4499,14 @@
"_name": "ing", "_name": "ing",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 86 "__id__": 89
}, },
"_children": [ "_children": [
{ {
"__id__": 90 "__id__": 93
}, },
{ {
"__id__": 98 "__id__": 101
} }
], ],
"_active": false, "_active": false,
...@@ -4397,23 +4564,23 @@ ...@@ -4397,23 +4564,23 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 89 "__id__": 92
}, },
"_children": [ "_children": [
{ {
"__id__": 91 "__id__": 94
}, },
{ {
"__id__": 93 "__id__": 96
}, },
{ {
"__id__": 95 "__id__": 98
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 97 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4469,13 +4636,13 @@ ...@@ -4469,13 +4636,13 @@
"_name": "fanka_img_circle1", "_name": "fanka_img_circle1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 93
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4531,7 +4698,7 @@ ...@@ -4531,7 +4698,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4563,13 +4730,13 @@ ...@@ -4563,13 +4730,13 @@
"_name": "fanka_img_circle2", "_name": "fanka_img_circle2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 93
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4625,7 +4792,7 @@ ...@@ -4625,7 +4792,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4657,13 +4824,13 @@ ...@@ -4657,13 +4824,13 @@
"_name": "fanka_img_circle3", "_name": "fanka_img_circle3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 93
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4719,7 +4886,7 @@ ...@@ -4719,7 +4886,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4751,18 +4918,18 @@ ...@@ -4751,18 +4918,18 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 90 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"imgList": [ "imgList": [
{ {
"__id__": 91 "__id__": 94
}, },
{ {
"__id__": 93 "__id__": 96
}, },
{ {
"__id__": 95 "__id__": 98
} }
], ],
"_id": "7eC6d9sttNuZu2bSqk1QTx" "_id": "7eC6d9sttNuZu2bSqk1QTx"
...@@ -4772,13 +4939,13 @@ ...@@ -4772,13 +4939,13 @@
"_name": "ing", "_name": "ing",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 89 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4834,7 +5001,7 @@ ...@@ -4834,7 +5001,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4866,7 +5033,7 @@ ...@@ -4866,7 +5033,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 70
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -4898,7 +5065,7 @@ ...@@ -4898,7 +5065,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4929,13 +5096,13 @@ ...@@ -4929,13 +5096,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 103 "__id__": 106
}, },
{ {
"__id__": 105 "__id__": 108
}, },
{ {
"__id__": 107 "__id__": 110
} }
], ],
"_active": true, "_active": true,
...@@ -4993,13 +5160,13 @@ ...@@ -4993,13 +5160,13 @@
"_name": "JJ_Excellent_ske", "_name": "JJ_Excellent_ske",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 102 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5055,7 +5222,7 @@ ...@@ -5055,7 +5222,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5095,13 +5262,13 @@ ...@@ -5095,13 +5262,13 @@
"_name": "JJ_Good_ske", "_name": "JJ_Good_ske",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 102 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5134,8 +5301,8 @@ ...@@ -5134,8 +5301,8 @@
0, 0,
0, 0,
1, 1,
1, 1.5,
1, 1.5,
1 1
] ]
}, },
...@@ -5157,7 +5324,7 @@ ...@@ -5157,7 +5324,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5197,13 +5364,13 @@ ...@@ -5197,13 +5364,13 @@
"_name": "JJ_Tryagain_ske", "_name": "JJ_Tryagain_ske",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 102 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5236,8 +5403,8 @@ ...@@ -5236,8 +5403,8 @@
0, 0,
0, 0,
1, 1,
1, 2,
1, 2,
1 1
] ]
}, },
...@@ -5259,7 +5426,7 @@ ...@@ -5259,7 +5426,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5303,22 +5470,22 @@ ...@@ -5303,22 +5470,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 110 "__id__": 113
}, },
{ {
"__id__": 112 "__id__": 115
}, },
{ {
"__id__": 114 "__id__": 117
}, },
{ {
"__id__": 116 "__id__": 119
}, },
{ {
"__id__": 118 "__id__": 121
}, },
{ {
"__id__": 120 "__id__": 123
} }
], ],
"_active": false, "_active": false,
...@@ -5376,13 +5543,13 @@ ...@@ -5376,13 +5543,13 @@
"_name": "point_orange_normal", "_name": "point_orange_normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 112
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 114
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5438,7 +5605,7 @@ ...@@ -5438,7 +5605,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5470,13 +5637,13 @@ ...@@ -5470,13 +5637,13 @@
"_name": "point_orange_right", "_name": "point_orange_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 112
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 116
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5532,7 +5699,7 @@ ...@@ -5532,7 +5699,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5564,13 +5731,13 @@ ...@@ -5564,13 +5731,13 @@
"_name": "point_orange_select_normal", "_name": "point_orange_select_normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 112
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 118
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5626,7 +5793,7 @@ ...@@ -5626,7 +5793,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 117
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5658,13 +5825,13 @@ ...@@ -5658,13 +5825,13 @@
"_name": "point_orange_select_right", "_name": "point_orange_select_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 112
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5720,7 +5887,7 @@ ...@@ -5720,7 +5887,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5752,13 +5919,13 @@ ...@@ -5752,13 +5919,13 @@
"_name": "point_orange_wrong", "_name": "point_orange_wrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 112
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 122
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5814,7 +5981,7 @@ ...@@ -5814,7 +5981,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5846,13 +6013,13 @@ ...@@ -5846,13 +6013,13 @@
"_name": "point_orange_select_wrong", "_name": "point_orange_select_wrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 112
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 124
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5908,7 +6075,7 @@ ...@@ -5908,7 +6075,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5944,16 +6111,16 @@ ...@@ -5944,16 +6111,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 123 "__id__": 126
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 125 "__id__": 128
}, },
{ {
"__id__": 126 "__id__": 129
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6009,13 +6176,13 @@ ...@@ -6009,13 +6176,13 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 125
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 127
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6071,7 +6238,7 @@ ...@@ -6071,7 +6238,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6104,7 +6271,7 @@ ...@@ -6104,7 +6271,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 125
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6136,7 +6303,7 @@ ...@@ -6136,7 +6303,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 125
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -6174,7 +6341,7 @@ ...@@ -6174,7 +6341,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 131
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6230,7 +6397,7 @@ ...@@ -6230,7 +6397,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 130
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6268,7 +6435,7 @@ ...@@ -6268,7 +6435,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6324,7 +6491,7 @@ ...@@ -6324,7 +6491,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6359,14 +6526,14 @@ ...@@ -6359,14 +6526,14 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 132
},
{ {
"__id__": 135 "__id__": 135
}, },
{ {
"__id__": 138 "__id__": 138
},
{
"__id__": 141
} }
], ],
"_active": false, "_active": false,
...@@ -6424,11 +6591,11 @@ ...@@ -6424,11 +6591,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 131 "__id__": 134
}, },
"_children": [ "_children": [
{ {
"__id__": 133 "__id__": 136
} }
], ],
"_active": true, "_active": true,
...@@ -6486,13 +6653,13 @@ ...@@ -6486,13 +6653,13 @@
"_name": "BRLNSDB", "_name": "BRLNSDB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 132 "__id__": 135
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 137
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6548,7 +6715,7 @@ ...@@ -6548,7 +6715,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -6579,11 +6746,11 @@ ...@@ -6579,11 +6746,11 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 131 "__id__": 134
}, },
"_children": [ "_children": [
{ {
"__id__": 136 "__id__": 139
} }
], ],
"_active": true, "_active": true,
...@@ -6641,13 +6808,13 @@ ...@@ -6641,13 +6808,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 135 "__id__": 138
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6703,7 +6870,7 @@ ...@@ -6703,7 +6870,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 136 "__id__": 139
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -6731,53 +6898,53 @@ ...@@ -6731,53 +6898,53 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 131 "__id__": 134
}, },
"_children": [ "_children": [
{ {
"__id__": 139 "__id__": 142
}, },
{ {
"__id__": 141 "__id__": 144
}, },
{ {
"__id__": 143 "__id__": 146
}, },
{ {
"__id__": 145 "__id__": 148
}, },
{ {
"__id__": 147 "__id__": 150
}, },
{ {
"__id__": 149 "__id__": 152
}, },
{ {
"__id__": 151 "__id__": 154
}, },
{ {
"__id__": 153 "__id__": 156
}, },
{ {
"__id__": 155 "__id__": 158
}, },
{ {
"__id__": 157 "__id__": 160
}, },
{ {
"__id__": 159 "__id__": 162
}, },
{ {
"__id__": 161 "__id__": 164
}, },
{ {
"__id__": 163 "__id__": 166
}, },
{ {
"__id__": 165 "__id__": 168
}, },
{ {
"__id__": 167 "__id__": 170
} }
], ],
"_active": true, "_active": true,
...@@ -6835,13 +7002,13 @@ ...@@ -6835,13 +7002,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 140 "__id__": 143
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6897,7 +7064,7 @@ ...@@ -6897,7 +7064,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 139 "__id__": 142
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6916,13 +7083,13 @@ ...@@ -6916,13 +7083,13 @@
"_name": "tip", "_name": "tip",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6978,7 +7145,7 @@ ...@@ -6978,7 +7145,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6997,13 +7164,13 @@ ...@@ -6997,13 +7164,13 @@
"_name": "tosmall", "_name": "tosmall",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 144 "__id__": 147
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7059,7 +7226,7 @@ ...@@ -7059,7 +7226,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 143 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7078,13 +7245,13 @@ ...@@ -7078,13 +7245,13 @@
"_name": "pagenext", "_name": "pagenext",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 146 "__id__": 149
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7140,7 +7307,7 @@ ...@@ -7140,7 +7307,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 145 "__id__": 148
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7159,13 +7326,13 @@ ...@@ -7159,13 +7326,13 @@
"_name": "arrow", "_name": "arrow",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 151
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7221,7 +7388,7 @@ ...@@ -7221,7 +7388,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7240,13 +7407,13 @@ ...@@ -7240,13 +7407,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 150 "__id__": 153
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7302,7 +7469,7 @@ ...@@ -7302,7 +7469,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 149 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7321,13 +7488,13 @@ ...@@ -7321,13 +7488,13 @@
"_name": "touch_voice", "_name": "touch_voice",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 152 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7383,7 +7550,7 @@ ...@@ -7383,7 +7550,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7402,13 +7569,13 @@ ...@@ -7402,13 +7569,13 @@
"_name": "end", "_name": "end",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 154 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7464,7 +7631,7 @@ ...@@ -7464,7 +7631,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7483,13 +7650,13 @@ ...@@ -7483,13 +7650,13 @@
"_name": "fanka", "_name": "fanka",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 156 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7545,7 +7712,7 @@ ...@@ -7545,7 +7712,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 155 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7564,13 +7731,13 @@ ...@@ -7564,13 +7731,13 @@
"_name": "try", "_name": "try",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 158 "__id__": 161
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7626,7 +7793,7 @@ ...@@ -7626,7 +7793,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7645,13 +7812,13 @@ ...@@ -7645,13 +7812,13 @@
"_name": "wait", "_name": "wait",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 160 "__id__": 163
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7707,7 +7874,7 @@ ...@@ -7707,7 +7874,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7726,13 +7893,13 @@ ...@@ -7726,13 +7893,13 @@
"_name": "excellent", "_name": "excellent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 162 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7788,7 +7955,7 @@ ...@@ -7788,7 +7955,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 161 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7807,13 +7974,13 @@ ...@@ -7807,13 +7974,13 @@
"_name": "good", "_name": "good",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 164 "__id__": 167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7869,7 +8036,7 @@ ...@@ -7869,7 +8036,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 163 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7888,13 +8055,13 @@ ...@@ -7888,13 +8055,13 @@
"_name": "record_wrong", "_name": "record_wrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 169
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7950,7 +8117,7 @@ ...@@ -7950,7 +8117,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -7969,13 +8136,13 @@ ...@@ -7969,13 +8136,13 @@
"_name": "record_right", "_name": "record_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8031,7 +8198,7 @@ ...@@ -8031,7 +8198,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 167 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -8098,40 +8265,40 @@ ...@@ -8098,40 +8265,40 @@
}, },
"_enabled": true, "_enabled": true,
"label_round": { "label_round": {
"__id__": 24 "__id__": 27
}, },
"layout_item": { "layout_item": {
"__id__": 16 "__id__": 16
}, },
"layer_item": { "layer_item": {
"__id__": 29 "__id__": 32
}, },
"layer_item_little": { "layer_item_little": {
"__id__": 48 "__id__": 51
}, },
"label_title": { "label_title": {
"__id__": 23 "__id__": 26
}, },
"layer_touch": { "layer_touch": {
"__id__": 12 "__id__": 12
}, },
"btn_last": { "btn_last": {
"__id__": 52 "__id__": 55
}, },
"btn_next": { "btn_next": {
"__id__": 59 "__id__": 62
}, },
"gou_node": { "gou_node": {
"__id__": 18 "__id__": 18
}, },
"btn_start": { "btn_start": {
"__id__": 42 "__id__": 45
}, },
"layout_record": { "layout_record": {
"__id__": 67 "__id__": 70
}, },
"btn_close": { "btn_close": {
"__id__": 72 "__id__": 75
}, },
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "eaTVUpqahPfZeO9+sUI7RP"
}, },
...@@ -8143,9 +8310,6 @@ ...@@ -8143,9 +8310,6 @@
"__id__": 1 "__id__": 1
}, },
"_children": [ "_children": [
{
"__id__": 173
},
{ {
"__id__": 176 "__id__": 176
}, },
...@@ -8166,12 +8330,15 @@ ...@@ -8166,12 +8330,15 @@
}, },
{ {
"__id__": 194 "__id__": 194
},
{
"__id__": 197
} }
], ],
"_active": false, "_active": false,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 197 "__id__": 200
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8225,17 +8392,17 @@ ...@@ -8225,17 +8392,17 @@
"_name": "sahua", "_name": "sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 174 "__id__": 177
} }
], ],
"_prefab": { "_prefab": {
"__id__": 175 "__id__": 178
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8289,7 +8456,7 @@ ...@@ -8289,7 +8456,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 173 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8319,7 +8486,7 @@ ...@@ -8319,7 +8486,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
...@@ -8332,17 +8499,17 @@ ...@@ -8332,17 +8499,17 @@
"_name": "sahua", "_name": "sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 177 "__id__": 180
} }
], ],
"_prefab": { "_prefab": {
"__id__": 178 "__id__": 181
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8396,7 +8563,7 @@ ...@@ -8396,7 +8563,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 176 "__id__": 179
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8426,7 +8593,7 @@ ...@@ -8426,7 +8593,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
...@@ -8439,17 +8606,17 @@ ...@@ -8439,17 +8606,17 @@
"_name": "sahua", "_name": "sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 180 "__id__": 183
} }
], ],
"_prefab": { "_prefab": {
"__id__": 181 "__id__": 184
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8503,7 +8670,7 @@ ...@@ -8503,7 +8670,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 179 "__id__": 182
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8533,7 +8700,7 @@ ...@@ -8533,7 +8700,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
...@@ -8546,17 +8713,17 @@ ...@@ -8546,17 +8713,17 @@
"_name": "sahua", "_name": "sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 183 "__id__": 186
} }
], ],
"_prefab": { "_prefab": {
"__id__": 184 "__id__": 187
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8610,7 +8777,7 @@ ...@@ -8610,7 +8777,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 182 "__id__": 185
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8640,7 +8807,7 @@ ...@@ -8640,7 +8807,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
...@@ -8653,17 +8820,17 @@ ...@@ -8653,17 +8820,17 @@
"_name": "sahua", "_name": "sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 186 "__id__": 189
} }
], ],
"_prefab": { "_prefab": {
"__id__": 187 "__id__": 190
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8717,7 +8884,7 @@ ...@@ -8717,7 +8884,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 185 "__id__": 188
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8747,7 +8914,7 @@ ...@@ -8747,7 +8914,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
...@@ -8760,17 +8927,17 @@ ...@@ -8760,17 +8927,17 @@
"_name": "sahua", "_name": "sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 189 "__id__": 192
} }
], ],
"_prefab": { "_prefab": {
"__id__": 190 "__id__": 193
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8824,7 +8991,7 @@ ...@@ -8824,7 +8991,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 188 "__id__": 191
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8854,7 +9021,7 @@ ...@@ -8854,7 +9021,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
...@@ -8867,17 +9034,17 @@ ...@@ -8867,17 +9034,17 @@
"_name": "sahua", "_name": "sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 192 "__id__": 195
} }
], ],
"_prefab": { "_prefab": {
"__id__": 193 "__id__": 196
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8931,7 +9098,7 @@ ...@@ -8931,7 +9098,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 191 "__id__": 194
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8961,7 +9128,7 @@ ...@@ -8961,7 +9128,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
...@@ -8974,17 +9141,17 @@ ...@@ -8974,17 +9141,17 @@
"_name": "sahua", "_name": "sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 195 "__id__": 198
} }
], ],
"_prefab": { "_prefab": {
"__id__": 196 "__id__": 199
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -9038,7 +9205,7 @@ ...@@ -9038,7 +9205,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 194 "__id__": 197
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9068,7 +9235,7 @@ ...@@ -9068,7 +9235,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
...@@ -9079,7 +9246,7 @@ ...@@ -9079,7 +9246,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 172 "__id__": 175
}, },
"asset": { "asset": {
"__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d" "__uuid__": "f64b76f1-fff3-40d6-8eb6-07f263db799d"
......
...@@ -126,6 +126,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -126,6 +126,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.count = 0; this.count = 0;
this.touchForbid = true; this.touchForbid = true;
this.voiceTouchForbid = true; this.voiceTouchForbid = true;
this.gou_node.orgPos = cc.v2(this.gou_node)
let currentLayer = this.createLayer(); let currentLayer = this.createLayer();
this.updateLayer(currentLayer, this.CurrentData, this.count) this.updateLayer(currentLayer, this.CurrentData, this.count)
this.layers.push(currentLayer) this.layers.push(currentLayer)
...@@ -426,6 +427,11 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -426,6 +427,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
gameOver() { gameOver() {
if (!this.showFires) this.showFires = {};
if (!this.showFires[`${this.count}`]) {
this.showFires[`${this.count}`] = true;
hw.util.playEndTrebleFirework();
}
this.sendData().then(() => { this.sendData().then(() => {
if (!cc.find('middleLayer')) return; if (!cc.find('middleLayer')) return;
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
...@@ -550,14 +556,39 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -550,14 +556,39 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.currentDt = data; this.currentDt = data;
this.touchForbid = true; this.touchForbid = true;
// 移动钩子过来 然后弹出面板
cc.tween(this.gou_node) cc.tween(this.gou_node)
.to(1, { x: item.x }) // 移动钩子
.to(0.5, { y: item.y }) .to(0.5, { x: item.x })
// 下钩
.to(0.5, { y: item.y + item.height / 2 })
// 播放钩子动画
.call(() => {
pg.view.visible(pg.view.find(this.gou_node, 'img'), false);
pg.view.visible(pg.view.find(this.gou_node, 'ani'), true);
let ani = pg.view.playDBAnimation(pg.view.find(this.gou_node, 'ani'), 'newAnimation', 1);
ani.timeScale = 1;
})
// 等待动画
.delay(1)
// 获取图片坐标后隐藏
.call(() => { .call(() => {
let ani = pg.view.playDBAnimation(pg.view.find(this.gou_node, 'ani'), 'newAnimation', 1);
ani.timeScale = -1;
this.touchForbid = false; this.touchForbid = false;
// showRecord 传递坐标 执行内部动画效果
this.showRecord(item); this.showRecord(item);
}) })
.delay(1)
.call(() => {
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);
})
// 钩子移动回去
.to(0.5, { y: this.gou_node.orgPos.y })
.to(0.5, { x: this.gou_node.orgPos.x })
.start(); .start();
} }
...@@ -566,14 +597,31 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -566,14 +597,31 @@ export default class SceneComponent extends MyCocosSceneComponent {
@property(cc.Node) @property(cc.Node)
private btn_close: cc.Node = null; private btn_close: cc.Node = null;
showRecord(item) { showRecord(item) {
item.active = false;
this.layout_record.active = true; this.layout_record.active = true;
// 卡片显示 // 卡片显示
let bg = pg.view.find(this.layout_record, 'bg')
bg.opacity = 0;
cc.tween(bg).to(0.5, { opacity: 155 }).start();
let card = pg.view.find(this.layout_record, 'card') let card = pg.view.find(this.layout_record, 'card')
this.updateCard(card, this.currentDt) 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();
// 音频处理 // 音频处理
let btn_voice = pg.view.find(this.layout_record, 'btn_voice') let btn_voice = pg.view.find(this.layout_record, 'btn_voice')
btn_voice.data = this.currentDt; btn_voice.data = this.currentDt;
// 展示待录音内容 // 展示待录音内容
let normal = pg.view.find(btn_voice, 'normal') let normal = pg.view.find(btn_voice, 'normal')
let ing = pg.view.find(btn_voice, 'ing') let ing = pg.view.find(btn_voice, 'ing')
...@@ -610,6 +658,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -610,6 +658,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
onTouchRecordClose() { onTouchRecordClose() {
this.layout_record.active = false; this.layout_record.active = false;
this.currentItem.active = true;
} }
// current 和 currentCard // current 和 currentCard
btn_voice_time_id: any; btn_voice_time_id: any;
...@@ -675,15 +724,12 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -675,15 +724,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
} }
recordExcellent() { recordExcellent() {
if (!this.showFires) this.showFires = {}; this.currentItem.parent = null;
if (!this.showFires[`${this.count}`]) { this.currentItem = null;
this.showFires[`${this.count}`] = true;
hw.util.playEndTrebleFirework();
}
this.onTouchRecordClose(); this.onTouchRecordClose();
} }
recordTryAgain() { recordTryAgain() {
// this.onTouchRecordClose();
} }
private currentPlayAudioId: any; private currentPlayAudioId: any;
......
...@@ -533,7 +533,7 @@ let pg = { ...@@ -533,7 +533,7 @@ let pg = {
}); });
return skl; return skl;
}, },
playDBAnimation(item, aniName, loop = -1) { playDBAnimation(item, aniName, loop = -1): dragonBones.ArmatureDisplay {
if (!item || !cc.isValid(item)) return pg.logger.w("动画播放失败,传入了错误的item"); if (!item || !cc.isValid(item)) return pg.logger.w("动画播放失败,传入了错误的item");
if (!aniName) return pg.logger.w("动画播放失败,传入了错误的aniName"); if (!aniName) return pg.logger.w("动画播放失败,传入了错误的aniName");
let node = item.node ? item.node : item; let node = item.node ? item.node : item;
......
{
"ver": "1.1.2",
"uuid": "39d66892-a12d-4c81-86ca-464ae43979c3",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{"frameRate":24,"name":"zhua_zi","version":"5.5","compatibleVersion":"5.5","armature":[{"type":"Armature","frameRate":24,"name":"Armature","aabb":{"x":-101,"y":-0.45,"width":202,"height":228},"bone":[{"name":"root"},{"length":86,"name":"爪子","parent":"root","transform":{"x":0.25,"skX":89.8008,"skY":89.8008}},{"length":91,"name":"左指_1","parent":"爪子","transform":{"x":87.098,"y":8.9676,"skX":48.0202,"skY":48.0202}},{"length":80,"name":"中指_1","parent":"爪子","transform":{"x":85.7505,"y":-0.0019,"skX":0.5887,"skY":0.5887}},{"length":91,"name":"右指_1","parent":"爪子","transform":{"x":86.6289,"y":-8.1489,"skX":-47.3328,"skY":-47.3328}},{"length":84,"name":"左指_2","parent":"左指_1","transform":{"x":92.2204,"y":0.0673,"skX":-83.138,"skY":-83.138}},{"length":84,"name":"右指_2","parent":"右指_1","transform":{"x":91.5721,"y":1.1828,"skX":80.0058,"skY":80.0058}},{"length":50,"name":"中指_2","parent":"中指_1","transform":{"x":80.9019,"skX":-0.6746,"skY":-0.6746}}],"slot":[{"name":"图层_4","parent":"右指_2"},{"name":"图层_5","parent":"左指_2"},{"name":"图层_3","parent":"中指_2"},{"name":"图层_7","parent":"右指_1"},{"name":"图层_6","parent":"左指_1"},{"name":"爪子_拷贝","parent":"中指_1"}],"skin":[{"slot":[{"name":"图层_4","display":[{"name":"zhuazi/图层_4","transform":{"x":33.82,"y":-3.21,"skX":-122.47,"skY":-122.47}}]},{"name":"图层_5","display":[{"name":"zhuazi/图层_5","transform":{"x":32.6,"y":2.51,"skX":-54.68,"skY":-54.68}}]},{"name":"图层_3","display":[{"name":"zhuazi/图层_3","transform":{"x":25.4,"y":0.13,"skX":-89.71,"skY":-89.71}}]},{"name":"图层_7","display":[{"type":"mesh","name":"zhuazi/图层_7","width":93,"height":87,"vertices":[16.78,-24.91,100.83,-26.54,122.07,-3.34,93.38,22.78,23.66,26.88,-5.27,-4.73,32.76,-25.22,37.82,26.05,52.5,25.19,53.22,-25.62],"uvs":[0.32151,0,1,0.63851,1,1,0.5828,0.99885,0,0.49253,0,0,0.45045,0.12135,0.11837,0.59537,0.24112,0.70201,0.61561,0.27677],"triangles":[9,3,1,1,3,2,6,7,9,7,8,9,8,3,9,0,4,6,4,7,6,5,4,0],"edges":[1,2,2,3,4,5,5,0,0,6,7,4,3,8,8,7,6,9,9,1],"userEdges":[]}]},{"name":"图层_6","display":[{"type":"mesh","name":"zhuazi/图层_6","width":92,"height":86,"vertices":[17.73,24.94,102.03,25.28,121.94,3.31,95.6,-20.56,23.92,-25.53,-3.98,5.27,51.9,-23.58,53.03,25.08,37.44,25.02,38.19,-24.54],"uvs":[0.68152,0,0,0.65523,0,1,0.38641,1,1,0.48314,1,0,0.76046,0.68492,0.39615,0.27437,0.52218,0.15319,0.8778,0.58608],"triangles":[8,9,4,0,8,4,0,4,5,8,7,6,8,6,9,7,3,6,7,1,3,1,2,3],"edges":[1,2,2,3,4,5,5,0,3,6,7,1,0,8,8,7,6,9,9,4],"userEdges":[]}]},{"name":"爪子_拷贝","display":[{"name":"zhuazi/爪子_拷贝","transform":{"x":-0.2,"y":0.05,"skX":-90.39,"skY":-90.39}}]}]}],"animation":[{"duration":16,"playTimes":0,"name":"newAnimation","bone":[{"name":"左指_1","translateFrame":[{"duration":12,"tweenEasing":0},{"duration":4,"x":20,"y":70}],"rotateFrame":[{"duration":12,"tweenEasing":0},{"duration":4,"rotate":30}]},{"name":"右指_1","translateFrame":[{"duration":12,"tweenEasing":0},{"duration":4,"x":20,"y":-70}],"rotateFrame":[{"duration":12,"tweenEasing":0},{"duration":4,"rotate":-30}]},{"name":"右指_2","rotateFrame":[{"duration":12,"tweenEasing":0},{"duration":4,"curve":[0,0,0.6926829268292684,0.5564271588661833],"rotate":-20},{"duration":0,"rotate":20}]},{"name":"左指_2","rotateFrame":[{"duration":12,"tweenEasing":0},{"duration":4,"curve":[0,0,1,0.4208965062623602],"rotate":20},{"duration":0,"rotate":-20}]}],"ffd":[{"name":"zhuazi/图层_7","slot":"图层_7","frame":[{"duration":12,"tweenEasing":0},{"duration":4,"vertices":[-90.42,3.51,0,0,0,0,0,0,-96.66,2.22,-86.61,3.38]}]},{"name":"zhuazi/图层_6","slot":"图层_6","frame":[{"duration":12,"tweenEasing":0},{"duration":4,"vertices":[-123.19,-9.14,0,0,0,0,0,0,-119.71,-0.42,-95.81,-7.07]}]}]}],"defaultActions":[{"gotoAndPlay":"newAnimation"}]}]}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "5ea62525-dedc-4341-bcd3-40e236741149",
"subMetas": {}
}
\ No newline at end of file
{"name":"zhua_zi","SubTexture":[{"name":"zhuazi/图层_4","x":164,"height":96,"y":90,"width":82},{"name":"zhuazi/图层_5","x":248,"height":95,"y":90,"width":82},{"name":"zhuazi/图层_3","x":1,"height":67,"y":175,"width":32},{"name":"zhuazi/图层_7","x":70,"height":87,"y":1,"width":93},{"name":"zhuazi/图层_6","x":70,"height":86,"y":90,"width":92},{"name":"zhuazi/爪子_拷贝","x":1,"height":172,"y":1,"width":67}],"imagePath":"zhua_zi_tex.png","height":256,"width":512}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "5ccd4b2c-5401-4873-9ab8-5cfddbb70a71",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "394ad3bb-1c53-4300-b0b2-ac981224ff61",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 512,
"height": 256,
"platformSettings": {},
"subMetas": {
"zhua_zi_tex": {
"ver": "1.0.4",
"uuid": "3d566e31-773c-4ad7-a0af-4a2e2d7dd4b3",
"rawTextureUuid": "394ad3bb-1c53-4300-b0b2-ac981224ff61",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -90.5,
"offsetY": 6.5,
"trimX": 1,
"trimY": 1,
"width": 329,
"height": 241,
"rawWidth": 512,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
...@@ -172,13 +172,22 @@ ...@@ -172,13 +172,22 @@
<input type="text" class="input-place-red" nz-input [(ngModel)]="option.text" placeholder="" <input type="text" class="input-place-red" nz-input [(ngModel)]="option.text" placeholder=""
(blur)="save()"> (blur)="save()">
</div> </div>
<div *ngIf="option.type=='img'" class=" option-text">
<div class="word-input-title">
<span style="color:red;margin-left:-15px">* </span>
<span>录音文本: </span>
</div>
<input type="text" class="input-place-red" nz-input [(ngModel)]="option.text" placeholder=""
(blur)="save()">
</div>
</div> </div>
<div style="display: block;"> <div style="display: block;">
<div> <div>
<button class="btn-red" nz-button nzType="default" nzDanger (click)="removeoption(i,j)">减少选项</button> <button class="btn-red" nz-button nzType="default" nzDanger
(click)="removeoption(i,j)">减少选项</button>
</div> </div>
<button class="btn-blue" style="margin-top: 10px;" nz-button nzType="default" nzDanger <button class="btn-blue" style="margin-top: 10px;" nz-button nzType="default" nzDanger
(click)="copyoption(i,j)">复制选项</button> (click)="copyoption(i,j)">复制选项</button>
......
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