Commit 6139c64a authored by 范雪寒's avatar 范雪寒

feat: 适配

parent 6e8deec1
......@@ -295,25 +295,25 @@
"__id__": 20
},
{
"__id__": 137
"__id__": 138
},
{
"__id__": 172
"__id__": 173
},
{
"__id__": 176
"__id__": 177
},
{
"__id__": 178
"__id__": 179
}
],
"_active": true,
"_components": [
{
"__id__": 189
"__id__": 190
},
{
"__id__": 190
"__id__": 191
}
],
"_prefab": null,
......@@ -1013,7 +1013,11 @@
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 137
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1025,8 +1029,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1120,
"height": 510
"width": 1280,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -6816,25 +6820,25 @@
},
"_children": [
{
"__id__": 138
"__id__": 139
},
{
"__id__": 144
"__id__": 145
},
{
"__id__": 147
"__id__": 148
},
{
"__id__": 155
"__id__": 156
},
{
"__id__": 163
"__id__": 164
}
],
"_active": true,
"_components": [
{
"__id__": 171
"__id__": 172
}
],
"_prefab": null,
......@@ -6890,20 +6894,20 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 138
},
"_children": [
{
"__id__": 139
"__id__": 140
}
],
"_active": false,
"_components": [
{
"__id__": 142
"__id__": 143
},
{
"__id__": 143
"__id__": 144
}
],
"_prefab": null,
......@@ -6959,16 +6963,16 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 138
"__id__": 139
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 140
"__id__": 141
},
{
"__id__": 141
"__id__": 142
}
],
"_prefab": null,
......@@ -7024,7 +7028,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 140
},
"_enabled": true,
"_materials": [
......@@ -7057,7 +7061,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 140
},
"_enabled": true,
"alignMode": 1,
......@@ -7084,7 +7088,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 139
},
"_enabled": true,
"_layoutSize": {
......@@ -7116,7 +7120,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 139
},
"_enabled": true,
"alignMode": 2,
......@@ -7143,16 +7147,16 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 138
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 145
"__id__": 146
},
{
"__id__": 146
"__id__": 147
}
],
"_prefab": null,
......@@ -7208,7 +7212,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 145
},
"_enabled": true,
"_materials": [
......@@ -7240,7 +7244,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 145
},
"_enabled": true,
"alignMode": 1,
......@@ -7267,18 +7271,15 @@
"_name": "Console",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 138
},
"_children": [
{
"__id__": 148
"__id__": 149
}
],
"_active": false,
"_components": [
{
"__id__": 151
},
{
"__id__": 152
},
......@@ -7287,6 +7288,9 @@
},
{
"__id__": 154
},
{
"__id__": 155
}
],
"_prefab": null,
......@@ -7342,16 +7346,16 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
"__id__": 147
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 150
},
{
"__id__": 150
"__id__": 151
}
],
"_prefab": null,
......@@ -7407,7 +7411,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 149
},
"_enabled": true,
"_layoutSize": {
......@@ -7439,7 +7443,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 149
},
"_enabled": true,
"alignMode": 1,
......@@ -7466,7 +7470,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 148
},
"_enabled": true,
"alignMode": 2,
......@@ -7493,7 +7497,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 148
},
"_enabled": true,
"_materials": [
......@@ -7513,7 +7517,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 148
},
"_enabled": true,
"horizontal": false,
......@@ -7525,10 +7529,10 @@
"scrollEvents": [],
"cancelInnerEvents": true,
"_N$content": {
"__id__": 148
"__id__": 149
},
"content": {
"__id__": 148
"__id__": 149
},
"_id": "43wBGhGBpFP7OYyNM+j0Ho"
},
......@@ -7537,7 +7541,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 148
},
"_enabled": true,
"_layoutSize": {
......@@ -7569,20 +7573,20 @@
"_name": "BtnClose",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 138
},
"_children": [
{
"__id__": 156
"__id__": 157
}
],
"_active": false,
"_components": [
{
"__id__": 161
"__id__": 162
},
{
"__id__": 162
"__id__": 163
}
],
"_prefab": null,
......@@ -7638,20 +7642,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 155
"__id__": 156
},
"_children": [
{
"__id__": 157
"__id__": 158
}
],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 160
},
{
"__id__": 160
"__id__": 161
}
],
"_prefab": null,
......@@ -7707,13 +7711,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 156
"__id__": 157
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 158
"__id__": 159
}
],
"_prefab": null,
......@@ -7769,7 +7773,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7802,7 +7806,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 157
},
"_enabled": true,
"_materials": [
......@@ -7834,7 +7838,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 157
},
"_enabled": true,
"alignMode": 0,
......@@ -7861,7 +7865,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 156
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7934,7 +7938,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 156
"__id__": 157
},
"_id": "54SC9WcmBAZ6cTznyI0o+3"
},
......@@ -7943,7 +7947,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 156
},
"_enabled": true,
"alignMode": 1,
......@@ -7970,20 +7974,20 @@
"_name": "BtnOpen",
"_objFlags": 0,
"_parent": {
"__id__": 137
"__id__": 138
},
"_children": [
{
"__id__": 164
"__id__": 165
}
],
"_active": false,
"_components": [
{
"__id__": 169
"__id__": 170
},
{
"__id__": 170
"__id__": 171
}
],
"_prefab": null,
......@@ -8039,20 +8043,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 163
"__id__": 164
},
"_children": [
{
"__id__": 165
"__id__": 166
}
],
"_active": true,
"_components": [
{
"__id__": 167
"__id__": 168
},
{
"__id__": 168
"__id__": 169
}
],
"_prefab": null,
......@@ -8108,13 +8112,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 164
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 167
}
],
"_prefab": null,
......@@ -8170,7 +8174,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 166
},
"_enabled": true,
"_materials": [
......@@ -8203,7 +8207,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 165
},
"_enabled": true,
"_materials": [
......@@ -8235,7 +8239,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 165
},
"_enabled": true,
"alignMode": 0,
......@@ -8262,7 +8266,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 164
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8335,7 +8339,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 164
"__id__": 165
},
"_id": "81HoUuRyJOppi+n4Av/u0p"
},
......@@ -8344,7 +8348,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 164
},
"_enabled": true,
"alignMode": 1,
......@@ -8371,7 +8375,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 138
},
"_enabled": true,
"alignMode": 1,
......@@ -8403,14 +8407,14 @@
"_children": [],
"_active": false,
"_components": [
{
"__id__": 173
},
{
"__id__": 174
},
{
"__id__": 175
},
{
"__id__": 176
}
],
"_prefab": null,
......@@ -8466,7 +8470,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 173
},
"_enabled": true,
"alignMode": 2,
......@@ -8493,7 +8497,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 173
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8561,7 +8565,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 173
},
"_enabled": true,
"_materials": [
......@@ -8599,7 +8603,7 @@
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 178
}
],
"_prefab": null,
......@@ -8655,7 +8659,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 177
},
"_enabled": true,
"_layoutSize": {
......@@ -8691,10 +8695,10 @@
},
"_children": [
{
"__id__": 179
"__id__": 180
},
{
"__id__": 182
"__id__": 183
}
],
"_active": false,
......@@ -8752,16 +8756,16 @@
"_name": "loading",
"_objFlags": 0,
"_parent": {
"__id__": 178
"__id__": 179
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 180
"__id__": 181
},
{
"__id__": 181
"__id__": 182
}
],
"_prefab": null,
......@@ -8817,7 +8821,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 180
},
"_enabled": true,
"_materials": [
......@@ -8849,7 +8853,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 180
},
"_enabled": true,
"_defaultClip": {
......@@ -8868,24 +8872,24 @@
"_name": "progress",
"_objFlags": 0,
"_parent": {
"__id__": 178
"__id__": 179
},
"_children": [
{
"__id__": 183
"__id__": 184
}
],
"_active": true,
"_components": [
{
"__id__": 186
"__id__": 187
},
{
"__id__": 187
"__id__": 188
}
],
"_prefab": {
"__id__": 188
"__id__": 189
},
"_opacity": 255,
"_color": {
......@@ -8939,17 +8943,17 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 183
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 184
"__id__": 185
}
],
"_prefab": {
"__id__": 185
"__id__": 186
},
"_opacity": 255,
"_color": {
......@@ -9003,7 +9007,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 184
},
"_enabled": true,
"_materials": [
......@@ -9033,7 +9037,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 182
"__id__": 183
},
"asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
......@@ -9046,7 +9050,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 183
},
"_enabled": true,
"_materials": [
......@@ -9078,7 +9082,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 183
},
"_enabled": true,
"_id": "3eMT/DXoJNGZT/8Z3nuTUH"
......@@ -9086,7 +9090,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 182
"__id__": 183
},
"asset": {
"__uuid__": "3d356c4d-cb23-4239-aa5f-8a913f420fa4"
......
import { initAir } from "./air";
import { initAir } from './air';
cc.Class({
extends: cc.Component,
properties: {
......@@ -73,7 +74,7 @@ cc.Class({
this.preloadCount = 0;
this.loadedCount = 0;
const ui = cc.find('middleLayer/ui');
ui.scale = Math.min(1, cc.view.getFrameSize().width/ui.width, cc.view.getFrameSize().height/ui.height);
ui.scale = Math.min(cc.view.getFrameSize().width/ui.width, cc.view.getFrameSize().height/ui.height);
initAir(this);
// this.preloadAll();
},
......
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