Skip to content

D
dap-hu
Commit 5fabb20b authored by Vũ Gia Vương's avatar Vũ Gia Vương
Browse files
Options

update BreakingBottleScreen

parent 417b3c67
Hide whitespace changes
Inline Side-by-side
Showing with 588 additions and 552 deletions
assets/main.fire
View file @ 5fabb20b
...@@ -78,31 +78,31 @@ ...@@ -78,31 +78,31 @@
"__id__": 11 "__id__": 11
}, },
{ {
"__id__": 66 "__id__": 67
}, },
{ {
"__id__": 81 "__id__": 82
}, },
{ {
"__id__": 30 "__id__": 30
}, },
{ {
"__id__": 83 "__id__": 84
}, },
{ {
"__id__": 100 "__id__": 101
}, },
{ {
"__id__": 110 "__id__": 111
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 184 "__id__": 185
}, },
{ {
"__id__": 185 "__id__": 186
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -550,6 +550,9 @@ ...@@ -550,6 +550,9 @@
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 28
},
{
"__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3182,6 +3185,16 @@ ...@@ -3182,6 +3185,16 @@
"_N$affectedByScale": false, "_N$affectedByScale": false,
"_id": "bdTblgZJJCZY2V0juzYpu8" "_id": "bdTblgZJJCZY2V0juzYpu8"
}, },
{
"__type__": "cc.BlockInputEvents",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
},
"_enabled": true,
"_id": "98lXLksvRCM6lZRz5MAv8p"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ActionScreen", "_name": "ActionScreen",
...@@ -3191,22 +3204,22 @@ ...@@ -3191,22 +3204,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 67 "__id__": 68
}, },
{ {
"__id__": 70 "__id__": 71
}, },
{ {
"__id__": 72 "__id__": 73
}, },
{ {
"__id__": 76 "__id__": 77
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3262,16 +3275,16 @@ ...@@ -3262,16 +3275,16 @@
"_name": "Chum", "_name": "Chum",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 69
}, },
{ {
"__id__": 69 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3327,7 +3340,7 @@ ...@@ -3327,7 +3340,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_id": "32Nb7fXTdNIYe2FGNiHQD8" "_id": "32Nb7fXTdNIYe2FGNiHQD8"
...@@ -3337,7 +3350,7 @@ ...@@ -3337,7 +3350,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3379,13 +3392,13 @@ ...@@ -3379,13 +3392,13 @@
"_name": "hu", "_name": "hu",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 72
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3441,7 +3454,7 @@ ...@@ -3441,7 +3454,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3483,17 +3496,17 @@ ...@@ -3483,17 +3496,17 @@
"_name": "buaPos", "_name": "buaPos",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 67
}, },
"_children": [ "_children": [
{ {
"__id__": 73 "__id__": 74
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 75 "__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3549,13 +3562,13 @@ ...@@ -3549,13 +3562,13 @@
"_name": "Bua", "_name": "Bua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 72 "__id__": 73
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3611,7 +3624,7 @@ ...@@ -3611,7 +3624,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 73 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3653,7 +3666,7 @@ ...@@ -3653,7 +3666,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"_id": "74FwAooblKp5Uz0cmQR1wo" "_id": "74FwAooblKp5Uz0cmQR1wo"
...@@ -3663,17 +3676,17 @@ ...@@ -3663,17 +3676,17 @@
"_name": "Tutorial Tap", "_name": "Tutorial Tap",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 67
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 78
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3729,13 +3742,13 @@ ...@@ -3729,13 +3742,13 @@
"_name": "hand", "_name": "hand",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3791,7 +3804,7 @@ ...@@ -3791,7 +3804,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3823,7 +3836,7 @@ ...@@ -3823,7 +3836,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_id": "e7adhzbtVIXItHuXv9Y+hG" "_id": "e7adhzbtVIXItHuXv9Y+hG"
...@@ -3833,14 +3846,14 @@ ...@@ -3833,14 +3846,14 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"bottleIdle": { "bottleIdle": {
"__id__": 70 "__id__": 71
}, },
"bottleAction": { "bottleAction": {
"__id__": 67 "__id__": 68
}, },
"_id": "45yzC1EPtJP4Z8W/DF1iwD" "_id": "45yzC1EPtJP4Z8W/DF1iwD"
}, },
...@@ -3855,7 +3868,7 @@ ...@@ -3855,7 +3868,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 83
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3911,7 +3924,7 @@ ...@@ -3911,7 +3924,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_id": "96hHP+ssxLNpn8/i2AKAyI" "_id": "96hHP+ssxLNpn8/i2AKAyI"
...@@ -3925,22 +3938,22 @@ ...@@ -3925,22 +3938,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 84 "__id__": 85
}, },
{ {
"__id__": 86 "__id__": 87
}, },
{ {
"__id__": 91 "__id__": 92
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 99
}, },
{ {
"__id__": 99 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3996,13 +4009,13 @@ ...@@ -3996,13 +4009,13 @@
"_name": "Mask copy", "_name": "Mask copy",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 83 "__id__": 84
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 85 "__id__": 86
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4058,7 +4071,7 @@ ...@@ -4058,7 +4071,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4090,20 +4103,20 @@ ...@@ -4090,20 +4103,20 @@
"_name": "The", "_name": "The",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 83 "__id__": 84
}, },
"_children": [ "_children": [
{ {
"__id__": 87 "__id__": 88
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 89 "__id__": 90
}, },
{ {
"__id__": 90 "__id__": 91
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4159,13 +4172,13 @@ ...@@ -4159,13 +4172,13 @@
"_name": "text1", "_name": "text1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 86 "__id__": 87
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4221,7 +4234,7 @@ ...@@ -4221,7 +4234,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 88
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4253,7 +4266,7 @@ ...@@ -4253,7 +4266,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"frames": [ "frames": [
...@@ -4271,7 +4284,7 @@ ...@@ -4271,7 +4284,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4313,17 +4326,17 @@ ...@@ -4313,17 +4326,17 @@
"_name": "Replay Button", "_name": "Replay Button",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 83 "__id__": 84
}, },
"_children": [ "_children": [
{ {
"__id__": 92 "__id__": 93
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 97 "__id__": 98
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4379,20 +4392,20 @@ ...@@ -4379,20 +4392,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 91 "__id__": 92
}, },
"_children": [ "_children": [
{ {
"__id__": 93 "__id__": 94
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 96
}, },
{ {
"__id__": 96 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4448,13 +4461,13 @@ ...@@ -4448,13 +4461,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 92 "__id__": 93
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4510,7 +4523,7 @@ ...@@ -4510,7 +4523,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4545,7 +4558,7 @@ ...@@ -4545,7 +4558,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4577,7 +4590,7 @@ ...@@ -4577,7 +4590,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -4604,7 +4617,7 @@ ...@@ -4604,7 +4617,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 92
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4677,7 +4690,7 @@ ...@@ -4677,7 +4690,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 92 "__id__": 93
}, },
"_id": "adCMRaOEVD5LOjd7MAm9EO" "_id": "adCMRaOEVD5LOjd7MAm9EO"
}, },
...@@ -4686,7 +4699,7 @@ ...@@ -4686,7 +4699,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"_id": "bcaw0ZNyRPGoK8ATotq1yF" "_id": "bcaw0ZNyRPGoK8ATotq1yF"
...@@ -4696,7 +4709,7 @@ ...@@ -4696,7 +4709,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"_id": "17J7OqMb1NsbF4iJiNTrDS" "_id": "17J7OqMb1NsbF4iJiNTrDS"
...@@ -4710,22 +4723,22 @@ ...@@ -4710,22 +4723,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 101 "__id__": 102
}, },
{ {
"__id__": 103 "__id__": 104
}, },
{ {
"__id__": 105 "__id__": 106
}, },
{ {
"__id__": 107 "__id__": 108
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4781,13 +4794,13 @@ ...@@ -4781,13 +4794,13 @@
"_name": "beer-bottle-rolling-on-a-sidewalk-82234", "_name": "beer-bottle-rolling-on-a-sidewalk-82234",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4843,7 +4856,7 @@ ...@@ -4843,7 +4856,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4862,13 +4875,13 @@ ...@@ -4862,13 +4875,13 @@
"_name": "Cartoon Short Version 2_01", "_name": "Cartoon Short Version 2_01",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4924,7 +4937,7 @@ ...@@ -4924,7 +4937,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4943,13 +4956,13 @@ ...@@ -4943,13 +4956,13 @@
"_name": "tieng_va_cham_chai_thuy_tinh-www_tiengdong_com", "_name": "tieng_va_cham_chai_thuy_tinh-www_tiengdong_com",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5005,7 +5018,7 @@ ...@@ -5005,7 +5018,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5024,13 +5037,13 @@ ...@@ -5024,13 +5037,13 @@
"_name": "breaking-a-vase-remix-87091", "_name": "breaking-a-vase-remix-87091",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5086,7 +5099,7 @@ ...@@ -5086,7 +5099,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5105,17 +5118,17 @@ ...@@ -5105,17 +5118,17 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"rollingSound": { "rollingSound": {
"__id__": 102 "__id__": 103
}, },
"breakingSound": { "breakingSound": {
"__id__": 108 "__id__": 109
}, },
"dropSound": { "dropSound": {
"__id__": 106 "__id__": 107
}, },
"_id": "a5vu6IE1ROn6VO7UPM9J3p" "_id": "a5vu6IE1ROn6VO7UPM9J3p"
}, },
...@@ -5128,37 +5141,22 @@ ...@@ -5128,37 +5141,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 111 "__id__": 112
},
{
"__id__": 113
},
{
"__id__": 115
},
{
"__id__": 120
},
{
"__id__": 171
}, },
{ {
"__id__": 173 "__id__": 114
}, },
{ {
"__id__": 176 "__id__": 178
}, },
{ {
"__id__": 179 "__id__": 181
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 182 "__id__": 184
},
{
"__id__": 183
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5214,13 +5212,13 @@ ...@@ -5214,13 +5212,13 @@
"_name": "BG", "_name": "BG",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 111
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 112 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5276,7 +5274,7 @@ ...@@ -5276,7 +5274,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 111 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5305,16 +5303,38 @@ ...@@ -5305,16 +5303,38 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Layer 723", "_name": "BottleController",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 111
}, },
"_children": [], "_children": [
{
"__id__": 115
},
{
"__id__": 118
},
{
"__id__": 120
},
{
"__id__": 122
},
{
"__id__": 159
},
{
"__id__": 172
},
{
"__id__": 175
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 177
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5328,8 +5348,8 @@ ...@@ -5328,8 +5348,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 326, "width": 500,
"height": 311 "height": 500
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -5340,15 +5360,15 @@ ...@@ -5340,15 +5360,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
23.26, 0,
-52.304, 0,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
2, 1,
2, 1,
1 1
] ]
}, },
...@@ -5363,69 +5383,33 @@ ...@@ -5363,69 +5383,33 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "3d46evHUVDqadYPx9W8uKv" "_id": "93EQDERhBAwreiqQ6+2Aya"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Node",
"_name": "", "_name": "The copy",
"_objFlags": 0, "_objFlags": 0,
"node": { "_parent": {
"__id__": 113 "__id__": 114
}, },
"_enabled": true, "_children": [],
"_materials": [ "_active": true,
"_components": [
{ {
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__id__": 116
},
{
"__id__": 117
} }
], ],
"_srcBlendFactor": 770, "_prefab": null,
"_dstBlendFactor": 771, "_opacity": 255,
"_spriteFrame": { "_color": {
"__uuid__": "089541ca-5089-4ec3-970f-32084f5706d6" "__type__": "cc.Color",
}, "r": 255,
"_type": 0, "g": 255,
"_sizeMode": 1, "b": 255,
"_fillType": 0, "a": 255
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "9aEHHSCy5LAYZWVIMwiKdo"
},
{
"__type__": "cc.Node",
"_name": "The copy",
"_objFlags": 0,
"_parent": {
"__id__": 110
},
"_children": [
{
"__id__": 116
}
],
"_active": true,
"_components": [
{
"__id__": 118
},
{
"__id__": 119
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -5466,18 +5450,78 @@ ...@@ -5466,18 +5450,78 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "46d6VRPY1PzJ0JUN88ggZD" "_id": "46d6VRPY1PzJ0JUN88ggZD"
}, },
{
"__type__": "16a952mWXdLX4fDDoWJWpu4",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
},
"_enabled": true,
"frames": [
{
"__uuid__": "95fbff81-21f6-4a58-9bc5-c8fc3f869e8c"
},
{
"__uuid__": "87e4a26d-6ec7-4770-bc46-8d94501901cf"
}
],
"_id": "285jokyFNBoLY6esDpO4q2"
},
{
"__type__": "sp.Skeleton",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
},
"_enabled": true,
"_materials": [
{
"__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
}
],
"paused": false,
"defaultSkin": "default",
"defaultAnimation": "",
"_preCacheMode": 0,
"_cacheMode": 0,
"loop": true,
"premultipliedAlpha": true,
"timeScale": 1,
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_skeletonCache": null,
"_animationName": "",
"_animationQueue": [],
"_headAniInfo": null,
"_playTimes": 0,
"_isAniComplete": true,
"_N$skeletonData": {
"__uuid__": "c7779876-e7ea-4a74-8ed6-5e9ac1ca0175"
},
"_N$_defaultCacheMode": 0,
"_N$debugSlots": false,
"_N$debugBones": false,
"_N$debugMesh": false,
"_N$useTint": false,
"_N$enableBatch": false,
"_id": "7d5AGjB/FHXakCeD3DRAWR"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "text1", "_name": "text1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 114
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5533,7 +5577,7 @@ ...@@ -5533,7 +5577,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5560,83 +5604,20 @@ ...@@ -5560,83 +5604,20 @@
"_atlas": null, "_atlas": null,
"_id": "18lYnFPJxHbo1jlGrnQP0R" "_id": "18lYnFPJxHbo1jlGrnQP0R"
}, },
{
"__type__": "16a952mWXdLX4fDDoWJWpu4",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
},
"_enabled": true,
"frames": [
{
"__uuid__": "95fbff81-21f6-4a58-9bc5-c8fc3f869e8c"
},
{
"__uuid__": "87e4a26d-6ec7-4770-bc46-8d94501901cf"
}
],
"_id": "285jokyFNBoLY6esDpO4q2"
},
{
"__type__": "sp.Skeleton",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
},
"_enabled": true,
"_materials": [
{
"__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
}
],
"paused": false,
"defaultSkin": "default",
"defaultAnimation": "",
"_preCacheMode": 0,
"_cacheMode": 0,
"loop": true,
"premultipliedAlpha": true,
"timeScale": 1,
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_skeletonCache": null,
"_animationName": "",
"_animationQueue": [],
"_headAniInfo": null,
"_playTimes": 0,
"_isAniComplete": true,
"_N$skeletonData": {
"__uuid__": "c7779876-e7ea-4a74-8ed6-5e9ac1ca0175"
},
"_N$_defaultCacheMode": 0,
"_N$debugSlots": false,
"_N$debugBones": false,
"_N$debugMesh": false,
"_N$useTint": false,
"_N$enableBatch": false,
"_id": "7d5AGjB/FHXakCeD3DRAWR"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Bottle", "_name": "Layer 723",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 114
}, },
"_children": [ "_children": [],
"_active": true,
"_components": [
{ {
"__id__": 121 "__id__": 121
},
{
"__id__": 158
} }
], ],
"_active": true,
"_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -5648,8 +5629,8 @@ ...@@ -5648,8 +5629,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 500, "width": 326,
"height": 500 "height": 311
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -5661,15 +5642,15 @@ ...@@ -5661,15 +5642,15 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, -52.304,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 2,
1, 2,
1 2
] ]
}, },
"_eulerAngles": { "_eulerAngles": {
...@@ -5683,33 +5664,65 @@ ...@@ -5683,33 +5664,65 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "93EQDERhBAwreiqQ6+2Aya" "_id": "3d46evHUVDqadYPx9W8uKv"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "089541ca-5089-4ec3-970f-32084f5706d6"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "9aEHHSCy5LAYZWVIMwiKdo"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Body", "_name": "Body",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 120 "__id__": 114
}, },
"_children": [ "_children": [
{ {
"__id__": 122 "__id__": 123
}, },
{ {
"__id__": 128 "__id__": 129
}, },
{ {
"__id__": 134 "__id__": 135
}, },
{ {
"__id__": 140 "__id__": 141
}, },
{ {
"__id__": 146 "__id__": 147
}, },
{ {
"__id__": 152 "__id__": 153
} }
], ],
"_active": true, "_active": true,
...@@ -5767,14 +5780,11 @@ ...@@ -5767,14 +5780,11 @@
"_name": "6", "_name": "6",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 123
},
{ {
"__id__": 124 "__id__": 124
}, },
...@@ -5786,6 +5796,9 @@ ...@@ -5786,6 +5796,9 @@
}, },
{ {
"__id__": 127 "__id__": 127
},
{
"__id__": 128
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5841,7 +5854,7 @@ ...@@ -5841,7 +5854,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_id": "cfh1jBullN7JO53xK2NK9d" "_id": "cfh1jBullN7JO53xK2NK9d"
...@@ -5851,7 +5864,7 @@ ...@@ -5851,7 +5864,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5883,7 +5896,7 @@ ...@@ -5883,7 +5896,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -5951,10 +5964,10 @@ ...@@ -5951,10 +5964,10 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 0,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
"_linearDamping": 0, "_linearDamping": 0,
...@@ -5976,7 +5989,7 @@ ...@@ -5976,7 +5989,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6019,14 +6032,11 @@ ...@@ -6019,14 +6032,11 @@
"_name": "3", "_name": "3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 129
},
{ {
"__id__": 130 "__id__": 130
}, },
...@@ -6038,6 +6048,9 @@ ...@@ -6038,6 +6048,9 @@
}, },
{ {
"__id__": 133 "__id__": 133
},
{
"__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6093,7 +6106,7 @@ ...@@ -6093,7 +6106,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6125,7 +6138,7 @@ ...@@ -6125,7 +6138,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_id": "4f6Dt6/09FwL+yIiIkzOdP" "_id": "4f6Dt6/09FwL+yIiIkzOdP"
...@@ -6135,7 +6148,7 @@ ...@@ -6135,7 +6148,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6233,10 +6246,10 @@ ...@@ -6233,10 +6246,10 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 0,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
"_linearDamping": 0, "_linearDamping": 0,
...@@ -6258,7 +6271,7 @@ ...@@ -6258,7 +6271,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6301,14 +6314,11 @@ ...@@ -6301,14 +6314,11 @@
"_name": "2", "_name": "2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 135
},
{ {
"__id__": 136 "__id__": 136
}, },
...@@ -6320,6 +6330,9 @@ ...@@ -6320,6 +6330,9 @@
}, },
{ {
"__id__": 139 "__id__": 139
},
{
"__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6375,7 +6388,7 @@ ...@@ -6375,7 +6388,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 134 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6407,7 +6420,7 @@ ...@@ -6407,7 +6420,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 134 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"_id": "63ZB/kFSVEKavLaqo0Hp3l" "_id": "63ZB/kFSVEKavLaqo0Hp3l"
...@@ -6417,7 +6430,7 @@ ...@@ -6417,7 +6430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 134 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6520,10 +6533,10 @@ ...@@ -6520,10 +6533,10 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 134 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 0,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
"_linearDamping": 0, "_linearDamping": 0,
...@@ -6545,7 +6558,7 @@ ...@@ -6545,7 +6558,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 134 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6588,14 +6601,11 @@ ...@@ -6588,14 +6601,11 @@
"_name": "4", "_name": "4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 141
},
{ {
"__id__": 142 "__id__": 142
}, },
...@@ -6607,6 +6617,9 @@ ...@@ -6607,6 +6617,9 @@
}, },
{ {
"__id__": 145 "__id__": 145
},
{
"__id__": 146
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6662,7 +6675,7 @@ ...@@ -6662,7 +6675,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6694,7 +6707,7 @@ ...@@ -6694,7 +6707,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_id": "21oKTWFXpPAbnbcJMb9BD0" "_id": "21oKTWFXpPAbnbcJMb9BD0"
...@@ -6704,7 +6717,7 @@ ...@@ -6704,7 +6717,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6827,10 +6840,10 @@ ...@@ -6827,10 +6840,10 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 0,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
"_linearDamping": 0, "_linearDamping": 0,
...@@ -6852,7 +6865,7 @@ ...@@ -6852,7 +6865,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6895,14 +6908,11 @@ ...@@ -6895,14 +6908,11 @@
"_name": "1", "_name": "1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 147
},
{ {
"__id__": 148 "__id__": 148
}, },
...@@ -6914,6 +6924,9 @@ ...@@ -6914,6 +6924,9 @@
}, },
{ {
"__id__": 151 "__id__": 151
},
{
"__id__": 152
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6969,7 +6982,7 @@ ...@@ -6969,7 +6982,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7001,7 +7014,7 @@ ...@@ -7001,7 +7014,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7104,7 +7117,7 @@ ...@@ -7104,7 +7117,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"_id": "bcmluUpTRPK6hZlUXAbqw5" "_id": "bcmluUpTRPK6hZlUXAbqw5"
...@@ -7114,10 +7127,10 @@ ...@@ -7114,10 +7127,10 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 0,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
"_linearDamping": 0, "_linearDamping": 0,
...@@ -7139,7 +7152,7 @@ ...@@ -7139,7 +7152,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7182,14 +7195,11 @@ ...@@ -7182,14 +7195,11 @@
"_name": "5", "_name": "5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 153
},
{ {
"__id__": 154 "__id__": 154
}, },
...@@ -7201,6 +7211,9 @@ ...@@ -7201,6 +7211,9 @@
}, },
{ {
"__id__": 157 "__id__": 157
},
{
"__id__": 158
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7256,7 +7269,7 @@ ...@@ -7256,7 +7269,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_id": "68uH5Wy0NHeJJxTq87yA/F" "_id": "68uH5Wy0NHeJJxTq87yA/F"
...@@ -7266,7 +7279,7 @@ ...@@ -7266,7 +7279,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7298,7 +7311,7 @@ ...@@ -7298,7 +7311,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7406,10 +7419,10 @@ ...@@ -7406,10 +7419,10 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 0,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
"_linearDamping": 0, "_linearDamping": 0,
...@@ -7431,7 +7444,7 @@ ...@@ -7431,7 +7444,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7474,14 +7487,14 @@ ...@@ -7474,14 +7487,14 @@
"_name": "Nap", "_name": "Nap",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 120 "__id__": 114
}, },
"_children": [ "_children": [
{ {
"__id__": 159 "__id__": 160
}, },
{ {
"__id__": 165 "__id__": 166
} }
], ],
"_active": true, "_active": true,
...@@ -7539,14 +7552,11 @@ ...@@ -7539,14 +7552,11 @@
"_name": "nap 2", "_name": "nap 2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 160
},
{ {
"__id__": 161 "__id__": 161
}, },
...@@ -7558,6 +7568,9 @@ ...@@ -7558,6 +7568,9 @@
}, },
{ {
"__id__": 164 "__id__": 164
},
{
"__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7613,7 +7626,7 @@ ...@@ -7613,7 +7626,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7645,7 +7658,7 @@ ...@@ -7645,7 +7658,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7793,7 +7806,7 @@ ...@@ -7793,7 +7806,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_id": "66j+VkXfpNoadfW56880/G" "_id": "66j+VkXfpNoadfW56880/G"
...@@ -7803,10 +7816,10 @@ ...@@ -7803,10 +7816,10 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 0,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
"_linearDamping": 0, "_linearDamping": 0,
...@@ -7828,7 +7841,7 @@ ...@@ -7828,7 +7841,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7871,14 +7884,11 @@ ...@@ -7871,14 +7884,11 @@
"_name": "nap 1", "_name": "nap 1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 166
},
{ {
"__id__": 167 "__id__": 167
}, },
...@@ -7890,6 +7900,9 @@ ...@@ -7890,6 +7900,9 @@
}, },
{ {
"__id__": 170 "__id__": 170
},
{
"__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7945,7 +7958,7 @@ ...@@ -7945,7 +7958,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7977,7 +7990,7 @@ ...@@ -7977,7 +7990,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_id": "24D4XJuZlE+q6fQu9Zy6vU" "_id": "24D4XJuZlE+q6fQu9Zy6vU"
...@@ -7987,7 +8000,7 @@ ...@@ -7987,7 +8000,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -8095,10 +8108,10 @@ ...@@ -8095,10 +8108,10 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 0,
"_allowSleep": true, "_allowSleep": true,
"_gravityScale": 1, "_gravityScale": 1,
"_linearDamping": 0, "_linearDamping": 0,
...@@ -8120,7 +8133,7 @@ ...@@ -8120,7 +8133,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -8160,18 +8173,18 @@ ...@@ -8160,18 +8173,18 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "New Sprite", "_name": "Hammer",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 114
}, },
"_children": [], "_children": [
"_active": true,
"_components": [
{ {
"__id__": 172 "__id__": 173
} }
], ],
"_active": true,
"_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8183,8 +8196,8 @@ ...@@ -8183,8 +8196,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 20, "width": 400,
"height": 20 "height": 600
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8218,55 +8231,20 @@ ...@@ -8218,55 +8231,20 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "e3jCDOU0VExKvoPYRYipk/" "_id": "ecEAZtsQ1M86ZSI5xa+HtN"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e7aba14b-f956-4480-b254-8d57832e273f"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "4aeKl+F5NDy4t+ofdhiju2"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Ground", "_name": "Bua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 172
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 174 "__id__": 174
},
{
"__id__": 175
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8280,8 +8258,8 @@ ...@@ -8280,8 +8258,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2000, "width": 462.01,
"height": 100 "height": 540.78
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8292,8 +8270,8 @@ ...@@ -8292,8 +8270,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 200,
-898.1, -150,
0, 0,
0, 0,
0, 0,
...@@ -8315,74 +8293,62 @@ ...@@ -8315,74 +8293,62 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "69sT2jMJ1Eo4eI0cKvUR7R" "_id": "eb8hbSoSxMx7ZXOGQBwKBk"
},
{
"__type__": "cc.RigidBody",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
},
"_enabled": true,
"_type": 1,
"_allowSleep": true,
"_gravityScale": 1,
"_linearDamping": 0,
"_angularDamping": 0,
"_linearVelocity": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_angularVelocity": 0,
"_fixedRotation": false,
"enabledContactListener": false,
"bullet": false,
"awakeOnLoad": true,
"_id": "b9YodRnt9BtbHX8sfyUQpm"
}, },
{ {
"__type__": "cc.PhysicsBoxCollider", "__type__": "sp.Skeleton",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 173 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "_materials": [
"_density": 1, {
"_sensor": false, "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
"_friction": 0.2, }
"_restitution": 0, ],
"body": null, "paused": false,
"_offset": { "defaultSkin": "Bua",
"__type__": "cc.Vec2", "defaultAnimation": "Idle",
"x": 0, "_preCacheMode": 0,
"y": 0 "_cacheMode": 0,
}, "loop": false,
"_size": { "premultipliedAlpha": true,
"__type__": "cc.Size", "timeScale": 1,
"width": 2000, "_accTime": 0,
"height": 100 "_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_skeletonCache": null,
"_animationName": "Idle",
"_animationQueue": [],
"_headAniInfo": null,
"_playTimes": 1,
"_isAniComplete": true,
"_N$skeletonData": {
"__uuid__": "a5d5b5a3-7ac9-4207-a35a-9fd1ce088b83"
}, },
"_id": "b8Mk8Eu8dBG4ECrSWuKcF2" "_N$_defaultCacheMode": 0,
"_N$debugSlots": false,
"_N$debugBones": false,
"_N$debugMesh": false,
"_N$useTint": false,
"_N$enableBatch": false,
"_id": "0dlMrbSXxJU6Vbpc+nVqiW"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "default_sprite_splash", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 114
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 177 "__id__": 176
},
{
"__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8396,8 +8362,8 @@ ...@@ -8396,8 +8362,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 97.87,
"height": 100 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8408,8 +8374,8 @@ ...@@ -8408,8 +8374,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
3.01, 185.327,
-526.727, 630.994,
0, 0,
0, 0,
0, 0,
...@@ -8431,73 +8397,71 @@ ...@@ -8431,73 +8397,71 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a02Lxjqk9HJYVidyPlB44o" "_id": "a7nRd/23FDOY7UoJR9BT/k"
}, },
{ {
"__type__": "cc.RigidBody", "__type__": "cc.Label",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 176 "__id__": 175
}, },
"_enabled": true, "_enabled": true,
"_type": 2, "_materials": [
"_allowSleep": true, {
"_gravityScale": 1, "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
"_linearDamping": 0, }
"_angularDamping": 0, ],
"_linearVelocity": { "_srcBlendFactor": 770,
"__type__": "cc.Vec2", "_dstBlendFactor": 771,
"x": 0, "_string": "Label",
"y": 0 "_N$string": "Label",
}, "_fontSize": 40,
"_angularVelocity": 0, "_lineHeight": 40,
"_fixedRotation": false, "_enableWrapText": true,
"enabledContactListener": false, "_N$file": null,
"bullet": false, "_isSystemFontUsed": true,
"awakeOnLoad": true, "_spacingX": 0,
"_id": "f1vILs+9dGzId9dSCs9quj" "_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "cc2wCYN+5FT47FBkBwmBt/"
}, },
{ {
"__type__": "cc.PhysicsBoxCollider", "__type__": "6fcd79x0JdPZKDzUr010UMy",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 176 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "hammerNode": {
"_density": 1, "__id__": 172
"_sensor": false,
"_friction": 0.2,
"_restitution": 0,
"body": null,
"_offset": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_size": {
"__type__": "cc.Size",
"width": 100,
"height": 100
}, },
"_id": "55p7kNBX9GUKwcKmGcqJ9A" "_id": "bajJhmrelJN6Gv2WqcoCLj"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Hammer", "_name": "Ground",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 111
}, },
"_children": [ "_children": [],
"_active": true,
"_components": [
{
"__id__": 179
},
{ {
"__id__": 180 "__id__": 180
} }
], ],
"_active": true,
"_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8509,8 +8473,8 @@ ...@@ -8509,8 +8473,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 400, "width": 2000,
"height": 600 "height": 100
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8522,7 +8486,7 @@ ...@@ -8522,7 +8486,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, -898.1,
0, 0,
0, 0,
0, 0,
...@@ -8544,20 +8508,74 @@ ...@@ -8544,20 +8508,74 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "ecEAZtsQ1M86ZSI5xa+HtN" "_id": "69sT2jMJ1Eo4eI0cKvUR7R"
},
{
"__type__": "cc.RigidBody",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
},
"_enabled": true,
"_type": 1,
"_allowSleep": true,
"_gravityScale": 1,
"_linearDamping": 0,
"_angularDamping": 0,
"_linearVelocity": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_angularVelocity": 0,
"_fixedRotation": false,
"enabledContactListener": false,
"bullet": false,
"awakeOnLoad": true,
"_id": "b9YodRnt9BtbHX8sfyUQpm"
},
{
"__type__": "cc.PhysicsBoxCollider",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
},
"_enabled": true,
"tag": 0,
"_density": 1,
"_sensor": false,
"_friction": 0.2,
"_restitution": 0,
"body": null,
"_offset": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_size": {
"__type__": "cc.Size",
"width": 2000,
"height": 100
},
"_id": "b8Mk8Eu8dBG4ECrSWuKcF2"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Bua", "_name": "Obstance",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 179 "__id__": 111
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 181 "__id__": 182
},
{
"__id__": 183
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8571,8 +8589,8 @@ ...@@ -8571,8 +8589,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 462.01, "width": 100,
"height": 540.78 "height": 100
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8583,8 +8601,8 @@ ...@@ -8583,8 +8601,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
200, 3.01,
-150, -604.414,
0, 0,
0, 0,
0, 0,
...@@ -8606,72 +8624,64 @@ ...@@ -8606,72 +8624,64 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "eb8hbSoSxMx7ZXOGQBwKBk" "_id": "a02Lxjqk9HJYVidyPlB44o"
}, },
{ {
"__type__": "sp.Skeleton", "__type__": "cc.RigidBody",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 180 "__id__": 181
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_type": 2,
{ "_allowSleep": true,
"__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" "_gravityScale": 1,
} "_linearDamping": 0,
], "_angularDamping": 0,
"paused": false, "_linearVelocity": {
"defaultSkin": "Bua", "__type__": "cc.Vec2",
"defaultAnimation": "Idle", "x": 0,
"_preCacheMode": 0, "y": 0
"_cacheMode": 0,
"loop": false,
"premultipliedAlpha": true,
"timeScale": 1,
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_skeletonCache": null,
"_animationName": "Idle",
"_animationQueue": [],
"_headAniInfo": null,
"_playTimes": 1,
"_isAniComplete": true,
"_N$skeletonData": {
"__uuid__": "a5d5b5a3-7ac9-4207-a35a-9fd1ce088b83"
}, },
"_N$_defaultCacheMode": 0, "_angularVelocity": 0,
"_N$debugSlots": false, "_fixedRotation": false,
"_N$debugBones": false, "enabledContactListener": false,
"_N$debugMesh": false, "bullet": false,
"_N$useTint": false, "awakeOnLoad": true,
"_N$enableBatch": false, "_id": "f1vILs+9dGzId9dSCs9quj"
"_id": "0dlMrbSXxJU6Vbpc+nVqiW"
}, },
{ {
"__type__": "90267gmddZPkLBW/eIiYJR6", "__type__": "cc.PhysicsCircleCollider",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 181
}, },
"_enabled": true, "_enabled": true,
"_id": "4eyUw4PwxKSq63DGUgJory" "tag": 0,
"_density": 1,
"_sensor": false,
"_friction": 0.2,
"_restitution": 0,
"body": null,
"_offset": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_radius": 20,
"_id": "0fuA0DuwxDErcjlTRl+J1g"
}, },
{ {
"__type__": "6fcd79x0JdPZKDzUr010UMy", "__type__": "90267gmddZPkLBW/eIiYJR6",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 111
}, },
"_enabled": true, "_enabled": true,
"hammerNode": { "_id": "4eyUw4PwxKSq63DGUgJory"
"__id__": 179
},
"_id": "e8vixNUuZPSqJIbe4huu8F"
}, },
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
......
assets/scripts/GamePlay/BreakingBottleController.ts
View file @ 5fabb20b
...@@ -22,9 +22,9 @@ export default class BreakingBottleController extends cc.Component { ...@@ -22,9 +22,9 @@ export default class BreakingBottleController extends cc.Component {
this._cardNode = this.node.getComponentInChildren(TheController).node; this._cardNode = this.node.getComponentInChildren(TheController).node;
this._cardNode.active = false; this._cardNode.active = false;
this.node.position = cc.v3(0, 0);
this.node.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this); this.node.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this);
this.node.on(cc.Node.EventType.TOUCH_END, this.onTouchEnd, this); this.node.on(cc.Node.EventType.TOUCH_END, this.onTouchEnd, this);
eventTarget.on(CHECK_FRAGMENT, this.checkFragment, this); eventTarget.on(CHECK_FRAGMENT, this.checkFragment, this);
eventTarget.on(HAMMER, this.onHammer, this); eventTarget.on(HAMMER, this.onHammer, this);
} }
......
assets/scripts/GamePlay/FragmentController.ts
View file @ 5fabb20b
...@@ -16,6 +16,7 @@ export default class FragmentController extends cc.Component { ...@@ -16,6 +16,7 @@ export default class FragmentController extends cc.Component {
this._physicsCollider.points = this._collider.points; this._physicsCollider.points = this._collider.points;
this._physicsCollider.enabled = false; this._physicsCollider.enabled = false;
this._rg = this.node.getComponent(cc.RigidBody); this._rg = this.node.getComponent(cc.RigidBody);
this._rg.type = cc.RigidBodyType.Static;
eventTarget.on(CHECK_TOUCH, this.checkTouch, this); eventTarget.on(CHECK_TOUCH, this.checkTouch, this);
} }
......
assets/scripts/UI/ActionScreen.ts
View file @ 5fabb20b
import { eventTarget, PLAY_ANIM_NUT1, PLAY_ANIM_NUT2, PLAY_ANIM_NUT3, PLAY_ANIM_NUT4, SHOW_ACTION_SCREEN, SHOW_CARD_POPUP, SHOW_START_SCREEN } from "../Events"; import { eventTarget, PLAY_ANIM_NUT1, PLAY_ANIM_NUT2, PLAY_ANIM_NUT3, PLAY_ANIM_NUT4, SHOW_ACTION_SCREEN, SHOW_START_SCREEN } from "../Events";
import BuaController from "../GamePlay/BuaController"; import BuaController from "../GamePlay/BuaController";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
...@@ -14,6 +14,8 @@ export default class ActionScreen extends cc.Component { ...@@ -14,6 +14,8 @@ export default class ActionScreen extends cc.Component {
private _spine: sp.Skeleton = null; private _spine: sp.Skeleton = null;
onLoad() { onLoad() {
return;
eventTarget.on(SHOW_ACTION_SCREEN, this.showScreen, this); eventTarget.on(SHOW_ACTION_SCREEN, this.showScreen, this);
eventTarget.on(SHOW_START_SCREEN, this.hideScreen, this); eventTarget.on(SHOW_START_SCREEN, this.hideScreen, this);
eventTarget.on(PLAY_ANIM_NUT1, this.hideBottle, this); eventTarget.on(PLAY_ANIM_NUT1, this.hideBottle, this);
......
assets/scripts/UI/BreakingBottleScreen.ts
View file @ 5fabb20b
import { eventTarget, SHOW_ACTION_SCREEN, SHOW_START_SCREEN } from "../Events";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
@ccclass @ccclass
export default class BreakingBottleScreen extends cc.Component { export default class BreakingBottleScreen extends cc.Component {
onLoad() { onLoad() {
eventTarget.on(SHOW_ACTION_SCREEN, this.showScreen, this);
eventTarget.on(SHOW_START_SCREEN, this.hideScreen, this);
// this.node.position = cc.v3(400, 600, 0);
}
private hideBottle() {
// this.bottleAction.active = true;
// this.bottleIdle.active = false;
} }
private showScreen() {
console.log('showScreen', this.node)
// this.bottleAction.active = false;
// this.bottleIdle.active = true;
// this._spine.setAnimation(0, 'Idle', true);
// this._buaController.onSetTool();
this.node.active = true;
this.node.position = cc.v3();
}
private hideScreen() {
this.node.active = false;
}
} }
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