diff --git a/assets/atlas/comp/btn_pause2.png b/assets/atlas/comp/btn_pause2.png deleted file mode 100644 index 10bda62..0000000 Binary files a/assets/atlas/comp/btn_pause2.png and /dev/null differ diff --git a/assets/atlas/comp/btn_pause2.png.meta b/assets/atlas/comp/btn_pause2.png.meta deleted file mode 100644 index 552e20b..0000000 --- a/assets/atlas/comp/btn_pause2.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "d45b000b-f3e3-4db4-ab5d-a3f0715ac18f", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/resources/Stage.lh b/assets/resources/Stage.lh index 171a62f..afa2c49 100644 --- a/assets/resources/Stage.lh +++ b/assets/resources/Stage.lh @@ -19,7 +19,7 @@ }, "btn_new": null, "btn_pause": { - "_$ref": "qfuij2yw" + "_$ref": "m2fmtqrc" }, "obj_mask": { "_$ref": "n15hk529" @@ -98,24 +98,23 @@ ] }, { - "_$id": "qfuij2yw", - "_$type": "Button", + "_$id": "m2fmtqrc", + "_$type": "Box", "name": "btn_pause", "x": 990, - "width": 75, - "height": 75, - "_mouseState": 2, - "stateNum": 1, - "skin": "res://7d36066d-f01a-4a46-9eb7-109f58cdbc19", - "label": "", - "labelSize": 20, - "labelAlign": "center", - "labelVAlign": "middle", - "_$comp": [ + "width": 200, + "height": 200, + "_$child": [ { - "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", - "scriptPath": "../src/views/common/CommonHover.ts", - "hoverAlpha": true + "_$id": "5uhu17g4", + "_$type": "Image", + "name": "Image", + "width": 84, + "height": 84, + "mouseThrough": true, + "skin": "res://7d36066d-f01a-4a46-9eb7-109f58cdbc19", + "useSourceSize": true, + "color": "#ffffff" } ] } @@ -45649,6 +45648,7 @@ "name": "mask", "width": 1080, "height": 1920, + "visible": false, "centerX": 0, "centerY": 0, "_$child": [ diff --git a/assets/resources/Stage_H.lh b/assets/resources/Stage_H.lh index 87737ef..48e8c7f 100644 --- a/assets/resources/Stage_H.lh +++ b/assets/resources/Stage_H.lh @@ -21,7 +21,7 @@ "_$ref": "zz4k3kw6" }, "btn_pause": { - "_$ref": "a584gnqk" + "_$ref": "xl8gtdmx" }, "obj_mask": { "_$ref": "9y0dq6th" @@ -45495,27 +45495,26 @@ "padding": "0,0,0,0", "_$child": [ { - "_$id": "a584gnqk", - "_$type": "Button", + "_$id": "xl8gtdmx", + "_$type": "Box", "name": "btn_pause", "x": 306, "y": -2, "width": 30, "height": 30, - "_mouseState": 2, - "right": -36, - "centerY": -2, - "stateNum": 1, - "skin": "res://d45b000b-f3e3-4db4-ab5d-a3f0715ac18f", - "label": "", - "labelSize": 20, - "labelAlign": "center", - "labelVAlign": "middle", - "_$comp": [ + "_$child": [ { - "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", - "scriptPath": "../src/views/common/CommonHover.ts", - "hoverAlpha": true + "_$id": "7000il0d", + "_$type": "Image", + "name": "Image", + "width": 84, + "height": 84, + "scaleX": 0.35, + "scaleY": 0.35, + "mouseThrough": true, + "skin": "res://7d36066d-f01a-4a46-9eb7-109f58cdbc19", + "useSourceSize": true, + "color": "#ffffff" } ] } diff --git a/src/views/Stage.ts b/src/views/Stage.ts index 19388b6..b039e22 100644 --- a/src/views/Stage.ts +++ b/src/views/Stage.ts @@ -20,8 +20,8 @@ export class Stage extends Laya.Script { @property(Laya.Box) public btn_new: Laya.Box - @property(Laya.Button) - public btn_pause: Laya.Button + @property(Laya.Box) + public btn_pause: Laya.Box @property(Laya.Box) public obj_mask: Laya.Box @@ -143,8 +143,6 @@ export class Stage extends Laya.Script { this.btn_hint_ad = this.btn_hint.getChildByName("Image").getChildByName("ad") as Laya.Box this.btn_hint_label = this.btn_hint.getChildByName("Image").getChildByName("normal").getChildByName("label") as Laya.Label - this.obj_mask.visible = false - EventManager.getInstance().RegisterEvent(EVENT_TYPES.NOT_UPDATE_MISTAKE, Stage.EventUpdateMistake) EventManager.getInstance().RegisterEvent(EVENT_TYPES.NOT_UPDATE_PAUSE, Stage.EventUpdatePause) } @@ -174,6 +172,8 @@ export class Stage extends Laya.Script { this.data = doStage this.paused = false + this.obj_mask.visible = false + if (config.H_SCREEN) { this.btn_back.visible = this.data.get_stageType() === config.STAGE_TYPE.DC this.btn_new.visible = this.data.get_stageType() === config.STAGE_TYPE.MAIN @@ -210,6 +210,7 @@ export class Stage extends Laya.Script { block.setBlock(doBlock) block.setTipsBgColor(false) block.setSelected(false) + block.setPaused(false) } this.onUpdateCandys() this.onClickNote(null)