diff --git a/assets/animations/block_fade_to_red.mc b/assets/animations/block_fade_to_red.mc deleted file mode 100644 index c28a3bd..0000000 Binary files a/assets/animations/block_fade_to_red.mc and /dev/null differ diff --git a/assets/animations/block_fade_to_red.mc.meta b/assets/animations/block_fade_to_red.mc.meta deleted file mode 100644 index 19d6c50..0000000 --- a/assets/animations/block_fade_to_red.mc.meta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "uuid": "ffc1d580-9237-4231-a78d-f39d72640d50" -} \ No newline at end of file diff --git a/assets/animations/block_fade_to_red.mcc b/assets/animations/block_fade_to_red.mcc deleted file mode 100644 index cd88803..0000000 --- a/assets/animations/block_fade_to_red.mcc +++ /dev/null @@ -1,53 +0,0 @@ -{ - "_$type": "Animator", - "enabled": true, - "path": "", - "cullingMode": 2, - "controllerLayers": [ - { - "name": "Base Layer", - "states": [ - { - "x": 84, - "y": 176, - "id": "-1", - "name": "进入", - "nexts": [], - "soloTransitions": [ - { - "id": "0", - "exitByTime": true, - "exitTime": 1 - } - ] - }, - { - "y": 305, - "id": "-2", - "name": "任何状态", - "x": 70, - "soloTransitions": [] - }, - { - "x": 291, - "y": 262, - "_isLooping": 0, - "id": "0", - "name": "fade_to_red", - "speed": 1, - "clipEnd": 1, - "loop": 0, - "clip": { - "_$uuid": "ffc1d580-9237-4231-a78d-f39d72640d50" - }, - "soloTransitions": [] - } - ], - "playOnWake": false, - "blendingMode": 0, - "defaultWeight": 1 - } - ], - "layerW": 150, - "animatorParams": [] -} \ No newline at end of file diff --git a/assets/animations/block_fade_to_red.mcc.meta b/assets/animations/block_fade_to_red.mcc.meta deleted file mode 100644 index e920afb..0000000 --- a/assets/animations/block_fade_to_red.mcc.meta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "uuid": "d1fce7b7-1bf7-4f74-9c5a-bd9051e10b95" -} \ No newline at end of file diff --git a/assets/animations/score_up.mc b/assets/animations/score_up.mc deleted file mode 100644 index acba399..0000000 Binary files a/assets/animations/score_up.mc and /dev/null differ diff --git a/assets/animations/score_up.mc.meta b/assets/animations/score_up.mc.meta deleted file mode 100644 index 7a98a35..0000000 --- a/assets/animations/score_up.mc.meta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "uuid": "3ff6c374-5ecd-4de1-b271-a3280f87f9d9" -} \ No newline at end of file diff --git a/assets/animations/score_up.mcc b/assets/animations/score_up.mcc deleted file mode 100644 index 526dc7e..0000000 --- a/assets/animations/score_up.mcc +++ /dev/null @@ -1,48 +0,0 @@ -{ - "_$type": "Animator", - "enabled": true, - "path": "", - "cullingMode": 2, - "controllerLayers": [ - { - "name": "Base Layer", - "states": [ - { - "x": 108, - "y": 105, - "id": "-1", - "name": "进入", - "nexts": [], - "soloTransitions": [ - { - "id": "1" - } - ] - }, - { - "y": 112, - "id": "-2", - "name": "任何状态", - "x": 447 - }, - { - "x": 285.5874536260055, - "y": 220.0965316887919, - "_isLooping": 0, - "id": "1", - "name": "score_up", - "speed": 1, - "clipEnd": 1, - "clip": { - "_$uuid": "3ff6c374-5ecd-4de1-b271-a3280f87f9d9" - }, - "loop": -1 - } - ], - "playOnWake": true, - "blendingMode": 0, - "defaultWeight": 1 - } - ], - "layerW": 150 -} \ No newline at end of file diff --git a/assets/animations/score_up.mcc.meta b/assets/animations/score_up.mcc.meta deleted file mode 100644 index 0817ef2..0000000 --- a/assets/animations/score_up.mcc.meta +++ /dev/null @@ -1,3 +0,0 @@ -{ - "uuid": "96c849ea-9704-40bc-8bb5-c00a4f341d30" -} \ No newline at end of file diff --git a/assets/atlas/comp/badge_bg_blue_2.png b/assets/atlas/comp/badge_bg_blue_2.png deleted file mode 100644 index 76c1bfa..0000000 Binary files a/assets/atlas/comp/badge_bg_blue_2.png and /dev/null differ diff --git a/assets/atlas/comp/badge_bg_blue_2.png.meta b/assets/atlas/comp/badge_bg_blue_2.png.meta deleted file mode 100644 index ac22528..0000000 --- a/assets/atlas/comp/badge_bg_blue_2.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "15fb8b20-2b34-48fb-8259-499ebf380309", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/bg_common_white.png b/assets/atlas/comp/bg_common_white.png deleted file mode 100644 index 75a1482..0000000 Binary files a/assets/atlas/comp/bg_common_white.png and /dev/null differ diff --git a/assets/atlas/comp/bg_common_white.png.meta b/assets/atlas/comp/bg_common_white.png.meta deleted file mode 100644 index 8cea496..0000000 --- a/assets/atlas/comp/bg_common_white.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "6ad19646-ed7a-431c-a50e-65c2bcb40751", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/bg_mild.png b/assets/atlas/comp/bg_mild.png deleted file mode 100644 index 4be4465..0000000 Binary files a/assets/atlas/comp/bg_mild.png and /dev/null differ diff --git a/assets/atlas/comp/bg_mild.png.meta b/assets/atlas/comp/bg_mild.png.meta deleted file mode 100644 index b1d8be0..0000000 --- a/assets/atlas/comp/bg_mild.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "63e88ec0-8898-4190-9f70-a4df67200ce3", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/btn_back.png b/assets/atlas/comp/btn_back.png index 1dfb21e..e818eaf 100644 Binary files a/assets/atlas/comp/btn_back.png and b/assets/atlas/comp/btn_back.png differ diff --git a/assets/atlas/comp/btn_blue.png b/assets/atlas/comp/btn_blue.png deleted file mode 100644 index 13337bb..0000000 Binary files a/assets/atlas/comp/btn_blue.png and /dev/null differ diff --git a/assets/atlas/comp/btn_blue.png.meta b/assets/atlas/comp/btn_blue.png.meta deleted file mode 100644 index 34643fc..0000000 --- a/assets/atlas/comp/btn_blue.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "a75b43fb-bcf6-47d1-a1ef-e5261122a4e2", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/btn_blue_light.png b/assets/atlas/comp/btn_blue_light.png deleted file mode 100644 index 619191b..0000000 Binary files a/assets/atlas/comp/btn_blue_light.png and /dev/null differ diff --git a/assets/atlas/comp/btn_blue_light.png.meta b/assets/atlas/comp/btn_blue_light.png.meta index d49aee4..b462012 100644 --- a/assets/atlas/comp/btn_blue_light.png.meta +++ b/assets/atlas/comp/btn_blue_light.png.meta @@ -1,5 +1,5 @@ { - "uuid": "2e8c9585-e650-4494-a329-807fd2d2a532", + "uuid": "f65337d1-7946-41c1-909f-195efe1dfd8f", "importer": { "textureType": 2 } diff --git a/assets/atlas/comp/btn_erase.png b/assets/atlas/comp/btn_erase.png index b079651..07c6e8b 100644 Binary files a/assets/atlas/comp/btn_erase.png and b/assets/atlas/comp/btn_erase.png differ diff --git a/assets/atlas/comp/btn_hint.png b/assets/atlas/comp/btn_hint.png index 783cb34..ee8609b 100644 Binary files a/assets/atlas/comp/btn_hint.png and b/assets/atlas/comp/btn_hint.png differ diff --git a/assets/atlas/comp/btn_note_gray.png b/assets/atlas/comp/btn_note_gray.png index e33fc0a..109f0bc 100644 Binary files a/assets/atlas/comp/btn_note_gray.png and b/assets/atlas/comp/btn_note_gray.png differ diff --git a/assets/atlas/comp/btn_note_light.png b/assets/atlas/comp/btn_note_light.png index ee322fb..44898a1 100644 Binary files a/assets/atlas/comp/btn_note_light.png and b/assets/atlas/comp/btn_note_light.png differ diff --git a/assets/atlas/comp/btn_undo.png b/assets/atlas/comp/btn_undo.png index 818ffae..cd667c4 100644 Binary files a/assets/atlas/comp/btn_undo.png and b/assets/atlas/comp/btn_undo.png differ diff --git a/assets/atlas/comp/gp_board_bg_correct.png b/assets/atlas/comp/gp_board_bg_correct.png deleted file mode 100644 index b9a9676..0000000 Binary files a/assets/atlas/comp/gp_board_bg_correct.png and /dev/null differ diff --git a/assets/atlas/comp/gp_board_bg_correct.png.meta b/assets/atlas/comp/gp_board_bg_correct.png.meta deleted file mode 100644 index fbf81ba..0000000 --- a/assets/atlas/comp/gp_board_bg_correct.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "499ac838-d426-45a9-b14c-901abaa3e095", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/gp_board_bg_wrong.png b/assets/atlas/comp/gp_board_bg_wrong.png deleted file mode 100644 index 2ef4e88..0000000 Binary files a/assets/atlas/comp/gp_board_bg_wrong.png and /dev/null differ diff --git a/assets/atlas/comp/gp_board_bg_wrong.png.meta b/assets/atlas/comp/gp_board_bg_wrong.png.meta deleted file mode 100644 index ce25d1b..0000000 --- a/assets/atlas/comp/gp_board_bg_wrong.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "ef56c8bc-05bb-4b9c-aa50-822500db9a89", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/gp_board_line.png b/assets/atlas/comp/gp_board_line.png deleted file mode 100644 index e203ea4..0000000 Binary files a/assets/atlas/comp/gp_board_line.png and /dev/null differ diff --git a/assets/atlas/comp/gp_board_line.png.meta b/assets/atlas/comp/gp_board_line.png.meta deleted file mode 100644 index 0179710..0000000 --- a/assets/atlas/comp/gp_board_line.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "df3eeb43-93a4-496f-9da2-2a9bdaa70987", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/gp_board_line_waek.png b/assets/atlas/comp/gp_board_line_waek.png deleted file mode 100644 index 343127d..0000000 Binary files a/assets/atlas/comp/gp_board_line_waek.png and /dev/null differ diff --git a/assets/atlas/comp/gp_board_line_waek.png.meta b/assets/atlas/comp/gp_board_line_waek.png.meta deleted file mode 100644 index 1b761cd..0000000 --- a/assets/atlas/comp/gp_board_line_waek.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "8f0587ca-ca53-4ce7-be0a-87388b357e15", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/gp_board_wrong.png b/assets/atlas/comp/gp_board_wrong.png deleted file mode 100644 index 621ac0f..0000000 Binary files a/assets/atlas/comp/gp_board_wrong.png and /dev/null differ diff --git a/assets/atlas/comp/gp_board_wrong.png.meta b/assets/atlas/comp/gp_board_wrong.png.meta deleted file mode 100644 index 6db22a0..0000000 --- a/assets/atlas/comp/gp_board_wrong.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "4365c9f3-5118-42c7-aa2c-7d68bad82b39", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/gp_correct.png b/assets/atlas/comp/gp_correct.png deleted file mode 100644 index 59fd2b7..0000000 Binary files a/assets/atlas/comp/gp_correct.png and /dev/null differ diff --git a/assets/atlas/comp/gp_correct.png.meta b/assets/atlas/comp/gp_correct.png.meta deleted file mode 100644 index 405d2ed..0000000 --- a/assets/atlas/comp/gp_correct.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "7eeb7e11-21ca-41ca-b7c2-dd2afa0c3ba7", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/icon_play.png b/assets/atlas/comp/icon_play.png deleted file mode 100644 index 4e9cc62..0000000 Binary files a/assets/atlas/comp/icon_play.png and /dev/null differ diff --git a/assets/atlas/comp/icon_play.png.meta b/assets/atlas/comp/icon_play.png.meta deleted file mode 100644 index c874278..0000000 --- a/assets/atlas/comp/icon_play.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "c46eab14-87ac-4178-a786-afe811fc0848", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/atlas/comp/welldone.png b/assets/atlas/comp/welldone.png deleted file mode 100644 index 2687f2d..0000000 Binary files a/assets/atlas/comp/welldone.png and /dev/null differ diff --git a/assets/atlas/comp/welldone.png.meta b/assets/atlas/comp/welldone.png.meta deleted file mode 100644 index c6467c4..0000000 --- a/assets/atlas/comp/welldone.png.meta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "uuid": "120856c0-7081-4fde-8dca-ae0a78d684e2", - "importer": { - "textureType": 2 - } -} \ No newline at end of file diff --git a/assets/resources/Home.lh b/assets/resources/Home.lh index f9b57de..9465b72 100644 --- a/assets/resources/Home.lh +++ b/assets/resources/Home.lh @@ -15,7 +15,7 @@ "_$type": "f2970e4d-7a09-4a9b-aef3-45d330c86f4f", "scriptPath": "../src/views/Home.ts", "btn_start": { - "_$ref": "6ystn7m8" + "_$ref": "6irhm6t7" }, "btn_clean": { "_$ref": "m2dc2r9d" @@ -33,50 +33,60 @@ "right": 0, "top": 0, "bottom": 0, - "skin": "res://63e88ec0-8898-4190-9f70-a4df67200ce3", - "color": "#ffffff" + "skin": "res://a98f334e-ce04-4cd0-8fc5-bbdf9b048609", + "color": "#f5f7fb" }, { - "_$id": "hxal67ur", - "_$type": "Button", - "name": "btn_continue", - "x": 440, - "y": 737, - "width": 200, - "height": 100, - "visible": false, - "_mouseState": 2, - "centerX": 0, - "centerY": -173, - "skin": "res://7eeb7e11-21ca-41ca-b7c2-dd2afa0c3ba7", - "label": "继续", - "labelFont": "", - "labelSize": 60, - "labelColors": "#ffffff,#32cc6b,#ff0000", - "labelAlign": "center", - "labelVAlign": "middle" - }, - { - "_$id": "6ystn7m8", - "_$type": "Button", + "_$id": "6irhm6t7", + "_$type": "Box", "name": "btn_start", - "x": 172, - "y": 1182, - "width": 736, - "height": 152, - "_mouseState": 2, + "x": 144, + "y": 1464, + "width": 792, + "height": 168, "centerX": 0, - "centerY": 298, - "stateNum": 1, - "skin": "res://a75b43fb-bcf6-47d1-a1ef-e5261122a4e2", - "sizeGrid": "24,40,24,40,0", - "label": "新游戏", - "labelFont": "", - "labelSize": 60, - "labelBold": true, - "labelColors": "#ffffff,#ffffff,#ffffff", - "labelAlign": "center", - "labelVAlign": "middle" + "centerY": 588, + "_$child": [ + { + "_$id": "ry13plzy", + "_$type": "Sprite", + "name": "Sprite", + "width": 792, + "height": 168, + "_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": "la3qcz7o", + "_$type": "Label", + "name": "Label", + "width": 792, + "height": 168, + "centerX": 0, + "centerY": 0, + "text": "New Game", + "fontSize": 100, + "color": "#FFFFFF", + "bold": true, + "align": "center", + "valign": "middle", + "padding": "0,0,0,0" + } + ] }, { "_$id": "m2dc2r9d", @@ -91,7 +101,6 @@ "centerX": 0, "skin": "res://7eeb7e11-21ca-41ca-b7c2-dd2afa0c3ba7", "label": "清理", - "labelFont": "", "labelSize": 60, "labelColors": "#ffffff,#32cc6b,#ff0000", "labelAlign": "center", diff --git a/assets/resources/Stage.lh b/assets/resources/Stage.lh index 1ac65b3..9e0f18d 100644 --- a/assets/resources/Stage.lh +++ b/assets/resources/Stage.lh @@ -74,19 +74,19 @@ "_$type": "Box", "name": "back", "x": 26, - "y": 40, + "y": 60, "width": 400, "height": 64, "_mouseState": 2, "centerX": -314, - "centerY": -888, + "centerY": -868, "_$child": [ { "_$id": "l1ebdt6a", "_$type": "Button", "name": "btn_back", - "width": 92, - "height": 64, + "width": 69, + "height": 48, "_mouseState": 2, "stateNum": 1, "skin": "res://06a9c4a8-d664-4f3a-9c35-25b610195ced", @@ -117,12 +117,12 @@ "_$type": "Box", "name": "Center", "x": 18, - "y": 310, + "y": 288, "width": 1044, "height": 1044, "_mouseState": 2, "centerX": 0, - "centerY": -128, + "centerY": -150, "_$child": [ { "_$id": "zgzyqyoc", @@ -134,9 +134,10 @@ "height": 60, "centerX": 0, "centerY": -614, - "text": "分数：999", + "text": "Score:999", "fontSize": 50, "color": "rgba(29, 92, 220, 1)", + "bold": true, "align": "center", "valign": "middle", "padding": "0,0,0,0" @@ -41063,13 +41064,13 @@ "_$type": "HBox", "name": "buttons", "x": 115, - "y": 1386, + "y": 1400, "width": 850, "height": 200, "_mouseState": 2, "drawCallOptimize": true, "centerX": 0, - "centerY": 526, + "centerY": 540, "space": 150, "align": "middle", "_$child": [ @@ -41086,9 +41087,10 @@ "_$id": "at2v2bn5", "_$type": "Image", "name": "Image", - "y": 3, - "width": 100, - "height": 95, + "x": 16, + "y": 16, + "width": 69, + "height": 69, "centerX": 0, "centerY": 0, "skin": "res://8cacbf45-5b2c-4ec0-ad94-5ca671b74d72", @@ -41098,14 +41100,15 @@ "_$id": "5x56vbw3", "_$type": "Label", "name": "label", - "y": 122, + "y": 108, "width": 100, "height": 40, "centerX": 0, - "centerY": 92, - "text": "撤销", + "centerY": 78, + "text": "Undo", "fontSize": 40, "color": "rgba(55, 53, 53, 1)", + "bold": true, "align": "center", "valign": "middle", "padding": "0,0,0,0" @@ -41127,10 +41130,10 @@ "_$id": "nu0r4h4m", "_$type": "Image", "name": "Image", - "x": 4, - "y": 4, - "width": 92, - "height": 92, + "x": 13, + "y": 14, + "width": 75, + "height": 72, "centerX": 0, "centerY": 0, "skin": "res://4870f053-9781-471b-a405-ea95b5318a98", @@ -41140,14 +41143,15 @@ "_$id": "pc0bjn7t", "_$type": "Label", "name": "label", - "y": 122, + "y": 108, "width": 100, "height": 40, "centerX": 0, - "centerY": 92, - "text": "橡皮", + "centerY": 78, + "text": "Erase", "fontSize": 40, "color": "rgba(55, 53, 53, 1)", + "bold": true, "align": "center", "valign": "middle", "padding": "0,0,0,0" @@ -41168,32 +41172,36 @@ "_$id": "nd653uaf", "_$type": "Box", "name": "normal", - "width": 100, - "height": 100, + "x": 14, + "y": 13, + "width": 73, + "height": 74, + "centerX": 0, + "centerY": 0, "_$child": [ { - "_$id": "grt97hsn", + "_$id": "bi09jj9a", "_$type": "Image", "name": "Image", - "width": 97, - "height": 98, - "centerX": -2, - "centerY": -1, + "width": 73, + "height": 74, "skin": "res://18ec8458-52a2-405b-886a-f6441ed4f785", - "color": "#ffffff" - }, - { - "_$id": "pbzbhtaj", - "_$type": "Image", - "name": "off", - "x": 58, - "y": -40, - "width": 56, - "height": 32, - "scaleX": 2, - "scaleY": 2, - "skin": "res://a5777c44-0002-4629-b646-c0e8098c7f80", - "color": "#ffffff" + "color": "#ffffff", + "_$child": [ + { + "_$id": "yjptrqd4", + "_$type": "Image", + "name": "OFF", + "x": 58, + "y": -40, + "width": 56, + "height": 32, + "scaleX": 2, + "scaleY": 2, + "skin": "res://a5777c44-0002-4629-b646-c0e8098c7f80", + "color": "#ffffff" + } + ] } ] }, @@ -41201,32 +41209,36 @@ "_$id": "dflp9r4d", "_$type": "Box", "name": "checked", - "width": 100, - "height": 100, + "x": 14, + "y": 13, + "width": 73, + "height": 74, + "centerX": 0, + "centerY": 0, "_$child": [ { "_$id": "cwaogbaq", "_$type": "Image", "name": "Image", - "width": 97, - "height": 98, - "centerX": -2, - "centerY": -1, + "width": 73, + "height": 74, "skin": "res://3d714bdf-39fd-48aa-b29d-5c179abc1981", - "color": "#ffffff" - }, - { - "_$id": "iufey8m0", - "_$type": "Image", - "name": "on", - "x": 58, - "y": -40, - "width": 48, - "height": 32, - "scaleX": 2, - "scaleY": 2, - "skin": "res://e2b45239-87db-4cee-9dd7-a2d1762abc24", - "color": "#ffffff" + "color": "#ffffff", + "_$child": [ + { + "_$id": "iufey8m0", + "_$type": "Image", + "name": "on", + "x": 58, + "y": -40, + "width": 48, + "height": 32, + "scaleX": 2, + "scaleY": 2, + "skin": "res://e2b45239-87db-4cee-9dd7-a2d1762abc24", + "color": "#ffffff" + } + ] } ] }, @@ -41234,14 +41246,15 @@ "_$id": "cplq65uj", "_$type": "Label", "name": "label", - "y": 122, + "y": 108, "width": 100, "height": 40, "centerX": 0, - "centerY": 92, - "text": "铅笔", + "centerY": 78, + "text": "Notes", "fontSize": 40, "color": "rgba(55, 53, 53, 1)", + "bold": true, "align": "center", "valign": "middle", "padding": "0,0,0,0" @@ -41262,10 +41275,10 @@ "_$id": "qgd1z6lm", "_$type": "Image", "name": "Image", - "x": 6, - "y": -3, - "width": 88, - "height": 107, + "x": 17, + "y": 10, + "width": 67, + "height": 80, "mouseThrough": true, "centerX": 0, "centerY": 0, @@ -41273,29 +41286,35 @@ "color": "#ffffff", "_$child": [ { - "_$id": "oxahjz0j", - "_$type": "Image", + "_$id": "9t9m3cg3", + "_$type": "Sprite", "name": "normal", "x": 52, "y": -34, "width": 64, "height": 64, - "visible": false, - "mouseThrough": true, - "drawCallOptimize": true, - "skin": "res://7c87f6c5-6334-4f12-b61a-22c3af858d8f", - "color": "#ffffff", + "_gcmds": [ + { + "_$type": "DrawCircleCmd", + "x": 0.5, + "y": 0.5, + "radius": 0.5, + "percent": true, + "lineWidth": 4, + "lineColor": "rgba(255, 255, 255, 1)", + "fillColor": "rgba(29, 108, 220, 1)" + } + ], "_$child": [ { "_$id": "la5q6qsc", "_$type": "Label", "name": "label", - "y": 2, "width": 64, "height": 64, "centerX": 0, - "centerY": 2, - "text": "1", + "centerY": 0, + "text": "2", "fontSize": 40, "color": "rgba(255, 255, 255, 1)", "bold": true, @@ -41307,42 +41326,66 @@ ] }, { - "_$id": "g2azy5am", - "_$type": "Image", + "_$id": "jgwq47et", + "_$type": "Sprite", "name": "ad", - "x": 47, + "x": 52, "y": -34, "width": 128, "height": 64, - "visible": false, - "mouseThrough": true, - "drawCallOptimize": true, - "skin": "res://15fb8b20-2b34-48fb-8259-499ebf380309", - "color": "#ffffff", + "_gcmds": [ + { + "_$type": "DrawRoundRectCmd", + "x": 0, + "y": 0, + "width": 1, + "height": 1, + "lt": 30, + "rt": 30, + "lb": 30, + "rb": 30, + "percent": true, + "lineWidth": 2, + "lineColor": "rgba(255, 255, 255, 1)", + "fillColor": "rgba(29, 92, 220, 1)" + } + ], "_$child": [ { - "_$id": "x9m9qhp2", - "_$type": "Image", - "name": "Image", + "_$id": "6mgjiuhv", + "_$type": "Sprite", + "name": "Sprite", "x": 24, - "y": 14, - "width": 28, + "y": 15, + "width": 32, "height": 32, - "mouseThrough": true, - "skin": "res://c46eab14-87ac-4178-a786-afe811fc0848", - "useSourceSize": true, - "color": "#ffffff" + "_gcmds": [ + { + "_$type": "DrawPolyCmd", + "x": 0, + "y": 0, + "points": [ + 0, + 0, + 32, + 16, + 0, + 32 + ], + "lineWidth": 1, + "fillColor": "#FFFFFF" + } + ] }, { - "_$id": "oq70ww6z", + "_$id": "bmgjjptw", "_$type": "Label", "name": "label", - "x": 53, - "y": 2, + "x": 54, "width": 64, "height": 64, - "centerX": 21, - "centerY": 2, + "centerX": 22, + "centerY": 0, "text": "+2", "fontSize": 40, "color": "rgba(255, 255, 255, 1)", @@ -41360,14 +41403,15 @@ "_$id": "h9be7h1y", "_$type": "Label", "name": "label", - "y": 122, + "y": 108, "width": 100, "height": 40, "centerX": 0, - "centerY": 92, - "text": "提示", + "centerY": 78, + "text": "Hint", "fontSize": 40, "color": "rgba(55, 53, 53, 1)", + "bold": true, "align": "center", "valign": "middle", "padding": "0,0,0,0" @@ -41381,12 +41425,12 @@ "_$type": "HBox", "name": "candys", "x": 19, - "y": 1607, + "y": 1695, "width": 1042, "height": 178, "_mouseState": 2, "centerX": 0, - "centerY": 736, + "centerY": 824, "space": 11, "align": "middle", "_$child": [ @@ -41756,13 +41800,13 @@ "_$type": "HBox", "name": "candy_labels", "x": 19, - "y": 1607, + "y": 1695, "width": 1042, "height": 178, "_mouseState": 2, "mouseThrough": true, "centerX": 0, - "centerY": 736, + "centerY": 824, "space": 11, "align": "middle", "_$child": [ diff --git a/src/views/Home.ts b/src/views/Home.ts index 7745a92..e64c1dc 100644 --- a/src/views/Home.ts +++ b/src/views/Home.ts @@ -8,8 +8,8 @@ const { regClass, property } = Laya export class Home extends Laya.Script { declare owner : Laya.Box; - @property(Laya.Button) - public btn_start: Laya.Button; + @property(Laya.Box) + public btn_start: Laya.Box; @property(Laya.Button) public btn_clean: Laya.Button; diff --git a/src/views/Stage.ts b/src/views/Stage.ts index fd04b70..fae3f81 100644 --- a/src/views/Stage.ts +++ b/src/views/Stage.ts @@ -44,6 +44,8 @@ export class Stage extends Laya.Script { private btn_note_checked: Laya.Box @property(Laya.Box) public btn_hint: Laya.Box; + private btn_hint_normal: Laya.Box + private btn_hint_ad: Laya.Box private selectedBlock: Block; private data: DOStage; @@ -159,11 +161,11 @@ export class Stage extends Laya.Script { else { var sames = this.findSameNumberBlocks(block)//相同数字的格子 for (var i=0; i