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 0000000..597abfc Binary files /dev/null and b/assets/UI/UI/pop/fenx.png differ diff --git a/assets/UI/UI/pop/fenx.png.meta b/assets/UI/UI/pop/fenx.png.meta new file mode 100644 index 0000000..e555850 --- /dev/null +++ b/assets/UI/UI/pop/fenx.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "b9a782b2-3e0a-44a4-a360-0713673ffa90", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 609, + "height": 122, + "platformSettings": {}, + "subMetas": { + "fenx": { + "ver": "1.0.6", + "uuid": "6b170755-619c-4323-9ec4-5ff07e004765", + "importer": "sprite-frame", + "rawTextureUuid": "b9a782b2-3e0a-44a4-a360-0713673ffa90", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -0.5, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 608, + "height": 122, + "rawWidth": 609, + "rawHeight": 122, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file