Commit 417b3c67 authored by Vũ Gia Vương's avatar Vũ Gia Vương

update hammer

parent 5ceadf6d
...@@ -99,10 +99,10 @@ ...@@ -99,10 +99,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 180 "__id__": 184
}, },
{ {
"__id__": 181 "__id__": 185
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3203,7 +3203,7 @@ ...@@ -3203,7 +3203,7 @@
"__id__": 76 "__id__": 76
} }
], ],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 80
...@@ -5137,22 +5137,28 @@ ...@@ -5137,22 +5137,28 @@
"__id__": 115 "__id__": 115
}, },
{ {
"__id__": 167 "__id__": 120
}, },
{ {
"__id__": 169 "__id__": 171
}, },
{ {
"__id__": 172 "__id__": 173
}, },
{ {
"__id__": 175 "__id__": 176
},
{
"__id__": 179
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 179 "__id__": 182
},
{
"__id__": 183
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5393,7 +5399,7 @@ ...@@ -5393,7 +5399,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Bottle", "_name": "The copy",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 110
...@@ -5401,15 +5407,77 @@ ...@@ -5401,15 +5407,77 @@
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 116
}
],
"_active": true,
"_components": [
{
"__id__": 118
}, },
{ {
"__id__": 153 "__id__": 119
} }
], ],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1393
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "46d6VRPY1PzJ0JUN88ggZD"
},
{
"__type__": "cc.Node",
"_name": "text1",
"_objFlags": 0,
"_parent": {
"__id__": 115
},
"_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5421,6 +5489,163 @@ ...@@ -5421,6 +5489,163 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": {
"__type__": "cc.Size",
"width": 458,
"height": 145
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-232.087,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "86Ls0/UsxPHrX1wNSkGt3Y"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "95fbff81-21f6-4a58-9bc5-c8fc3f869e8c"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_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",
"_name": "Bottle",
"_objFlags": 0,
"_parent": {
"__id__": 110
},
"_children": [
{
"__id__": 121
},
{
"__id__": 158
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 500, "width": 500,
...@@ -5465,26 +5690,26 @@ ...@@ -5465,26 +5690,26 @@
"_name": "Body", "_name": "Body",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 120
}, },
"_children": [ "_children": [
{ {
"__id__": 117 "__id__": 122
}, },
{ {
"__id__": 123 "__id__": 128
}, },
{ {
"__id__": 129 "__id__": 134
}, },
{ {
"__id__": 135 "__id__": 140
}, },
{ {
"__id__": 141 "__id__": 146
}, },
{ {
"__id__": 147 "__id__": 152
} }
], ],
"_active": true, "_active": true,
...@@ -5542,25 +5767,25 @@ ...@@ -5542,25 +5767,25 @@
"_name": "6", "_name": "6",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 123
}, },
{ {
"__id__": 119 "__id__": 124
}, },
{ {
"__id__": 120 "__id__": 125
}, },
{ {
"__id__": 121 "__id__": 126
}, },
{ {
"__id__": 122 "__id__": 127
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5616,7 +5841,7 @@ ...@@ -5616,7 +5841,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_id": "cfh1jBullN7JO53xK2NK9d" "_id": "cfh1jBullN7JO53xK2NK9d"
...@@ -5626,7 +5851,7 @@ ...@@ -5626,7 +5851,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5658,7 +5883,7 @@ ...@@ -5658,7 +5883,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -5726,7 +5951,7 @@ ...@@ -5726,7 +5951,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -5751,7 +5976,7 @@ ...@@ -5751,7 +5976,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -5794,25 +6019,25 @@ ...@@ -5794,25 +6019,25 @@
"_name": "3", "_name": "3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 129
}, },
{ {
"__id__": 125 "__id__": 130
}, },
{ {
"__id__": 126 "__id__": 131
}, },
{ {
"__id__": 127 "__id__": 132
}, },
{ {
"__id__": 128 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5868,7 +6093,7 @@ ...@@ -5868,7 +6093,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5900,7 +6125,7 @@ ...@@ -5900,7 +6125,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"_id": "4f6Dt6/09FwL+yIiIkzOdP" "_id": "4f6Dt6/09FwL+yIiIkzOdP"
...@@ -5910,7 +6135,7 @@ ...@@ -5910,7 +6135,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6008,7 +6233,7 @@ ...@@ -6008,7 +6233,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -6033,7 +6258,7 @@ ...@@ -6033,7 +6258,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6076,25 +6301,25 @@ ...@@ -6076,25 +6301,25 @@
"_name": "2", "_name": "2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 135
}, },
{ {
"__id__": 131 "__id__": 136
}, },
{ {
"__id__": 132 "__id__": 137
}, },
{ {
"__id__": 133 "__id__": 138
}, },
{ {
"__id__": 134 "__id__": 139
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6150,7 +6375,7 @@ ...@@ -6150,7 +6375,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6182,7 +6407,7 @@ ...@@ -6182,7 +6407,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_id": "63ZB/kFSVEKavLaqo0Hp3l" "_id": "63ZB/kFSVEKavLaqo0Hp3l"
...@@ -6192,7 +6417,7 @@ ...@@ -6192,7 +6417,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6295,7 +6520,7 @@ ...@@ -6295,7 +6520,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -6320,7 +6545,7 @@ ...@@ -6320,7 +6545,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6363,25 +6588,25 @@ ...@@ -6363,25 +6588,25 @@
"_name": "4", "_name": "4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 136 "__id__": 141
}, },
{ {
"__id__": 137 "__id__": 142
}, },
{ {
"__id__": 138 "__id__": 143
}, },
{ {
"__id__": 139 "__id__": 144
}, },
{ {
"__id__": 140 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6437,7 +6662,7 @@ ...@@ -6437,7 +6662,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6469,7 +6694,7 @@ ...@@ -6469,7 +6694,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_id": "21oKTWFXpPAbnbcJMb9BD0" "_id": "21oKTWFXpPAbnbcJMb9BD0"
...@@ -6479,7 +6704,7 @@ ...@@ -6479,7 +6704,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6602,7 +6827,7 @@ ...@@ -6602,7 +6827,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -6627,7 +6852,7 @@ ...@@ -6627,7 +6852,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6670,25 +6895,25 @@ ...@@ -6670,25 +6895,25 @@
"_name": "1", "_name": "1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 147
}, },
{ {
"__id__": 143 "__id__": 148
}, },
{ {
"__id__": 144 "__id__": 149
}, },
{ {
"__id__": 145 "__id__": 150
}, },
{ {
"__id__": 146 "__id__": 151
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6744,7 +6969,7 @@ ...@@ -6744,7 +6969,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6776,7 +7001,7 @@ ...@@ -6776,7 +7001,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6879,7 +7104,7 @@ ...@@ -6879,7 +7104,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"_id": "bcmluUpTRPK6hZlUXAbqw5" "_id": "bcmluUpTRPK6hZlUXAbqw5"
...@@ -6889,7 +7114,7 @@ ...@@ -6889,7 +7114,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -6914,7 +7139,7 @@ ...@@ -6914,7 +7139,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -6957,25 +7182,25 @@ ...@@ -6957,25 +7182,25 @@
"_name": "5", "_name": "5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 116 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 153
}, },
{ {
"__id__": 149 "__id__": 154
}, },
{ {
"__id__": 150 "__id__": 155
}, },
{ {
"__id__": 151 "__id__": 156
}, },
{ {
"__id__": 152 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7031,7 +7256,7 @@ ...@@ -7031,7 +7256,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_id": "68uH5Wy0NHeJJxTq87yA/F" "_id": "68uH5Wy0NHeJJxTq87yA/F"
...@@ -7041,7 +7266,7 @@ ...@@ -7041,7 +7266,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7073,7 +7298,7 @@ ...@@ -7073,7 +7298,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7181,7 +7406,7 @@ ...@@ -7181,7 +7406,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -7206,7 +7431,7 @@ ...@@ -7206,7 +7431,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7249,14 +7474,14 @@ ...@@ -7249,14 +7474,14 @@
"_name": "Nap", "_name": "Nap",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 120
}, },
"_children": [ "_children": [
{ {
"__id__": 154 "__id__": 159
}, },
{ {
"__id__": 160 "__id__": 165
} }
], ],
"_active": true, "_active": true,
...@@ -7314,25 +7539,25 @@ ...@@ -7314,25 +7539,25 @@
"_name": "nap 2", "_name": "nap 2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 158
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 160
}, },
{ {
"__id__": 156 "__id__": 161
}, },
{ {
"__id__": 157 "__id__": 162
}, },
{ {
"__id__": 158 "__id__": 163
}, },
{ {
"__id__": 159 "__id__": 164
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7388,7 +7613,7 @@ ...@@ -7388,7 +7613,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7420,7 +7645,7 @@ ...@@ -7420,7 +7645,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7568,7 +7793,7 @@ ...@@ -7568,7 +7793,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"_id": "66j+VkXfpNoadfW56880/G" "_id": "66j+VkXfpNoadfW56880/G"
...@@ -7578,7 +7803,7 @@ ...@@ -7578,7 +7803,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -7603,7 +7828,7 @@ ...@@ -7603,7 +7828,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7646,25 +7871,25 @@ ...@@ -7646,25 +7871,25 @@
"_name": "nap 1", "_name": "nap 1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 158
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 161 "__id__": 166
}, },
{ {
"__id__": 162 "__id__": 167
}, },
{ {
"__id__": 163 "__id__": 168
}, },
{ {
"__id__": 164 "__id__": 169
}, },
{ {
"__id__": 165 "__id__": 170
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7720,7 +7945,7 @@ ...@@ -7720,7 +7945,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 165
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7752,7 +7977,7 @@ ...@@ -7752,7 +7977,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 165
}, },
"_enabled": true, "_enabled": true,
"_id": "24D4XJuZlE+q6fQu9Zy6vU" "_id": "24D4XJuZlE+q6fQu9Zy6vU"
...@@ -7762,7 +7987,7 @@ ...@@ -7762,7 +7987,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 165
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7870,7 +8095,7 @@ ...@@ -7870,7 +8095,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 165
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -7895,7 +8120,7 @@ ...@@ -7895,7 +8120,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 165
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -7933,16 +8158,6 @@ ...@@ -7933,16 +8158,6 @@
], ],
"_id": "b2Sk5SfGZJko4XQX7dgETM" "_id": "b2Sk5SfGZJko4XQX7dgETM"
}, },
{
"__type__": "6fcd79x0JdPZKDzUr010UMy",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
},
"_enabled": true,
"_id": "25U1ge+O5DNb3crcOwx3Pu"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "New Sprite", "_name": "New Sprite",
...@@ -7954,7 +8169,7 @@ ...@@ -7954,7 +8169,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 172
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8010,7 +8225,7 @@ ...@@ -8010,7 +8225,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 167 "__id__": 171
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8048,10 +8263,10 @@ ...@@ -8048,10 +8263,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 170 "__id__": 174
}, },
{ {
"__id__": 171 "__id__": 175
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8107,7 +8322,7 @@ ...@@ -8107,7 +8322,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 169 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"_type": 1, "_type": 1,
...@@ -8132,7 +8347,7 @@ ...@@ -8132,7 +8347,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 169 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -8164,10 +8379,10 @@ ...@@ -8164,10 +8379,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 177
}, },
{ {
"__id__": 174 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8223,7 +8438,7 @@ ...@@ -8223,7 +8438,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 172 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_type": 2, "_type": 2,
...@@ -8248,7 +8463,7 @@ ...@@ -8248,7 +8463,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 172 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"tag": 0, "tag": 0,
...@@ -8278,15 +8493,11 @@ ...@@ -8278,15 +8493,11 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 176 "__id__": 180
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [],
{
"__id__": 178
}
],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -8340,13 +8551,13 @@ ...@@ -8340,13 +8551,13 @@
"_name": "Bua", "_name": "Bua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 175 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 177 "__id__": 181
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8402,7 +8613,7 @@ ...@@ -8402,7 +8613,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 176 "__id__": 180
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8412,10 +8623,10 @@ ...@@ -8412,10 +8623,10 @@
], ],
"paused": false, "paused": false,
"defaultSkin": "Bua", "defaultSkin": "Bua",
"defaultAnimation": "Dap4", "defaultAnimation": "Idle",
"_preCacheMode": 0, "_preCacheMode": 0,
"_cacheMode": 0, "_cacheMode": 0,
"loop": true, "loop": false,
"premultipliedAlpha": true, "premultipliedAlpha": true,
"timeScale": 1, "timeScale": 1,
"_accTime": 0, "_accTime": 0,
...@@ -8423,10 +8634,10 @@ ...@@ -8423,10 +8634,10 @@
"_frameCache": null, "_frameCache": null,
"_curFrame": null, "_curFrame": null,
"_skeletonCache": null, "_skeletonCache": null,
"_animationName": "Dap4", "_animationName": "Idle",
"_animationQueue": [], "_animationQueue": [],
"_headAniInfo": null, "_headAniInfo": null,
"_playTimes": 0, "_playTimes": 1,
"_isAniComplete": true, "_isAniComplete": true,
"_N$skeletonData": { "_N$skeletonData": {
"__uuid__": "a5d5b5a3-7ac9-4207-a35a-9fd1ce088b83" "__uuid__": "a5d5b5a3-7ac9-4207-a35a-9fd1ce088b83"
...@@ -8440,30 +8651,27 @@ ...@@ -8440,30 +8651,27 @@
"_id": "0dlMrbSXxJU6Vbpc+nVqiW" "_id": "0dlMrbSXxJU6Vbpc+nVqiW"
}, },
{ {
"__type__": "fa954JGo2FPTIS/o0ccP3kC", "__type__": "90267gmddZPkLBW/eIiYJR6",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 175 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_id": "9a4ytEMJlKtKZ1ogOoLQA/" "_id": "4eyUw4PwxKSq63DGUgJory"
}, },
{ {
"__type__": "90267gmddZPkLBW/eIiYJR6", "__type__": "6fcd79x0JdPZKDzUr010UMy",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"spriteNode": {
"__id__": 167
},
"hammerNode": { "hammerNode": {
"__id__": 175 "__id__": 179
}, },
"_id": "4eyUw4PwxKSq63DGUgJory" "_id": "e8vixNUuZPSqJIbe4huu8F"
}, },
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
......
...@@ -21,4 +21,6 @@ export const BEAT_GUILD = 'BEAT_GUILD'; ...@@ -21,4 +21,6 @@ export const BEAT_GUILD = 'BEAT_GUILD';
export const STOP_GUILD_ROTATE = 'STOP_GUILD_ROTATE'; export const STOP_GUILD_ROTATE = 'STOP_GUILD_ROTATE';
export const STOP_GUILD_TAP = 'STOP_GUILD_TAP'; export const STOP_GUILD_TAP = 'STOP_GUILD_TAP';
export const CHECK_TOUCH = 'CHECK_TOUCH'; export const CHECK_TOUCH = 'CHECK_TOUCH';
\ No newline at end of file export const CHECK_FRAGMENT = 'CHECK_FRAGMENT';
export const HAMMER = 'HAMMER';
\ No newline at end of file
import { CHECK_FRAGMENT, CHECK_TOUCH, eventTarget, HAMMER } from "../Events";
import { Global } from "../Global";
import FragmentController from "./FragmentController"; import FragmentController from "./FragmentController";
import TheController from "./TheController";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
@ccclass @ccclass
export default class BreakingBottleController extends cc.Component { export default class BreakingBottleController extends cc.Component {
private _body: cc.Node = null; @property(cc.Node)
private _lid: cc.Node = null; private hammerNode: cc.Node = null;
private _fragmentsBody: cc.Node[] = [];
private _fragmentsLid: cc.Node[] = [];
private _fragmentsAll: cc.Node[] = [];
protected onLoad(): void { private _spine: sp.Skeleton = null;
private _skins = ["Ga", "Gai_lung", "Gay", "Bua",];
[this._body, this._lid] = this.node.children; private _cardNode: cc.Node = null;
this._fragmentsBody = this._body.children; private _countFragment = 0;
this._fragmentsLid = this._lid.children;
this._fragmentsAll = [...this._fragmentsBody, ...this._fragmentsLid];
// console.log('this._fragmentsAll', this._fragmentsAll.map(item => item.position.toString())); onLoad() {
cc.director.getPhysicsManager().enabled = true;
this._spine = this.hammerNode.getComponentInChildren(sp.Skeleton);
this._cardNode = this.node.getComponentInChildren(TheController).node;
this._cardNode.active = false;
// this._fragmentsAll.forEach(item => { this.node.position = cc.v3(0, 0);
// item.addComponent(FragmentController); this.node.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this);
// }) this.node.on(cc.Node.EventType.TOUCH_END, this.onTouchEnd, this);
eventTarget.on(CHECK_FRAGMENT, this.checkFragment, this);
eventTarget.on(HAMMER, this.onHammer, this);
}
protected start(): void {
this.hideHammer();
}
private onHammer(newPos: cc.Vec2) {
cc.tween(this.hammerNode)
.to(0.1, { opacity: 255, position: cc.v3(newPos.x, newPos.y) })
.delay(0.7)
.to(0.2, { opacity: 0 })
.start();
}
private checkFragment(name: string) {
this._countFragment++;
if (this._countFragment == 8) {
this._cardNode.active = true;
}
} }
private onTouchStart(event: cc.Event.EventTouch) {
const pos = event.getLocation();
const nodePos = this.node.convertToNodeSpaceAR(pos);
const newPos = cc.v3(nodePos.x, nodePos.y);
eventTarget.emit(CHECK_TOUCH, nodePos);
this._spine.setSkin(this._skins[Global.tool % this._skins.length]);
this._spine.setAnimation(0, "Dap4", false);
}
private onTouchEnd(event: cc.Event.EventTouch) {
}
private hideHammer() {
this.hammerNode.opacity = 0;
}
} }
import { eventTarget, CHECK_TOUCH } from "../Events"; import { eventTarget, CHECK_TOUCH, CHECK_FRAGMENT, HAMMER } from "../Events";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
...@@ -25,6 +25,7 @@ export default class FragmentController extends cc.Component { ...@@ -25,6 +25,7 @@ export default class FragmentController extends cc.Component {
let isInside = cc.Intersection.pointInPolygon(pos, this._collider.points); let isInside = cc.Intersection.pointInPolygon(pos, this._collider.points);
if (isInside) { if (isInside) {
eventTarget.emit(HAMMER, point);
this.dropFragment(); this.dropFragment();
} }
} }
...@@ -33,6 +34,7 @@ export default class FragmentController extends cc.Component { ...@@ -33,6 +34,7 @@ export default class FragmentController extends cc.Component {
const pos = this.node.position; const pos = this.node.position;
this.node.setSiblingIndex(-1); this.node.setSiblingIndex(-1);
cc.tween(this.node) cc.tween(this.node)
.delay(0.5)
.to(0.2, { scale: 0.95 }) .to(0.2, { scale: 0.95 })
.to(0.2, { scale: 1.05, position: pos.clone().multiplyScalar(1.2) }) .to(0.2, { scale: 1.05, position: pos.clone().multiplyScalar(1.2) })
.call(() => { .call(() => {
...@@ -40,6 +42,10 @@ export default class FragmentController extends cc.Component { ...@@ -40,6 +42,10 @@ export default class FragmentController extends cc.Component {
this._rg.type = cc.RigidBodyType.Dynamic; this._rg.type = cc.RigidBodyType.Dynamic;
this._rg.gravityScale = 5; this._rg.gravityScale = 5;
}) })
.delay(1)
.call(() => {
eventTarget.emit(CHECK_FRAGMENT, this.node.name);
})
.start(); .start();
} }
} }
...@@ -14,6 +14,7 @@ export default class TheController extends cc.Component { ...@@ -14,6 +14,7 @@ export default class TheController extends cc.Component {
protected onLoad(): void { protected onLoad(): void {
this._textSprite = this.getComponentInChildren(cc.Sprite); this._textSprite = this.getComponentInChildren(cc.Sprite);
this._spine = this.node.getComponent(sp.Skeleton); this._spine = this.node.getComponent(sp.Skeleton);
this._spine.setCompleteListener((trackEntry) => { this._spine.setCompleteListener((trackEntry) => {
if (trackEntry.animation.name == 'Open') { if (trackEntry.animation.name == 'Open') {
this._spine.setAnimation(0, 'Idle', true); this._spine.setAnimation(0, 'Idle', true);
......
import { eventTarget, CHECK_TOUCH } 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 {
@property(cc.Node)
private spriteNode: cc.Node = null;
@property(cc.Node)
private hammerNode: cc.Node = null;
onLoad() { onLoad() {
cc.director.getPhysicsManager().enabled = true;
this.node.position = cc.v3(0, 0);
this.node.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this);
} }
private onTouchStart(event: cc.Event.EventTouch) {
const pos = event.getLocation();
const nodePos = this.node.convertToNodeSpaceAR(pos);
this.spriteNode.position = cc.v3(nodePos.x, nodePos.y);
eventTarget.emit(CHECK_TOUCH, nodePos);
this.hammerNode.position = cc.v3(nodePos.x, nodePos.y);
}
} }
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