Skip to content

D
DropAndMergeTheNumber
Commit 2e09a438 authored by Nguyễn Quang Sáng's avatar Nguyễn Quang Sáng
Browse files
Options

06/10/23 commit

parent 4b85df29
Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 731 deletions
assets/Resources/Sprites/UI/Buttons/board.png.meta → assets/Resources/Sprites/UI/Backgrounds/board.png.meta
View file @ 2e09a438
{
"ver": "2.3.7",
"uuid": "05bd40d3-f0d9-49e6-a807-1a18c072d5f8",
"uuid": "b971e505-a4fb-4bd1-951a-b0adb49418f3",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
......@@ -14,9 +14,9 @@
"subMetas": {
"board": {
"ver": "1.0.6",
"uuid": "72614e26-8584-481b-be35-1a58541bca6e",
"uuid": "56deaa84-0d07-4862-bf7a-464463fe0b20",
"importer": "sprite-frame",
"rawTextureUuid": "05bd40d3-f0d9-49e6-a807-1a18c072d5f8",
"rawTextureUuid": "b971e505-a4fb-4bd1-951a-b0adb49418f3",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
......@@ -28,8 +28,8 @@
"height": 232,
"rawWidth": 629,
"rawHeight": 232,
"borderTop": 60,
"borderBottom": 60,
"borderTop": 50,
"borderBottom": 54,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
......
assets/Resources/Sprites/UI/Backgrounds/background.png.meta → assets/Resources/Sprites/UI/Backgrounds/cover.png.meta
View file @ 2e09a438
{
"ver": "2.3.7",
"uuid": "6ef10c61-7948-4a75-bcdc-d78b4d4a3739",
"uuid": "22d327b7-97f5-454a-abeb-449c8f236e08",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
......@@ -8,15 +8,15 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 100,
"height": 1180,
"width": 688,
"height": 127,
"platformSettings": {},
"subMetas": {
"background": {
"cover": {
"ver": "1.0.6",
"uuid": "dc2bc766-5d14-4d73-bf9c-0fd9128ded4b",
"uuid": "bc1ff98b-19b9-47d3-9d2e-e210fd915684",
"importer": "sprite-frame",
"rawTextureUuid": "6ef10c61-7948-4a75-bcdc-d78b4d4a3739",
"rawTextureUuid": "22d327b7-97f5-454a-abeb-449c8f236e08",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
......@@ -24,10 +24,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 125,
"height": 125,
"rawWidth": 125,
"rawHeight": 125,
"width": 688,
"height": 127,
"rawWidth": 688,
"rawHeight": 127,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
assets/Resources/Sprites/UI/Backgrounds/startBar.png.meta 0 → 100644
View file @ 2e09a438
{
"ver": "2.3.7",
"uuid": "df371361-80fe-4eb1-97e3-2f914c6d1f10",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 604,
"height": 105,
"platformSettings": {},
"subMetas": {
"startBar": {
"ver": "1.0.6",
"uuid": "693b3bd4-5606-4e95-b740-c3df1e66624e",
"importer": "sprite-frame",
"rawTextureUuid": "df371361-80fe-4eb1-97e3-2f914c6d1f10",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 604,
"height": 105,
"rawWidth": 604,
"rawHeight": 105,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
assets/Scenes/gameplay.fire
View file @ 2e09a438
......@@ -75,34 +75,31 @@
"__id__": 5
},
{
"__id__": 52
},
{
"__id__": 53
"__id__": 54
},
{
"__id__": 55
},
{
"__id__": 70
"__id__": 57
},
{
"__id__": 8
"__id__": 72
},
{
"__id__": 41
"__id__": 8
},
{
"__id__": 82
"__id__": 42
}
],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 74
},
{
"__id__": 85
"__id__": 75
}
],
"_prefab": null,
......@@ -393,7 +390,7 @@
"__id__": 41
},
"blocksData": {
"__id__": 51
"__id__": 53
},
"_id": "3fQVty34VNO4exzcgIvAU2"
},
......@@ -2306,10 +2303,10 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "72614e26-8584-481b-be35-1a58541bca6e"
"__uuid__": "56deaa84-0d07-4862-bf7a-464463fe0b20"
},
"_type": 1,
"_sizeMode": 0,
......@@ -2362,29 +2359,29 @@
"_name": "SpawnBar",
"_objFlags": 0,
"_parent": {
"__id__": 2
"__id__": 42
},
"_children": [
{
"__id__": 42
},
{
"__id__": 43
"__id__": 44
},
{
"__id__": 45
},
{
"__id__": 46
"__id__": 47
},
{
"__id__": 48
},
{
"__id__": 50
}
],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 52
}
],
"_prefab": null,
......@@ -2411,7 +2408,7 @@
"ctor": "Float64Array",
"array": [
0,
241.438,
406.308,
0,
0,
0,
......@@ -2435,6 +2432,92 @@
"groupIndex": 0,
"_id": "bbYIxXABVCYoRmM6yWlrL0"
},
{
"__type__": "cc.Node",
"_name": "Mask",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 41
}
],
"_active": true,
"_components": [
{
"__id__": 43
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 550,
"height": 717
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-196,
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": "ddSKdZ7+VEh6rXDzhhXuLv"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "1aOc8RixhIFJ6HO9umCNJA"
},
{
"__type__": "cc.Node",
"_name": "Gate",
......@@ -2504,7 +2587,7 @@
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 46
}
],
"_prefab": null,
......@@ -2560,7 +2643,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2654,7 +2737,7 @@
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 49
}
],
"_prefab": null,
......@@ -2710,7 +2793,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2746,7 +2829,7 @@
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 51
}
],
"_prefab": null,
......@@ -2802,7 +2885,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2864,7 +2947,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 54
},
"_enabled": true,
"_id": "856LDG70lBV7GZwA6/JKPa"
......@@ -2880,7 +2963,7 @@
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 53
}
],
"_prefab": null,
......@@ -2942,7 +3025,7 @@
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 56
}
],
"_prefab": null,
......@@ -2951,7 +3034,7 @@
"__type__": "cc.Color",
"r": 48,
"g": 54,
"b": 77,
"b": 72,
"a": 255
},
"_contentSize": {
......@@ -2998,7 +3081,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -3006,7 +3089,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
......@@ -3033,9 +3116,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 56
},
{
"__id__": 58
},
......@@ -3053,6 +3133,9 @@
},
{
"__id__": 68
},
{
"__id__": 70
}
],
"_active": true,
......@@ -3110,13 +3193,13 @@
"_name": "ButtonPause",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 59
}
],
"_prefab": null,
......@@ -3172,7 +3255,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -3204,13 +3287,13 @@
"_name": "Pause",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 61
}
],
"_prefab": null,
......@@ -3266,7 +3349,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -3298,17 +3381,17 @@
"_name": "HighestBar",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 63
}
],
"_prefab": null,
"_opacity": 255,
"_opacity": 200,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -3330,8 +3413,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-150,
464,
-145,
461,
0,
0,
0,
......@@ -3360,7 +3443,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -3392,13 +3475,13 @@
"_name": "Couronne",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 65
}
],
"_prefab": null,
......@@ -3424,8 +3507,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-147.243,
518,
-142.243,
524,
0,
0,
0,
......@@ -3454,7 +3537,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -3486,13 +3569,13 @@
"_name": "HighestLabel",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 65
"__id__": 67
}
],
"_prefab": null,
......@@ -3518,8 +3601,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-150.932,
464,
-145.932,
461,
0,
0,
0,
......@@ -3548,7 +3631,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -3583,13 +3666,13 @@
"_name": "ScoreBar",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 69
}
],
"_prefab": null,
......@@ -3603,7 +3686,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 267,
"width": 250,
"height": 72
},
"_anchorPoint": {
......@@ -3615,7 +3698,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-141,
-142.568,
385,
0,
0,
......@@ -3645,7 +3728,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -3677,13 +3760,13 @@
"_name": "ScoreLabel",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 71
}
],
"_prefab": null,
......@@ -3709,7 +3792,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-144.306,
-144.561,
387.822,
0,
0,
......@@ -3739,7 +3822,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3776,89 +3859,11 @@
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 71
},
{
"__id__": 73
},
{
"__id__": 75
},
{
"__id__": 77
},
{
"__id__": 79
}
],
"_active": true,
"_components": [
{
"__id__": 81
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 550,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
146.786,
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": "75rheVHKRPfq4fowOjQRpm"
},
{
"__type__": "cc.Node",
"_name": "StartPoint",
"_objFlags": 0,
"_parent": {
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 73
}
],
"_prefab": null,
......@@ -3872,8 +3877,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 50,
"height": 38
"width": 529.9,
"height": 94
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3885,14 +3890,14 @@
"ctor": "Float64Array",
"array": [
0,
126.924,
0,
0,
0,
0,
0,
1,
1,
1,
0.7,
1
]
},
......@@ -3907,14 +3912,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "7aYzhPbphHs6vCbVlfcv6/"
"_id": "75rheVHKRPfq4fowOjQRpm"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -3925,7 +3930,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "198639e5-9950-4d01-b8c5-732441df6eab"
"__uuid__": "693b3bd4-5606-4e95-b740-c3df1e66624e"
},
"_type": 0,
"_sizeMode": 0,
......@@ -3939,510 +3944,8 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "90PlneBCZP3ryp74WYDNXc"
},
{
"__type__": "cc.Node",
"_name": "StartPoint",
"_objFlags": 0,
"_parent": {
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 50,
"height": 38
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-101.164,
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": "e8qRdmjY5LEpdJLoA3yLei"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "198639e5-9950-4d01-b8c5-732441df6eab"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "2a2MnjpRVILpGetjUs/ZmN"
},
{
"__type__": "cc.Node",
"_name": "StartPoint",
"_objFlags": 0,
"_parent": {
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 50,
"height": 38
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-209.478,
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": "04tLuyTNpI3pfWuRyF81um"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "198639e5-9950-4d01-b8c5-732441df6eab"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "6dLjpfb+xIWJ5pakXgu/A+"
},
{
"__type__": "cc.Node",
"_name": "StartPoint",
"_objFlags": 0,
"_parent": {
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 50,
"height": 38
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
107.554,
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": "b4BMgDOlVMuKpwmqzvlREp"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "198639e5-9950-4d01-b8c5-732441df6eab"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "abgCRCkoNInLPvEijBx9Gg"
},
{
"__type__": "cc.Node",
"_name": "StartPoint",
"_objFlags": 0,
"_parent": {
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 50,
"height": 38
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
213.589,
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": "7erdK6yYBBwoEYQILaxax4"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "198639e5-9950-4d01-b8c5-732441df6eab"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "63naLwjBBDN4xWnUAgXvmI"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "72614e26-8584-481b-be35-1a58541bca6e"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "ffT/lwHsxIW6+GwJhXeFXP"
},
{
"__type__": "cc.Node",
"_name": "Cover",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 83
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 48,
"g": 54,
"b": 77,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 550,
"height": 106
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
241.438,
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": "ddj4q73t1KLqyxHuQe7axp"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "59KccFhWlDjr/WchgSfqAb"
},
{
"__type__": "cc.Canvas",
"_name": "",
......
assets/Scripts/Controllers/GameController.ts
View file @ 2e09a438
......@@ -277,14 +277,14 @@ export default class GameController extends cc.Component {
newValue
);
this.mergeMotion(
this.mergeAction(
cellToMerge,
this.currentBlock.getComponent(Block).value,
index
);
}
mergeMotion(cellToMerge: cc.Node, value: number, index: number) {
mergeAction(cellToMerge: cc.Node, value: number, index: number) {
let hasCheckedEmptyCell = false;
for (let i = 0; i < this.cachedBlocksToMerge.length; i++) {
......@@ -307,7 +307,8 @@ export default class GameController extends cc.Component {
.call(() => {
nodeClone.destroy();
nodeClone.parent.removeAllChildren();
this.currentBlock.getComponent(Block).setSpriteBlock(index);
cellToMerge.children[0].getComponent(Block).setSpriteBlock(index);
this.cachedBlocksToMerge.length = 0;
if (!hasCheckedEmptyCell) {
......@@ -321,70 +322,58 @@ export default class GameController extends cc.Component {
checkEmptyCell() {
const data = this.blocksData.blockData;
const numRows = data.length;
const numCols = data[0].length;
let newRow = 0;
let newCol = 0;
// detected empty cell
for (let col = 0; col < numCols; col++) {
for (let row = numRows - 2; row >= 0; row--) {
if (data[row][col] !== 0) {
let currentRow = row;
while (currentRow + 1 < numRows) {
if (data[currentRow + 1][col] == 0) {
data[currentRow + 1][col] = data[currentRow][col];
data[currentRow][col] = 0;
currentRow++;
newRow = currentRow;
newCol = col;
return this.checkMergeability(newRow, newCol);
} else {
const cells = this.board.children;
let fallingDown = false;
for (let row = 0; row < data.length; row++) {
for (let col = 0; col < data[row].length; col++) {
const value = data[row][col];
if (value == 0) {
for (let i = row - 1; i >= 0; i--) {
if (data[i][col] !== 0) {
fallingDown = true;
break;
}
}
if (fallingDown) {
let cellMoveIndex = row * 5 + col - 5;
for (let j = cellMoveIndex; j >= 0; j -= 5) {
if (cells[j].children.length > 0) {
const cellMerge = cells[j + 5];
const cellMove = cells[j];
const nodeToMove = cellMove.children[0];
const newRow = Math.floor(j / 5) + 1;
const newCol = j % 5;
const globalPos = cellMerge.convertToWorldSpaceAR(cc.Vec2.ZERO);
const localPos = cellMove.convertToNodeSpaceAR(globalPos);
cc.tween(nodeToMove)
.to(0.3, { position: cc.v3(localPos.x, localPos.y) })
.call(() => {
nodeToMove.removeFromParent();
cellMerge.removeAllChildren();
cellMerge.addChild(nodeToMove);
nodeToMove.setPosition(cc.Vec2.ZERO);
data[newRow][newCol] = data[newRow - 1][newCol];
data[newRow - 1][newCol] = 0;
console.log(data);
this.checkMergeability(row, col);
})
.start();
}
}
}
}
}
}
// no empty cell detected
if (newRow == 0 && newCol == 0) {
return this.checkMergeability(this.currentBlockRow, this.currentBlockCol);
if (!fallingDown) {
this.checkMergeability(this.currentBlockRow, this.currentBlockCol);
}
}
// updateBoardChildren() {
// const data = this.blocksData.blockData;
// const childrens = this.board.children;
// for (let row = 0; row < 6; row++) {
// for (let col = 0; col < 5; col++) {
// const index = row * 5 + col;
// const cell = childrens[index];
// const value = data[row][col];
// cell.removeAllChildren();
// if (value !== 0) {
// const newValueNode = this.createValueNode(value);
// cell.addChild(newValueNode);
// if (cell.children.length > 1) cell.children.shift();
// }
// }
// }
// }
// createValueNode(value: number) {
// const newNode = new cc.Node();
// newNode.addComponent(cc.Sprite).spriteFrame =
// this.blockPrefab.data.getComponent(Block).listSpriteBlocks[
// Math.log(value) / Math.log(2) - 1
// ];
// return newNode;
// }
}
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