Commit 206d1651 authored by Vũ Gia Vương's avatar Vũ Gia Vương

add tutorial, sprite fragment

parent 4cd1b5ee
......@@ -78,31 +78,31 @@
"__id__": 11
},
{
"__id__": 78
"__id__": 82
},
{
"__id__": 134
"__id__": 138
},
{
"__id__": 149
"__id__": 153
},
{
"__id__": 97
"__id__": 101
},
{
"__id__": 151
"__id__": 155
},
{
"__id__": 168
"__id__": 172
}
],
"_active": true,
"_components": [
{
"__id__": 178
"__id__": 182
},
{
"__id__": 179
"__id__": 183
}
],
"_prefab": null,
......@@ -543,16 +543,16 @@
"__id__": 14
},
{
"__id__": 71
"__id__": 75
},
{
"__id__": 74
"__id__": 78
}
],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 81
}
],
"_prefab": null,
......@@ -716,12 +716,15 @@
},
{
"__id__": 67
},
{
"__id__": 71
}
],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 74
}
],
"_prefab": null,
......@@ -3341,7 +3344,7 @@
},
{
"__type__": "cc.Node",
"_name": "Hammer",
"_name": "Tutorial Tap copy",
"_objFlags": 0,
"_parent": {
"__id__": 14
......@@ -3352,6 +3355,176 @@
}
],
"_active": true,
"_components": [
{
"__id__": 70
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-400,
-400,
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": "21dQf2NGBI5I1VwDkwkEz3"
},
{
"__type__": "cc.Node",
"_name": "hand",
"_objFlags": 0,
"_parent": {
"__id__": 67
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 215,
"height": 291
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0
},
"_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": "f51XfdVvdFTpyyYhR7RVaq"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "bb4b8653-efdf-49ce-b06e-3e199eddbc6f"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b2g9jLkkFF5ZSzSGhJHqg/"
},
{
"__type__": "2c2cbdHwQFCdpQMA/zXzBGt",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
},
"_enabled": true,
"_id": "0fmaVPxutFp715PkTE0KGs"
},
{
"__type__": "cc.Node",
"_name": "Hammer",
"_objFlags": 0,
"_parent": {
"__id__": 14
},
"_children": [
{
"__id__": 72
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
......@@ -3406,13 +3579,13 @@
"_name": "Bua",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 73
}
],
"_prefab": null,
......@@ -3468,7 +3641,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3514,7 +3687,7 @@
},
"_enabled": true,
"hammerNode": {
"__id__": 67
"__id__": 71
},
"_id": "bajJhmrelJN6Gv2WqcoCLj"
},
......@@ -3529,10 +3702,10 @@
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 76
},
{
"__id__": 73
"__id__": 77
}
],
"_prefab": null,
......@@ -3588,7 +3761,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 75
},
"_enabled": true,
"_type": 1,
......@@ -3613,7 +3786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 75
},
"_enabled": true,
"tag": 0,
......@@ -3645,10 +3818,10 @@
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 79
},
{
"__id__": 76
"__id__": 80
}
],
"_prefab": null,
......@@ -3704,7 +3877,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 78
},
"_enabled": true,
"_type": 1,
......@@ -3729,7 +3902,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 78
},
"_enabled": true,
"tag": 0,
......@@ -3765,22 +3938,22 @@
},
"_children": [
{
"__id__": 79
"__id__": 83
},
{
"__id__": 84
"__id__": 88
},
{
"__id__": 91
"__id__": 95
}
],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 99
},
{
"__id__": 133
"__id__": 137
}
],
"_prefab": null,
......@@ -3836,20 +4009,20 @@
"_name": "hu",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [
{
"__id__": 80
"__id__": 84
}
],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 86
},
{
"__id__": 83
"__id__": 87
}
],
"_prefab": null,
......@@ -3905,13 +4078,13 @@
"_name": "debug",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 85
}
],
"_prefab": null,
......@@ -3967,7 +4140,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -4000,7 +4173,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 83
},
"_enabled": true,
"_id": "ce7kjbfMJI6azmjgef3qfN"
......@@ -4010,7 +4183,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 83
},
"_enabled": true,
"_materials": [
......@@ -4052,17 +4225,17 @@
"_name": "SelectButton",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [
{
"__id__": 85
"__id__": 89
}
],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 94
}
],
"_prefab": null,
......@@ -4118,20 +4291,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 84
"__id__": 88
},
"_children": [
{
"__id__": 86
"__id__": 90
}
],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 92
},
{
"__id__": 89
"__id__": 93
}
],
"_prefab": null,
......@@ -4187,13 +4360,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 85
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 91
}
],
"_prefab": null,
......@@ -4249,7 +4422,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4284,7 +4457,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4316,7 +4489,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 89
},
"_enabled": true,
"alignMode": 0,
......@@ -4343,7 +4516,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 88
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4416,7 +4589,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 85
"__id__": 89
},
"_id": "009jyGf0JGyaWytJquX/r/"
},
......@@ -4425,17 +4598,17 @@
"_name": "Tutorial Rotate",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 82
},
"_children": [
{
"__id__": 92
"__id__": 96
}
],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 98
}
],
"_prefab": null,
......@@ -4491,13 +4664,13 @@
"_name": "hand",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 95
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 97
}
],
"_prefab": null,
......@@ -4553,7 +4726,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4585,7 +4758,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 95
},
"_enabled": true,
"_id": "d4FPzvmYhLzKDMGhWyEnXj"
......@@ -4595,17 +4768,17 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 82
},
"_enabled": true,
"selectBtnNode": {
"__id__": 84
"__id__": 88
},
"contentNode": {
"__id__": 96
"__id__": 100
},
"checkedNode": {
"__id__": 104
"__id__": 108
},
"_id": "12WntYtI5C+bsPwyWnA236"
},
......@@ -4614,12 +4787,9 @@
"_name": "Conttent",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 101
},
"_children": [
{
"__id__": 115
},
{
"__id__": 119
},
......@@ -4628,15 +4798,18 @@
},
{
"__id__": 127
},
{
"__id__": 131
}
],
"_active": true,
"_components": [
{
"__id__": 131
"__id__": 135
},
{
"__id__": 132
"__id__": 136
}
],
"_prefab": null,
......@@ -4696,31 +4869,31 @@
},
"_children": [
{
"__id__": 98
"__id__": 102
},
{
"__id__": 100
"__id__": 104
},
{
"__id__": 102
"__id__": 106
},
{
"__id__": 96
"__id__": 100
},
{
"__id__": 104
"__id__": 108
},
{
"__id__": 106
"__id__": 110
}
],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 117
},
{
"__id__": 114
"__id__": 118
}
],
"_prefab": null,
......@@ -4776,13 +4949,13 @@
"_name": "Mask",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 103
}
],
"_prefab": null,
......@@ -4838,7 +5011,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -4870,13 +5043,13 @@
"_name": "BG",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 105
}
],
"_prefab": null,
......@@ -4932,7 +5105,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 104
},
"_enabled": true,
"_materials": [
......@@ -4964,13 +5137,13 @@
"_name": "Title",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 107
}
],
"_prefab": null,
......@@ -5026,7 +5199,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 106
},
"_enabled": false,
"_materials": [
......@@ -5059,13 +5232,13 @@
"_name": "Checked",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 105
"__id__": 109
}
],
"_prefab": null,
......@@ -5121,7 +5294,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5153,17 +5326,17 @@
"_name": "OkButton",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 101
},
"_children": [
{
"__id__": 107
"__id__": 111
}
],
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 116
}
],
"_prefab": null,
......@@ -5219,20 +5392,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 106
"__id__": 110
},
"_children": [
{
"__id__": 108
"__id__": 112
}
],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 114
},
{
"__id__": 111
"__id__": 115
}
],
"_prefab": null,
......@@ -5288,13 +5461,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 107
"__id__": 111
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 113
}
],
"_prefab": null,
......@@ -5350,7 +5523,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 112
},
"_enabled": true,
"_materials": [
......@@ -5385,7 +5558,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 111
},
"_enabled": true,
"_materials": [
......@@ -5417,7 +5590,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 111
},
"_enabled": true,
"alignMode": 0,
......@@ -5444,7 +5617,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 110
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5517,7 +5690,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 107
"__id__": 111
},
"_id": "e8Z5R1m9xLJZ0M9KGeyDSC"
},
......@@ -5526,7 +5699,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"_id": "f1aq5xMrVN341tWAhOykW0"
......@@ -5536,7 +5709,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 101
},
"_enabled": true,
"_id": "69dYJ1wBlP5Z6QRZCRykh8"
......@@ -5546,17 +5719,17 @@
"_name": "box copy",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 100
},
"_children": [
{
"__id__": 116
"__id__": 120
}
],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 122
}
],
"_prefab": null,
......@@ -5612,13 +5785,13 @@
"_name": "ga",
"_objFlags": 0,
"_parent": {
"__id__": 115
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 121
}
],
"_prefab": null,
......@@ -5674,7 +5847,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 120
},
"_enabled": true,
"_materials": [
......@@ -5716,7 +5889,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -5748,17 +5921,17 @@
"_name": "box copy",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 100
},
"_children": [
{
"__id__": 120
"__id__": 124
}
],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 126
}
],
"_prefab": null,
......@@ -5814,13 +5987,13 @@
"_name": "gai lung",
"_objFlags": 0,
"_parent": {
"__id__": 119
"__id__": 123
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 125
}
],
"_prefab": null,
......@@ -5876,7 +6049,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 124
},
"_enabled": true,
"_materials": [
......@@ -5918,7 +6091,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 123
},
"_enabled": true,
"_materials": [
......@@ -5950,17 +6123,17 @@
"_name": "box copy",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 100
},
"_children": [
{
"__id__": 124
"__id__": 128
}
],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 130
}
],
"_prefab": null,
......@@ -6016,13 +6189,13 @@
"_name": "gay",
"_objFlags": 0,
"_parent": {
"__id__": 123
"__id__": 127
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 129
}
],
"_prefab": null,
......@@ -6078,7 +6251,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 128
},
"_enabled": true,
"_materials": [
......@@ -6120,7 +6293,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -6152,17 +6325,17 @@
"_name": "box",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 100
},
"_children": [
{
"__id__": 128
"__id__": 132
}
],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 134
}
],
"_prefab": null,
......@@ -6218,13 +6391,13 @@
"_name": "Bua",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 131
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 129
"__id__": 133
}
],
"_prefab": null,
......@@ -6280,7 +6453,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6322,7 +6495,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 131
},
"_enabled": true,
"_materials": [
......@@ -6354,7 +6527,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 100
},
"_enabled": false,
"_materials": [
......@@ -6386,7 +6559,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 100
},
"_enabled": true,
"_layoutSize": {
......@@ -6418,7 +6591,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 82
},
"_enabled": true,
"_id": "98lXLksvRCM6lZRz5MAv8p"
......@@ -6432,22 +6605,22 @@
},
"_children": [
{
"__id__": 135
"__id__": 139
},
{
"__id__": 138
"__id__": 142
},
{
"__id__": 140
"__id__": 144
},
{
"__id__": 144
"__id__": 148
}
],
"_active": false,
"_components": [
{
"__id__": 148
"__id__": 152
}
],
"_prefab": null,
......@@ -6503,16 +6676,16 @@
"_name": "Chum",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 138
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 140
},
{
"__id__": 137
"__id__": 141
}
],
"_prefab": null,
......@@ -6568,7 +6741,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 139
},
"_enabled": true,
"_id": "32Nb7fXTdNIYe2FGNiHQD8"
......@@ -6578,7 +6751,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6620,13 +6793,13 @@
"_name": "hu",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 138
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 143
}
],
"_prefab": null,
......@@ -6682,7 +6855,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 142
},
"_enabled": true,
"_materials": [
......@@ -6724,17 +6897,17 @@
"_name": "buaPos",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 138
},
"_children": [
{
"__id__": 141
"__id__": 145
}
],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 147
}
],
"_prefab": null,
......@@ -6790,13 +6963,13 @@
"_name": "Bua",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 144
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 142
"__id__": 146
}
],
"_prefab": null,
......@@ -6852,7 +7025,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 141
"__id__": 145
},
"_enabled": true,
"_materials": [
......@@ -6894,7 +7067,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 144
},
"_enabled": true,
"_id": "74FwAooblKp5Uz0cmQR1wo"
......@@ -6904,17 +7077,17 @@
"_name": "Tutorial Tap",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 138
},
"_children": [
{
"__id__": 145
"__id__": 149
}
],
"_active": true,
"_components": [
{
"__id__": 147
"__id__": 151
}
],
"_prefab": null,
......@@ -6970,13 +7143,13 @@
"_name": "hand",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 146
"__id__": 150
}
],
"_prefab": null,
......@@ -7032,7 +7205,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 149
},
"_enabled": true,
"_materials": [
......@@ -7064,7 +7237,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 148
},
"_enabled": true,
"_id": "e7adhzbtVIXItHuXv9Y+hG"
......@@ -7074,14 +7247,14 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 138
},
"_enabled": true,
"bottleIdle": {
"__id__": 138
"__id__": 142
},
"bottleAction": {
"__id__": 135
"__id__": 139
},
"_id": "45yzC1EPtJP4Z8W/DF1iwD"
},
......@@ -7096,7 +7269,7 @@
"_active": false,
"_components": [
{
"__id__": 150
"__id__": 154
}
],
"_prefab": null,
......@@ -7152,7 +7325,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
"__id__": 153
},
"_enabled": true,
"_id": "96hHP+ssxLNpn8/i2AKAyI"
......@@ -7166,22 +7339,22 @@
},
"_children": [
{
"__id__": 152
"__id__": 156
},
{
"__id__": 154
"__id__": 158
},
{
"__id__": 159
"__id__": 163
}
],
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 170
},
{
"__id__": 167
"__id__": 171
}
],
"_prefab": null,
......@@ -7237,13 +7410,13 @@
"_name": "Mask copy",
"_objFlags": 0,
"_parent": {
"__id__": 151
"__id__": 155
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 153
"__id__": 157
}
],
"_prefab": null,
......@@ -7299,7 +7472,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7331,20 +7504,20 @@
"_name": "The",
"_objFlags": 0,
"_parent": {
"__id__": 151
"__id__": 155
},
"_children": [
{
"__id__": 155
"__id__": 159
}
],
"_active": true,
"_components": [
{
"__id__": 157
"__id__": 161
},
{
"__id__": 158
"__id__": 162
}
],
"_prefab": null,
......@@ -7400,13 +7573,13 @@
"_name": "text1",
"_objFlags": 0,
"_parent": {
"__id__": 154
"__id__": 158
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 156
"__id__": 160
}
],
"_prefab": null,
......@@ -7462,7 +7635,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 159
},
"_enabled": true,
"_materials": [
......@@ -7494,7 +7667,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 158
},
"_enabled": true,
"frames": [
......@@ -7512,7 +7685,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7554,17 +7727,17 @@
"_name": "Replay Button",
"_objFlags": 0,
"_parent": {
"__id__": 151
"__id__": 155
},
"_children": [
{
"__id__": 160
"__id__": 164
}
],
"_active": true,
"_components": [
{
"__id__": 165
"__id__": 169
}
],
"_prefab": null,
......@@ -7620,20 +7793,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 159
"__id__": 163
},
"_children": [
{
"__id__": 161
"__id__": 165
}
],
"_active": true,
"_components": [
{
"__id__": 163
"__id__": 167
},
{
"__id__": 164
"__id__": 168
}
],
"_prefab": null,
......@@ -7689,13 +7862,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 160
"__id__": 164
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 162
"__id__": 166
}
],
"_prefab": null,
......@@ -7751,7 +7924,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 165
},
"_enabled": true,
"_materials": [
......@@ -7786,7 +7959,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 164
},
"_enabled": true,
"_materials": [
......@@ -7818,7 +7991,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 164
},
"_enabled": true,
"alignMode": 0,
......@@ -7845,7 +8018,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
"__id__": 163
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7918,7 +8091,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 160
"__id__": 164
},
"_id": "adCMRaOEVD5LOjd7MAm9EO"
},
......@@ -7927,7 +8100,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 155
},
"_enabled": true,
"_id": "bcaw0ZNyRPGoK8ATotq1yF"
......@@ -7937,7 +8110,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 155
},
"_enabled": true,
"_id": "17J7OqMb1NsbF4iJiNTrDS"
......@@ -7951,22 +8124,22 @@
},
"_children": [
{
"__id__": 169
"__id__": 173
},
{
"__id__": 171
"__id__": 175
},
{
"__id__": 173
"__id__": 177
},
{
"__id__": 175
"__id__": 179
}
],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 181
}
],
"_prefab": null,
......@@ -8022,13 +8195,13 @@
"_name": "beer-bottle-rolling-on-a-sidewalk-82234",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 172
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 174
}
],
"_prefab": null,
......@@ -8084,7 +8257,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 173
},
"_enabled": true,
"_clip": {
......@@ -8103,13 +8276,13 @@
"_name": "Cartoon Short Version 2_01",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 172
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 176
}
],
"_prefab": null,
......@@ -8165,7 +8338,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 175
},
"_enabled": true,
"_clip": {
......@@ -8184,13 +8357,13 @@
"_name": "tieng_va_cham_chai_thuy_tinh-www_tiengdong_com",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 172
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 174
"__id__": 178
}
],
"_prefab": null,
......@@ -8246,7 +8419,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 177
},
"_enabled": true,
"_clip": {
......@@ -8265,13 +8438,13 @@
"_name": "breaking-a-vase-remix-87091",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 172
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
"__id__": 180
}
],
"_prefab": null,
......@@ -8327,7 +8500,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 179
},
"_enabled": true,
"_clip": {
......@@ -8346,17 +8519,17 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
"__id__": 172
},
"_enabled": true,
"rollingSound": {
"__id__": 170
"__id__": 174
},
"breakingSound": {
"__id__": 176
"__id__": 180
},
"dropSound": {
"__id__": 174
"__id__": 178
},
"_id": "a5vu6IE1ROn6VO7UPM9J3p"
},
......
{
"ver": "2.3.7",
"uuid": "1dea3e9f-3ceb-4f42-830f-62d96c35878d",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 283,
"height": 199,
"platformSettings": {},
"subMetas": {
"3 copy 2": {
"ver": "1.0.6",
"uuid": "c75a5b3d-beed-44d2-b507-2b610bfcdf78",
"importer": "sprite-frame",
"rawTextureUuid": "1dea3e9f-3ceb-4f42-830f-62d96c35878d",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 283,
"height": 199,
"rawWidth": 283,
"rawHeight": 199,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.7",
"uuid": "5fd52759-45a6-4b36-9832-1be50933da9d",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 237,
"height": 212,
"platformSettings": {},
"subMetas": {
"3 copy": {
"ver": "1.0.6",
"uuid": "d9decce6-590a-47b0-bad7-aee365a4b45a",
"importer": "sprite-frame",
"rawTextureUuid": "5fd52759-45a6-4b36-9832-1be50933da9d",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 237,
"height": 212,
"rawWidth": 237,
"rawHeight": 212,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.7",
"uuid": "8d9e57b1-563f-40b3-aaed-cd8d4e8c6255",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 217,
"height": 225,
"platformSettings": {},
"subMetas": {
"6 copy 2": {
"ver": "1.0.6",
"uuid": "4176edff-03cb-4219-9c89-a99ef9c740ae",
"importer": "sprite-frame",
"rawTextureUuid": "8d9e57b1-563f-40b3-aaed-cd8d4e8c6255",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 217,
"height": 225,
"rawWidth": 217,
"rawHeight": 225,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.7",
"uuid": "163fa625-c63f-4ccd-bda2-e2ee8d4ab844",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 168,
"height": 310,
"platformSettings": {},
"subMetas": {
"6 copy": {
"ver": "1.0.6",
"uuid": "ae7ba715-3fca-4a44-94bb-b1d9c7d2286f",
"importer": "sprite-frame",
"rawTextureUuid": "163fa625-c63f-4ccd-bda2-e2ee8d4ab844",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 168,
"height": 310,
"rawWidth": 168,
"rawHeight": 310,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
import { CHECK_FRAGMENT, CHECK_TOUCH, eventTarget, HAMMER, RESET_BOTTLE, RESET_FRAGMENT, SHOW_CARD_POPUP } from "../Events";
import { BEAT_GUILD, CHECK_FRAGMENT, CHECK_TOUCH, eventTarget, HAMMER, RESET_BOTTLE, RESET_FRAGMENT, SHOW_CARD_POPUP, STOP_GUILD_TAP } from "../Events";
import { Global } from "../Global";
import FragmentController from "./FragmentController";
import TheController from "./TheController";
......@@ -33,11 +33,17 @@ export default class BreakingBottleController extends cc.Component {
eventTarget.on(CHECK_FRAGMENT, this.checkFragment, this);
eventTarget.on(HAMMER, this.onHammer, this);
eventTarget.on(RESET_BOTTLE, this.resetBottle, this);
eventTarget.on(BEAT_GUILD, this.beatGuild, this);
this._fragmentsNode = this.getComponentsInChildren(FragmentController).map(item => item.node);
this._fragmentsPosition = this._fragmentsNode.map(item => item.position.clone());
}
private beatGuild() {
this.onHammer(cc.v2(100));
}
protected start(): void {
this.hideHammer();
}
......@@ -54,10 +60,17 @@ export default class BreakingBottleController extends cc.Component {
}
private onHammer(newPos: cc.Vec2) {
this.hammerNode.active = false;
this.scheduleOnce(() => this.hammerNode.active = true, 0);
cc.Tween.stopAllByTarget(this.hammerNode);
this._spine.setAnimation(0, "Dap4", false);
cc.tween(this.hammerNode)
.to(0.1, { opacity: 255, position: cc.v3(newPos.x, newPos.y), active: true })
.delay(0.7)
.to(0.2, { opacity: 0, active: false })
.to(0, { opacity: 255, position: cc.v3(newPos.x, newPos.y, 0), active: false })
.to(0, { active: true })
.delay(1)
.to(0.5, { position: cc.v3(300) })
.start();
}
......@@ -69,6 +82,7 @@ export default class BreakingBottleController extends cc.Component {
}
private onTouchStart(event: cc.Event.EventTouch) {
eventTarget.emit(STOP_GUILD_TAP);
const pos = event.getLocation();
const nodePos = this.node.convertToNodeSpaceAR(pos);
......@@ -84,7 +98,8 @@ export default class BreakingBottleController extends cc.Component {
}
private hideHammer() {
this.hammerNode.opacity = 0;
// this.hammerNode.opacity = 0;
this.hammerNode.position = cc.v3(300);
}
......
......@@ -10,7 +10,8 @@ export default class TapTutorialController extends cc.Component {
[this._hand] = this.node.children;
eventTarget.on(STOP_GUILD_TAP, this.stopGuild, this);
this.tutorialTap();
// this.tutorialTap();
this.tutorialTapForFragements();
}
private stopGuild() {
......@@ -27,7 +28,22 @@ export default class TapTutorialController extends cc.Component {
.to(0.2, { angle: -15 })
.to(0.15, { position: cc.v3(110, 80) })
.call(() => eventTarget.emit(BEAT_GUILD))
.delay(0.8)
.delay(1)
)
.start();
}
private tutorialTapForFragements() {
this._hand.active = true;
cc.tween(this._hand)
.repeatForever(cc.tween(this._hand)
.to(0, { position: cc.v3(120, 100), opacity: 255 })
.to(0.2, { angle: 15 })
.to(0.2, { angle: -15 })
.to(0.15, { position: cc.v3(110, 80) })
.call(() => eventTarget.emit(BEAT_GUILD))
.to(0.5, { opacity: 0 })
.delay(2)
)
.start();
}
......
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