Commit aea79427 authored by asdf's avatar asdf

shipei

parent 87c4450b
......@@ -73,16 +73,10 @@
},
{
"__id__": 5
},
{
"__id__": 54
}
],
"_active": true,
"_components": [
{
"__id__": 64
},
{
"__id__": 65
},
......@@ -91,6 +85,9 @@
},
{
"__id__": 67
},
{
"__id__": 68
}
],
"_prefab": null,
......@@ -266,25 +263,28 @@
"__id__": 25
},
{
"__id__": 28
"__id__": 29
},
{
"__id__": 31
"__id__": 32
},
{
"__id__": 34
"__id__": 35
},
{
"__id__": 37
"__id__": 38
},
{
"__id__": 47
"__id__": 48
},
{
"__id__": 54
}
],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 64
}
],
"_prefab": null,
......@@ -1150,6 +1150,9 @@
},
{
"__id__": 27
},
{
"__id__": 28
}
],
"_prefab": null,
......@@ -1259,6 +1262,17 @@
"_originalHeight": 0,
"_id": "5asRigMmdJdqwJeYwQ8bhv"
},
{
"__type__": "e22e11e0CVGPajfhd4ljXke",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
},
"_enabled": true,
"FitType": 3,
"_id": "a3cWGmSwhH4q3MA7W70LUz"
},
{
"__type__": "cc.Node",
"_name": "invalid-name_5",
......@@ -1270,10 +1284,10 @@
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 30
},
{
"__id__": 30
"__id__": 31
}
],
"_prefab": null,
......@@ -1329,7 +1343,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1361,7 +1375,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 29
},
"_enabled": true,
"alignMode": 1,
......@@ -1394,10 +1408,10 @@
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 33
},
{
"__id__": 33
"__id__": 34
}
],
"_prefab": null,
......@@ -1453,7 +1467,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1485,7 +1499,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 32
},
"_enabled": true,
"alignMode": 1,
......@@ -1518,10 +1532,10 @@
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 36
},
{
"__id__": 36
"__id__": 37
}
],
"_prefab": null,
......@@ -1548,7 +1562,7 @@
"ctor": "Float64Array",
"array": [
0,
-295.959,
-295.5,
0,
0,
0,
......@@ -1577,7 +1591,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1609,7 +1623,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"alignMode": 1,
......@@ -1618,7 +1632,7 @@
"_left": 41,
"_right": 41,
"_top": 0,
"_bottom": -0.4590000000000032,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -1640,22 +1654,22 @@
},
"_children": [
{
"__id__": 38
"__id__": 39
},
{
"__id__": 40
"__id__": 41
},
{
"__id__": 42
"__id__": 43
},
{
"__id__": 44
"__id__": 45
}
],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 47
}
],
"_prefab": null,
......@@ -1711,13 +1725,13 @@
"_name": "invalid-name_14",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 40
}
],
"_prefab": null,
......@@ -1773,7 +1787,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1805,13 +1819,13 @@
"_name": "level1",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 42
}
],
"_prefab": null,
......@@ -1867,7 +1881,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 41
},
"_enabled": true,
"_materials": [
......@@ -1899,13 +1913,13 @@
"_name": "level2",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 43
"__id__": 44
}
],
"_prefab": null,
......@@ -1961,7 +1975,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -1993,13 +2007,13 @@
"_name": "level3",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 38
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 45
"__id__": 46
}
],
"_prefab": null,
......@@ -2055,7 +2069,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2087,7 +2101,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 38
},
"_enabled": true,
"alignMode": 1,
......@@ -2118,16 +2132,16 @@
},
"_children": [
{
"__id__": 48
"__id__": 49
}
],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 51
},
{
"__id__": 52
"__id__": 53
}
],
"_prefab": null,
......@@ -2183,13 +2197,13 @@
"_name": "invalid-name_8",
"_objFlags": 0,
"_parent": {
"__id__": 47
"__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 50
}
],
"_prefab": null,
......@@ -2245,7 +2259,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2277,7 +2291,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 48
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2286,7 +2300,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 51
"__id__": 52
}
],
"_N$interactable": true,
......@@ -2354,7 +2368,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 47
"__id__": 48
},
"_id": "c4/0LlKOhNGYxw9Qf+RGtc"
},
......@@ -2373,7 +2387,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 48
},
"_enabled": true,
"alignMode": 1,
......@@ -2395,23 +2409,12 @@
"_originalHeight": 0,
"_id": "f09+2Nb4VHkJP4XueVoe1+"
},
{
"__type__": "e22e11e0CVGPajfhd4ljXke",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"FitType": 1,
"_id": "d2d7tWj1RCkoGmGJOQgkXO"
},
{
"__type__": "cc.Node",
"_name": "layerTrain",
"_objFlags": 0,
"_parent": {
"__id__": 2
"__id__": 5
},
"_children": [
{
......@@ -2885,6 +2888,17 @@
"_originalHeight": 0,
"_id": "21D3mlX0ZIeKDtow2Zj3Lc"
},
{
"__type__": "e22e11e0CVGPajfhd4ljXke",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"FitType": 1,
"_id": "d2d7tWj1RCkoGmGJOQgkXO"
},
{
"__type__": "cc.Canvas",
"_name": "",
......
......@@ -3,6 +3,8 @@ const FitType = {
Scale: 0,//等比缩放,一般用于背景图
FullScreen: 1,//铺满全屏,拉伸
FitMode: 2,//更改canvas适配策略,只能挂在canvas上
FullHeight: 3,
FullWidth: 4,
};
const designSize = cc.size(1280, 720);
cc.Class({
......@@ -30,6 +32,16 @@ cc.Class({
let visiblesize = cc.view.getVisibleSize();
this.node.width = visiblesize.width;
this.node.height = visiblesize.height;
} else if (this.FitType == FitType.FullHeight) {
let visiblesize = cc.view.getVisibleSize();
let scale = visiblesize.width / this.node.width;
this.node.width = scale * this.node.width;
this.node.height = scale * this.node.height;
} else if (this.FitType == FitType.FullWidth) {
let visiblesize = cc.view.getVisibleSize();
let scale = visiblesize.height / this.node.height;
this.node.width = scale * this.node.width;
this.node.height = scale * this.node.height;
} else {
let wsize = cc.view.getFrameSize();
let scaleW = wsize.width / designSize.width;
......
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