From 276a9c5732edf9e3d6361bfd785b979c858eb1bc Mon Sep 17 00:00:00 2001 From: huanghaipeng Date: Thu, 18 Dec 2025 16:49:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/Scene/GameScene.fire | 12 +++++------ assets/Script/JiaZai.ts | 4 ++-- assets/Script/Map.ts | 7 ++++++ assets/UI/UI/pop/fenx.png | Bin 0 -> 6811 bytes assets/UI/UI/pop/fenx.png.meta | 38 +++++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 assets/UI/UI/pop/fenx.png create mode 100644 assets/UI/UI/pop/fenx.png.meta diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index a304283..6e72da4 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -22456,8 +22456,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 584, - "height": 100 + "width": 608, + "height": 122 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -22509,7 +22509,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "ea910867-db13-4d95-a0c1-4eb24501001c" + "__uuid__": "6b170755-619c-4323-9ec4-5ff07e004765" }, "_type": 0, "_sizeMode": 1, @@ -22522,9 +22522,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "2beee6ec-25c2-4485-9924-da395a4cd05a" - }, + "_atlas": null, "_id": "51DgMAsqpIzomWCIGyVYlO" }, { @@ -22539,7 +22537,7 @@ "_target": null, "_alignFlags": 32, "_left": 485.8, - "_right": 10.199999999999989, + "_right": -1.8000000000000114, "_top": 0, "_bottom": 0, "_verticalCenter": 0, diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index cd6b9dc..d450a29 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -685,13 +685,13 @@ export default class JiaZai extends cc.Component { let timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time); //console.log("健康值倒计时结束,当前时间:", timeTemp, cc.fx.GameConfig.GM_INFO.min_Time); if (timeLabelNode) { - NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "month_", timeLabelNode); + NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "tili_", timeLabelNode); } NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "tili_x_", this.heath, true); } else { let timeTemp = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time); if (timeLabelNode) { - NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "month_", timeLabelNode); + NumberToImage.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time, 50, "tili_", timeLabelNode); } } }.bind(this); diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 940be75..1530c09 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -2674,6 +2674,7 @@ export default class MapConroler extends cc.Component { this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").active = false; + this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Health").active = true; } else { @@ -2691,6 +2692,7 @@ export default class MapConroler extends cc.Component { this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").active = false; + this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Health").active = true; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("WinStreak").active = false; } @@ -2815,6 +2817,7 @@ export default class MapConroler extends cc.Component { this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").active = false; + this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").active = false; let buyBtn = this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").getChildByName("buyBtn"); buyBtn.getChildByName("coin1").active = buyBtn.getChildByName("coin2").active = buyBtn.getChildByName("coin3").active = false; if (cc.fx.GameConfig.GM_INFO.review == 0) buyBtn.getChildByName("coin1").active = true; @@ -2826,6 +2829,7 @@ export default class MapConroler extends cc.Component { this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = true; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").active = false; + this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").active = false; let buyBtn = this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").getChildByName("buyBtn"); buyBtn.getChildByName("coin1").active = buyBtn.getChildByName("coin2").active = buyBtn.getChildByName("coin3").active = false; if (cc.fx.GameConfig.GM_INFO.reviewBoom == 0) buyBtn.getChildByName("coin1").active = true; @@ -2837,6 +2841,7 @@ export default class MapConroler extends cc.Component { this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = true; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").active = false; + this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").active = false; let buyBtn = this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").getChildByName("buyBtn"); buyBtn.getChildByName("coin1").active = buyBtn.getChildByName("coin2").active = buyBtn.getChildByName("coin3").active = false; if (cc.fx.GameConfig.GM_INFO.reviewDoor == 0) buyBtn.getChildByName("coin1").active = true; @@ -2847,6 +2852,7 @@ export default class MapConroler extends cc.Component { this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = false; + this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").active = true; let buyBtn = this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").getChildByName("buyBtn"); buyBtn.getChildByName("coin1").active = buyBtn.getChildByName("coin2").active = buyBtn.getChildByName("coin3").active = false; @@ -2858,6 +2864,7 @@ export default class MapConroler extends cc.Component { this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = false; + this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").active = false; this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").active = true; let buyBtn = this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").getChildByName("buyBtn"); buyBtn.getChildByName("coin1").active = buyBtn.getChildByName("coin2").active = buyBtn.getChildByName("coin3").active = false; diff --git a/assets/UI/UI/pop/fenx.png b/assets/UI/UI/pop/fenx.png new file mode 100644 index 0000000000000000000000000000000000000000..597abfc9f4047b4716e080dd54283bf50c188ccc GIT binary patch literal 6811 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