diff --git a/assets/atlas/comp/icon_check.png b/assets/atlas/comp/icon_check.png index c74b55e..0b8fbbd 100644 Binary files a/assets/atlas/comp/icon_check.png and b/assets/atlas/comp/icon_check.png differ diff --git a/assets/resources/CommonTips.lh b/assets/resources/CommonTips.lh index b4184a5..b88da18 100644 --- a/assets/resources/CommonTips.lh +++ b/assets/resources/CommonTips.lh @@ -54,10 +54,10 @@ "_$id": "r463so4u", "_$type": "Box", "name": "center", - "x": 540, - "y": 330, - "width": 840, - "height": 420, + "x": 480, + "y": 280, + "width": 960, + "height": 520, "_mouseState": 2, "centerX": 0, "centerY": 0, @@ -66,8 +66,8 @@ "_$id": "wfz9ah0j", "_$type": "Sprite", "name": "Sprite", - "width": 840, - "height": 420, + "width": 960, + "height": 520, "_gcmds": [ { "_$type": "DrawRoundRectCmd", @@ -85,132 +85,32 @@ } ] }, - { - "_$id": "kdbuqg4b", - "_$type": "VBox", - "name": "buttons", - "x": 114, - "y": 106, - "width": 612, - "height": 350, - "bottom": -36, - "centerX": 0, - "space": 27, - "align": "center" - }, - { - "_$id": "qawnoo6z", - "_$type": "Label", - "name": "label_title", - "x": 120, - "y": 24, - "width": 600, - "height": 60, - "top": 24, - "centerX": 0, - "text": "Start New Game", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 48, - "color": "rgba(45, 49, 56, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "jjabofyx", - "_$type": "Label", - "name": "label_content", - "x": 120, - "y": 112, - "width": 600, - "height": 120, - "top": 112, - "centerX": 0, - "text": "Current game progress will be lost", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(123, 129, 140, 1)", - "align": "center", - "valign": "top", - "padding": "0,0,0,0" - }, { "_$id": "k3fjill3", "_$type": "HBox", "name": "HBox", - "x": 80, - "y": 214, - "width": 680, + "x": 54, + "y": 271, + "width": 852, "height": 96, "centerX": 0, - "space": 80, + "space": 28, "align": "middle", "_$child": [ - { - "_$id": "ob8d2aj7", - "_$type": "Box", - "name": "btn_ok", - "width": 300, - "height": 96, - "_$child": [ - { - "_$id": "bqp1fe7k", - "_$type": "Sprite", - "name": "Sprite", - "width": 300, - "height": 96, - "mouseThrough": true, - "_gcmds": [ - { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 20, - "rt": 20, - "lb": 20, - "rb": 20, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" - } - ] - }, - { - "_$id": "q2n5i4r9", - "_$type": "Label", - "name": "Label", - "width": 300, - "height": 96, - "centerX": 0, - "centerY": 0, - "text": "OK", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(255, 255, 255, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - } - ] - }, { "_$id": "ikd12rw5", "_$type": "Box", "name": "btn_cancel", - "x": 380, - "width": 300, - "height": 96, + "y": -12, + "width": 412, + "height": 120, "_$child": [ { "_$id": "he6hpns9", "_$type": "Sprite", "name": "Sprite", - "width": 300, - "height": 96, + "width": 412, + "height": 120, "alpha": 0.1, "mouseThrough": true, "_gcmds": [ @@ -220,10 +120,10 @@ "y": 0, "width": 1, "height": 1, - "lt": 20, - "rt": 20, - "lb": 20, - "rb": 20, + "lt": 27, + "rt": 27, + "lb": 27, + "rb": 27, "percent": true, "lineWidth": 1, "fillColor": "rgba(29, 92, 220, 1)" @@ -234,13 +134,15 @@ "_$id": "qa4fm6cu", "_$type": "Label", "name": "Label", + "x": 56, + "y": 12, "width": 300, "height": 96, "centerX": 0, "centerY": 0, "text": "Cancel", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, + "fontSize": 45, "color": "rgba(29, 92, 220, 1)", "bold": true, "align": "center", @@ -248,6 +150,60 @@ "padding": "0,0,0,0" } ] + }, + { + "_$id": "ob8d2aj7", + "_$type": "Box", + "name": "btn_ok", + "x": 440, + "y": -12, + "width": 412, + "height": 120, + "_$child": [ + { + "_$id": "bqp1fe7k", + "_$type": "Sprite", + "name": "Sprite", + "width": 412, + "height": 120, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 27, + "rt": 27, + "lb": 27, + "rb": 27, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "q2n5i4r9", + "_$type": "Label", + "name": "Label", + "x": 56, + "y": 12, + "width": 300, + "height": 96, + "centerX": 0, + "centerY": 0, + "text": "Start", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 45, + "color": "rgba(255, 255, 255, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" + } + ] } ] }, @@ -255,17 +211,18 @@ "_$id": "g1zoj9qx", "_$type": "Box", "name": "toggle", - "x": 226, - "y": 339, - "width": 64, - "height": 64, + "x": 320, + "y": 424, + "width": 42, + "height": 42, + "bottom": 54, "_$child": [ { "_$id": "74puwx15", "_$type": "Sprite", "name": "Sprite", - "width": 64, - "height": 64, + "width": 42, + "height": 42, "mouseThrough": true, "_gcmds": [ { @@ -274,51 +231,84 @@ "y": 0, "width": 1, "height": 1, - "lt": 10, - "rt": 10, - "lb": 10, - "rb": 10, + "lt": 6, + "rt": 6, + "lb": 6, + "rb": 6, "percent": true, "lineWidth": 2, - "lineColor": "#000000", - "fillColor": "#FFFFFF" - } - ], - "_$child": [ - { - "_$id": "cofalite", - "_$type": "Image", - "name": "Image", - "x": 14, - "y": 18, - "width": 36, - "height": 28, - "centerX": 0, - "centerY": 0, - "skin": "res://6f23a1ca-70f5-467a-afc3-5b178a851423", - "useSourceSize": true, - "color": "#ffffff" + "fillColor": "rgba(240, 242, 247, 1)" } ] }, + { + "_$id": "cofalite", + "_$type": "Image", + "name": "Image", + "width": 43, + "height": 42, + "centerX": 0, + "centerY": 0, + "skin": "res://6f23a1ca-70f5-467a-afc3-5b178a851423", + "useSourceSize": true, + "color": "#ffffff" + }, { "_$id": "jf00gv80", "_$type": "Label", "name": "Label", - "x": 78, + "x": 54, "y": 2, "width": 400, - "height": 64, - "left": 78, + "height": 42, + "left": 54, "centerY": 2, "text": "Don't ask me agin", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(123, 129, 140, 1)", + "fontSize": 30, + "color": "rgba(84, 89, 98, 1)", "valign": "middle", "padding": "0,0,0,0" } ] + }, + { + "_$id": "qawnoo6z", + "_$type": "Label", + "name": "label_title", + "x": 180, + "y": 54, + "width": 600, + "height": 66, + "top": 54, + "centerX": 0, + "text": "Start New Game", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 54, + "color": "rgba(45, 49, 56, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0", + "strokeColor": "rgba(45, 49, 56, 1)" + }, + { + "_$id": "jjabofyx", + "_$type": "Label", + "name": "label_content", + "x": 130, + "y": 150, + "width": 700, + "height": 48, + "top": 150, + "centerX": 0, + "text": "Current game progress will be lost", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 40, + "color": "rgba(84, 89, 98, 1)", + "align": "center", + "valign": "top", + "padding": "0,0,0,0" } ] } diff --git a/assets/resources/GameDone_DC_H.lh b/assets/resources/GameDone_DC_H.lh index a9ca2d3..111beb0 100644 --- a/assets/resources/GameDone_DC_H.lh +++ b/assets/resources/GameDone_DC_H.lh @@ -238,7 +238,7 @@ "_$id": "nfqfex9l", "_$type": "Label", "name": "Label", - "x": 54, + "x": 100, "width": 400, "height": 80, "text": "Difficulty ", @@ -252,10 +252,10 @@ "_$id": "t56jxo0a", "_$type": "Label", "name": "label_difficulty", - "x": 422, + "x": 376, "width": 400, "height": 80, - "right": 54, + "right": 100, "text": "Medium", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 36, @@ -278,7 +278,7 @@ "_$id": "utszg27d", "_$type": "Label", "name": "Label", - "x": 54, + "x": 100, "width": 400, "height": 80, "text": "Time", @@ -292,10 +292,10 @@ "_$id": "v0a6pgjh", "_$type": "Label", "name": "label_time", - "x": 422, + "x": 376, "width": 400, "height": 80, - "right": 54, + "right": 100, "text": "Medium", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 36, @@ -318,7 +318,7 @@ "_$id": "nwe3p9mt", "_$type": "Label", "name": "Label", - "x": 54, + "x": 100, "width": 400, "height": 80, "text": "Score", @@ -332,10 +332,10 @@ "_$id": "sjgiel5s", "_$type": "Label", "name": "label_score", - "x": 422, + "x": 376, "width": 400, "height": 80, - "right": 54, + "right": 100, "text": "Medium", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 36, @@ -421,6 +421,7 @@ "y": 558, "width": 540, "height": 156, + "visible": false, "top": 558, "centerX": 0, "_$child": [ diff --git a/assets/resources/GameDone_Normal_H.lh b/assets/resources/GameDone_Normal_H.lh index 423edd2..b49aff5 100644 --- a/assets/resources/GameDone_Normal_H.lh +++ b/assets/resources/GameDone_Normal_H.lh @@ -238,7 +238,7 @@ "_$id": "phpj9rno", "_$type": "Label", "name": "Label", - "x": 54, + "x": 100, "width": 400, "height": 80, "text": "Difficulty ", @@ -252,10 +252,10 @@ "_$id": "291hwgvn", "_$type": "Label", "name": "label_difficulty", - "x": 422, + "x": 376, "width": 400, "height": 80, - "right": 54, + "right": 100, "text": "Medium", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 36, @@ -278,7 +278,7 @@ "_$id": "xmjk7stg", "_$type": "Label", "name": "Label", - "x": 54, + "x": 100, "width": 400, "height": 80, "text": "Time", @@ -292,10 +292,10 @@ "_$id": "656grx7b", "_$type": "Label", "name": "label_time", - "x": 422, + "x": 376, "width": 400, "height": 80, - "right": 54, + "right": 100, "text": "Medium", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 36, @@ -318,7 +318,7 @@ "_$id": "zy5w77m2", "_$type": "Label", "name": "Label", - "x": 54, + "x": 100, "width": 400, "height": 80, "text": "Score", @@ -332,10 +332,10 @@ "_$id": "6upkkpwf", "_$type": "Label", "name": "label_score", - "x": 422, + "x": 376, "width": 400, "height": 80, - "right": 54, + "right": 100, "text": "Medium", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 36, @@ -420,6 +420,7 @@ "y": 558, "width": 540, "height": 156, + "visible": false, "top": 558, "centerX": 0, "_$child": [ diff --git a/assets/resources/GameOver.lh b/assets/resources/GameOver.lh index 95b1fc6..5ebcc42 100644 --- a/assets/resources/GameOver.lh +++ b/assets/resources/GameOver.lh @@ -16,13 +16,13 @@ "_$type": "72a5ccd3-8177-451c-b2ce-cf1b42f7e6d4", "scriptPath": "../src/views/GameOver.ts", "btn_second": { - "_$ref": "0w6x8zzw" + "_$ref": "xxbk8zbl" }, "btn_restart": { - "_$ref": "y7aniaui" + "_$ref": "g47r0en7" }, "btn_newOrClose": { - "_$ref": "eepsaznr" + "_$ref": "umnahawk" }, "label_newOrClose": { "_$ref": "2r6iotpo" @@ -92,36 +92,19 @@ "align": "center", "_$child": [ { - "_$id": "0w6x8zzw", - "_$type": "Sprite", + "_$id": "xxbk8zbl", + "_$type": "Box", "name": "btn_second", "width": 744, "height": 156, - "_gcmds": [ - { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 36, - "rt": 36, - "lb": 36, - "rb": 36, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" - } - ], "_$child": [ { - "_$id": "23po992p", + "_$id": "0w6x8zzw", "_$type": "Sprite", "name": "Sprite", - "x": 64, - "y": 44, - "width": 60, - "height": 54, + "width": 744, + "height": 156, + "mouseThrough": true, "_gcmds": [ { "_$type": "DrawRoundRectCmd", @@ -129,159 +112,197 @@ "y": 0, "width": 1, "height": 1, - "lt": 10, - "rt": 10, - "lb": 10, - "rb": 10, + "lt": 36, + "rt": 36, + "lb": 36, + "rb": 36, "percent": true, "lineWidth": 1, - "fillColor": "#FFFFFF" + "fillColor": "rgba(29, 92, 220, 1)" } ], "_$child": [ { - "_$id": "7i8eqgi1", + "_$id": "23po992p", "_$type": "Sprite", "name": "Sprite", - "x": 16, - "y": 13, - "width": 28, - "height": 28, + "x": 64, + "y": 44, + "width": 60, + "height": 54, + "mouseThrough": true, "_gcmds": [ { - "_$type": "DrawPolyCmd", + "_$type": "DrawRoundRectCmd", "x": 0, "y": 0, - "points": [ - 0, - 0, - 28, - 14, - 0, - 28 - ], + "width": 1, + "height": 1, + "lt": 10, + "rt": 10, + "lb": 10, + "rb": 10, + "percent": true, "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" + "fillColor": "#FFFFFF" + } + ], + "_$child": [ + { + "_$id": "7i8eqgi1", + "_$type": "Sprite", + "name": "Sprite", + "x": 16, + "y": 13, + "width": 28, + "height": 28, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawPolyCmd", + "x": 0, + "y": 0, + "points": [ + 0, + 0, + 28, + 14, + 0, + 28 + ], + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] } ] } ] + }, + { + "_$id": "4fv9wmfi", + "_$type": "Label", + "name": "Label", + "width": 744, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "Second Chance", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 60, + "color": "rgba(255, 255, 255, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" } ] }, { - "_$id": "y7aniaui", - "_$type": "Sprite", + "_$id": "g47r0en7", + "_$type": "Box", "name": "btn_restart", "y": 196, "width": 744, "height": 156, - "alpha": 0.1, - "_gcmds": [ + "_$child": [ { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 36, - "rt": 36, - "lb": 36, - "rb": 36, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" + "_$id": "y7aniaui", + "_$type": "Sprite", + "name": "Sprite", + "width": 744, + "height": 156, + "alpha": 0.1, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 36, + "rt": 36, + "lb": 36, + "rb": 36, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "o6codx3p", + "_$type": "Label", + "name": "Label", + "width": 744, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "Restart", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 60, + "color": "rgba(29, 92, 220, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" } ] }, { - "_$id": "eepsaznr", - "_$type": "Sprite", + "_$id": "umnahawk", + "_$type": "Box", "name": "btn_newOrClose", "y": 392, "width": 744, "height": 156, - "alpha": 0.1, - "_gcmds": [ + "_$child": [ { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 36, - "rt": 36, - "lb": 36, - "rb": 36, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" + "_$id": "eepsaznr", + "_$type": "Sprite", + "name": "Sprite", + "width": 744, + "height": 156, + "alpha": 0.1, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 36, + "rt": 36, + "lb": 36, + "rb": 36, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "2r6iotpo", + "_$type": "Label", + "name": "Label", + "width": 744, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "New Game", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 60, + "color": "rgba(29, 92, 220, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" } ] } ] - }, - { - "_$id": "17a1hg41", - "_$type": "VBox", - "name": "labels", - "x": 72, - "y": 456, - "width": 744, - "height": 600, - "centerX": 0, - "centerY": 216, - "space": 40, - "align": "center", - "_$child": [ - { - "_$id": "4fv9wmfi", - "_$type": "Label", - "name": "Label(1)", - "width": 744, - "height": 156, - "text": "Second Chance", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 60, - "color": "rgba(255, 255, 255, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "o6codx3p", - "_$type": "Label", - "name": "Label(2)", - "y": 196, - "width": 744, - "height": 156, - "text": "Restart", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 60, - "color": "rgba(29, 92, 220, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "2r6iotpo", - "_$type": "Label", - "name": "Label(3)", - "y": 392, - "width": 744, - "height": 156, - "text": "New Game", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 60, - "color": "rgba(29, 92, 220, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - } - ] } ] }, diff --git a/assets/resources/GameOver_H.lh b/assets/resources/GameOver_H.lh index 51625f8..4c11579 100644 --- a/assets/resources/GameOver_H.lh +++ b/assets/resources/GameOver_H.lh @@ -16,13 +16,13 @@ "_$type": "72a5ccd3-8177-451c-b2ce-cf1b42f7e6d4", "scriptPath": "../src/views/GameOver.ts", "btn_second": { - "_$ref": "szb9ucan" + "_$ref": "0mzw96e9" }, "btn_restart": { - "_$ref": "vhabgf62" + "_$ref": "lceajjw5" }, "btn_newOrClose": { - "_$ref": "90q3msn4" + "_$ref": "s45ffbjo" }, "label_newOrClose": { "_$ref": "b03vjzma" @@ -48,10 +48,10 @@ "_$id": "ak02a9xq", "_$type": "Box", "name": "center", - "x": 600, - "y": 135, - "width": 720, - "height": 810, + "x": 480, + "y": 225, + "width": 960, + "height": 630, "_mouseState": 2, "centerX": 0, "centerY": 0, @@ -60,8 +60,8 @@ "_$id": "kaqpo7v4", "_$type": "Sprite", "name": "Sprite", - "width": 720, - "height": 810, + "width": 960, + "height": 630, "_gcmds": [ { "_$type": "DrawRoundRectCmd", @@ -83,46 +83,29 @@ "_$id": "gcpm74vt", "_$type": "VBox", "name": "buttons", - "y": 351, - "width": 720, - "height": 495, - "bottom": -36, + "x": 54, + "y": 304, + "width": 852, + "height": 350, + "bottom": -24, "centerX": 0, "space": 27, "align": "center", "_$child": [ { - "_$id": "szb9ucan", - "_$type": "Sprite", + "_$id": "0mzw96e9", + "_$type": "Box", "name": "btn_second", - "x": 54, - "width": 612, + "width": 852, "height": 120, - "_gcmds": [ - { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 27, - "rt": 27, - "lb": 27, - "rb": 27, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" - } - ], "_$child": [ { - "_$id": "sl0p26bq", + "_$id": "szb9ucan", "_$type": "Sprite", "name": "Sprite", - "x": 67, - "y": 37, - "width": 48, - "height": 40, + "width": 852, + "height": 120, + "mouseThrough": true, "_gcmds": [ { "_$type": "DrawRoundRectCmd", @@ -130,161 +113,209 @@ "y": 0, "width": 1, "height": 1, - "lt": 10, - "rt": 10, - "lb": 10, - "rb": 10, + "lt": 27, + "rt": 27, + "lb": 27, + "rb": 27, "percent": true, "lineWidth": 1, - "fillColor": "#FFFFFF" + "fillColor": "rgba(29, 92, 220, 1)" } ], "_$child": [ { - "_$id": "shuwbc76", + "_$id": "sl0p26bq", "_$type": "Sprite", "name": "Sprite", - "x": 16, - "y": 10, - "width": 18, - "height": 20, + "x": 188, + "y": 37, + "width": 48, + "height": 40, + "mouseThrough": true, "_gcmds": [ { - "_$type": "DrawPolyCmd", + "_$type": "DrawRoundRectCmd", "x": 0, "y": 0, - "points": [ - 0, - 0, - 18, - 10, - 0, - 20 - ], + "width": 1, + "height": 1, + "lt": 10, + "rt": 10, + "lb": 10, + "rb": 10, + "percent": true, "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" + "fillColor": "#FFFFFF" + } + ], + "_$child": [ + { + "_$id": "shuwbc76", + "_$type": "Sprite", + "name": "Sprite", + "x": 16, + "y": 10, + "width": 18, + "height": 20, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawPolyCmd", + "x": 0, + "y": 0, + "points": [ + 0, + 0, + 18, + 10, + 0, + 20 + ], + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] } ] } ] - } - ] - }, - { - "_$id": "vhabgf62", - "_$type": "Sprite", - "name": "btn_restart", - "x": 54, - "y": 147, - "width": 612, - "height": 120, - "alpha": 0.1, - "_gcmds": [ + }, { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 20, - "rt": 20, - "lb": 20, - "rb": 20, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" + "_$id": "xemd8gdj", + "_$type": "Label", + "name": "Label", + "x": 120, + "width": 612, + "height": 120, + "centerX": 0, + "centerY": 0, + "text": "Second Chance", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 45, + "color": "rgba(255, 255, 255, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" } ] }, { - "_$id": "90q3msn4", - "_$type": "Sprite", - "name": "btn_newOrClose", - "x": 54, - "y": 294, - "width": 612, - "height": 120, - "alpha": 0.1, - "_gcmds": [ - { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 20, - "rt": 20, - "lb": 20, - "rb": 20, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" - } - ] - } - ] - }, - { - "_$id": "x4n5s73l", - "_$type": "VBox", - "name": "labels", - "y": 351, - "width": 720, - "height": 495, - "bottom": -36, - "centerX": 0, - "space": 27, - "align": "center", - "_$child": [ - { - "_$id": "xemd8gdj", - "_$type": "Label", - "name": "Label(1)", - "x": 54, - "width": 612, - "height": 120, - "text": "Second Chance", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 45, - "color": "rgba(255, 255, 255, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "km7828dd", - "_$type": "Label", - "name": "Label(2)", - "x": 54, + "_$id": "2g3rpaw7", + "_$type": "HBox", + "name": "HBox", "y": 147, - "width": 612, + "width": 852, "height": 120, - "text": "Restart", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 45, - "color": "rgba(29, 92, 220, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "b03vjzma", - "_$type": "Label", - "name": "Label(3)", - "x": 54, - "y": 294, - "width": 612, - "height": 120, - "text": "New Game", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 45, - "color": "rgba(29, 92, 220, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" + "space": 28, + "align": "middle", + "_$child": [ + { + "_$id": "lceajjw5", + "_$type": "Box", + "name": "btn_restart", + "width": 412, + "height": 120, + "_$child": [ + { + "_$id": "vhabgf62", + "_$type": "Sprite", + "name": "Sprite", + "width": 412, + "height": 120, + "alpha": 0.1, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 27, + "rt": 27, + "lb": 27, + "rb": 27, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "km7828dd", + "_$type": "Label", + "name": "Label", + "x": -100, + "width": 612, + "height": 120, + "centerX": 0, + "centerY": 0, + "text": "Restart", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 45, + "color": "rgba(29, 92, 220, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" + } + ] + }, + { + "_$id": "s45ffbjo", + "_$type": "Box", + "name": "btn_newOrClose", + "x": 440, + "width": 412, + "height": 120, + "_$child": [ + { + "_$id": "qkqudbcq", + "_$type": "Sprite", + "name": "Sprite", + "width": 412, + "height": 120, + "alpha": 0.1, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 27, + "rt": 27, + "lb": 27, + "rb": 27, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "b03vjzma", + "_$type": "Label", + "name": "Label", + "x": -100, + "width": 612, + "height": 120, + "centerX": 0, + "centerY": 0, + "text": "New Game", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 45, + "color": "rgba(29, 92, 220, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" + } + ] + } + ] } ] }, @@ -292,11 +323,11 @@ "_$id": "jqc2ijwf", "_$type": "Label", "name": "Label", - "x": 60, - "y": 90, + "x": 180, + "y": 54, "width": 600, "height": 66, - "top": 90, + "top": 54, "centerX": 0, "text": "Game Over", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", @@ -311,11 +342,11 @@ "_$id": "oioxcne0", "_$type": "Label", "name": "Label(1)", - "x": 14, - "y": 180, - "width": 692, + "x": 54, + "y": 150, + "width": 852, "height": 96, - "top": 180, + "top": 150, "centerX": 0, "text": "You lost the game because you made 3 mistakes", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", diff --git a/assets/resources/GamePause.lh b/assets/resources/GamePause.lh index 22ef270..24988fe 100644 --- a/assets/resources/GamePause.lh +++ b/assets/resources/GamePause.lh @@ -3,8 +3,8 @@ "_$id": "2c04twx2", "_$type": "Box", "name": "GamePause", - "width": 1080, - "height": 1920, + "width": 1920, + "height": 1080, "_mouseState": 2, "drawCallOptimize": true, "left": 0, @@ -22,10 +22,10 @@ "_$ref": "ztc8yofh" }, "btn_continue": { - "_$ref": "ugz9ejd0" + "_$ref": "eg30duhu" }, "btn_restart": { - "_$ref": "lkzndo0i" + "_$ref": "hzogezgn" } } ], @@ -34,8 +34,8 @@ "_$id": "vqp0nqaw", "_$type": "Image", "name": "Image", - "width": 1080, - "height": 1920, + "width": 1920, + "height": 1080, "alpha": 0.6, "left": 0, "right": 0, @@ -48,8 +48,8 @@ "_$id": "cy0qcxu0", "_$type": "Box", "name": "center", - "x": 96, - "y": 507, + "x": 516, + "y": 87, "width": 888, "height": 906, "_mouseState": 2, @@ -93,101 +93,109 @@ "align": "center", "_$child": [ { - "_$id": "ugz9ejd0", - "_$type": "Sprite", + "_$id": "eg30duhu", + "_$type": "Box", "name": "btn_continue", "width": 744, "height": 156, - "_gcmds": [ + "_$child": [ { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 36, - "rt": 36, - "lb": 36, - "rb": 36, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" + "_$id": "ugz9ejd0", + "_$type": "Sprite", + "name": "Sprite", + "width": 744, + "height": 156, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 36, + "rt": 36, + "lb": 36, + "rb": 36, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "8v40s793", + "_$type": "Label", + "name": "Label", + "width": 744, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "Continue", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 60, + "color": "rgba(255, 255, 255, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" } ] }, { - "_$id": "lkzndo0i", - "_$type": "Sprite", + "_$id": "hzogezgn", + "_$type": "Box", "name": "btn_restart", "y": 196, "width": 744, "height": 156, - "alpha": 0.1, - "_gcmds": [ + "_$child": [ { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 36, - "rt": 36, - "lb": 36, - "rb": 36, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" + "_$id": "lkzndo0i", + "_$type": "Sprite", + "name": "Sprite", + "width": 744, + "height": 156, + "alpha": 0.1, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 36, + "rt": 36, + "lb": 36, + "rb": 36, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "urss0raj", + "_$type": "Label", + "name": "Label", + "width": 744, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "Restart", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 60, + "color": "rgba(29, 92, 220, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" } ] } ] }, - { - "_$id": "e5ib0aqq", - "_$type": "VBox", - "name": "labels", - "x": 72, - "y": 478, - "width": 744, - "height": 600, - "centerX": 0, - "centerY": 325, - "space": 40, - "align": "center", - "_$child": [ - { - "_$id": "8v40s793", - "_$type": "Label", - "name": "Label(1)", - "width": 744, - "height": 156, - "text": "Continue", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 60, - "color": "rgba(255, 255, 255, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "urss0raj", - "_$type": "Label", - "name": "Label(2)", - "y": 196, - "width": 744, - "height": 156, - "text": "Restart", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 60, - "color": "rgba(29, 92, 220, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - } - ] - }, { "_$id": "hk8la5r2", "_$type": "Label", diff --git a/assets/resources/GamePause_H.lh b/assets/resources/GamePause_H.lh index 7bfdc42..f3c73be 100644 --- a/assets/resources/GamePause_H.lh +++ b/assets/resources/GamePause_H.lh @@ -22,10 +22,10 @@ "_$ref": "x0g211ix" }, "btn_continue": { - "_$ref": "h0pbxs4g" + "_$ref": "xa5cbi60" }, "btn_restart": { - "_$ref": "i67pxiat" + "_$ref": "1bdygkhu" } } ], @@ -48,10 +48,10 @@ "_$id": "2oq6bad5", "_$type": "Box", "name": "center", - "x": 600, - "y": 200, - "width": 720, - "height": 680, + "x": 480, + "y": 279, + "width": 960, + "height": 522, "_mouseState": 2, "centerX": 0, "centerY": 0, @@ -60,8 +60,8 @@ "_$id": "1lql105a", "_$type": "Sprite", "name": "Sprite", - "width": 720, - "height": 680, + "width": 960, + "height": 522, "_gcmds": [ { "_$type": "DrawRoundRectCmd", @@ -80,113 +80,121 @@ ] }, { - "_$id": "o4e4pyiy", - "_$type": "VBox", + "_$id": "xu85tc1o", + "_$type": "HBox", "name": "buttons", "x": 54, - "y": 366, - "width": 612, - "height": 350, - "bottom": -36, + "y": 302, + "width": 852, + "height": 210, + "bottom": 10, "centerX": 0, - "space": 27, - "align": "center", + "space": 28, + "align": "middle", "_$child": [ { - "_$id": "h0pbxs4g", - "_$type": "Sprite", - "name": "btn_continue", - "width": 612, - "height": 120, - "_gcmds": [ - { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 27, - "rt": 27, - "lb": 27, - "rb": 27, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" - } - ] - }, - { - "_$id": "i67pxiat", - "_$type": "Sprite", + "_$id": "1bdygkhu", + "_$type": "Box", "name": "btn_restart", - "y": 147, - "width": 612, + "y": 45, + "width": 412, "height": 120, - "alpha": 0.1, - "_gcmds": [ + "_$child": [ { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 27, - "rt": 27, - "lb": 27, - "rb": 27, - "percent": true, - "lineWidth": 1, - "fillColor": "rgba(29, 92, 220, 1)" + "_$id": "i67pxiat", + "_$type": "Sprite", + "name": "Sprte", + "width": 412, + "height": 120, + "alpha": 0.1, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 27, + "rt": 27, + "lb": 27, + "rb": 27, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "julmw9iu", + "_$type": "Label", + "name": "Label", + "width": 412, + "height": 120, + "centerX": 0, + "centerY": 0, + "text": "Restart", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 45, + "color": "rgba(29, 92, 220, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" } ] - } - ] - }, - { - "_$id": "34mfjw6q", - "_$type": "VBox", - "name": "labels", - "x": 54, - "y": 366, - "width": 612, - "height": 350, - "bottom": -36, - "centerX": 0, - "space": 27, - "align": "center", - "_$child": [ - { - "_$id": "64brcggk", - "_$type": "Label", - "name": "Label(1)", - "x": -66, - "width": 744, - "height": 120, - "text": "Continue", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 45, - "color": "rgba(255, 255, 255, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" }, { - "_$id": "julmw9iu", - "_$type": "Label", - "name": "Label(2)", - "x": -66, - "y": 147, - "width": 744, + "_$id": "xa5cbi60", + "_$type": "Box", + "name": "btn_continue", + "x": 440, + "y": 45, + "width": 412, "height": 120, - "text": "Restart", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 45, - "color": "rgba(29, 92, 220, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" + "_$child": [ + { + "_$id": "h0pbxs4g", + "_$type": "Sprite", + "name": "Sprite", + "width": 412, + "height": 120, + "mouseThrough": true, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 27, + "rt": 27, + "lb": 27, + "rb": 27, + "percent": true, + "lineWidth": 1, + "fillColor": "rgba(29, 92, 220, 1)" + } + ] + }, + { + "_$id": "64brcggk", + "_$type": "Label", + "name": "Label", + "width": 412, + "height": 120, + "centerX": 0, + "centerY": 0, + "text": "Continue", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 45, + "color": "rgba(255, 255, 255, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" + } + ] } ] }, @@ -194,11 +202,11 @@ "_$id": "hjmgztax", "_$type": "Label", "name": "Label", - "x": 60, - "y": 90, + "x": 180, + "y": 54, "width": 600, "height": 60, - "top": 90, + "top": 54, "centerX": 0, "text": "Pause", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", @@ -213,28 +221,31 @@ "_$id": "q0nefmnf", "_$type": "HBox", "name": "summary", - "y": 192, - "width": 720, - "height": 140, - "top": 192, + "x": 53, + "y": 156, + "width": 854, + "height": 150, + "top": 156, "centerX": 0, - "space": 0, + "space": 18, "align": "middle", "_$child": [ { "_$id": "xfwuob5k", "_$type": "Box", "name": "Box(1)", - "y": 2.5, - "width": 360, + "y": 7.5, + "width": 418, "height": 135, "_$child": [ { "_$id": "o1clptre", "_$type": "Label", "name": "Label", + "x": 29, "width": 360, "height": 60, + "centerX": 0, "text": "Time", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 30, @@ -247,13 +258,16 @@ "_$id": "2oo94fn6", "_$type": "Label", "name": "label_time", + "x": 29, "y": 52, "width": 360, "height": 72, + "centerX": 0, "text": "Medium", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 45, "color": "rgba(45, 49, 56, 1)", + "bold": true, "align": "center", "valign": "middle", "padding": "0,0,0,0" @@ -264,17 +278,19 @@ "_$id": "juv58eq7", "_$type": "Box", "name": "Box(2)", - "x": 360, - "y": 2.5, - "width": 360, + "x": 436, + "y": 7.5, + "width": 418, "height": 135, "_$child": [ { "_$id": "y3cucgc5", "_$type": "Label", "name": "Label", + "x": 29, "width": 360, "height": 60, + "centerX": 0, "text": "Difficulty ", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 30, @@ -287,13 +303,16 @@ "_$id": "x0g211ix", "_$type": "Label", "name": "label_diffculty", + "x": 29, "y": 52, "width": 360, "height": 72, + "centerX": 0, "text": "Medium", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 45, "color": "rgba(45, 49, 56, 1)", + "bold": true, "align": "center", "valign": "middle", "padding": "0,0,0,0" diff --git a/settings/PlayerSettings.json b/settings/PlayerSettings.json index 78c0abb..fcc683e 100644 --- a/settings/PlayerSettings.json +++ b/settings/PlayerSettings.json @@ -1,7 +1,7 @@ { "resolution": { - "designWidth": 1080, - "designHeight": 1920, + "designWidth": 1920, + "designHeight": 1080, "scaleMode": "fixedauto", "backgroundColor": "rgba(245, 247, 251, 1)" }, diff --git a/src/views/GameOver.ts b/src/views/GameOver.ts index d3a5fd1..51001f5 100644 --- a/src/views/GameOver.ts +++ b/src/views/GameOver.ts @@ -12,14 +12,14 @@ const { regClass, property } = Laya export class GameOver extends Laya.Script { declare owner: Laya.Box - @property(Laya.Sprite) - public btn_second: Laya.Sprite + @property(Laya.Box) + public btn_second: Laya.Box - @property(Laya.Sprite) - public btn_restart: Laya.Sprite + @property(Laya.Box) + public btn_restart: Laya.Box - @property(Laya.Sprite) - public btn_newOrClose: Laya.Sprite + @property(Laya.Box) + public btn_newOrClose: Laya.Box @property(Laya.Label) public label_newOrClose: Laya.Label diff --git a/src/views/GamePause.ts b/src/views/GamePause.ts index 713935d..b8e2749 100644 --- a/src/views/GamePause.ts +++ b/src/views/GamePause.ts @@ -16,11 +16,11 @@ export class GamePause extends Laya.Script { @property(Laya.Label) public label_diffucuty: Laya.Label - @property(Laya.Sprite) - public btn_continue: Laya.Sprite + @property(Laya.Box) + public btn_continue: Laya.Box - @property(Laya.Sprite) - public btn_restart: Laya.Sprite + @property(Laya.Box) + public btn_restart: Laya.Box // 组件被激活后执行，此时所有节点和组件均已创建完毕，此方法只执行一次 onAwake(): void { diff --git a/src/views/Stage.ts b/src/views/Stage.ts index 99b2dc7..55d63bc 100644 --- a/src/views/Stage.ts +++ b/src/views/Stage.ts @@ -253,7 +253,7 @@ export class Stage extends Laya.Script { } onUpdateMistake(): void { - this.label_mistake.text = `Mistake: ${this.data.get_mistake()}/${config.MISTAKE_MAX}` + this.label_mistake.text = `Mistakes: ${this.data.get_mistake()} / ${config.MISTAKE_MAX}` } onSetBlock(block: Block, animated: boolean = false): void {