diff --git a/assets/Scene/ContentAdapterScene.fire b/assets/Scene/ContentAdapterScene.fire index 9357135..19c4ec3 100644 --- a/assets/Scene/ContentAdapterScene.fire +++ b/assets/Scene/ContentAdapterScene.fire @@ -41,8 +41,8 @@ }, "_scale": { "__type__": "cc.Vec3", - "x": 0.26417236328125, - "y": 0.26417236328125, + "x": 0.34375, + "y": 0.34375, "z": 1 }, "_quat": { @@ -275,6 +275,16 @@ "groupIndex": 0, "_id": "748XIUTtxCl6ctqKNxegV2" }, + { + "__type__": "c9395A23IBAn5BEQV28rsN+", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 5 + }, + "_enabled": true, + "_id": "6fYyWHCY5H6LLguJhhhVSo" + }, { "__type__": "cc.Sprite", "_name": "", @@ -303,16 +313,6 @@ "_atlas": null, "_id": "40p284gaxMX7WQ2B2lf7Vk" }, - { - "__type__": "c9395A23IBAn5BEQV28rsN+", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 5 - }, - "_enabled": true, - "_id": "6fYyWHCY5H6LLguJhhhVSo" - }, { "__type__": "cc.Node", "_name": "Content", diff --git a/assets/Script/MultiResolution/ContentAdapter.ts b/assets/Script/MultiResolution/ContentAdapter.ts index c5fcc9e..80a065d 100644 --- a/assets/Script/MultiResolution/ContentAdapter.ts +++ b/assets/Script/MultiResolution/ContentAdapter.ts @@ -47,8 +47,8 @@ export default class ContentAdapter extends cc.Component { this.node.width = this.node.width * (cc.view.getCanvasSize().width / realWidth); this.node.height = this.node.height * (cc.view.getCanvasSize().height / realHeight); - // 3. 因为本节点的宽高发生了改变,所以要手动更新剩下子节点的宽高 - this._updateAllChildNodeWidget(this.node); + // // 3. 因为本节点的宽高发生了改变,所以要手动更新剩下子节点的宽高 + // this._updateAllChildNodeWidget(this.node); // if (CC_DEBUG) { // cc.log(`节点在SHOW_ALL模式下展示的宽高: ${realWidth} x ${realHeight}`); @@ -61,19 +61,19 @@ export default class ContentAdapter extends cc.Component { // } } - private _updateAllChildNodeWidget(parentNode: cc.Node) { - if (parentNode == null) { - return; - } - let widget = parentNode.getComponent(cc.Widget); - if (widget != null) { - widget.updateAlignment(); - } - if (parentNode.childrenCount == 0) { - return; - } - parentNode.children.forEach((childNode: cc.Node) => { - this._updateAllChildNodeWidget(childNode); - }); - } + // private _updateAllChildNodeWidget(parentNode: cc.Node) { + // if (parentNode == null) { + // return; + // } + // let widget = parentNode.getComponent(cc.Widget); + // if (widget != null) { + // widget.updateAlignment(); + // } + // if (parentNode.childrenCount == 0) { + // return; + // } + // parentNode.children.forEach((childNode: cc.Node) => { + // this._updateAllChildNodeWidget(childNode); + // }); + // } } diff --git a/assets/Script/MultiResolution/MultiResoultionCompat.ts b/assets/Script/MultiResolution/MultiResoultionCompat.ts index 67b1b3e..6f4dcea 100644 --- a/assets/Script/MultiResolution/MultiResoultionCompat.ts +++ b/assets/Script/MultiResolution/MultiResoultionCompat.ts @@ -1,5 +1,8 @@ const { ccclass, property } = cc._decorator; +/** + * 未完成 + */ @ccclass export default class MultiResolutionCompat extends cc.Component { static DEFAULT_RESOLUTION_WIDTH = 720; diff --git a/static/BACKGROUND_ADAPTER_1.png b/static/BACKGROUND_ADAPTER_PROCESS.png similarity index 100% rename from static/BACKGROUND_ADAPTER_1.png rename to static/BACKGROUND_ADAPTER_PROCESS.png diff --git a/static/CONTENT_ADAPTER_PROCESS.png b/static/CONTENT_ADAPTER_PROCESS.png new file mode 100644 index 0000000..81300aa Binary files /dev/null and b/static/CONTENT_ADAPTER_PROCESS.png differ diff --git a/static/CONTENT_ADAPTER_RESULT.png b/static/CONTENT_ADAPTER_RESULT.png new file mode 100644 index 0000000..9d9b5c2 Binary files /dev/null and b/static/CONTENT_ADAPTER_RESULT.png differ diff --git a/static/all.rp b/static/all.rp index b33a1ae..995052f 100644 Binary files a/static/all.rp and b/static/all.rp differ