Commit b2fc16cf authored by Tt's avatar Tt

修改窄屏效果

parent 6471b288
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 58
"__id__": 64
},
{
"__id__": 60
"__id__": 66
}
],
"_active": false,
......@@ -84,13 +84,13 @@
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 61
},
{
"__id__": 56
"__id__": 62
},
{
"__id__": 57
"__id__": 63
}
],
"_prefab": null,
......@@ -266,34 +266,34 @@
"__id__": 21
},
{
"__id__": 23
"__id__": 24
},
{
"__id__": 25
"__id__": 27
},
{
"__id__": 26
"__id__": 29
},
{
"__id__": 28
"__id__": 32
},
{
"__id__": 29
"__id__": 35
},
{
"__id__": 33
"__id__": 39
},
{
"__id__": 37
"__id__": 43
},
{
"__id__": 44
"__id__": 50
}
],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 60
}
],
"_prefab": null,
......@@ -976,6 +976,9 @@
"_components": [
{
"__id__": 22
},
{
"__id__": 23
}
],
"_prefab": null,
......@@ -1058,6 +1061,33 @@
"_atlas": null,
"_id": "37jC2KFgFC1pezr5bhdpx6"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 106.072,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "afKVJ8AEVEuZgMxkw0awES"
},
{
"__type__": "cc.Node",
"_name": "烟花_ske",
......@@ -1069,7 +1099,10 @@
"_active": false,
"_components": [
{
"__id__": 24
"__id__": 25
},
{
"__id__": 26
}
],
"_prefab": null,
......@@ -1125,7 +1158,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 24
},
"_enabled": true,
"_materials": [
......@@ -1160,6 +1193,33 @@
"_N$enableBatch": false,
"_id": "d4RfP/48VEa6tc+bXwS8Y4"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 168.62799999999993,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "ed3YLCiUVBBburmFlfqrpZ"
},
{
"__type__": "cc.Node",
"_name": "box_mid",
......@@ -1169,7 +1229,11 @@
},
"_children": [],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 28
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1218,6 +1282,33 @@
"groupIndex": 0,
"_id": "ccaT8FY6RIyo7ozWrb0ATs"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 840.472,
"_bottom": 59.52800000000002,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 700,
"_id": "0aCSWRqo9NqJio7QwfOOAW"
},
{
"__type__": "cc.Node",
"_name": "box_front",
......@@ -1229,7 +1320,10 @@
"_active": true,
"_components": [
{
"__id__": 27
"__id__": 30
},
{
"__id__": 31
}
],
"_prefab": null,
......@@ -1256,7 +1350,7 @@
"ctor": "Float64Array",
"array": [
-27.746,
-438.877,
-438.87699999999995,
0,
0,
0,
......@@ -1285,7 +1379,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1312,6 +1406,33 @@
"_atlas": null,
"_id": "54p1hyplFB85K1OFE8clP5"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 106.12300000000005,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "91qbwodzZOiq7zBOkrBGxx"
},
{
"__type__": "cc.Node",
"_name": "box",
......@@ -1321,7 +1442,14 @@
},
"_children": [],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 33
},
{
"__id__": 34
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1370,6 +1498,65 @@
"groupIndex": 0,
"_id": "b5EshdkRFKGrgj1YJxo2Yp"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 840.472,
"_bottom": 59.52800000000002,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 700,
"_id": "f7hBl0WDBKkbdBEzKIomF6"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
},
"_enabled": false,
"_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": "8aD0nb0Z9ISp3/0uwtfjEP"
},
{
"__type__": "cc.Node",
"_name": "btnSubmit",
......@@ -1381,13 +1568,13 @@
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 36
},
{
"__id__": 31
"__id__": 37
},
{
"__id__": 32
"__id__": 38
}
],
"_prefab": null,
......@@ -1443,7 +1630,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1475,7 +1662,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 35
},
"_enabled": true,
"alignMode": 1,
......@@ -1502,7 +1689,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 35
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1576,13 +1763,13 @@
"_active": false,
"_components": [
{
"__id__": 34
"__id__": 40
},
{
"__id__": 35
"__id__": 41
},
{
"__id__": 36
"__id__": 42
}
],
"_prefab": null,
......@@ -1638,7 +1825,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1670,7 +1857,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 39
},
"_enabled": true,
"alignMode": 1,
......@@ -1697,7 +1884,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 39
},
"_enabled": true,
"_normalMaterial": null,
......@@ -1769,16 +1956,16 @@
},
"_children": [
{
"__id__": 38
"__id__": 44
},
{
"__id__": 40
"__id__": 46
}
],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 49
}
],
"_prefab": null,
......@@ -1834,13 +2021,13 @@
"_name": "CoolCat",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 45
}
],
"_prefab": null,
......@@ -1896,7 +2083,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -1936,16 +2123,16 @@
"_name": "BtnCoolCat",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 47
},
{
"__id__": 42
"__id__": 48
}
],
"_prefab": null,
......@@ -2001,7 +2188,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 46
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2069,7 +2256,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 46
},
"_enabled": true,
"alignMode": 1,
......@@ -2096,7 +2283,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 43
},
"_enabled": true,
"alignMode": 1,
......@@ -2127,25 +2314,25 @@
},
"_children": [
{
"__id__": 45
"__id__": 51
},
{
"__id__": 47
"__id__": 53
},
{
"__id__": 49
"__id__": 55
}
],
"_active": false,
"_components": [
{
"__id__": 51
"__id__": 57
},
{
"__id__": 52
"__id__": 58
},
{
"__id__": 53
"__id__": 59
}
],
"_prefab": null,
......@@ -2201,13 +2388,13 @@
"_name": "bg_circle2",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 52
}
],
"_prefab": null,
......@@ -2263,7 +2450,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2295,13 +2482,13 @@
"_name": "bg_circle",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 54
}
],
"_prefab": null,
......@@ -2357,7 +2544,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 53
},
"_enabled": true,
"_materials": [
......@@ -2389,13 +2576,13 @@
"_name": "btn_replay",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 56
}
],
"_prefab": null,
......@@ -2451,7 +2638,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2483,7 +2670,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2515,7 +2702,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 50
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2583,7 +2770,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 50
},
"_enabled": true,
"alignMode": 1,
......@@ -2697,7 +2884,7 @@
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 65
}
],
"_prefab": null,
......@@ -2753,7 +2940,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -2788,15 +2975,6 @@
"__id__": 1
},
"_children": [
{
"__id__": 61
},
{
"__id__": 63
},
{
"__id__": 65
},
{
"__id__": 67
},
......@@ -2817,6 +2995,15 @@
},
{
"__id__": 79
},
{
"__id__": 81
},
{
"__id__": 83
},
{
"__id__": 85
}
],
"_active": true,
......@@ -2874,13 +3061,13 @@
"_name": "next",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 68
}
],
"_prefab": null,
......@@ -2936,7 +3123,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 67
},
"_enabled": true,
"_clip": {
......@@ -2955,13 +3142,13 @@
"_name": "boxJump",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 70
}
],
"_prefab": null,
......@@ -3017,7 +3204,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 69
},
"_enabled": true,
"_clip": {
......@@ -3036,13 +3223,13 @@
"_name": "jumpAll",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 72
}
],
"_prefab": null,
......@@ -3098,7 +3285,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 71
},
"_enabled": true,
"_clip": {
......@@ -3117,13 +3304,13 @@
"_name": "submit",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 74
}
],
"_prefab": null,
......@@ -3179,7 +3366,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 73
},
"_enabled": true,
"_clip": {
......@@ -3198,13 +3385,13 @@
"_name": "flyBack",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 76
}
],
"_prefab": null,
......@@ -3260,7 +3447,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 69
"__id__": 75
},
"_enabled": true,
"_clip": {
......@@ -3279,13 +3466,13 @@
"_name": "flyBackAll",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 72
"__id__": 78
}
],
"_prefab": null,
......@@ -3341,7 +3528,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 77
},
"_enabled": true,
"_clip": {
......@@ -3360,13 +3547,13 @@
"_name": "CoolCatRight",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 80
}
],
"_prefab": null,
......@@ -3422,7 +3609,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 79
},
"_enabled": true,
"_clip": {
......@@ -3441,13 +3628,13 @@
"_name": "CoolCatWrong",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 82
}
],
"_prefab": null,
......@@ -3503,7 +3690,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 81
},
"_enabled": true,
"_clip": {
......@@ -3522,13 +3709,13 @@
"_name": "CoolCatBegin",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 84
}
],
"_prefab": null,
......@@ -3584,7 +3771,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 83
},
"_enabled": true,
"_clip": {
......@@ -3603,13 +3790,13 @@
"_name": "CoolCatFinish",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 66
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 86
}
],
"_prefab": null,
......@@ -3665,7 +3852,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 85
},
"_enabled": true,
"_clip": {
......
......@@ -251,7 +251,8 @@ cc.Class({
return;
}
const rectOption = optionNode.getBoundingBox();
if (!cc.Intersection.rectRect(box, rectOption)) {
const tartRect = cc.rect(0, 0, box.width, box.height)
if (!cc.Intersection.rectRect(tartRect, rectOption)) {
cc.tween(optionNode)
.to(0.05, {
......
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