Commit 5f2a3d79 authored by 李维's avatar 李维

dev commit

parent 341bba3b
......@@ -17,7 +17,7 @@
"__id__": 2
},
{
"__id__": 236
"__id__": 243
}
],
"_active": false,
......@@ -78,64 +78,64 @@
"__id__": 5
},
{
"__id__": 26
"__id__": 29
},
{
"__id__": 31
"__id__": 34
},
{
"__id__": 36
"__id__": 39
},
{
"__id__": 51
"__id__": 54
},
{
"__id__": 66
"__id__": 69
},
{
"__id__": 81
"__id__": 84
},
{
"__id__": 96
"__id__": 99
},
{
"__id__": 111
"__id__": 114
},
{
"__id__": 126
"__id__": 129
},
{
"__id__": 141
"__id__": 144
},
{
"__id__": 156
"__id__": 159
},
{
"__id__": 171
"__id__": 174
},
{
"__id__": 186
"__id__": 189
},
{
"__id__": 189
"__id__": 192
},
{
"__id__": 196
"__id__": 201
},
{
"__id__": 203
"__id__": 210
}
],
"_active": true,
"_components": [
{
"__id__": 233
"__id__": 240
},
{
"__id__": 234
"__id__": 241
},
{
"__id__": 235
"__id__": 242
}
],
"_prefab": null,
......@@ -225,7 +225,7 @@
"array": [
0,
0,
412.2234881528291,
405.3946104996562,
0,
0,
0,
......@@ -311,7 +311,7 @@
"__id__": 19
},
{
"__id__": 24
"__id__": 27
}
],
"_active": true,
......@@ -1005,13 +1005,13 @@
"__id__": 20
},
{
"__id__": 21
"__id__": 22
},
{
"__id__": 22
"__id__": 24
},
{
"__id__": 23
"__id__": 26
}
],
"_active": true,
......@@ -1073,7 +1073,11 @@
},
"_children": [],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 21
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1086,7 +1090,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 174,
"height": 164
"height": 148.48
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1122,6 +1126,46 @@
"groupIndex": 0,
"_id": "0apXf/mTlKYZlg2VASmcAM"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature播放",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "e2664613-08c9-45f2-b1c5-4e5cca185e27#cbcf8ca6-f67d-4aab-981a-c1a381e8aa48",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "e2664613-08c9-45f2-b1c5-4e5cca185e27"
},
"_N$dragonAtlasAsset": {
"__uuid__": "cbcf8ca6-f67d-4aab-981a-c1a381e8aa48"
},
"_N$_defaultArmatureIndex": 1,
"_N$_animationIndex": 2,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "0aHPjW3gdHO6GTtcokn7Ij"
},
{
"__type__": "cc.Node",
"_name": "wrong",
......@@ -1131,7 +1175,11 @@
},
"_children": [],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 23
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1144,7 +1192,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 174,
"height": 164
"height": 148.48
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1180,6 +1228,46 @@
"groupIndex": 0,
"_id": "acreTLNFtFja8mLOj4tFLd"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature播放",
"_animationName": "wrong",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "e2664613-08c9-45f2-b1c5-4e5cca185e27#cbcf8ca6-f67d-4aab-981a-c1a381e8aa48",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "e2664613-08c9-45f2-b1c5-4e5cca185e27"
},
"_N$dragonAtlasAsset": {
"__uuid__": "cbcf8ca6-f67d-4aab-981a-c1a381e8aa48"
},
"_N$_defaultArmatureIndex": 1,
"_N$_animationIndex": 3,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "beqNzxihtPLpMbE5PG7GF+"
},
{
"__type__": "cc.Node",
"_name": "playing",
......@@ -1189,7 +1277,11 @@
},
"_children": [],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 25
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1202,7 +1294,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 174,
"height": 164
"height": 148.48
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1238,6 +1330,46 @@
"groupIndex": 0,
"_id": "759Y3MbvpCbZYbR7xp/jkZ"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature播放",
"_animationName": "playing",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "e2664613-08c9-45f2-b1c5-4e5cca185e27#cbcf8ca6-f67d-4aab-981a-c1a381e8aa48",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "e2664613-08c9-45f2-b1c5-4e5cca185e27"
},
"_N$dragonAtlasAsset": {
"__uuid__": "cbcf8ca6-f67d-4aab-981a-c1a381e8aa48"
},
"_N$_defaultArmatureIndex": 1,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "4b3+Ncxf5IG7XMsCafvtLF"
},
{
"__type__": "cc.Node",
"_name": "clickTarget",
......@@ -1307,7 +1439,7 @@
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 28
}
],
"_prefab": null,
......@@ -1363,7 +1495,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1399,10 +1531,10 @@
},
"_children": [
{
"__id__": 27
"__id__": 30
},
{
"__id__": 29
"__id__": 32
}
],
"_active": true,
......@@ -1460,13 +1592,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 29
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 31
}
],
"_prefab": null,
......@@ -1522,7 +1654,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 30
},
"_enabled": true,
"_materials": [
......@@ -1554,13 +1686,13 @@
"_name": "text",
"_objFlags": 0,
"_parent": {
"__id__": 26
"__id__": 29
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 33
}
],
"_prefab": null,
......@@ -1616,7 +1748,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1654,10 +1786,10 @@
},
"_children": [
{
"__id__": 32
"__id__": 35
},
{
"__id__": 34
"__id__": 37
}
],
"_active": true,
......@@ -1715,13 +1847,13 @@
"_name": "line_1",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 34
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 36
}
],
"_prefab": null,
......@@ -1777,7 +1909,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1809,13 +1941,13 @@
"_name": "line_2",
"_objFlags": 0,
"_parent": {
"__id__": 31
"__id__": 34
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 38
}
],
"_prefab": null,
......@@ -1871,7 +2003,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1907,16 +2039,16 @@
},
"_children": [
{
"__id__": 37
"__id__": 40
},
{
"__id__": 39
"__id__": 42
},
{
"__id__": 41
"__id__": 44
},
{
"__id__": 47
"__id__": 50
}
],
"_active": true,
......@@ -1974,13 +2106,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 36
"__id__": 39
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 41
}
],
"_prefab": null,
......@@ -2036,7 +2168,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 40
},
"_enabled": true,
"_materials": [
......@@ -2068,13 +2200,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 36
"__id__": 39
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 43
}
],
"_prefab": null,
......@@ -2130,7 +2262,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 42
},
"_enabled": true,
"_materials": [
......@@ -2162,20 +2294,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 36
"__id__": 39
},
"_children": [
{
"__id__": 42
"__id__": 45
},
{
"__id__": 44
"__id__": 47
}
],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 49
}
],
"_prefab": null,
......@@ -2231,13 +2363,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 44
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 46
}
],
"_prefab": null,
......@@ -2293,7 +2425,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2327,13 +2459,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 44
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 45
"__id__": 48
}
],
"_prefab": null,
......@@ -2389,7 +2521,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2421,7 +2553,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2453,17 +2585,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 36
"__id__": 39
},
"_children": [
{
"__id__": 48
"__id__": 51
}
],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 53
}
],
"_prefab": null,
......@@ -2519,13 +2651,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 47
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 52
}
],
"_prefab": null,
......@@ -2581,7 +2713,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2613,7 +2745,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2649,16 +2781,16 @@
},
"_children": [
{
"__id__": 52
"__id__": 55
},
{
"__id__": 54
"__id__": 57
},
{
"__id__": 56
"__id__": 59
},
{
"__id__": 62
"__id__": 65
}
],
"_active": true,
......@@ -2716,13 +2848,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 54
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 56
}
],
"_prefab": null,
......@@ -2778,7 +2910,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2810,13 +2942,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 54
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 58
}
],
"_prefab": null,
......@@ -2872,7 +3004,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2904,20 +3036,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 54
},
"_children": [
{
"__id__": 57
"__id__": 60
},
{
"__id__": 59
"__id__": 62
}
],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 64
}
],
"_prefab": null,
......@@ -2973,13 +3105,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 56
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 61
}
],
"_prefab": null,
......@@ -3035,7 +3167,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -3069,13 +3201,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 56
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 60
"__id__": 63
}
],
"_prefab": null,
......@@ -3131,7 +3263,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -3163,7 +3295,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -3195,17 +3327,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 54
},
"_children": [
{
"__id__": 63
"__id__": 66
}
],
"_active": true,
"_components": [
{
"__id__": 65
"__id__": 68
}
],
"_prefab": null,
......@@ -3261,13 +3393,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 65
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 67
}
],
"_prefab": null,
......@@ -3323,7 +3455,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -3355,7 +3487,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3391,16 +3523,16 @@
},
"_children": [
{
"__id__": 67
"__id__": 70
},
{
"__id__": 69
"__id__": 72
},
{
"__id__": 71
"__id__": 74
},
{
"__id__": 77
"__id__": 80
}
],
"_active": true,
......@@ -3458,13 +3590,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 66
"__id__": 69
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 71
}
],
"_prefab": null,
......@@ -3520,7 +3652,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3552,13 +3684,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 66
"__id__": 69
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 73
}
],
"_prefab": null,
......@@ -3614,7 +3746,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3646,20 +3778,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 66
"__id__": 69
},
"_children": [
{
"__id__": 72
"__id__": 75
},
{
"__id__": 74
"__id__": 77
}
],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 79
}
],
"_prefab": null,
......@@ -3715,13 +3847,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 76
}
],
"_prefab": null,
......@@ -3777,7 +3909,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3811,13 +3943,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 74
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 78
}
],
"_prefab": null,
......@@ -3873,7 +4005,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3905,7 +4037,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -3937,17 +4069,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 66
"__id__": 69
},
"_children": [
{
"__id__": 78
"__id__": 81
}
],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 83
}
],
"_prefab": null,
......@@ -4003,13 +4135,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 80
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 82
}
],
"_prefab": null,
......@@ -4065,7 +4197,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -4097,7 +4229,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -4133,16 +4265,16 @@
},
"_children": [
{
"__id__": 82
"__id__": 85
},
{
"__id__": 84
"__id__": 87
},
{
"__id__": 86
"__id__": 89
},
{
"__id__": 92
"__id__": 95
}
],
"_active": true,
......@@ -4200,13 +4332,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 81
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 83
"__id__": 86
}
],
"_prefab": null,
......@@ -4262,7 +4394,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4294,13 +4426,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 81
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 88
}
],
"_prefab": null,
......@@ -4356,7 +4488,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -4388,20 +4520,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 81
"__id__": 84
},
"_children": [
{
"__id__": 87
"__id__": 90
},
{
"__id__": 89
"__id__": 92
}
],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 94
}
],
"_prefab": null,
......@@ -4457,13 +4589,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 91
}
],
"_prefab": null,
......@@ -4519,7 +4651,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4553,13 +4685,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 93
}
],
"_prefab": null,
......@@ -4615,7 +4747,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4647,7 +4779,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4679,17 +4811,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 81
"__id__": 84
},
"_children": [
{
"__id__": 93
"__id__": 96
}
],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 98
}
],
"_prefab": null,
......@@ -4745,13 +4877,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 95
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 97
}
],
"_prefab": null,
......@@ -4807,7 +4939,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4839,7 +4971,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4875,16 +5007,16 @@
},
"_children": [
{
"__id__": 97
"__id__": 100
},
{
"__id__": 99
"__id__": 102
},
{
"__id__": 101
"__id__": 104
},
{
"__id__": 107
"__id__": 110
}
],
"_active": true,
......@@ -4942,13 +5074,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 101
}
],
"_prefab": null,
......@@ -5004,7 +5136,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -5036,13 +5168,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 103
}
],
"_prefab": null,
......@@ -5098,7 +5230,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -5130,20 +5262,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 99
},
"_children": [
{
"__id__": 102
"__id__": 105
},
{
"__id__": 104
"__id__": 107
}
],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 109
}
],
"_prefab": null,
......@@ -5199,13 +5331,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 106
}
],
"_prefab": null,
......@@ -5261,7 +5393,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -5295,13 +5427,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 105
"__id__": 108
}
],
"_prefab": null,
......@@ -5357,7 +5489,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 107
},
"_enabled": true,
"_materials": [
......@@ -5389,7 +5521,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 104
},
"_enabled": true,
"_materials": [
......@@ -5421,17 +5553,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 99
},
"_children": [
{
"__id__": 108
"__id__": 111
}
],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 113
}
],
"_prefab": null,
......@@ -5487,13 +5619,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 107
"__id__": 110
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 112
}
],
"_prefab": null,
......@@ -5549,7 +5681,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 111
},
"_enabled": true,
"_materials": [
......@@ -5581,7 +5713,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 110
},
"_enabled": true,
"_materials": [
......@@ -5617,16 +5749,16 @@
},
"_children": [
{
"__id__": 112
"__id__": 115
},
{
"__id__": 114
"__id__": 117
},
{
"__id__": 116
"__id__": 119
},
{
"__id__": 122
"__id__": 125
}
],
"_active": true,
......@@ -5684,13 +5816,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 116
}
],
"_prefab": null,
......@@ -5746,7 +5878,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5778,13 +5910,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 118
}
],
"_prefab": null,
......@@ -5840,7 +5972,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 117
},
"_enabled": true,
"_materials": [
......@@ -5872,20 +6004,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [
{
"__id__": 117
"__id__": 120
},
{
"__id__": 119
"__id__": 122
}
],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 124
}
],
"_prefab": null,
......@@ -5941,13 +6073,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 116
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 121
}
],
"_prefab": null,
......@@ -6003,7 +6135,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 120
},
"_enabled": true,
"_materials": [
......@@ -6037,13 +6169,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 116
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 123
}
],
"_prefab": null,
......@@ -6099,7 +6231,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 122
},
"_enabled": true,
"_materials": [
......@@ -6131,7 +6263,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -6163,17 +6295,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [
{
"__id__": 123
"__id__": 126
}
],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 128
}
],
"_prefab": null,
......@@ -6229,13 +6361,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 125
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 127
}
],
"_prefab": null,
......@@ -6291,7 +6423,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 126
},
"_enabled": true,
"_materials": [
......@@ -6323,7 +6455,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -6359,16 +6491,16 @@
},
"_children": [
{
"__id__": 127
"__id__": 130
},
{
"__id__": 129
"__id__": 132
},
{
"__id__": 131
"__id__": 134
},
{
"__id__": 137
"__id__": 140
}
],
"_active": true,
......@@ -6426,13 +6558,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
"__id__": 131
}
],
"_prefab": null,
......@@ -6488,7 +6620,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6520,13 +6652,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 133
}
],
"_prefab": null,
......@@ -6582,7 +6714,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6614,20 +6746,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 129
},
"_children": [
{
"__id__": 132
"__id__": 135
},
{
"__id__": 134
"__id__": 137
}
],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 139
}
],
"_prefab": null,
......@@ -6683,13 +6815,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 134
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 136
}
],
"_prefab": null,
......@@ -6745,7 +6877,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 135
},
"_enabled": true,
"_materials": [
......@@ -6779,13 +6911,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 134
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 135
"__id__": 138
}
],
"_prefab": null,
......@@ -6841,7 +6973,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6873,7 +7005,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6905,17 +7037,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 129
},
"_children": [
{
"__id__": 138
"__id__": 141
}
],
"_active": true,
"_components": [
{
"__id__": 140
"__id__": 143
}
],
"_prefab": null,
......@@ -6971,13 +7103,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 142
}
],
"_prefab": null,
......@@ -7033,7 +7165,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 141
},
"_enabled": true,
"_materials": [
......@@ -7065,7 +7197,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 140
},
"_enabled": true,
"_materials": [
......@@ -7101,16 +7233,16 @@
},
"_children": [
{
"__id__": 142
"__id__": 145
},
{
"__id__": 144
"__id__": 147
},
{
"__id__": 146
"__id__": 149
},
{
"__id__": 152
"__id__": 155
}
],
"_active": true,
......@@ -7168,13 +7300,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 144
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 146
}
],
"_prefab": null,
......@@ -7230,7 +7362,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 145
},
"_enabled": true,
"_materials": [
......@@ -7262,13 +7394,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 144
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
"__id__": 148
}
],
"_prefab": null,
......@@ -7324,7 +7456,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 147
},
"_enabled": true,
"_materials": [
......@@ -7356,20 +7488,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 144
},
"_children": [
{
"__id__": 147
"__id__": 150
},
{
"__id__": 149
"__id__": 152
}
],
"_active": true,
"_components": [
{
"__id__": 151
"__id__": 154
}
],
"_prefab": null,
......@@ -7425,13 +7557,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 149
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 148
"__id__": 151
}
],
"_prefab": null,
......@@ -7487,7 +7619,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -7521,13 +7653,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 149
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 150
"__id__": 153
}
],
"_prefab": null,
......@@ -7583,7 +7715,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -7615,7 +7747,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 149
},
"_enabled": true,
"_materials": [
......@@ -7647,17 +7779,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 144
},
"_children": [
{
"__id__": 153
"__id__": 156
}
],
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 158
}
],
"_prefab": null,
......@@ -7713,13 +7845,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 152
"__id__": 155
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 154
"__id__": 157
}
],
"_prefab": null,
......@@ -7775,7 +7907,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7807,7 +7939,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 155
},
"_enabled": true,
"_materials": [
......@@ -7843,16 +7975,16 @@
},
"_children": [
{
"__id__": 157
"__id__": 160
},
{
"__id__": 159
"__id__": 162
},
{
"__id__": 161
"__id__": 164
},
{
"__id__": 167
"__id__": 170
}
],
"_active": true,
......@@ -7910,13 +8042,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 156
"__id__": 159
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 158
"__id__": 161
}
],
"_prefab": null,
......@@ -7972,7 +8104,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 160
},
"_enabled": true,
"_materials": [
......@@ -8004,13 +8136,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 156
"__id__": 159
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 160
"__id__": 163
}
],
"_prefab": null,
......@@ -8066,7 +8198,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -8098,20 +8230,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 156
"__id__": 159
},
"_children": [
{
"__id__": 162
"__id__": 165
},
{
"__id__": 164
"__id__": 167
}
],
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 169
}
],
"_prefab": null,
......@@ -8167,13 +8299,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 164
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 163
"__id__": 166
}
],
"_prefab": null,
......@@ -8229,7 +8361,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 165
},
"_enabled": true,
"_materials": [
......@@ -8263,13 +8395,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 164
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 165
"__id__": 168
}
],
"_prefab": null,
......@@ -8325,7 +8457,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 167
},
"_enabled": true,
"_materials": [
......@@ -8357,7 +8489,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 164
},
"_enabled": true,
"_materials": [
......@@ -8389,17 +8521,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 156
"__id__": 159
},
"_children": [
{
"__id__": 168
"__id__": 171
}
],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 173
}
],
"_prefab": null,
......@@ -8455,13 +8587,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 167
"__id__": 170
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 169
"__id__": 172
}
],
"_prefab": null,
......@@ -8517,7 +8649,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -8549,7 +8681,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 170
},
"_enabled": true,
"_materials": [
......@@ -8585,16 +8717,16 @@
},
"_children": [
{
"__id__": 172
"__id__": 175
},
{
"__id__": 174
"__id__": 177
},
{
"__id__": 176
"__id__": 179
},
{
"__id__": 182
"__id__": 185
}
],
"_active": true,
......@@ -8652,13 +8784,13 @@
"_name": "normal",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 174
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 173
"__id__": 176
}
],
"_prefab": null,
......@@ -8714,7 +8846,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -8746,13 +8878,13 @@
"_name": "selected",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 174
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 175
"__id__": 178
}
],
"_prefab": null,
......@@ -8808,7 +8940,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 177
},
"_enabled": true,
"_materials": [
......@@ -8840,20 +8972,20 @@
"_name": "bell",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 174
},
"_children": [
{
"__id__": 177
"__id__": 180
},
{
"__id__": 179
"__id__": 182
}
],
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 184
}
],
"_prefab": null,
......@@ -8909,13 +9041,13 @@
"_name": "index",
"_objFlags": 0,
"_parent": {
"__id__": 176
"__id__": 179
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 178
"__id__": 181
}
],
"_prefab": null,
......@@ -8971,7 +9103,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 180
},
"_enabled": true,
"_materials": [
......@@ -9005,13 +9137,13 @@
"_name": "bell_outline",
"_objFlags": 0,
"_parent": {
"__id__": 176
"__id__": 179
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 180
"__id__": 183
}
],
"_prefab": null,
......@@ -9067,7 +9199,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 182
},
"_enabled": true,
"_materials": [
......@@ -9099,7 +9231,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -9131,17 +9263,17 @@
"_name": "container",
"_objFlags": 0,
"_parent": {
"__id__": 171
"__id__": 174
},
"_children": [
{
"__id__": 183
"__id__": 186
}
],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 188
}
],
"_prefab": null,
......@@ -9197,13 +9329,13 @@
"_name": "image",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 185
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 184
"__id__": 187
}
],
"_prefab": null,
......@@ -9259,7 +9391,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -9291,7 +9423,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 185
},
"_enabled": true,
"_materials": [
......@@ -9327,7 +9459,7 @@
},
"_children": [
{
"__id__": 187
"__id__": 190
}
],
"_active": true,
......@@ -9385,13 +9517,13 @@
"_name": "restart",
"_objFlags": 0,
"_parent": {
"__id__": 186
"__id__": 189
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 191
}
],
"_prefab": null,
......@@ -9447,7 +9579,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 190
},
"_enabled": true,
"_materials": [
......@@ -9483,13 +9615,13 @@
},
"_children": [
{
"__id__": 190
"__id__": 193
},
{
"__id__": 192
"__id__": 195
},
{
"__id__": 194
"__id__": 198
}
],
"_active": true,
......@@ -9547,13 +9679,13 @@
"_name": "static",
"_objFlags": 0,
"_parent": {
"__id__": 189
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
"__id__": 194
}
],
"_prefab": null,
......@@ -9609,7 +9741,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 193
},
"_enabled": true,
"_materials": [
......@@ -9641,13 +9773,16 @@
"_name": "fly",
"_objFlags": 0,
"_parent": {
"__id__": 189
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 196
},
{
"__id__": 197
}
],
"_prefab": null,
......@@ -9661,8 +9796,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 73,
"height": 76
"width": 82.26,
"height": 96.31
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -9680,8 +9815,8 @@
0,
0,
1,
1,
1,
0.85,
0.85,
1
]
},
......@@ -9703,7 +9838,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 195
},
"_enabled": true,
"_defaultClip": null,
......@@ -9711,18 +9846,61 @@
"playOnLoad": false,
"_id": "2d6CCcVSxOXolPG8TaCNDk"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature鸟1",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "813ac122-0250-4251-987c-e4a47b614dc6#5b56b333-6084-4425-b0aa-3e314600830d",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "813ac122-0250-4251-987c-e4a47b614dc6"
},
"_N$dragonAtlasAsset": {
"__uuid__": "5b56b333-6084-4425-b0aa-3e314600830d"
},
"_N$_defaultArmatureIndex": 1,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "8e8C8GzzBGp4egpW1LNk+l"
},
{
"__type__": "cc.Node",
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 189
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 195
"__id__": 199
},
{
"__id__": 200
}
],
"_prefab": null,
......@@ -9736,8 +9914,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 73,
"height": 76
"width": 82.26,
"height": 96.31
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -9748,15 +9926,15 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-2,
-40,
-3,
-41,
0,
0,
0,
0,
1,
1.08,
1.08,
0.88,
0.88,
1
]
},
......@@ -9778,7 +9956,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 194
"__id__": 198
},
"_enabled": true,
"_defaultClip": null,
......@@ -9786,6 +9964,46 @@
"playOnLoad": false,
"_id": "8177u2tVhJt6ZeX9weU6J2"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 198
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature鸟1",
"_animationName": "wrong",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "813ac122-0250-4251-987c-e4a47b614dc6#5b56b333-6084-4425-b0aa-3e314600830d",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "813ac122-0250-4251-987c-e4a47b614dc6"
},
"_N$dragonAtlasAsset": {
"__uuid__": "5b56b333-6084-4425-b0aa-3e314600830d"
},
"_N$_defaultArmatureIndex": 1,
"_N$_animationIndex": 2,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "690/lKbGdJT61DcnmFnd7U"
},
{
"__type__": "cc.Node",
"_name": "bird_2",
......@@ -9795,13 +10013,13 @@
},
"_children": [
{
"__id__": 197
"__id__": 202
},
{
"__id__": 199
"__id__": 204
},
{
"__id__": 201
"__id__": 207
}
],
"_active": true,
......@@ -9859,13 +10077,13 @@
"_name": "static",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 198
"__id__": 203
}
],
"_prefab": null,
......@@ -9921,7 +10139,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 197
"__id__": 202
},
"_enabled": true,
"_materials": [
......@@ -9953,13 +10171,16 @@
"_name": "fly",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 200
"__id__": 205
},
{
"__id__": 206
}
],
"_prefab": null,
......@@ -9973,8 +10194,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 73,
"height": 76
"width": 90,
"height": 95
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -9992,8 +10213,8 @@
0,
0,
1,
1,
1,
0.85,
0.85,
1
]
},
......@@ -10015,7 +10236,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 204
},
"_enabled": true,
"_defaultClip": null,
......@@ -10023,18 +10244,61 @@
"playOnLoad": false,
"_id": "eeNwWegi1JRp8S8VtchW5v"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 204
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature鸟2",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "df43ea65-4963-4fbb-b8ff-faa6e372cf02#e3393958-5e89-48b5-b79c-c8d75f801529",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "df43ea65-4963-4fbb-b8ff-faa6e372cf02"
},
"_N$dragonAtlasAsset": {
"__uuid__": "e3393958-5e89-48b5-b79c-c8d75f801529"
},
"_N$_defaultArmatureIndex": 1,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "b1r3OcCGJKP4QPbEQuw44i"
},
{
"__type__": "cc.Node",
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 202
"__id__": 208
},
{
"__id__": 209
}
],
"_prefab": null,
......@@ -10048,8 +10312,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 73,
"height": 76
"width": 90,
"height": 95
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -10061,14 +10325,14 @@
"ctor": "Float64Array",
"array": [
-2,
0,
-2,
0,
0,
0,
0,
1,
1.08,
1.1,
0.85,
0.85,
1
]
},
......@@ -10090,7 +10354,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 201
"__id__": 207
},
"_enabled": true,
"_defaultClip": null,
......@@ -10098,6 +10362,46 @@
"playOnLoad": false,
"_id": "b2Ec0RL2VBwJo5nS3b0GDu"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 207
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature鸟2",
"_animationName": "wrong",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "df43ea65-4963-4fbb-b8ff-faa6e372cf02#e3393958-5e89-48b5-b79c-c8d75f801529",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "df43ea65-4963-4fbb-b8ff-faa6e372cf02"
},
"_N$dragonAtlasAsset": {
"__uuid__": "e3393958-5e89-48b5-b79c-c8d75f801529"
},
"_N$_defaultArmatureIndex": 1,
"_N$_animationIndex": 2,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "4e1hnU6BtBeYTNCoTZjwn2"
},
{
"__type__": "cc.Node",
"_name": "res",
......@@ -10107,13 +10411,13 @@
},
"_children": [
{
"__id__": 204
"__id__": 211
},
{
"__id__": 207
"__id__": 214
},
{
"__id__": 220
"__id__": 227
}
],
"_active": false,
......@@ -10171,11 +10475,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 203
"__id__": 210
},
"_children": [
{
"__id__": 205
"__id__": 212
}
],
"_active": true,
......@@ -10233,13 +10537,13 @@
"_name": "Comic Sans MS",
"_objFlags": 0,
"_parent": {
"__id__": 204
"__id__": 211
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 206
"__id__": 213
}
],
"_prefab": null,
......@@ -10295,7 +10599,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 205
"__id__": 212
},
"_enabled": true,
"_materials": [],
......@@ -10327,26 +10631,26 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 203
"__id__": 210
},
"_children": [
{
"__id__": 208
"__id__": 215
},
{
"__id__": 210
"__id__": 217
},
{
"__id__": 212
"__id__": 219
},
{
"__id__": 214
"__id__": 221
},
{
"__id__": 216
"__id__": 223
},
{
"__id__": 218
"__id__": 225
}
],
"_active": true,
......@@ -10404,13 +10708,13 @@
"_name": "card_demo",
"_objFlags": 0,
"_parent": {
"__id__": 207
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 209
"__id__": 216
}
],
"_prefab": null,
......@@ -10466,7 +10770,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 208
"__id__": 215
},
"_enabled": true,
"_materials": [],
......@@ -10494,13 +10798,13 @@
"_name": "black",
"_objFlags": 0,
"_parent": {
"__id__": 207
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 211
"__id__": 218
}
],
"_prefab": null,
......@@ -10556,7 +10860,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
"__id__": 217
},
"_enabled": true,
"_materials": [],
......@@ -10584,13 +10888,13 @@
"_name": "snow_1",
"_objFlags": 0,
"_parent": {
"__id__": 207
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 213
"__id__": 220
}
],
"_prefab": null,
......@@ -10646,7 +10950,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 219
},
"_enabled": true,
"_materials": [],
......@@ -10674,13 +10978,13 @@
"_name": "snow_2",
"_objFlags": 0,
"_parent": {
"__id__": 207
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 215
"__id__": 222
}
],
"_prefab": null,
......@@ -10736,7 +11040,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 214
"__id__": 221
},
"_enabled": true,
"_materials": [],
......@@ -10764,13 +11068,13 @@
"_name": "snow_3",
"_objFlags": 0,
"_parent": {
"__id__": 207
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 217
"__id__": 224
}
],
"_prefab": null,
......@@ -10826,7 +11130,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 216
"__id__": 223
},
"_enabled": true,
"_materials": [],
......@@ -10854,13 +11158,13 @@
"_name": "snow_4",
"_objFlags": 0,
"_parent": {
"__id__": 207
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 219
"__id__": 226
}
],
"_prefab": null,
......@@ -10916,7 +11220,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 218
"__id__": 225
},
"_enabled": true,
"_materials": [],
......@@ -10944,26 +11248,26 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 203
"__id__": 210
},
"_children": [
{
"__id__": 221
"__id__": 228
},
{
"__id__": 223
"__id__": 230
},
{
"__id__": 225
"__id__": 232
},
{
"__id__": 227
"__id__": 234
},
{
"__id__": 229
"__id__": 236
},
{
"__id__": 231
"__id__": 238
}
],
"_active": true,
......@@ -11021,13 +11325,13 @@
"_name": "test_audio",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 229
}
],
"_prefab": null,
......@@ -11083,7 +11387,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 228
},
"_enabled": true,
"_clip": {
......@@ -11101,13 +11405,13 @@
"_name": "star_boom",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 231
}
],
"_prefab": null,
......@@ -11163,7 +11467,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 230
},
"_enabled": true,
"_clip": {
......@@ -11181,13 +11485,13 @@
"_name": "good_job",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 226
"__id__": 233
}
],
"_prefab": null,
......@@ -11243,7 +11547,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 232
},
"_enabled": true,
"_clip": {
......@@ -11261,13 +11565,13 @@
"_name": "bird_fly",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 228
"__id__": 235
}
],
"_prefab": null,
......@@ -11323,7 +11627,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 234
},
"_enabled": true,
"_clip": {
......@@ -11341,13 +11645,13 @@
"_name": "try_again",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 230
"__id__": 237
}
],
"_prefab": null,
......@@ -11403,7 +11707,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 229
"__id__": 236
},
"_enabled": true,
"_clip": {
......@@ -11421,13 +11725,13 @@
"_name": "enter",
"_objFlags": 0,
"_parent": {
"__id__": 220
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 232
"__id__": 239
}
],
"_prefab": null,
......@@ -11483,7 +11787,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 231
"__id__": 238
},
"_enabled": true,
"_clip": {
......
......@@ -504,88 +504,88 @@ export default class GameLogic {
let birdAudioWrong = this.g_cartoon.getCartoonElement("birdAudioWrong");
let birdAudioPlaying = this.g_cartoon.getCartoonElement("birdAudioPlaying");
const birdDragonBones_1 = {
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/3fa1882c54e339da6dd269c97f04bb2a.png",
"name": "bird1_tex.png"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/59b30e639be3a22584acec712dd78574.json",
"name": "bird1_tex.json"
},
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/decfe2180607b27160bd34d07448898c.json",
"name": "bird1_ske.json"
}
}
// const birdDragonBones_1 = {
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/3fa1882c54e339da6dd269c97f04bb2a.png",
// "name": "bird1_tex.png"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/59b30e639be3a22584acec712dd78574.json",
// "name": "bird1_tex.json"
// },
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/decfe2180607b27160bd34d07448898c.json",
// "name": "bird1_ske.json"
// }
// }
const birdDragonBones_2 = {
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/09ff5666c731f45808e1c0f3d0bfc124.png",
"name": "bird2_tex.png"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/49231d10601dfadffedb9ee25dac164b.json",
"name": "bird2_tex.json"
},
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/c39541350a2828337d5cecb59deac5e8.json",
"name": "bird2_ske.json"
}
}
const audioBird = {
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/24a4f73fd0ba329427cc3a9c07430ede.png",
"name": "playbird_tex.png"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/7b855d3ca30aa8833b9c460424ca2e5c.json",
"name": "playbird_tex.json"
},
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/a611415a85a614a3f3a2c9620633bc2a.json",
"name": "playbird_ske.json"
}
}
// const birdDragonBones_2 = {
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/09ff5666c731f45808e1c0f3d0bfc124.png",
// "name": "bird2_tex.png"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/49231d10601dfadffedb9ee25dac164b.json",
// "name": "bird2_tex.json"
// },
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/c39541350a2828337d5cecb59deac5e8.json",
// "name": "bird2_ske.json"
// }
// }
// const audioBird = {
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/24a4f73fd0ba329427cc3a9c07430ede.png",
// "name": "playbird_tex.png"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/7b855d3ca30aa8833b9c460424ca2e5c.json",
// "name": "playbird_tex.json"
// },
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/a611415a85a614a3f3a2c9620633bc2a.json",
// "name": "playbird_ske.json"
// }
// }
// Normal
birdAniFly_1.node.opacity = 0;
birdAniFly_2.node.opacity = 0;
birdAniFly_1.dragonBones.setDragonBones(birdDragonBones_1, "Armature鸟1", ()=>{
birdAniFly_1.dragonBones.showDragonBones(-1, "normal")
})
birdAniFly_2.dragonBones.setDragonBones(birdDragonBones_2,"Armature鸟2", ()=>{
birdAniFly_2.dragonBones.showDragonBones(-1, "normal")
})
// birdAniFly_1.dragonBones.setDragonBones(birdDragonBones_1, "Armature鸟1", ()=>{
// birdAniFly_1.dragonBones.showDragonBones(-1, "normal")
// })
// birdAniFly_2.dragonBones.setDragonBones(birdDragonBones_2,"Armature鸟2", ()=>{
// birdAniFly_2.dragonBones.showDragonBones(-1, "normal")
// })
// Wrong
birdAniWrong_1.node.opacity = 0;
birdAniWrong_2.node.opacity = 0;
birdAniWrong_1.dragonBones.setDragonBones(birdDragonBones_1, "Armature鸟1", ()=>{
birdAniWrong_1.dragonBones.showDragonBones(-1, "wrong")
})
birdAniWrong_2.dragonBones.setDragonBones(birdDragonBones_2,"Armature鸟2", ()=>{
birdAniWrong_2.dragonBones.showDragonBones(-1, "wrong")
})
// birdAniWrong_1.dragonBones.setDragonBones(birdDragonBones_1, "Armature鸟1", ()=>{
// birdAniWrong_1.dragonBones.showDragonBones(-1, "wrong")
// })
// birdAniWrong_2.dragonBones.setDragonBones(birdDragonBones_2,"Armature鸟2", ()=>{
// birdAniWrong_2.dragonBones.showDragonBones(-1, "wrong")
// })
// Bird audio
// birdAudioNormal.node.opacity = 0;
birdAudioNormal.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
birdAudioNormal.dragonBones.showDragonBones(-1, "normal")
})
// birdAudioNormal.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
// birdAudioNormal.dragonBones.showDragonBones(-1, "normal")
// })
birdAudioWrong.node.opacity = 0;
birdAudioWrong.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
birdAudioWrong.dragonBones.showDragonBones(-1, "wrong")
})
// birdAudioWrong.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
// birdAudioWrong.dragonBones.showDragonBones(-1, "wrong")
// })
birdAudioPlaying.node.opacity = 0;
birdAudioPlaying.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
birdAudioPlaying.dragonBones.showDragonBones(-1, "playing")
})
// birdAudioPlaying.dragonBones.setDragonBones(audioBird, "Armature播放", ()=>{
// birdAudioPlaying.dragonBones.showDragonBones(-1, "playing")
// })
birdAudio.switchAni = (type) => {
switch(type) {
......
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