diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 4723b81..0c436c7 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -39529,7 +39529,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, + "width": 2000, "height": 2600 }, "_anchorPoint": { diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index fb957e4..7a02694 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -401,7 +401,7 @@ export default class JiaZai extends cc.Component { let top = this.node.getChildByName("Load").getChildByName("Top"); top.getChildByName("hammer").active = false; } - + this.setAdaptation(); // 加载广告 // cc.fx.GameTool.preloadRewardedVideoAd().then((success) => { // if (success) { @@ -412,6 +412,78 @@ export default class JiaZai extends cc.Component { // }); } + // 适配pad + setAdaptation() { + const hmScale = cc.fx.GameTool.adaptation() + if (hmScale == 1) return; + + const loadNode = this.node.getChildByName("Load"); + if (loadNode) { + const designSize = cc.view.getDesignResolutionSize(); + const frameSize = cc.view.getFrameSize(); + const scaleX = frameSize.width / designSize.width; + const scaleY = frameSize.height / designSize.height; + const scale = Math.min(scaleX, scaleY); + let barWidth = 0; + if (scaleX > scaleY) { + barWidth = (frameSize.width - designSize.width * scale) / 2; + } + + loadNode.scale = hmScale; + + // 适配右边的元素,保持与右边框距离不变 + const rightElements = [ + "tiaodik", + "shezhiBtn", + "popRank", + "Pause", + "rank", + "day", + "hammer", + "Coin" + ]; + const rightElements2 = [ + "shop", + "yicon", + "xinshou", + "avatar", + "kuang" + ] + rightElements.forEach(elementName => { + let element; + if (elementName === "Pause") { + element = this.node.getChildByName(elementName); + } else if (elementName === "popRank") { + element = this.node.getChildByName("rank"); + } else if (elementName === "tiaodik" || elementName === "shezhiBtn") { + element = loadNode.getChildByName(elementName); + } else { + element = loadNode.getChildByName("Top").getChildByName(elementName); + } + + if (element) { + if (!element.originalRightOffset) { + element.originalRightOffset = designSize.width / 2 - element.x; + } + element.x = designSize.width / 2 - element.originalRightOffset + barWidth / scale; + element.scale = hmScale; + } + }); + rightElements2.forEach(elementName => { + let element; + element = loadNode.getChildByName("Top").getChildByName(elementName); + + if (element) { + if (!element.originalLeftOffset) { + element.originalLeftOffset = element.x + designSize.width / 2; + } + element.x = -designSize.width / 2 + element.originalLeftOffset - barWidth / scale; + element.scale = hmScale; + } + }); + } + } + checkDailyQuests() { cc.fx.GameTool.getDailyQuestsInfo((data) => { }) diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index c59ccc5..6d48269 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -2641,6 +2641,9 @@ export default class MapConroler extends cc.Component { }) cc.fx.GameConfig.GM_INFO.freezeAmount -= 1; + // 倒计时加20秒 + this.timeNumber += 20; + NumberToImage.getTimeMargin(this.timeNumber, 50, "time_", this.timeLabel) if (cc.fx.GameConfig.GM_INFO.freezeAmount < 0) cc.fx.GameConfig.GM_INFO.freezeAmount = 0; this.setPropNum(); @@ -3475,11 +3478,30 @@ export default class MapConroler extends cc.Component { this.node.scale = 1; } - // this.node.scale = 1; + const gmScale = cc.fx.GameTool.adaptation() + this.node.scale = this.node.scale * gmScale; cc.fx.GameConfig.GM_INFO.scale = this.node.scale; - // this.node.scale = 0.5; - // console.log(this.node.scale); - // this.node.scale = 1; + + const topNode = this.node.parent.getChildByName("Top"); + // topNode.scale = gmScale; + if (topNode) { + if (gmScale == 0.7) { + // 修改Widget的top属性 + const widget = topNode.getComponent(cc.Widget); + if (widget) { + widget.top -= 80; // 减去偏移量使节点向上移动 + widget.updateAlignment(); // 强制更新对齐 + } + this.node.y = this.node.y + 40; + } else { + + } + } + this.node.parent.parent.getChildByName("Win").scale = gmScale; + this.node.parent.parent.getChildByName("Lose").scale = gmScale; + this.node.parent.parent.getChildByName("propWindow").scale = gmScale; + this.node.parent.parent.getChildByName("guidet").scale = gmScale; + this.node.parent.parent.parent.getChildByName("Pause").scale = gmScale; } //创建门的粒子特效