diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 2c53243..2f42e05 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -1644,8 +1644,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 19, - "height": 39 + "width": 11, + "height": 31 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1764,7 +1764,7 @@ "ctor": "Float64Array", "array": [ -337.767, - -60.296, + -67.741, 0, 0, 0, @@ -6468,7 +6468,7 @@ "__id__": 129 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 131 @@ -6547,8 +6547,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, - "height": 38 + "width": 24, + "height": 36 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6643,7 +6643,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 36, + "width": 32, "height": 38 }, "_anchorPoint": { @@ -9084,7 +9084,7 @@ "ctor": "Float64Array", "array": [ 345.952, - 84.684, + 108.238, 0, 0, 0, diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index b9f4840..19ad976 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -475,7 +475,7 @@ export default class MapConroler extends cc.Component { console.log("当前关卡时间", this.timeNumber); this.add_Time = 0; - NumberToImage.getTimeMargi3(this.timeNumber, 45, "company_", this.timeLabel) + NumberToImage.getTimeMargi3(this.timeNumber, 45, "custom", this.timeLabel) this.updateCoin(); // var timeTemp = cc.fx.GameTool.getTimeMargin(this.timeNumber); @@ -2559,7 +2559,7 @@ export default class MapConroler extends cc.Component { if (data.type == "time") { this.timeNumber = 21; this.add_Time += 20; - NumberToImage.getTimeMargi3(20, 45, "company_", this.timeLabel) + NumberToImage.getTimeMargi3(20, 45, "custom", this.timeLabel) } this.blockNum = this.blocks.length; @@ -2582,7 +2582,7 @@ export default class MapConroler extends cc.Component { this.pause = false; this.timeNumber = 21; this.add_Time += 20; - NumberToImage.getTimeMargi3(20, 45, "company_", this.timeLabel) + NumberToImage.getTimeMargi3(20, 45, "custom", this.timeLabel) this.blockNum = this.blocks.length; if (this.blockNum == 0) this.nextLevel(1); this.node.parent.parent.getChildByName("Lose").active = false; @@ -2918,7 +2918,7 @@ export default class MapConroler extends cc.Component { if (this.timeNumber <= 0) { this.stopTimeCutDown(); // var timeTemp = cc.fx.GameTool.getTimeMargin3(this.timeNumber); - NumberToImage.getTimeMargi3(this.timeNumber, 45, "company_", this.timeLabel) + NumberToImage.getTimeMargi3(this.timeNumber, 45, "custom", this.timeLabel) // this.timeLabel.string = timeTemp.toString(); if (!this.pause) this.failLevel("time"); } @@ -2929,7 +2929,7 @@ export default class MapConroler extends cc.Component { if (!this.pause) this.failLevel("time"); } // var timeTemp = cc.fx.GameTool.getTimeMargin3(this.timeNumber); - NumberToImage.getTimeMargi3(this.timeNumber, 45, "company_", this.timeLabel) + NumberToImage.getTimeMargi3(this.timeNumber, 45, "custom", this.timeLabel) // this.timeLabel.string = timeTemp.toString(); } }.bind(this); @@ -3028,7 +3028,7 @@ export default class MapConroler extends cc.Component { cc.fx.GameConfig.GM_INFO.freezeAmount -= 1; // 倒计时加20秒 this.timeNumber += 20; - NumberToImage.getTimeMargi3(this.timeNumber, 45, "company_", this.timeLabel) + NumberToImage.getTimeMargi3(this.timeNumber, 45, "custom", this.timeLabel) if (cc.fx.GameConfig.GM_INFO.freezeAmount < 0) cc.fx.GameConfig.GM_INFO.freezeAmount = 0; this.setPropNum(); @@ -4330,7 +4330,7 @@ export default class MapConroler extends cc.Component { rank.active = true; Career.active = false; - NumberToImage.numberToImageNodes4((cc.fx.GameConfig.GM_INFO.addLevel + 1), 40, 15, "company_", rank.getChildByName("addLevel"), true); + NumberToImage.numberToImageNodes4((cc.fx.GameConfig.GM_INFO.addLevel + 1), 40, 15, "custom", rank.getChildByName("addLevel"), true); for (let i = 0; i < rank.getChildByName("addLevel").children.length; i++) { rank.getChildByName("addLevel").children[i].color = cc.Color.WHITE; } diff --git a/assets/UI/UI/pop/mao.png b/assets/UI/UI/pop/mao.png index 34d59de..940d1a5 100644 Binary files a/assets/UI/UI/pop/mao.png and b/assets/UI/UI/pop/mao.png differ diff --git a/assets/UI/UI/pop/mao.png.meta b/assets/UI/UI/pop/mao.png.meta index 4ae1cb3..ac3856a 100644 --- a/assets/UI/UI/pop/mao.png.meta +++ b/assets/UI/UI/pop/mao.png.meta @@ -20,14 +20,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": 0, - "offsetY": 0.5, + "offsetX": -0.5, + "offsetY": 0, "trimX": 11, - "trimY": 7, - "width": 19, - "height": 39, - "rawWidth": 41, - "rawHeight": 54, + "trimY": 8, + "width": 11, + "height": 31, + "rawWidth": 34, + "rawHeight": 47, "borderTop": 0, "borderBottom": 0, "borderLeft": 0,