Commit 421622c6 authored by Tt's avatar Tt

Merge branch 'master' of http://120.27.1.210:43210/root/ngt10_tydh into master

# Conflicts:
#	assets/ngt10_tydh/textures/record_count.png
#	assets/ngt10_tydh/textures/record_count.png.meta
parents 565b96a7 9940b93f
...@@ -78,58 +78,58 @@ ...@@ -78,58 +78,58 @@
"__id__": 32 "__id__": 32
}, },
{ {
"__id__": 34 "__id__": 35
}, },
{ {
"__id__": 36 "__id__": 37
}, },
{ {
"__id__": 38 "__id__": 39
}, },
{ {
"__id__": 47 "__id__": 48
}, },
{ {
"__id__": 60 "__id__": 63
}, },
{ {
"__id__": 116 "__id__": 119
}, },
{ {
"__id__": 123 "__id__": 126
}, },
{ {
"__id__": 124 "__id__": 127
}, },
{ {
"__id__": 126 "__id__": 129
}, },
{ {
"__id__": 128 "__id__": 131
}, },
{ {
"__id__": 146 "__id__": 149
}, },
{ {
"__id__": 160 "__id__": 151
}, },
{ {
"__id__": 168 "__id__": 153
}, },
{ {
"__id__": 170 "__id__": 167
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 172 "__id__": 175
}, },
{ {
"__id__": 173 "__id__": 176
}, },
{ {
"__id__": 174 "__id__": 177
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1491,6 +1491,9 @@ ...@@ -1491,6 +1491,9 @@
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 33
},
{
"__id__": 34
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1573,6 +1576,33 @@ ...@@ -1573,6 +1576,33 @@
"_atlas": null, "_atlas": null,
"_id": "98soTy+7tIzY5i5+ugm1o/" "_id": "98soTy+7tIzY5i5+ugm1o/"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1920,
"_originalHeight": 1080,
"_id": "baaaGVP1pF5YuS3QN3yrY7"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_zhazhiji", "_name": "img_zhazhiji",
...@@ -1584,7 +1614,7 @@ ...@@ -1584,7 +1614,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 36
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1640,7 +1670,7 @@ ...@@ -1640,7 +1670,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 35
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1678,7 +1708,7 @@ ...@@ -1678,7 +1708,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 38
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1734,7 +1764,7 @@ ...@@ -1734,7 +1764,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1770,16 +1800,16 @@ ...@@ -1770,16 +1800,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 39 "__id__": 40
}, },
{ {
"__id__": 41 "__id__": 42
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1835,13 +1865,13 @@ ...@@ -1835,13 +1865,13 @@
"_name": "voice_normal", "_name": "voice_normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 38 "__id__": 39
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1856,7 +1886,7 @@ ...@@ -1856,7 +1886,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 223, "width": 223,
"height": 140 "height": 136
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1897,7 +1927,7 @@ ...@@ -1897,7 +1927,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1929,20 +1959,20 @@ ...@@ -1929,20 +1959,20 @@
"_name": "img_voice", "_name": "img_voice",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 38 "__id__": 39
}, },
"_children": [ "_children": [
{ {
"__id__": 42 "__id__": 43
}, },
{ {
"__id__": 43 "__id__": 44
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1998,7 +2028,7 @@ ...@@ -1998,7 +2028,7 @@
"_name": "btn_voice2", "_name": "btn_voice2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 41 "__id__": 42
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -2056,13 +2086,13 @@ ...@@ -2056,13 +2086,13 @@
"_name": "btn_voice3", "_name": "btn_voice3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 41 "__id__": 42
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2118,7 +2148,7 @@ ...@@ -2118,7 +2148,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2150,7 +2180,7 @@ ...@@ -2150,7 +2180,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 41 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2182,7 +2212,7 @@ ...@@ -2182,7 +2212,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2254,19 +2284,19 @@ ...@@ -2254,19 +2284,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 48 "__id__": 49
}, },
{ {
"__id__": 50 "__id__": 51
}, },
{ {
"__id__": 55 "__id__": 58
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2322,13 +2352,13 @@ ...@@ -2322,13 +2352,13 @@
"_name": "record_normal", "_name": "record_normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 48
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2343,7 +2373,7 @@ ...@@ -2343,7 +2373,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 223, "width": 223,
"height": 140 "height": 136
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2384,7 +2414,7 @@ ...@@ -2384,7 +2414,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 48 "__id__": 49
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2416,14 +2446,17 @@ ...@@ -2416,14 +2446,17 @@
"_name": "img_record", "_name": "img_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 48
}, },
"_children": [ "_children": [
{ {
"__id__": 51 "__id__": 52
}, },
{ {
"__id__": 53 "__id__": 54
},
{
"__id__": 56
} }
], ],
"_active": false, "_active": false,
...@@ -2481,13 +2514,13 @@ ...@@ -2481,13 +2514,13 @@
"_name": "btn_record2", "_name": "btn_record2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2501,8 +2534,8 @@ ...@@ -2501,8 +2534,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 221, "width": 226,
"height": 140 "height": 163
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2543,7 +2576,7 @@ ...@@ -2543,7 +2576,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2557,7 +2590,7 @@ ...@@ -2557,7 +2590,7 @@
"__uuid__": "c5cd0c47-6e2e-4de4-8683-520b6b0b0c1d" "__uuid__": "c5cd0c47-6e2e-4de4-8683-520b6b0b0c1d"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 2,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2566,7 +2599,7 @@ ...@@ -2566,7 +2599,7 @@
}, },
"_fillStart": 0, "_fillStart": 0,
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": false,
"_atlas": null, "_atlas": null,
"_id": "f2G/jY9rhFybQcSzDE0Hyx" "_id": "f2G/jY9rhFybQcSzDE0Hyx"
}, },
...@@ -2575,13 +2608,13 @@ ...@@ -2575,13 +2608,13 @@
"_name": "btn_record3", "_name": "btn_record3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2595,8 +2628,8 @@ ...@@ -2595,8 +2628,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 221, "width": 226,
"height": 140 "height": 163
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2637,7 +2670,7 @@ ...@@ -2637,7 +2670,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2651,7 +2684,7 @@ ...@@ -2651,7 +2684,7 @@
"__uuid__": "0eb9cfa9-359e-4785-863b-981327e57277" "__uuid__": "0eb9cfa9-359e-4785-863b-981327e57277"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 2,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2660,26 +2693,120 @@ ...@@ -2660,26 +2693,120 @@
}, },
"_fillStart": 0, "_fillStart": 0,
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": false,
"_atlas": null, "_atlas": null,
"_id": "d8FJ6XkkFDSrJ/VAbVYxnx" "_id": "d8FJ6XkkFDSrJ/VAbVYxnx"
}, },
{
"__type__": "cc.Node",
"_name": "record_count",
"_objFlags": 0,
"_parent": {
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 57
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 136,
"height": 136
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
41.683,
-11.142,
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": "49670g7+xJbISbxKQmurVl"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "4ef5ee81-79ff-49da-b215-bdddf5ea6b80"
},
"_type": 3,
"_sizeMode": 1,
"_fillType": 2,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_fillStart": 0.25,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d1sfFluJ5CZZDntx9UMm18"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "tip_bg", "_name": "tip_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 47 "__id__": 48
}, },
"_children": [ "_children": [
{ {
"__id__": 56 "__id__": 59
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2735,13 +2862,13 @@ ...@@ -2735,13 +2862,13 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 58
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2797,7 +2924,7 @@ ...@@ -2797,7 +2924,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2830,7 +2957,7 @@ ...@@ -2830,7 +2957,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 55 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2862,7 +2989,7 @@ ...@@ -2862,7 +2989,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2934,38 +3061,38 @@ ...@@ -2934,38 +3061,38 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 61 "__id__": 64
}, },
{ {
"__id__": 83 "__id__": 86
}, },
{ {
"__id__": 89 "__id__": 92
}, },
{ {
"__id__": 91 "__id__": 94
}, },
{ {
"__id__": 95 "__id__": 98
}, },
{ {
"__id__": 99 "__id__": 102
}, },
{ {
"__id__": 104 "__id__": 107
}, },
{ {
"__id__": 109 "__id__": 112
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 117
} }
], ],
"_prefab": { "_prefab": {
"__id__": 115 "__id__": 118
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3019,29 +3146,29 @@ ...@@ -3019,29 +3146,29 @@
"_name": "machine", "_name": "machine",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 63
}, },
"_children": [ "_children": [
{ {
"__id__": 62 "__id__": 65
}, },
{ {
"__id__": 66 "__id__": 69
}, },
{ {
"__id__": 70 "__id__": 73
}, },
{ {
"__id__": 74 "__id__": 77
}, },
{ {
"__id__": 78 "__id__": 81
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 82 "__id__": 85
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3095,20 +3222,20 @@ ...@@ -3095,20 +3222,20 @@
"_name": "bottom", "_name": "bottom",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 66
}, },
{ {
"__id__": 64 "__id__": 67
} }
], ],
"_prefab": { "_prefab": {
"__id__": 65 "__id__": 68
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3162,7 +3289,7 @@ ...@@ -3162,7 +3289,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -3187,7 +3314,7 @@ ...@@ -3187,7 +3314,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -3211,7 +3338,7 @@ ...@@ -3211,7 +3338,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -3224,20 +3351,20 @@ ...@@ -3224,20 +3351,20 @@
"_name": "left", "_name": "left",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 70
}, },
{ {
"__id__": 68 "__id__": 71
} }
], ],
"_prefab": { "_prefab": {
"__id__": 69 "__id__": 72
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3291,7 +3418,7 @@ ...@@ -3291,7 +3418,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -3316,7 +3443,7 @@ ...@@ -3316,7 +3443,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -3340,7 +3467,7 @@ ...@@ -3340,7 +3467,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -3353,20 +3480,20 @@ ...@@ -3353,20 +3480,20 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 74
}, },
{ {
"__id__": 72 "__id__": 75
} }
], ],
"_prefab": { "_prefab": {
"__id__": 73 "__id__": 76
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3420,7 +3547,7 @@ ...@@ -3420,7 +3547,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -3445,7 +3572,7 @@ ...@@ -3445,7 +3572,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -3469,7 +3596,7 @@ ...@@ -3469,7 +3596,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -3482,20 +3609,20 @@ ...@@ -3482,20 +3609,20 @@
"_name": "funnel_right", "_name": "funnel_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 75 "__id__": 78
}, },
{ {
"__id__": 76 "__id__": 79
} }
], ],
"_prefab": { "_prefab": {
"__id__": 77 "__id__": 80
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3549,7 +3676,7 @@ ...@@ -3549,7 +3676,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -3574,7 +3701,7 @@ ...@@ -3574,7 +3701,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -3598,7 +3725,7 @@ ...@@ -3598,7 +3725,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -3611,20 +3738,20 @@ ...@@ -3611,20 +3738,20 @@
"_name": "funnel_left", "_name": "funnel_left",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 82
}, },
{ {
"__id__": 80 "__id__": 83
} }
], ],
"_prefab": { "_prefab": {
"__id__": 81 "__id__": 84
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3678,7 +3805,7 @@ ...@@ -3678,7 +3805,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -3703,7 +3830,7 @@ ...@@ -3703,7 +3830,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -3727,7 +3854,7 @@ ...@@ -3727,7 +3854,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -3738,7 +3865,7 @@ ...@@ -3738,7 +3865,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -3751,17 +3878,17 @@ ...@@ -3751,17 +3878,17 @@
"_name": "shelf", "_name": "shelf",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 63
}, },
"_children": [ "_children": [
{ {
"__id__": 84 "__id__": 87
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 88 "__id__": 91
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3815,20 +3942,20 @@ ...@@ -3815,20 +3942,20 @@
"_name": "bottom", "_name": "bottom",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 83 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 85 "__id__": 88
}, },
{ {
"__id__": 86 "__id__": 89
} }
], ],
"_prefab": { "_prefab": {
"__id__": 87 "__id__": 90
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3882,7 +4009,7 @@ ...@@ -3882,7 +4009,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -3907,7 +4034,7 @@ ...@@ -3907,7 +4034,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -3931,7 +4058,7 @@ ...@@ -3931,7 +4058,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -3942,7 +4069,7 @@ ...@@ -3942,7 +4069,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -3955,13 +4082,13 @@ ...@@ -3955,13 +4082,13 @@
"_name": "layout_item", "_name": "layout_item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 90 "__id__": 93
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4013,7 +4140,7 @@ ...@@ -4013,7 +4140,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -4026,20 +4153,20 @@ ...@@ -4026,20 +4153,20 @@
"_name": "lid", "_name": "lid",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 95
}, },
{ {
"__id__": 93 "__id__": 96
} }
], ],
"_prefab": { "_prefab": {
"__id__": 94 "__id__": 97
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4093,7 +4220,7 @@ ...@@ -4093,7 +4220,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -4118,7 +4245,7 @@ ...@@ -4118,7 +4245,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -4142,7 +4269,7 @@ ...@@ -4142,7 +4269,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -4155,20 +4282,20 @@ ...@@ -4155,20 +4282,20 @@
"_name": "baffle", "_name": "baffle",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 99
}, },
{ {
"__id__": 97 "__id__": 100
} }
], ],
"_prefab": { "_prefab": {
"__id__": 98 "__id__": 101
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4222,7 +4349,7 @@ ...@@ -4222,7 +4349,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_type": 0, "_type": 0,
...@@ -4247,7 +4374,7 @@ ...@@ -4247,7 +4374,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -4271,7 +4398,7 @@ ...@@ -4271,7 +4398,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -4284,23 +4411,23 @@ ...@@ -4284,23 +4411,23 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 103
}, },
{ {
"__id__": 101 "__id__": 104
}, },
{ {
"__id__": 102 "__id__": 105
} }
], ],
"_prefab": { "_prefab": {
"__id__": 103 "__id__": 106
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4354,7 +4481,7 @@ ...@@ -4354,7 +4481,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4386,7 +4513,7 @@ ...@@ -4386,7 +4513,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_type": 2, "_type": 2,
...@@ -4411,7 +4538,7 @@ ...@@ -4411,7 +4538,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -4431,7 +4558,7 @@ ...@@ -4431,7 +4558,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -4444,23 +4571,23 @@ ...@@ -4444,23 +4571,23 @@
"_name": "item1", "_name": "item1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 108
}, },
{ {
"__id__": 106 "__id__": 109
}, },
{ {
"__id__": 107 "__id__": 110
} }
], ],
"_prefab": { "_prefab": {
"__id__": 108 "__id__": 111
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4514,7 +4641,7 @@ ...@@ -4514,7 +4641,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4546,7 +4673,7 @@ ...@@ -4546,7 +4673,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_type": 2, "_type": 2,
...@@ -4571,7 +4698,7 @@ ...@@ -4571,7 +4698,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -4591,7 +4718,7 @@ ...@@ -4591,7 +4718,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -4604,23 +4731,23 @@ ...@@ -4604,23 +4731,23 @@
"_name": "item2", "_name": "item2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 113
}, },
{ {
"__id__": 111 "__id__": 114
}, },
{ {
"__id__": 112 "__id__": 115
} }
], ],
"_prefab": { "_prefab": {
"__id__": 113 "__id__": 116
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -4674,7 +4801,7 @@ ...@@ -4674,7 +4801,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4706,7 +4833,7 @@ ...@@ -4706,7 +4833,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_type": 2, "_type": 2,
...@@ -4731,7 +4858,7 @@ ...@@ -4731,7 +4858,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -4751,7 +4878,7 @@ ...@@ -4751,7 +4878,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -4764,7 +4891,7 @@ ...@@ -4764,7 +4891,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_id": "78eYCs3VhJSK8BkxkkUZ9z" "_id": "78eYCs3VhJSK8BkxkkUZ9z"
...@@ -4772,7 +4899,7 @@ ...@@ -4772,7 +4899,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 60 "__id__": 63
}, },
"asset": { "asset": {
"__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca" "__uuid__": "d4d4fe2c-8df7-4cf6-8a53-07e045d628ca"
...@@ -4789,13 +4916,13 @@ ...@@ -4789,13 +4916,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 117 "__id__": 120
}, },
{ {
"__id__": 119 "__id__": 122
}, },
{ {
"__id__": 121 "__id__": 124
} }
], ],
"_active": true, "_active": true,
...@@ -4853,13 +4980,13 @@ ...@@ -4853,13 +4980,13 @@
"_name": "bg_enter", "_name": "bg_enter",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 119
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4915,7 +5042,7 @@ ...@@ -4915,7 +5042,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 120
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4947,13 +5074,13 @@ ...@@ -4947,13 +5074,13 @@
"_name": "bg_light", "_name": "bg_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 119
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 120 "__id__": 123
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5009,7 +5136,7 @@ ...@@ -5009,7 +5136,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5041,13 +5168,13 @@ ...@@ -5041,13 +5168,13 @@
"_name": "bg_jia", "_name": "bg_jia",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 119
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 122 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5103,7 +5230,7 @@ ...@@ -5103,7 +5230,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 121 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5199,7 +5326,7 @@ ...@@ -5199,7 +5326,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 125 "__id__": 128
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5255,7 +5382,7 @@ ...@@ -5255,7 +5382,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5296,7 +5423,7 @@ ...@@ -5296,7 +5423,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 127 "__id__": 130
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5352,7 +5479,7 @@ ...@@ -5352,7 +5479,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5391,19 +5518,19 @@ ...@@ -5391,19 +5518,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 129 "__id__": 132
}, },
{ {
"__id__": 132 "__id__": 135
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 144 "__id__": 147
}, },
{ {
"__id__": 145 "__id__": 148
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5459,16 +5586,16 @@ ...@@ -5459,16 +5586,16 @@
"_name": "label_title", "_name": "label_title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 128 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 133
}, },
{ {
"__id__": 131 "__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5524,7 +5651,7 @@ ...@@ -5524,7 +5651,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5559,7 +5686,7 @@ ...@@ -5559,7 +5686,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5586,20 +5713,20 @@ ...@@ -5586,20 +5713,20 @@
"_name": "layout_mouse", "_name": "layout_mouse",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 128 "__id__": 131
}, },
"_children": [ "_children": [
{ {
"__id__": 133 "__id__": 136
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 145
}, },
{ {
"__id__": 143 "__id__": 146
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5655,20 +5782,20 @@ ...@@ -5655,20 +5782,20 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 132 "__id__": 135
}, },
"_children": [ "_children": [
{ {
"__id__": 134 "__id__": 137
}, },
{ {
"__id__": 136 "__id__": 139
}, },
{ {
"__id__": 138 "__id__": 141
}, },
{ {
"__id__": 140 "__id__": 143
} }
], ],
"_active": false, "_active": false,
...@@ -5726,13 +5853,13 @@ ...@@ -5726,13 +5853,13 @@
"_name": "star_bg", "_name": "star_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 136
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 135 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5788,7 +5915,7 @@ ...@@ -5788,7 +5915,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 134 "__id__": 137
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5820,13 +5947,13 @@ ...@@ -5820,13 +5947,13 @@
"_name": "star", "_name": "star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 136
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5882,7 +6009,7 @@ ...@@ -5882,7 +6009,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 136 "__id__": 139
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5914,13 +6041,13 @@ ...@@ -5914,13 +6041,13 @@
"_name": "icon_bigstar", "_name": "icon_bigstar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 136
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 142
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5976,7 +6103,7 @@ ...@@ -5976,7 +6103,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6008,13 +6135,13 @@ ...@@ -6008,13 +6135,13 @@
"_name": "star_wrong", "_name": "star_wrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 136
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 141 "__id__": 144
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6070,7 +6197,7 @@ ...@@ -6070,7 +6197,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 143
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6102,7 +6229,7 @@ ...@@ -6102,7 +6229,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6129,7 +6256,7 @@ ...@@ -6129,7 +6256,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"position": { "position": {
...@@ -6150,7 +6277,7 @@ ...@@ -6150,7 +6277,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6182,7 +6309,7 @@ ...@@ -6182,7 +6309,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6206,29 +6333,16 @@ ...@@ -6206,29 +6333,16 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "layout_finish", "_name": "zjz_ske",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [],
{
"__id__": 147
},
{
"__id__": 151
},
{
"__id__": 153
},
{
"__id__": 156
}
],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 159 "__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6242,8 +6356,8 @@ ...@@ -6242,8 +6356,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1920, "width": 1556.7,
"height": 1080 "height": 313.42
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6254,15 +6368,15 @@ ...@@ -6254,15 +6368,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
249.866,
-233.915,
0, 0,
0, 0,
0, 0,
0, 0,
0,
0,
1,
1,
1, 1,
1.43,
1.43,
1 1
] ]
}, },
...@@ -6277,41 +6391,75 @@ ...@@ -6277,41 +6391,75 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a4Mhc/VPZOHJGkdZH+Aa2K" "_id": "87WYsSEjZOtb3VRpZL9PMg"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "armatureName",
"_animationName": "newAnimation",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "b49bf634-7bdb-402f-81a5-0d8a833bffea#385bfbab-482a-4d65-b7e0-dab379236bf5",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "b49bf634-7bdb-402f-81a5-0d8a833bffea"
},
"_N$dragonAtlasAsset": {
"__uuid__": "385bfbab-482a-4d65-b7e0-dab379236bf5"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "888dxS33NJ45qNOBxEmniO"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "New Sprite(Splash)", "_name": "img_cup",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 146 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 152
},
{
"__id__": 149
},
{
"__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 175, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 0, "r": 255,
"g": 0, "g": 255,
"b": 0, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1920, "width": 218,
"height": 1080 "height": 208
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6322,8 +6470,8 @@ ...@@ -6322,8 +6470,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 618.372,
0, -395.374,
0, 0,
0, 0,
0, 0,
...@@ -6345,14 +6493,14 @@ ...@@ -6345,14 +6493,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a8iyaNRbZCbbhWmrGm9B5z" "_id": "fffTw4JTdDGo+DH03bEl7g"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 151
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6363,10 +6511,10 @@ ...@@ -6363,10 +6511,10 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" "__uuid__": "61790975-4659-4c01-bae6-c5e89c28011a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6377,41 +6525,216 @@ ...@@ -6377,41 +6525,216 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "29hoHqJdVBsIPmuGqI8dp8" "_id": "48VRWpcwRK0JYFcjBWYFYY"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Node",
"_name": "", "_name": "layout_finish",
"_objFlags": 0, "_objFlags": 0,
"node": { "_parent": {
"__id__": 147 "__id__": 2
}, },
"_enabled": true, "_children": [
"alignMode": 1, {
"_target": null, "__id__": 154
"_alignFlags": 45, },
"_left": 0, {
"_right": 0, "__id__": 158
"_top": 0, },
"_bottom": 0, {
"_verticalCenter": 0, "__id__": 160
"_horizontalCenter": 0, },
"_isAbsLeft": true, {
"_isAbsRight": true, "__id__": 163
"_isAbsTop": true, }
"_isAbsBottom": true, ],
"_isAbsHorizontalCenter": true, "_active": false,
"_isAbsVerticalCenter": true, "_components": [
"_originalWidth": 1920, {
"_originalHeight": 1080, "__id__": 166
"_id": "7daNTfYqxB5KX28Uel7T92" }
}, ],
{ "_prefab": null,
"__type__": "cc.Button", "_opacity": 255,
"_name": "", "_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1080
},
"_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": "a4Mhc/VPZOHJGkdZH+Aa2K"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 153
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 155
},
{
"__id__": 156
},
{
"__id__": 157
}
],
"_prefab": null,
"_opacity": 175,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1920,
"height": 1080
},
"_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": "a8iyaNRbZCbbhWmrGm9B5z"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 154
},
"_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": "29hoHqJdVBsIPmuGqI8dp8"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1920,
"_originalHeight": 1080,
"_id": "7daNTfYqxB5KX28Uel7T92"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6479,13 +6802,13 @@ ...@@ -6479,13 +6802,13 @@
"_name": "finish_db", "_name": "finish_db",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 146 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 152 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6541,7 +6864,7 @@ ...@@ -6541,7 +6864,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6581,16 +6904,16 @@ ...@@ -6581,16 +6904,16 @@
"_name": "btn_again", "_name": "btn_again",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 146 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 154 "__id__": 161
}, },
{ {
"__id__": 155 "__id__": 162
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6646,7 +6969,7 @@ ...@@ -6646,7 +6969,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6678,7 +7001,7 @@ ...@@ -6678,7 +7001,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6746,16 +7069,16 @@ ...@@ -6746,16 +7069,16 @@
"_name": "btn_next", "_name": "btn_next",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 146 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 157 "__id__": 164
}, },
{ {
"__id__": 158 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6811,7 +7134,7 @@ ...@@ -6811,7 +7134,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 156 "__id__": 163
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6843,7 +7166,7 @@ ...@@ -6843,7 +7166,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 156 "__id__": 163
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6911,7 +7234,7 @@ ...@@ -6911,7 +7234,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6942,16 +7265,16 @@ ...@@ -6942,16 +7265,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 161 "__id__": 168
}, },
{ {
"__id__": 165 "__id__": 172
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 167 "__id__": 174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7007,19 +7330,19 @@ ...@@ -7007,19 +7330,19 @@
"_name": "New Sprite(Splash)", "_name": "New Sprite(Splash)",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 167
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 162 "__id__": 169
}, },
{ {
"__id__": 163 "__id__": 170
}, },
{ {
"__id__": 164 "__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7075,7 +7398,7 @@ ...@@ -7075,7 +7398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 161 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7107,7 +7430,7 @@ ...@@ -7107,7 +7430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 161 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7175,7 +7498,7 @@ ...@@ -7175,7 +7498,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 161 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7202,13 +7525,13 @@ ...@@ -7202,13 +7525,13 @@
"_name": "start_ske", "_name": "start_ske",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 160 "__id__": 167
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 173
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7264,7 +7587,7 @@ ...@@ -7264,7 +7587,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 172
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7300,7 +7623,7 @@ ...@@ -7300,7 +7623,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 167
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7322,202 +7645,6 @@ ...@@ -7322,202 +7645,6 @@
"_originalHeight": 1080, "_originalHeight": 1080,
"_id": "0esPFpketK16cfuJjEsCoM" "_id": "0esPFpketK16cfuJjEsCoM"
}, },
{
"__type__": "cc.Node",
"_name": "zjz_ske",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 169
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1556.7,
"height": 313.42
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
249.866,
-233.915,
0,
0,
0,
0,
1,
1.43,
1.43,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "87WYsSEjZOtb3VRpZL9PMg"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "armatureName",
"_animationName": "newAnimation",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "b49bf634-7bdb-402f-81a5-0d8a833bffea#385bfbab-482a-4d65-b7e0-dab379236bf5",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "b49bf634-7bdb-402f-81a5-0d8a833bffea"
},
"_N$dragonAtlasAsset": {
"__uuid__": "385bfbab-482a-4d65-b7e0-dab379236bf5"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "888dxS33NJ45qNOBxEmniO"
},
{
"__type__": "cc.Node",
"_name": "img_cup",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 171
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 218,
"height": 208
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
618.372,
-395.374,
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": "fffTw4JTdDGo+DH03bEl7g"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 170
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "61790975-4659-4c01-bae6-c5e89c28011a"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "48VRWpcwRK0JYFcjBWYFYY"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
...@@ -7571,31 +7698,31 @@ ...@@ -7571,31 +7698,31 @@
}, },
"_enabled": true, "_enabled": true,
"layout_start": { "layout_start": {
"__id__": 160 "__id__": 167
}, },
"layout_finish": { "layout_finish": {
"__id__": 146 "__id__": 153
}, },
"btn_laba": { "btn_laba": {
"__id__": 39 "__id__": 40
}, },
"btn_record": { "btn_record": {
"__id__": 48 "__id__": 49
}, },
"img_laba": { "img_laba": {
"__id__": 41 "__id__": 42
}, },
"img_record": { "img_record": {
"__id__": 50 "__id__": 51
}, },
"record_word": { "record_word": {
"__id__": 124 "__id__": 127
}, },
"question_word": { "question_word": {
"__id__": 126 "__id__": 129
}, },
"box2d": { "box2d": {
"__id__": 60 "__id__": 63
}, },
"_id": "45CXemIxhH4YIC4kX1oyBq" "_id": "45CXemIxhH4YIC4kX1oyBq"
} }
......
...@@ -156,11 +156,14 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -156,11 +156,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
clearInterval(this.recordIntervalId); clearInterval(this.recordIntervalId);
} }
}, 150); }, 150);
// this.showCountAction(3).then(() => { let record_count = cc.find("record_count", this.img_record).getComponent(cc.Sprite);
// stop = true; record_count.fillRange = 0;
// this.onTouchRecordEnd(); cc.Tween.stopAllByTarget(record_count);
// this.showMikeBgAction(); let question = Game.getIns().getCurrentPage();
// }); cc.tween(record_count).to(question.duration, { fillRange: -1 })
.call(() => {
this.onTouchRecordEnd();
}).start();
} }
private labaIntervalId; private labaIntervalId;
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 225, "width": 226,
"height": 166, "height": 163,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_record1": { "btn_record1": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -1, "offsetX": -0.5,
"offsetY": 10, "offsetY": 11.5,
"trimX": 0, "trimX": 1,
"trimY": 3, "trimY": 2,
"width": 223, "width": 223,
"height": 140, "height": 136,
"rawWidth": 225, "rawWidth": 226,
"rawHeight": 166, "rawHeight": 163,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 225, "width": 226,
"height": 166, "height": 163,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_record2": { "btn_record2": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -1, "offsetX": -1.5,
"offsetY": -11, "offsetY": -11.5,
"trimX": 1, "trimX": 1,
"trimY": 24, "trimY": 25,
"width": 221, "width": 221,
"height": 140, "height": 136,
"rawWidth": 225, "rawWidth": 226,
"rawHeight": 166, "rawHeight": 163,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 225, "width": 226,
"height": 166, "height": 163,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_record3": { "btn_record3": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -1, "offsetX": -1.5,
"offsetY": -11, "offsetY": -11.5,
"trimX": 1, "trimX": 1,
"trimY": 24, "trimY": 25,
"width": 221, "width": 221,
"height": 140, "height": 136,
"rawWidth": 225, "rawWidth": 226,
"rawHeight": 166, "rawHeight": 163,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 225, "width": 226,
"height": 166, "height": 163,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_voice1": { "btn_voice1": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -1, "offsetX": -0.5,
"offsetY": 11, "offsetY": 11.5,
"trimX": 0, "trimX": 1,
"trimY": 2, "trimY": 2,
"width": 223, "width": 223,
"height": 140, "height": 136,
"rawWidth": 225, "rawWidth": 226,
"rawHeight": 166, "rawHeight": 163,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 225, "width": 226,
"height": 166, "height": 163,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_voice2": { "btn_voice2": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -1, "offsetX": -1.5,
"offsetY": -10, "offsetY": -11.5,
"trimX": 1, "trimX": 1,
"trimY": 23, "trimY": 25,
"width": 221, "width": 221,
"height": 140, "height": 136,
"rawWidth": 225, "rawWidth": 226,
"rawHeight": 166, "rawHeight": 163,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 225, "width": 226,
"height": 166, "height": 163,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"btn_voice3": { "btn_voice3": {
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": -1, "offsetX": -1.5,
"offsetY": -10, "offsetY": -11.5,
"trimX": 1, "trimX": 1,
"trimY": 23, "trimY": 25,
"width": 221, "width": 221,
"height": 140, "height": 136,
"rawWidth": 225, "rawWidth": 226,
"rawHeight": 166, "rawHeight": 163,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "180e160f-b5ee-4fa2-9e52-5fb09a9d3511",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 136,
"height": 136,
"platformSettings": {},
"subMetas": {
"record_count": {
"ver": "1.0.4",
"uuid": "4ef5ee81-79ff-49da-b215-bdddf5ea6b80",
"rawTextureUuid": "180e160f-b5ee-4fa2-9e52-5fb09a9d3511",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 136,
"height": 136,
"rawWidth": 136,
"rawHeight": 136,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
...@@ -160,14 +160,14 @@ ...@@ -160,14 +160,14 @@
</div> </div>
<div style="margin:0 20px"> <div style="margin:0 20px">
<button class="btn-red" nz-button nzType="default" nzDanger (click)="removeQuestion(i)">删除题目</button> <button class="btn-red" nz-button nzType="default" nzDanger (click)="removeQuestion(i)">删除题目</button>
<button *ngIf="item.questions.length < 4" class="btn-blue" style="margin-top: 10px;" nz-button <button class="btn-blue" style="margin-top: 10px;" nz-button
nzType="default" nzDanger (click)="copyQuestion(i)">复制题目</button> nzType="default" nzDanger (click)="copyQuestion(i)">复制题目</button>
</div> </div>
</div> </div>
</div> </div>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<button *ngIf="item.questions.length < 4" class="btn-blue" style="width: 1000px; height: 50px;" nz-button <button class="btn-blue" style="width: 1000px; height: 50px;" nz-button
nzType="default" nzDanger (click)="addQuestion()">+增加题目</button> nzType="default" nzDanger (click)="addQuestion()">+增加题目</button>
</div> </div>
</div> </div>
......
...@@ -50,7 +50,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O ...@@ -50,7 +50,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
} }
addQuestion() { addQuestion() {
if (this.item.questions.length == 6) return; // if (this.item.questions.length == 6) return;
this.item.questions.push({ this.item.questions.push({
type: 'img', type: 'img',
audio: '', audio: '',
......
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