From 1a66e968c486db1d3c3e6bf2b862d6d4f96fd307 Mon Sep 17 00:00:00 2001 From: cutekibry Date: Sun, 28 Jan 2024 04:12:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=89=E5=85=B3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- levels/chapter_menu/chapter_menu.tscn | 13 +++++++- .../level_menu/level_button/level_button.tscn | 4 +-- levels/chapter_menu/level_menu/level_menu.gd | 5 +++ .../chapter_menu/level_menu/level_menu.tscn | 12 ++++++- objects/styled_button/styled_button.tscn | 32 ++++++++----------- 5 files changed, 44 insertions(+), 22 deletions(-) diff --git a/levels/chapter_menu/chapter_menu.tscn b/levels/chapter_menu/chapter_menu.tscn index 17b857c..86aed30 100644 --- a/levels/chapter_menu/chapter_menu.tscn +++ b/levels/chapter_menu/chapter_menu.tscn @@ -1,6 +1,17 @@ -[gd_scene load_steps=2 format=3 uid="uid://d138qs4pakk22"] +[gd_scene load_steps=3 format=3 uid="uid://d138qs4pakk22"] [ext_resource type="Script" path="res://levels/chapter_menu/chapter_menu.gd" id="1_sfx21"] +[ext_resource type="FontFile" uid="uid://1000owdyvwfg" path="res://fonts/unifont-15.1.04.otf" id="2_y2jwf"] [node name="ChapterMenu" type="Node2D"] script = ExtResource("1_sfx21") + +[node name="Label" type="Label" parent="."] +custom_minimum_size = Vector2(480, 1) +offset_top = 8.0 +offset_right = 480.0 +offset_bottom = 31.0 +theme_override_fonts/font = ExtResource("2_y2jwf") +text = "Chapter Select" +horizontal_alignment = 1 +vertical_alignment = 1 diff --git a/levels/chapter_menu/level_menu/level_button/level_button.tscn b/levels/chapter_menu/level_menu/level_button/level_button.tscn index c767ffa..ccd9efc 100644 --- a/levels/chapter_menu/level_menu/level_button/level_button.tscn +++ b/levels/chapter_menu/level_menu/level_button/level_button.tscn @@ -5,8 +5,8 @@ [ext_resource type="PackedScene" uid="uid://cvx7wowcbfo0r" path="res://objects/word/word.tscn" id="3_js2i2"] [node name="StyledButton" instance=ExtResource("1_4bgxw")] -offset_right = 42.0 -offset_bottom = 42.0 +offset_right = 40.0 +offset_bottom = 40.0 script = ExtResource("1_wwqfn") [node name="Word" parent="." index="0" instance=ExtResource("3_js2i2")] diff --git a/levels/chapter_menu/level_menu/level_menu.gd b/levels/chapter_menu/level_menu/level_menu.gd index 6f780bd..fe9bc15 100644 --- a/levels/chapter_menu/level_menu/level_menu.gd +++ b/levels/chapter_menu/level_menu/level_menu.gd @@ -2,6 +2,10 @@ extends Node2D +const CHAP_NAMES = ["=P", "Add", "Multiply", "()", "Equal?"] + + + const LevelButton := preload("res://levels/chapter_menu/level_menu/level_button/level_button.tscn") const BaseLevel := preload("res://levels/base_level/base_level.tscn") @@ -17,6 +21,7 @@ func init(chap_id : int, lvl_num : int) -> void: if lvl_num == -1: lvl_num = len(BaseLevel.instantiate().DATA[chap_id]) + $Title.set_text("Ch." + str(chap_id + 1) + " " + CHAP_NAMES[chap_id]) chapter_id = chap_id for level_id in range(0, lvl_num): diff --git a/levels/chapter_menu/level_menu/level_menu.tscn b/levels/chapter_menu/level_menu/level_menu.tscn index 87dbc22..3470225 100644 --- a/levels/chapter_menu/level_menu/level_menu.tscn +++ b/levels/chapter_menu/level_menu/level_menu.tscn @@ -1,11 +1,21 @@ -[gd_scene load_steps=3 format=3 uid="uid://doirpa1bwbjhr"] +[gd_scene load_steps=4 format=3 uid="uid://doirpa1bwbjhr"] [ext_resource type="Script" path="res://levels/chapter_menu/level_menu/level_menu.gd" id="1_sd65g"] [ext_resource type="PackedScene" uid="uid://bepyyenjtc0p3" path="res://levels/chapter_menu/level_menu/level_button/level_button.tscn" id="2_saprs"] +[ext_resource type="FontFile" uid="uid://1000owdyvwfg" path="res://fonts/unifont-15.1.04.otf" id="3_jlnpm"] [node name="LevelMenu" type="Node2D"] script = ExtResource("1_sd65g") [node name="BackButton" parent="." instance=ExtResource("2_saprs")] +[node name="Title" type="Label" parent="."] +offset_top = 8.0 +offset_right = 480.0 +offset_bottom = 31.0 +theme_override_fonts/font = ExtResource("3_jlnpm") +text = "Title" +horizontal_alignment = 1 +vertical_alignment = 1 + [connection signal="pressed" from="BackButton" to="." method="_on_back_button_pressed"] diff --git a/objects/styled_button/styled_button.tscn b/objects/styled_button/styled_button.tscn index 2dba0db..8236470 100644 --- a/objects/styled_button/styled_button.tscn +++ b/objects/styled_button/styled_button.tscn @@ -1,28 +1,24 @@ -[gd_scene load_steps=9 format=3 uid="uid://drl1xe103umpi"] +[gd_scene load_steps=6 format=3 uid="uid://drl1xe103umpi"] -[ext_resource type="Texture2D" uid="uid://b5d2rfms7vyfi" path="res://objects/card_base/card_base1.png" id="1_rsfr7"] -[ext_resource type="Texture2D" uid="uid://cs7vfmsrhpomj" path="res://objects/card_base/card_base_highlighted.png" id="2_hwjbt"] -[ext_resource type="Texture2D" uid="uid://bkjbrw1ppac5q" path="res://objects/card_base/card_base_disabled.png" id="3_eoagx"] +[ext_resource type="Texture2D" uid="uid://cfbqh1k0etr6g" path="res://objects/card/card1.png" id="1_l6dpy"] +[ext_resource type="Texture2D" uid="uid://cmcc5xrpkrd0f" path="res://objects/card/card_highlighted.png" id="2_j1sqk"] -[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_0r0ru"] -texture = ExtResource("1_rsfr7") +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_c0uot"] +texture = ExtResource("1_l6dpy") -[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mqko3"] -texture = ExtResource("2_hwjbt") - -[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_0m6th"] -texture = ExtResource("3_eoagx") - -[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_5rbv7"] -texture = ExtResource("3_eoagx") +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_eifmj"] +texture = ExtResource("2_j1sqk") +texture_margin_left = 4.0 +texture_margin_top = 4.0 +texture_margin_right = 4.0 +texture_margin_bottom = 4.0 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_tfhr0"] [node name="StyledButton" type="Button"] offset_right = 100.0 offset_bottom = 100.0 -theme_override_styles/normal = SubResource("StyleBoxTexture_0r0ru") -theme_override_styles/hover = SubResource("StyleBoxTexture_mqko3") -theme_override_styles/pressed = SubResource("StyleBoxTexture_0m6th") -theme_override_styles/disabled = SubResource("StyleBoxTexture_5rbv7") +theme_override_styles/normal = SubResource("StyleBoxTexture_c0uot") +theme_override_styles/hover = SubResource("StyleBoxTexture_eifmj") +theme_override_styles/pressed = SubResource("StyleBoxTexture_eifmj") theme_override_styles/focus = SubResource("StyleBoxEmpty_tfhr0")