diff --git a/assets/SceneGame.fire b/assets/SceneGame.fire index e1938d2..db08769 100644 --- a/assets/SceneGame.fire +++ b/assets/SceneGame.fire @@ -122,7 +122,7 @@ 1, 1, 1, - 1 + 0.31666666666666665 ] }, "_eulerAngles": { @@ -643,7 +643,7 @@ "width": 1080, "height": 1920 }, - "_fitWidth": true, + "_fitWidth": false, "_fitHeight": false, "_id": "6d1ebIvmZJPqKflif+HTsU" }, @@ -655,6 +655,6 @@ "__id__": 2 }, "_enabled": true, - "_id": "e7Qc+zZkdDeabOFueN7izj" + "_id": "b6/k9iZ/BOq7igiEs0QR6w" } ] \ No newline at end of file diff --git a/assets/Script/SceneAdapter.ts b/assets/Script/SceneAdapter.ts index 3ab3f94..eda00c1 100644 --- a/assets/Script/SceneAdapter.ts +++ b/assets/Script/SceneAdapter.ts @@ -9,8 +9,20 @@ const { ccclass, menu } = cc._decorator; @ccclass @menu('Comp/SceneAdapter') export default class SceneAdapter extends cc.Component { - protected onLoad() { + let cvs = this.node.getComponent(cc.Canvas); + if (cvs === null) { + cc.warn(`节点${this.node.name}没有cc.Canvas组件, SceneAdapter添加失败!`); + this.destroy(); + return; + } + if (cvs.designResolution.width < cvs.designResolution.height) { + cvs.fitWidth = true; + cvs.fitHeight = false; + } else { + cvs.fitWidth = false; + cvs.fitHeight = true; + } this.resize(); cc.view.setResizeCallback(this.resize.bind(this)); } @@ -28,4 +40,4 @@ export default class SceneAdapter extends cc.Component { } } } -} +} \ No newline at end of file diff --git a/creator.d.ts b/creator.d.ts index a8c47c9..842cd71 100644 --- a/creator.d.ts +++ b/creator.d.ts @@ -21038,7 +21038,7 @@ declare namespace cc.AssetManager { bundle2.load('imgs/cocos', cc.SpriteFrame, null, (err, spriteFrame) => console.log(err)); ``` */ - load(paths: string, type: { prototype: T } onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: T) => void): void; + load(paths: string, type: { prototype: T }, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: T) => void): void; load(paths: string[], type: { prototype: T }, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: Array) => void): void; load(paths: string, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: T) => void): void; load(paths: string[], onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: Array) => void): void; diff --git a/settings/project.json b/settings/project.json index 8a86a38..0e137bf 100644 --- a/settings/project.json +++ b/settings/project.json @@ -9,18 +9,18 @@ "default" ], "start-scene": "2d2f792f-a40c-49bb-a189-ed176a246e49", - "design-resolution-width": 960, - "design-resolution-height": 640, + "design-resolution-width": 0, + "design-resolution-height": 0, "fit-width": false, - "fit-height": true, + "fit-height": false, "use-project-simulator-setting": false, "simulator-orientation": false, - "use-customize-simulator": false, + "use-customize-simulator": true, "simulator-resolution": { "width": 960, "height": 640 }, - "last-module-event-record-time": 1691731715153, + "last-module-event-record-time": 1695092167763, "assets-sort-type": "name", "facebook": { "enable": false, @@ -31,5 +31,7 @@ "audience": { "enable": false } - } + }, + "preview-port": 7456, + "clear-simulator-cache": true }