diff --git a/assets/atlas/comp/icon_pause.png b/assets/atlas/comp/icon_pause.png new file mode 100644 index 0000000..693406e Binary files /dev/null and b/assets/atlas/comp/icon_pause.png differ diff --git a/assets/atlas/comp/icon_pause.png.meta b/assets/atlas/comp/icon_pause.png.meta new file mode 100644 index 0000000..51fd045 --- /dev/null +++ b/assets/atlas/comp/icon_pause.png.meta @@ -0,0 +1,6 @@ +{ + "uuid": "1fdb96f6-bb74-4923-8839-b44093e9d6d1", + "importer": { + "textureType": 2 + } +} \ No newline at end of file diff --git a/assets/resources/GamePause_H.lh b/assets/resources/GamePause_H.lh index 9762874..9547202 100644 --- a/assets/resources/GamePause_H.lh +++ b/assets/resources/GamePause_H.lh @@ -308,7 +308,7 @@ "height": 60, "centerX": 0, "text": "Difficulty ", - "font": "ArialMT", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 30, "color": "rgba(123, 129, 140, 1)", "align": "center", diff --git a/assets/resources/Stage.lh b/assets/resources/Stage.lh index bb8e260..9372344 100644 --- a/assets/resources/Stage.lh +++ b/assets/resources/Stage.lh @@ -104,6 +104,13 @@ "x": 990, "width": 200, "height": 200, + "_$comp": [ + { + "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", + "scriptPath": "../src/views/common/CommonHover.ts", + "hoverAlpha": true + } + ], "_$child": [ { "_$id": "5uhu17g4", @@ -44462,15 +44469,50 @@ "color": "#ffffff", "_$child": [ { - "_$id": "yjptrqd4", - "_$type": "Image", - "name": "OFF", + "_$id": "xikibn0h", + "_$type": "Sprite", + "name": "off", "x": 45, "y": -26, "width": 84, "height": 48, - "skin": "res://a5777c44-0002-4629-b646-c0e8098c7f80", - "color": "#ffffff" + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 24, + "rt": 24, + "lb": 24, + "rb": 24, + "percent": true, + "lineWidth": 2, + "lineColor": "rgba(255, 255, 255, 1)", + "fillColor": "rgba(167, 171, 179, 1)" + } + ], + "_$child": [ + { + "_$id": "sajob6jr", + "_$type": "Label", + "name": "label", + "y": 4, + "width": 84, + "height": 48, + "centerX": 0, + "centerY": 4, + "text": "OFF", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 30, + "color": "rgba(255, 255, 255, 1)", + "align": "center", + "valign": "middle", + "padding": "0,0,0,0", + "strokeColor": "rgba(160, 160, 160, 1)" + } + ] } ] } @@ -44497,15 +44539,50 @@ "color": "#ffffff", "_$child": [ { - "_$id": "iufey8m0", - "_$type": "Image", + "_$id": "8gny6los", + "_$type": "Sprite", "name": "on", "x": 45, "y": -26, "width": 72, "height": 48, - "skin": "res://e2b45239-87db-4cee-9dd7-a2d1762abc24", - "color": "#ffffff" + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 24, + "rt": 24, + "lb": 24, + "rb": 24, + "percent": true, + "lineWidth": 2, + "lineColor": "rgba(255, 255, 255, 1)", + "fillColor": "rgba(29, 92, 220, 1)" + } + ], + "_$child": [ + { + "_$id": "houyxe6r", + "_$type": "Label", + "name": "label", + "y": 4, + "width": 72, + "height": 48, + "centerX": 0, + "centerY": 4, + "text": "ON", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 30, + "color": "rgba(255, 255, 255, 1)", + "align": "center", + "valign": "middle", + "padding": "0,0,0,0", + "strokeColor": "rgba(160, 160, 160, 1)" + } + ] } ] } @@ -44621,10 +44698,10 @@ "y": 0, "width": 1, "height": 1, - "lt": 20, - "rt": 20, - "lb": 20, - "rb": 20, + "lt": 24, + "rt": 24, + "lb": 24, + "rb": 24, "percent": true, "lineWidth": 2, "lineColor": "rgba(255, 255, 255, 1)", diff --git a/assets/resources/Stage_H.lh b/assets/resources/Stage_H.lh index 403f22d..4a88e52 100644 --- a/assets/resources/Stage_H.lh +++ b/assets/resources/Stage_H.lh @@ -44166,6 +44166,7 @@ "y": 28, "width": 54, "height": 54, + "visible": false, "centerX": 0, "centerY": -20, "_$child": [ @@ -44179,15 +44180,50 @@ "color": "#ffffff", "_$child": [ { - "_$id": "dlhmp0up", - "_$type": "Image", - "name": "OFF", + "_$id": "ztz2tnzj", + "_$type": "Sprite", + "name": "off", "x": 30, - "y": -24, + "y": -20, "width": 64, "height": 36, - "skin": "res://a5777c44-0002-4629-b646-c0e8098c7f80", - "color": "#ffffff" + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 18, + "rt": 18, + "lb": 18, + "rb": 18, + "percent": true, + "lineWidth": 2, + "lineColor": "rgba(255, 255, 255, 1)", + "fillColor": "rgba(167, 171, 179, 1)" + } + ], + "_$child": [ + { + "_$id": "s448abxw", + "_$type": "Label", + "name": "label", + "y": 2, + "width": 64, + "height": 36, + "centerX": 0, + "centerY": 2, + "text": "OFF", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 22, + "color": "rgba(255, 255, 255, 1)", + "align": "center", + "valign": "middle", + "padding": "0,0,0,0", + "strokeColor": "rgba(160, 160, 160, 1)" + } + ] } ] } @@ -44214,15 +44250,50 @@ "color": "#ffffff", "_$child": [ { - "_$id": "ukyw1c6z", - "_$type": "Image", + "_$id": "kuwb7wnr", + "_$type": "Sprite", "name": "on", "x": 30, - "y": -24, + "y": -20, "width": 48, "height": 36, - "skin": "res://e2b45239-87db-4cee-9dd7-a2d1762abc24", - "color": "#ffffff" + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 18, + "rt": 18, + "lb": 18, + "rb": 18, + "percent": true, + "lineWidth": 2, + "lineColor": "rgba(255, 255, 255, 1)", + "fillColor": "rgba(29, 92, 220, 1)" + } + ], + "_$child": [ + { + "_$id": "r7fwk6ko", + "_$type": "Label", + "name": "label", + "y": 2, + "width": 48, + "height": 36, + "centerX": 0, + "centerY": 2, + "text": "ON", + "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", + "fontSize": 22, + "color": "rgba(255, 255, 255, 1)", + "align": "center", + "valign": "middle", + "padding": "0,0,0,0", + "strokeColor": "rgba(160, 160, 160, 1)" + } + ] } ] } @@ -44291,7 +44362,6 @@ "y": -18, "width": 36, "height": 36, - "visible": false, "_gcmds": [ { "_$type": "DrawCircleCmd", @@ -44299,7 +44369,8 @@ "y": 0.5, "radius": 0.5, "percent": true, - "lineWidth": 4, + "lineWidth": 2, + "lineColor": "rgba(255, 255, 255, 1)", "fillColor": "rgba(29, 108, 220, 1)" } ], @@ -44308,10 +44379,11 @@ "_$id": "ag5jbsxv", "_$type": "Label", "name": "label", + "y": 2, "width": 36, "height": 36, "centerX": 0, - "centerY": 0, + "centerY": 2, "text": "2", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", "fontSize": 22, @@ -44331,6 +44403,7 @@ "y": -18, "width": 72, "height": 36, + "visible": false, "_gcmds": [ { "_$type": "DrawRoundRectCmd", @@ -44338,10 +44411,10 @@ "y": 0, "width": 1, "height": 1, - "lt": 20, - "rt": 20, - "lb": 20, - "rb": 20, + "lt": 18, + "rt": 18, + "lb": 18, + "rb": 18, "percent": true, "lineWidth": 2, "lineColor": "rgba(255, 255, 255, 1)", @@ -45353,7 +45426,7 @@ "centerX": 0, "text": "Score:999", "font": "res://7322bbf9-175b-4a25-a0d7-72d369894de2", - "fontSize": 36, + "fontSize": 48, "color": "rgba(29, 92, 220, 1)", "align": "center", "valign": "middle", @@ -45420,17 +45493,22 @@ "y": -2, "width": 30, "height": 30, + "_$comp": [ + { + "_$type": "a541bdfc-e8e1-4795-b68e-7138c5190f17", + "scriptPath": "../src/views/common/CommonHover.ts", + "hoverAlpha": true + } + ], "_$child": [ { "_$id": "7000il0d", "_$type": "Image", "name": "Image", - "width": 84, - "height": 84, - "scaleX": 0.35, - "scaleY": 0.35, + "width": 32, + "height": 32, "mouseThrough": true, - "skin": "res://7d36066d-f01a-4a46-9eb7-109f58cdbc19", + "skin": "res://1fdb96f6-bb74-4923-8839-b44093e9d6d1", "useSourceSize": true, "color": "#ffffff" }