diff --git a/assets/Scene.ls b/assets/Scene.ls index feb3f5b..69ed5ff 100644 --- a/assets/Scene.ls +++ b/assets/Scene.ls @@ -34,8 +34,10 @@ "width": 1920, "height": 1080, "_mouseState": 2, - "centerX": 0, - "centerY": 0 + "left": 0, + "right": 0, + "top": 0, + "bottom": 0 }, { "_$id": "2668mvhf", diff --git a/assets/atlas/comp/White_left.png b/assets/atlas/comp/White_left.png new file mode 100644 index 0000000..a04cad9 Binary files /dev/null and b/assets/atlas/comp/White_left.png differ diff --git a/assets/atlas/comp/White_left.png.meta b/assets/atlas/comp/White_left.png.meta new file mode 100644 index 0000000..9825180 --- /dev/null +++ b/assets/atlas/comp/White_left.png.meta @@ -0,0 +1,6 @@ +{ + "uuid": "f4fc5788-06e1-422c-876d-36b204a1f067", + "importer": { + "textureType": 2 + } +} \ No newline at end of file diff --git a/assets/atlas/comp/White_right.png b/assets/atlas/comp/White_right.png new file mode 100644 index 0000000..a665396 Binary files /dev/null and b/assets/atlas/comp/White_right.png differ diff --git a/assets/atlas/comp/White_right.png.meta b/assets/atlas/comp/White_right.png.meta new file mode 100644 index 0000000..6461ddd --- /dev/null +++ b/assets/atlas/comp/White_right.png.meta @@ -0,0 +1,6 @@ +{ + "uuid": "dc59dea2-ef06-43dd-898f-01d253952f0c", + "importer": { + "textureType": 2 + } +} \ No newline at end of file diff --git a/assets/resources/GameDone_DC_H.lh b/assets/resources/GameDone_DC_H.lh index 58ba9d6..41c69d6 100644 --- a/assets/resources/GameDone_DC_H.lh +++ b/assets/resources/GameDone_DC_H.lh @@ -7,6 +7,10 @@ "height": 1080, "_mouseState": 2, "drawCallOptimize": true, + "left": 0, + "right": 0, + "top": 0, + "bottom": 0, "_$comp": [ { "_$type": "13e020d1-5ab8-4082-80ca-c0d208342103", @@ -64,503 +68,514 @@ "color": "#ffffff" }, { - "_$id": "5u982vt1", + "_$id": "ksvwr0iw", "_$type": "Box", - "name": "left", - "x": 618, - "y": 523, - "width": 948, - "height": 786, - "anchorX": 0.5, - "anchorY": 0.5, - "left": 144, - "top": 130, + "name": "center", + "width": 1920, + "height": 1080, + "centerX": 0, + "centerY": 0, "_$child": [ { - "_$id": "21h6okrs", - "_$type": "Image", - "name": "light", - "x": 474, - "y": 143, - "width": 924, - "height": 924, + "_$id": "5u982vt1", + "_$type": "Box", + "name": "left", + "x": 618, + "y": 523, + "width": 948, + "height": 786, "anchorX": 0.5, "anchorY": 0.5, - "scaleX": 3, - "scaleY": 3, - "alpha": 0.2, - "centerX": 0, - "skin": "res://ebbaa034-8dd8-4fb8-abd5-094cdd76f93a", - "color": "#ffffff", - "_$comp": [ - { - "_$type": "b4f67ca3-86fe-409d-a439-63a715243fb7", - "scriptPath": "../src/views/common/AutoRotate.ts", - "speed": 1 - } - ] - }, - { - "_$id": "qckc4n2a", - "_$type": "Image", - "name": "bg", - "y": 152, - "width": 948, - "height": 135, - "top": 152, - "skin": "res://14316514-e8bf-4d32-bf9c-ba375ea24798", - "color": "#ffffff", + "left": 144, + "top": 130, "_$child": [ { - "_$id": "oq7zp44e", - "_$type": "Sprite", - "name": "Sprite", - "y": 135, - "width": 948, - "height": 498, - "_gcmds": [ + "_$id": "21h6okrs", + "_$type": "Image", + "name": "light", + "x": 474, + "y": 143, + "width": 924, + "height": 924, + "anchorX": 0.5, + "anchorY": 0.5, + "scaleX": 3, + "scaleY": 3, + "alpha": 0.2, + "centerX": 0, + "skin": "res://ebbaa034-8dd8-4fb8-abd5-094cdd76f93a", + "color": "#ffffff", + "_$comp": [ { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 0, - "rt": 0, - "lb": 54, - "rb": 54, - "percent": true, - "lineWidth": 1, - "fillColor": "#FFFFFF" + "_$type": "b4f67ca3-86fe-409d-a439-63a715243fb7", + "scriptPath": "../src/views/common/AutoRotate.ts", + "speed": 1 } ] }, { - "_$id": "mspovqw2", - "_$type": "Sprite", - "name": "Sprite(1)", - "x": 44, - "y": 298, + "_$id": "qckc4n2a", + "_$type": "Image", + "name": "bg", + "y": 152, + "width": 948, + "height": 135, + "top": 152, + "skin": "res://14316514-e8bf-4d32-bf9c-ba375ea24798", + "color": "#ffffff", + "_$child": [ + { + "_$id": "oq7zp44e", + "_$type": "Sprite", + "name": "Sprite", + "y": 135, + "width": 948, + "height": 498, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 0, + "rt": 0, + "lb": 54, + "rb": 54, + "percent": true, + "lineWidth": 1, + "fillColor": "#FFFFFF" + } + ] + }, + { + "_$id": "mspovqw2", + "_$type": "Sprite", + "name": "Sprite(1)", + "x": 36, + "y": 298, + "width": 876, + "height": 280, + "_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(245, 247, 251, 1)" + } + ] + } + ] + }, + { + "_$id": "3u4pa40h", + "_$type": "Box", + "name": "stars", + "y": 28, + "width": 948, + "height": 300, + "visible": false, + "centerX": 0, + "_$child": [ + { + "_$id": "drl27n5v", + "_$type": "Image", + "name": "check(1)", + "x": 190, + "y": 33, + "width": 190, + "height": 190, + "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", + "color": "#ffffff" + }, + { + "_$id": "92i5b9b6", + "_$type": "Image", + "name": "check(2)", + "x": 361, + "width": 226, + "height": 226, + "centerX": 0, + "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", + "color": "#ffffff" + }, + { + "_$id": "qq8zxqnu", + "_$type": "Image", + "name": "check(3)", + "x": 630, + "y": -8, + "width": 190, + "height": 190, + "rotation": 28, + "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", + "color": "#ffffff" + } + ] + }, + { + "_$id": "r3vdvcfa", + "_$type": "Image", + "name": "star", + "x": 354, + "y": 20, + "width": 240, + "height": 240, + "centerX": 0, + "skin": "res://c5e80bd0-632f-4460-bce3-ebf9669359e3", + "color": "#ffffff" + }, + { + "_$id": "a71gwu9f", + "_$type": "Label", + "name": "Label", + "y": 288, + "width": 948, + "height": 150, + "centerX": 0, + "centerY": -30, + "text": "Congratulations!", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 64, + "color": "rgba(45, 49, 56, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" + }, + { + "_$id": "b4jktp33", + "_$type": "VBox", + "name": "summary", + "x": 36, + "y": 475, "width": 876, "height": 280, - "_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(245, 247, 251, 1)" - } - ] - } - ] - }, - { - "_$id": "3u4pa40h", - "_$type": "Box", - "name": "stars", - "y": 28, - "width": 948, - "height": 300, - "visible": false, - "centerX": 0, - "_$child": [ - { - "_$id": "drl27n5v", - "_$type": "Image", - "name": "check(1)", - "x": 190, - "y": 33, - "width": 190, - "height": 190, - "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", - "color": "#ffffff" - }, - { - "_$id": "92i5b9b6", - "_$type": "Image", - "name": "check(2)", - "x": 361, - "width": 226, - "height": 226, "centerX": 0, - "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", - "color": "#ffffff" - }, - { - "_$id": "qq8zxqnu", - "_$type": "Image", - "name": "check(3)", - "x": 630, - "y": -8, - "width": 190, - "height": 190, - "rotation": 28, - "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", - "color": "#ffffff" - } - ] - }, - { - "_$id": "r3vdvcfa", - "_$type": "Image", - "name": "star", - "x": 354, - "y": 20, - "width": 240, - "height": 240, - "centerX": 0, - "skin": "res://c5e80bd0-632f-4460-bce3-ebf9669359e3", - "color": "#ffffff" - }, - { - "_$id": "a71gwu9f", - "_$type": "Label", - "name": "Label", - "y": 288, - "width": 948, - "height": 150, - "centerX": 0, - "centerY": -30, - "text": "Congratulations!", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 64, - "color": "rgba(45, 49, 56, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "b4jktp33", - "_$type": "VBox", - "name": "summary", - "x": 36, - "y": 475, - "width": 876, - "height": 280, - "centerX": 0, - "space": 0, - "align": "center", - "_$child": [ - { - "_$id": "u71p7b61", - "_$type": "Box", - "name": "Box(1)", - "width": 876, - "height": 80, + "space": 0, + "align": "center", "_$child": [ { - "_$id": "nfqfex9l", - "_$type": "Label", - "name": "Label", - "x": 100, - "width": 400, + "_$id": "u71p7b61", + "_$type": "Box", + "name": "Box(1)", + "width": 876, "height": 80, - "text": "Difficulty ", - "font": "ArialMT", - "fontSize": 30, - "color": "rgba(123, 129, 140, 1)", - "valign": "middle", - "padding": "0,0,0,0" + "_$child": [ + { + "_$id": "nfqfex9l", + "_$type": "Label", + "name": "Label", + "x": 100, + "width": 400, + "height": 80, + "text": "Difficulty ", + "font": "ArialMT", + "fontSize": 30, + "color": "rgba(123, 129, 140, 1)", + "valign": "middle", + "padding": "0,0,0,0" + }, + { + "_$id": "t56jxo0a", + "_$type": "Label", + "name": "label_difficulty", + "x": 376, + "width": 400, + "height": 80, + "right": 100, + "text": "Medium", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 36, + "color": "rgba(45, 49, 56, 1)", + "align": "right", + "valign": "middle", + "padding": "0,0,0,0" + } + ] }, { - "_$id": "t56jxo0a", - "_$type": "Label", - "name": "label_difficulty", - "x": 376, - "width": 400, + "_$id": "smnoyskq", + "_$type": "Box", + "name": "Box(2)", + "y": 80, + "width": 876, "height": 80, - "right": 100, - "text": "Medium", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(45, 49, 56, 1)", - "align": "right", - "valign": "middle", - "padding": "0,0,0,0" - } - ] - }, - { - "_$id": "smnoyskq", - "_$type": "Box", - "name": "Box(2)", - "y": 80, - "width": 876, - "height": 80, - "_$child": [ - { - "_$id": "utszg27d", - "_$type": "Label", - "name": "Label", - "x": 100, - "width": 400, - "height": 80, - "text": "Time", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 30, - "color": "rgba(123, 129, 140, 1)", - "valign": "middle", - "padding": "0,0,0,0" + "_$child": [ + { + "_$id": "utszg27d", + "_$type": "Label", + "name": "Label", + "x": 100, + "width": 400, + "height": 80, + "text": "Time", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 30, + "color": "rgba(123, 129, 140, 1)", + "valign": "middle", + "padding": "0,0,0,0" + }, + { + "_$id": "v0a6pgjh", + "_$type": "Label", + "name": "label_time", + "x": 376, + "width": 400, + "height": 80, + "right": 100, + "text": "Medium", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 36, + "color": "rgba(45, 49, 56, 1)", + "align": "right", + "valign": "middle", + "padding": "0,0,0,0" + } + ] }, { - "_$id": "v0a6pgjh", - "_$type": "Label", - "name": "label_time", - "x": 376, - "width": 400, + "_$id": "yfk8zxhb", + "_$type": "Box", + "name": "Box(3)", + "y": 160, + "width": 876, "height": 80, - "right": 100, - "text": "Medium", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(45, 49, 56, 1)", - "align": "right", - "valign": "middle", - "padding": "0,0,0,0" + "_$child": [ + { + "_$id": "nwe3p9mt", + "_$type": "Label", + "name": "Label", + "x": 100, + "width": 400, + "height": 80, + "text": "Score", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 30, + "color": "rgba(123, 129, 140, 1)", + "valign": "middle", + "padding": "0,0,0,0" + }, + { + "_$id": "sjgiel5s", + "_$type": "Label", + "name": "label_score", + "x": 376, + "width": 400, + "height": 80, + "right": 100, + "text": "Medium", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 36, + "color": "rgba(45, 49, 56, 1)", + "align": "right", + "valign": "middle", + "padding": "0,0,0,0" + } + ] } ] - }, - { - "_$id": "yfk8zxhb", - "_$type": "Box", - "name": "Box(3)", - "y": 160, - "width": 876, - "height": 80, - "_$child": [ - { - "_$id": "nwe3p9mt", - "_$type": "Label", - "name": "Label", - "x": 100, - "width": 400, - "height": 80, - "text": "Score", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 30, - "color": "rgba(123, 129, 140, 1)", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "sjgiel5s", - "_$type": "Label", - "name": "label_score", - "x": 376, - "width": 400, - "height": 80, - "right": 100, - "text": "Medium", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(45, 49, 56, 1)", - "align": "right", - "valign": "middle", - "padding": "0,0,0,0" - } - ] - } - ] - } - ] - }, - { - "_$id": "4zdn7245", - "_$type": "Box", - "name": "bottom", - "x": 1236, - "width": 540, - "height": 1080, - "right": 144, - "top": 0, - "bottom": 0, - "_$child": [ - { - "_$id": "pezhhu4s", - "_$type": "Box", - "name": "btn_new", - "y": 510, - "width": 540, - "height": 156, - "visible": false, - "top": 510, - "centerX": 0, - "_$comp": [ - { - "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", - "scriptPath": "../src/views/common/CommonHover.ts", - "hoverAlpha": true - } - ], - "_$child": [ - { - "_$id": "z6im7ids", - "_$type": "Sprite", - "name": "Sprite", - "width": 540, - "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)" - } - ] - }, - { - "_$id": "ikcrof2c", - "_$type": "Label", - "name": "Label", - "width": 540, - "height": 156, - "centerX": 0, - "centerY": 0, - "text": "New Game", - "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": "b4zctay8", + "_$id": "4zdn7245", "_$type": "Box", - "name": "btn_home", - "y": 558, + "name": "bottom", + "x": 1236, "width": 540, - "height": 156, - "visible": false, - "top": 558, - "centerX": 0, - "_$comp": [ - { - "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", - "scriptPath": "../src/views/common/CommonHover.ts", - "hoverAlpha": true - } - ], + "height": 1080, + "right": 144, + "top": 0, + "bottom": 0, "_$child": [ { - "_$id": "sn58intc", - "_$type": "Sprite", - "name": "Sprite", + "_$id": "pezhhu4s", + "_$type": "Box", + "name": "btn_new", + "y": 510, "width": 540, "height": 156, - "alpha": 0.1, - "_gcmds": [ + "visible": false, + "top": 510, + "centerX": 0, + "_$comp": [ { - "_$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)" + "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", + "scriptPath": "../src/views/common/CommonHover.ts", + "hoverAlpha": true + } + ], + "_$child": [ + { + "_$id": "z6im7ids", + "_$type": "Sprite", + "name": "Sprite", + "width": 540, + "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)" + } + ] + }, + { + "_$id": "ikcrof2c", + "_$type": "Label", + "name": "Label", + "width": 540, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "New Game", + "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": "sfasmed5", - "_$type": "Label", - "name": "Label", + "_$id": "b4zctay8", + "_$type": "Box", + "name": "btn_home", + "y": 558, "width": 540, "height": 156, + "visible": false, + "top": 558, "centerX": 0, - "centerY": 0, - "text": "Home", - "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": "txe3oxe8", - "_$type": "Box", - "name": "btn_continue", - "y": 510, - "width": 540, - "height": 156, - "top": 510, - "centerX": 0, - "_$comp": [ - { - "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", - "scriptPath": "../src/views/common/CommonHover.ts", - "hoverAlpha": true - } - ], - "_$child": [ - { - "_$id": "usa1t482", - "_$type": "Sprite", - "name": "Sprite", - "width": 540, - "height": 156, - "_gcmds": [ + "_$comp": [ { - "_$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)" + "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", + "scriptPath": "../src/views/common/CommonHover.ts", + "hoverAlpha": true + } + ], + "_$child": [ + { + "_$id": "sn58intc", + "_$type": "Sprite", + "name": "Sprite", + "width": 540, + "height": 156, + "alpha": 0.1, + "_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": "sfasmed5", + "_$type": "Label", + "name": "Label", + "width": 540, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "Home", + "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": "x8cbcheh", - "_$type": "Label", - "name": "Label", + "_$id": "txe3oxe8", + "_$type": "Box", + "name": "btn_continue", + "y": 510, "width": 540, "height": 156, + "top": 510, "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" + "_$comp": [ + { + "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", + "scriptPath": "../src/views/common/CommonHover.ts", + "hoverAlpha": true + } + ], + "_$child": [ + { + "_$id": "usa1t482", + "_$type": "Sprite", + "name": "Sprite", + "width": 540, + "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)" + } + ] + }, + { + "_$id": "x8cbcheh", + "_$type": "Label", + "name": "Label", + "width": 540, + "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" + } + ] } ] } diff --git a/assets/resources/GameDone_Normal.lh b/assets/resources/GameDone_Normal.lh index 77d6a5f..cc13f7e 100644 --- a/assets/resources/GameDone_Normal.lh +++ b/assets/resources/GameDone_Normal.lh @@ -163,7 +163,7 @@ "_$id": "c0d4puxi", "_$type": "Box", "name": "stars", - "y": -168, + "y": -142, "width": 984, "height": 300, "centerX": 0, diff --git a/assets/resources/GameDone_Normal_H.lh b/assets/resources/GameDone_Normal_H.lh index 16e244d..36c65b2 100644 --- a/assets/resources/GameDone_Normal_H.lh +++ b/assets/resources/GameDone_Normal_H.lh @@ -3,11 +3,14 @@ "_$id": "mydj8ynl", "_$type": "Box", "name": "GameDone_Normal_H", - "y": -784, "width": 1920, "height": 1080, "_mouseState": 2, "drawCallOptimize": true, + "left": 0, + "right": 0, + "top": 0, + "bottom": 0, "_$comp": [ { "_$type": "13e020d1-5ab8-4082-80ca-c0d208342103", @@ -65,509 +68,520 @@ "color": "#ffffff" }, { - "_$id": "80l6yqgl", + "_$id": "bhko8e4w", "_$type": "Box", - "name": "left", - "x": 618, - "y": 523, - "width": 948, - "height": 786, - "anchorX": 0.5, - "anchorY": 0.5, - "left": 144, - "top": 130, + "name": "center", + "width": 1920, + "height": 1080, + "centerX": 0, + "centerY": 0, "_$child": [ { - "_$id": "3t9mq776", - "_$type": "Image", - "name": "light", - "x": 474, - "y": 143, - "width": 924, - "height": 924, + "_$id": "80l6yqgl", + "_$type": "Box", + "name": "left", + "x": 618, + "y": 523, + "width": 948, + "height": 786, "anchorX": 0.5, "anchorY": 0.5, - "scaleX": 3, - "scaleY": 3, - "alpha": 0.2, - "centerX": 0, - "skin": "res://ebbaa034-8dd8-4fb8-abd5-094cdd76f93a", - "color": "#ffffff", - "_$comp": [ - { - "_$type": "b4f67ca3-86fe-409d-a439-63a715243fb7", - "scriptPath": "../src/views/common/AutoRotate.ts", - "speed": 1 - } - ] - }, - { - "_$id": "bj4g8sfa", - "_$type": "Image", - "name": "bg", - "y": 152, - "width": 948, - "height": 135, - "top": 152, - "skin": "res://14316514-e8bf-4d32-bf9c-ba375ea24798", - "color": "#ffffff", + "left": 144, + "top": 130, "_$child": [ { - "_$id": "icjk9zm3", - "_$type": "Sprite", - "name": "Sprite", - "y": 135, - "width": 948, - "height": 498, - "_gcmds": [ + "_$id": "3t9mq776", + "_$type": "Image", + "name": "light", + "x": 474, + "y": 143, + "width": 924, + "height": 924, + "anchorX": 0.5, + "anchorY": 0.5, + "scaleX": 3, + "scaleY": 3, + "alpha": 0.2, + "centerX": 0, + "skin": "res://ebbaa034-8dd8-4fb8-abd5-094cdd76f93a", + "color": "#ffffff", + "_$comp": [ { - "_$type": "DrawRoundRectCmd", - "x": 0, - "y": 0, - "width": 1, - "height": 1, - "lt": 0, - "rt": 0, - "lb": 54, - "rb": 54, - "percent": true, - "lineWidth": 1, - "fillColor": "#FFFFFF" + "_$type": "b4f67ca3-86fe-409d-a439-63a715243fb7", + "scriptPath": "../src/views/common/AutoRotate.ts", + "speed": 1 } ] }, { - "_$id": "nsr1mvtb", - "_$type": "Sprite", - "name": "Sprite(1)", - "x": 44, - "y": 298, + "_$id": "bj4g8sfa", + "_$type": "Image", + "name": "bg", + "y": 152, + "width": 948, + "height": 135, + "top": 152, + "skin": "res://14316514-e8bf-4d32-bf9c-ba375ea24798", + "color": "#ffffff", + "_$child": [ + { + "_$id": "icjk9zm3", + "_$type": "Sprite", + "name": "Sprite", + "y": 135, + "width": 948, + "height": 498, + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 0, + "rt": 0, + "lb": 54, + "rb": 54, + "percent": true, + "lineWidth": 1, + "fillColor": "#FFFFFF" + } + ] + }, + { + "_$id": "nsr1mvtb", + "_$type": "Sprite", + "name": "Sprite(1)", + "x": 36, + "y": 298, + "width": 876, + "height": 280, + "_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(245, 247, 251, 1)" + } + ] + } + ] + }, + { + "_$id": "yt8pnsra", + "_$type": "Box", + "name": "stars", + "y": 45, + "width": 948, + "height": 300, + "centerX": 0, + "_$child": [ + { + "_$id": "dy7essc0", + "_$type": "Image", + "name": "check(1)", + "x": 263, + "y": 128, + "width": 190, + "height": 190, + "anchorX": 0.5, + "anchorY": 0.5, + "rotation": -13, + "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", + "color": "#ffffff" + }, + { + "_$id": "zyknbizk", + "_$type": "Image", + "name": "check(2)", + "x": 361, + "width": 226, + "height": 226, + "centerX": 0, + "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", + "color": "#ffffff" + }, + { + "_$id": "51j0ljjv", + "_$type": "Image", + "name": "check(3)", + "x": 686.2802239279707, + "y": 120.47981945881025, + "width": 190, + "height": 190, + "anchorX": 0.5, + "anchorY": 0.5, + "rotation": 8, + "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", + "color": "#ffffff" + } + ] + }, + { + "_$id": "0g7sbrhd", + "_$type": "Image", + "name": "star", + "x": 312, + "y": -160, + "width": 108, + "height": 108, + "scaleX": 3, + "scaleY": 3, + "visible": false, + "centerX": 0, + "skin": "res://c5e80bd0-632f-4460-bce3-ebf9669359e3", + "color": "#ffffff" + }, + { + "_$id": "t4lo6wcj", + "_$type": "Label", + "name": "Label", + "y": 288, + "width": 948, + "height": 150, + "centerX": 0, + "centerY": -30, + "text": "Congratulations!", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 64, + "color": "rgba(45, 49, 56, 1)", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" + }, + { + "_$id": "nv7eszk1", + "_$type": "VBox", + "name": "summary", + "x": 36, + "y": 475, "width": 876, "height": 280, - "_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(245, 247, 251, 1)" - } - ] - } - ] - }, - { - "_$id": "yt8pnsra", - "_$type": "Box", - "name": "stars", - "y": 28, - "width": 948, - "height": 300, - "centerX": 0, - "_$child": [ - { - "_$id": "dy7essc0", - "_$type": "Image", - "name": "check(1)", - "x": 263, - "y": 128, - "width": 190, - "height": 190, - "anchorX": 0.5, - "anchorY": 0.5, - "rotation": -13, - "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", - "color": "#ffffff" - }, - { - "_$id": "zyknbizk", - "_$type": "Image", - "name": "check(2)", - "x": 361, - "width": 226, - "height": 226, "centerX": 0, - "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", - "color": "#ffffff" - }, - { - "_$id": "51j0ljjv", - "_$type": "Image", - "name": "check(3)", - "x": 686.2802239279707, - "y": 120.47981945881025, - "width": 190, - "height": 190, - "anchorX": 0.5, - "anchorY": 0.5, - "rotation": 8, - "skin": "res://902e1f3a-6f95-4796-8449-974ae5354d72", - "color": "#ffffff" - } - ] - }, - { - "_$id": "0g7sbrhd", - "_$type": "Image", - "name": "star", - "x": 312, - "y": -160, - "width": 108, - "height": 108, - "scaleX": 3, - "scaleY": 3, - "visible": false, - "centerX": 0, - "skin": "res://c5e80bd0-632f-4460-bce3-ebf9669359e3", - "color": "#ffffff" - }, - { - "_$id": "t4lo6wcj", - "_$type": "Label", - "name": "Label", - "y": 288, - "width": 948, - "height": 150, - "centerX": 0, - "centerY": -30, - "text": "Congratulations!", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 64, - "color": "rgba(45, 49, 56, 1)", - "bold": true, - "align": "center", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "nv7eszk1", - "_$type": "VBox", - "name": "summary", - "x": 36, - "y": 475, - "width": 876, - "height": 280, - "centerX": 0, - "space": 0, - "align": "center", - "_$child": [ - { - "_$id": "7oa0nz8y", - "_$type": "Box", - "name": "Box(1)", - "width": 876, - "height": 80, + "space": 0, + "align": "center", "_$child": [ { - "_$id": "phpj9rno", - "_$type": "Label", - "name": "Label", - "x": 100, - "width": 400, + "_$id": "7oa0nz8y", + "_$type": "Box", + "name": "Box(1)", + "width": 876, "height": 80, - "text": "Difficulty ", - "font": "ArialMT", - "fontSize": 30, - "color": "rgba(123, 129, 140, 1)", - "valign": "middle", - "padding": "0,0,0,0" + "_$child": [ + { + "_$id": "phpj9rno", + "_$type": "Label", + "name": "Label", + "x": 100, + "width": 400, + "height": 80, + "text": "Difficulty ", + "font": "ArialMT", + "fontSize": 30, + "color": "rgba(123, 129, 140, 1)", + "valign": "middle", + "padding": "0,0,0,0" + }, + { + "_$id": "291hwgvn", + "_$type": "Label", + "name": "label_difficulty", + "x": 376, + "width": 400, + "height": 80, + "right": 100, + "text": "Medium", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 36, + "color": "rgba(45, 49, 56, 1)", + "align": "right", + "valign": "middle", + "padding": "0,0,0,0" + } + ] }, { - "_$id": "291hwgvn", - "_$type": "Label", - "name": "label_difficulty", - "x": 376, - "width": 400, + "_$id": "e6aitv6a", + "_$type": "Box", + "name": "Box(2)", + "y": 80, + "width": 876, "height": 80, - "right": 100, - "text": "Medium", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(45, 49, 56, 1)", - "align": "right", - "valign": "middle", - "padding": "0,0,0,0" - } - ] - }, - { - "_$id": "e6aitv6a", - "_$type": "Box", - "name": "Box(2)", - "y": 80, - "width": 876, - "height": 80, - "_$child": [ - { - "_$id": "xmjk7stg", - "_$type": "Label", - "name": "Label", - "x": 100, - "width": 400, - "height": 80, - "text": "Time", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 30, - "color": "rgba(123, 129, 140, 1)", - "valign": "middle", - "padding": "0,0,0,0" + "_$child": [ + { + "_$id": "xmjk7stg", + "_$type": "Label", + "name": "Label", + "x": 100, + "width": 400, + "height": 80, + "text": "Time", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 30, + "color": "rgba(123, 129, 140, 1)", + "valign": "middle", + "padding": "0,0,0,0" + }, + { + "_$id": "656grx7b", + "_$type": "Label", + "name": "label_time", + "x": 376, + "width": 400, + "height": 80, + "right": 100, + "text": "Medium", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 36, + "color": "rgba(45, 49, 56, 1)", + "align": "right", + "valign": "middle", + "padding": "0,0,0,0" + } + ] }, { - "_$id": "656grx7b", - "_$type": "Label", - "name": "label_time", - "x": 376, - "width": 400, + "_$id": "iwttmqpl", + "_$type": "Box", + "name": "Box(3)", + "y": 160, + "width": 876, "height": 80, - "right": 100, - "text": "Medium", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(45, 49, 56, 1)", - "align": "right", - "valign": "middle", - "padding": "0,0,0,0" + "_$child": [ + { + "_$id": "zy5w77m2", + "_$type": "Label", + "name": "Label", + "x": 100, + "width": 400, + "height": 80, + "text": "Score", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 30, + "color": "rgba(123, 129, 140, 1)", + "valign": "middle", + "padding": "0,0,0,0" + }, + { + "_$id": "6upkkpwf", + "_$type": "Label", + "name": "label_score", + "x": 376, + "width": 400, + "height": 80, + "right": 100, + "text": "Medium", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 36, + "color": "rgba(45, 49, 56, 1)", + "align": "right", + "valign": "middle", + "padding": "0,0,0,0" + } + ] } ] - }, - { - "_$id": "iwttmqpl", - "_$type": "Box", - "name": "Box(3)", - "y": 160, - "width": 876, - "height": 80, - "_$child": [ - { - "_$id": "zy5w77m2", - "_$type": "Label", - "name": "Label", - "x": 100, - "width": 400, - "height": 80, - "text": "Score", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 30, - "color": "rgba(123, 129, 140, 1)", - "valign": "middle", - "padding": "0,0,0,0" - }, - { - "_$id": "6upkkpwf", - "_$type": "Label", - "name": "label_score", - "x": 376, - "width": 400, - "height": 80, - "right": 100, - "text": "Medium", - "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, - "color": "rgba(45, 49, 56, 1)", - "align": "right", - "valign": "middle", - "padding": "0,0,0,0" - } - ] - } - ] - } - ] - }, - { - "_$id": "a83hr2ln", - "_$type": "Box", - "name": "bottom", - "x": 1236, - "width": 540, - "height": 1080, - "right": 144, - "top": 0, - "bottom": 0, - "_$child": [ - { - "_$id": "hgpxx02g", - "_$type": "Box", - "name": "btn_new", - "y": 510, - "width": 540, - "height": 156, - "top": 510, - "centerX": 0, - "_$comp": [ - { - "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", - "scriptPath": "../src/views/common/CommonHover.ts", - "hoverAlpha": true - } - ], - "_$child": [ - { - "_$id": "n7fabj30", - "_$type": "Sprite", - "name": "Sprite", - "width": 540, - "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)" - } - ] - }, - { - "_$id": "ju3t57bd", - "_$type": "Label", - "name": "Label", - "width": 540, - "height": 156, - "centerX": 0, - "centerY": 0, - "text": "New Game", - "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": "it1c7c3x", + "_$id": "a83hr2ln", "_$type": "Box", - "name": "btn_home", - "y": 510, + "name": "bottom", + "x": 1236, "width": 540, - "height": 156, - "visible": false, - "top": 510, - "centerX": 0, - "_$comp": [ - { - "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", - "scriptPath": "../src/views/common/CommonHover.ts", - "hoverAlpha": true - } - ], + "height": 1080, + "right": 144, + "top": 0, + "bottom": 0, "_$child": [ { - "_$id": "s93f5gz9", - "_$type": "Sprite", - "name": "Sprite", + "_$id": "hgpxx02g", + "_$type": "Box", + "name": "btn_new", + "y": 510, "width": 540, "height": 156, - "alpha": 0.1, - "_gcmds": [ + "top": 510, + "centerX": 0, + "_$comp": [ { - "_$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)" + "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", + "scriptPath": "../src/views/common/CommonHover.ts", + "hoverAlpha": true + } + ], + "_$child": [ + { + "_$id": "n7fabj30", + "_$type": "Sprite", + "name": "Sprite", + "width": 540, + "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)" + } + ] + }, + { + "_$id": "ju3t57bd", + "_$type": "Label", + "name": "Label", + "width": 540, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "New Game", + "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": "rgqm7pit", - "_$type": "Label", - "name": "Label", + "_$id": "it1c7c3x", + "_$type": "Box", + "name": "btn_home", + "y": 510, "width": 540, "height": 156, + "visible": false, + "top": 510, "centerX": 0, - "centerY": 0, - "text": "Home", - "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": "wnp5was8", - "_$type": "Box", - "name": "btn_continue", - "y": 264, - "width": 540, - "height": 156, - "visible": false, - "centerX": 0, - "_$comp": [ - { - "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", - "scriptPath": "../src/views/common/CommonHover.ts", - "hoverAlpha": true - } - ], - "_$child": [ - { - "_$id": "fftedkj5", - "_$type": "Sprite", - "name": "Sprite", - "width": 540, - "height": 156, - "_gcmds": [ + "_$comp": [ { - "_$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)" + "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", + "scriptPath": "../src/views/common/CommonHover.ts", + "hoverAlpha": true + } + ], + "_$child": [ + { + "_$id": "s93f5gz9", + "_$type": "Sprite", + "name": "Sprite", + "width": 540, + "height": 156, + "alpha": 0.1, + "_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": "rgqm7pit", + "_$type": "Label", + "name": "Label", + "width": 540, + "height": 156, + "centerX": 0, + "centerY": 0, + "text": "Home", + "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": "je1bffa3", - "_$type": "Label", - "name": "Label", + "_$id": "wnp5was8", + "_$type": "Box", + "name": "btn_continue", + "y": 264, "width": 540, "height": 156, + "visible": false, "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" + "_$comp": [ + { + "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", + "scriptPath": "../src/views/common/CommonHover.ts", + "hoverAlpha": true + } + ], + "_$child": [ + { + "_$id": "fftedkj5", + "_$type": "Sprite", + "name": "Sprite", + "width": 540, + "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)" + } + ] + }, + { + "_$id": "je1bffa3", + "_$type": "Label", + "name": "Label", + "width": 540, + "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" + } + ] } ] } diff --git a/assets/resources/Stage_H.lh b/assets/resources/Stage_H.lh index 6e1e9d4..403f22d 100644 --- a/assets/resources/Stage_H.lh +++ b/assets/resources/Stage_H.lh @@ -7,9 +7,8 @@ "width": 1920, "height": 960, "_mouseState": 2, - "left": 0, - "right": 0, - "bottom": 0, + "top": 120, + "centerX": 0, "_$comp": [ { "_$type": "692a672b-2457-456c-8093-321ea7a10e1b", @@ -44288,7 +44287,7 @@ "_$id": "l9bah2a9", "_$type": "Sprite", "name": "normal", - "x": 20, + "x": 30, "y": -18, "width": 36, "height": 36, @@ -44328,7 +44327,7 @@ "_$id": "bx8c1ghg", "_$type": "Sprite", "name": "ad", - "x": 20, + "x": 30, "y": -18, "width": 72, "height": 36, diff --git a/assets/resources/dc/DailyChallenge.lh b/assets/resources/dc/DailyChallenge.lh index eaa90ba..aacb901 100644 --- a/assets/resources/dc/DailyChallenge.lh +++ b/assets/resources/dc/DailyChallenge.lh @@ -309,6 +309,7 @@ "_$type": "Label", "name": "label_star", "x": 80, + "y": 4, "width": 111, "height": 72, "text": "31/31", diff --git a/assets/resources/dc/DailyChallenge_H.lh b/assets/resources/dc/DailyChallenge_H.lh index 54f40e8..dc4a098 100644 --- a/assets/resources/dc/DailyChallenge_H.lh +++ b/assets/resources/dc/DailyChallenge_H.lh @@ -216,10 +216,10 @@ "_$type": "Label", "name": "label_star", "x": 51, - "y": 6, + "y": 3, "width": 111, - "height": 36, - "centerY": 0, + "height": 48, + "centerY": 3, "text": "31/31", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 30, @@ -7272,7 +7272,7 @@ "y": 106, "width": 720, "height": 120, - "top": 106, + "bottom": 42, "centerX": 0, "_$comp": [ { diff --git a/assets/resources/dc/TrophyRoomCell.lh b/assets/resources/dc/TrophyRoomCell.lh index b0e07dc..416cc72 100644 --- a/assets/resources/dc/TrophyRoomCell.lh +++ b/assets/resources/dc/TrophyRoomCell.lh @@ -278,12 +278,36 @@ "_$id": "8354nuxx", "_$type": "Image", "name": "White", - "x": 12, + "x": 378, "y": 288, - "width": 960, + "width": 228, "height": 60, + "centerX": 0, "skin": "res://5f574ee6-46ee-4c31-b0ec-95c5731e6102", - "color": "#ffffff" + "color": "#ffffff", + "_$child": [ + { + "_$id": "uoqz04df", + "_$type": "Image", + "name": "White_left", + "x": -366, + "width": 366, + "height": 60, + "skin": "res://f4fc5788-06e1-422c-876d-36b204a1f067", + "color": "#ffffff" + }, + { + "_$id": "zsx33kbx", + "_$type": "Image", + "name": "White_right", + "x": 228, + "width": 366, + "height": 60, + "skin": "res://dc59dea2-ef06-43dd-898f-01d253952f0c", + "useSourceSize": true, + "color": "#ffffff" + } + ] } ] } \ No newline at end of file diff --git a/assets/resources/dc/TrophyRoomCell_H.lh b/assets/resources/dc/TrophyRoomCell_H.lh index b70ed05..d0e5891 100644 --- a/assets/resources/dc/TrophyRoomCell_H.lh +++ b/assets/resources/dc/TrophyRoomCell_H.lh @@ -448,11 +448,34 @@ "_$id": "d2khpcxf", "_$type": "Image", "name": "White", + "x": 366, "y": 288, - "width": 1830, + "width": 1098, "height": 60, "skin": "res://5f574ee6-46ee-4c31-b0ec-95c5731e6102", - "color": "#ffffff" + "color": "#ffffff", + "_$child": [ + { + "_$id": "psz5ovz4", + "_$type": "Image", + "name": "White_left", + "x": -366, + "width": 366, + "height": 60, + "skin": "res://f4fc5788-06e1-422c-876d-36b204a1f067", + "color": "#ffffff" + }, + { + "_$id": "p9bzjd1z", + "_$type": "Image", + "name": "White_right", + "x": 1098, + "width": 366, + "height": 60, + "skin": "res://dc59dea2-ef06-43dd-898f-01d253952f0c", + "color": "#ffffff" + } + ] } ] } \ No newline at end of file diff --git a/src/models/UIManager.ts b/src/models/UIManager.ts index 6b60b01..e4735a5 100644 --- a/src/models/UIManager.ts +++ b/src/models/UIManager.ts @@ -51,16 +51,10 @@ export class UIManager extends Laya.Script { private UIRoot: Laya.Panel public getUIRoot(): Laya.Node { - if (config.H_SCREEN) { - if (!this.UIRoot) { - this.UIRoot = this.owner.getChildByName("UIRoot") as Laya.Panel - this.UIRoot.width = config.DESIGN_HEIGHT - this.UIRoot.height = config.DESIGN_WIDTH - } - return this.UIRoot - } else { - return this.owner + if (!this.UIRoot) { + this.UIRoot = this.owner.getChildByName("UIRoot") as Laya.Panel } + return this.UIRoot } private topbar: TopBar diff --git a/src/views/TopBar.ts b/src/views/TopBar.ts index 45acbe1..1eca124 100644 --- a/src/views/TopBar.ts +++ b/src/views/TopBar.ts @@ -151,7 +151,7 @@ export class TopBar extends Laya.Script { }) const sprite = this.item_sprites.get(difficulty) sprite.graphics.clear() - sprite.graphics.drawRoundRect(0, 0, sprite.width, sprite.height, 12, 12, 12, 12, "#f5f7fb", "#1d5cdc", 5) + sprite.graphics.drawRoundRect(0, 0, sprite.width, sprite.height, 12, 12, 12, 12, "#f5f7fb", "#1d5cdc", 3) this.item_labels.forEach((label: Laya.Label) => { label.color = "#0e2a53"