Merge pull request #77 from ligen131/feat-20240914-change-font

feat(font): 将字体改为 Fusion Pixel 10px
ligen131 · Sep 14, 2024 · 67cd490 · 67cd490
2 parents ce28dc3 + d3ed6d2
commit 67cd490
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 9 deletions.
diff --git a/dialogs/styles/default_style.tres b/dialogs/styles/default_style.tres
@@ -0,0 +1,55 @@
+[gd_resource type="Resource" script_class="DialogicStyle" load_steps=17 format=3 uid="uid://cnym6dqrv76d2"]
+
+[ext_resource type="Script" path="res://addons/dialogic/Resources/dialogic_style_layer.gd" id="1_dihy5"]
+[ext_resource type="PackedScene" uid="uid://c1k5m0w3r40xf" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_FullBackground/full_background_layer.tscn" id="2_x7xqy"]
+[ext_resource type="PackedScene" uid="uid://cn674foxwedqu" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Input/full_advance_input_layer.tscn" id="3_ehmgf"]
+[ext_resource type="PackedScene" uid="uid://by6waso0mjpjp" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_SpeakerPortraitTextbox/textbox_with_speaker_portrait.tscn" id="4_lv4na"]
+[ext_resource type="PackedScene" uid="uid://dsbwnp5hegnu3" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_Glossary/glossary_popup_layer.tscn" id="5_y0fl0"]
+[ext_resource type="PackedScene" uid="uid://dhk6j6eb6e3q" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_VN_Choices/vn_choice_layer.tscn" id="6_kwpeo"]
+[ext_resource type="PackedScene" uid="uid://cvgf4c6gg0tsy" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_TextInput/text_input_layer.tscn" id="7_y3lhq"]
+[ext_resource type="PackedScene" uid="uid://lx24i8fl6uo" path="res://addons/dialogic/Modules/DefaultLayoutParts/Layer_History/history_layer.tscn" id="8_w1v5k"]
+[ext_resource type="Script" path="res://addons/dialogic/Resources/dialogic_style.gd" id="9_2iajh"]
+
+[sub_resource type="Resource" id="Resource_p4pyb"]
+script = ExtResource("1_dihy5")
+scene = ExtResource("2_x7xqy")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_1fqos"]
+script = ExtResource("1_dihy5")
+scene = ExtResource("3_ehmgf")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_smcht"]
+script = ExtResource("1_dihy5")
+scene = ExtResource("4_lv4na")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_4aahi"]
+script = ExtResource("1_dihy5")
+scene = ExtResource("5_y0fl0")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_1t075"]
+script = ExtResource("1_dihy5")
+scene = ExtResource("6_kwpeo")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_vi1cl"]
+script = ExtResource("1_dihy5")
+scene = ExtResource("7_y3lhq")
+overrides = {}
+
+[sub_resource type="Resource" id="Resource_tugyi"]
+script = ExtResource("1_dihy5")
+scene = ExtResource("8_w1v5k")
+overrides = {}
+
+[resource]
+script = ExtResource("9_2iajh")
+name = "default_style"
+base_overrides = {
+"global_bg_color": "Color(0.298039, 0.2, 0.113725, 0.901961)"
+}
+layers = Array[ExtResource("1_dihy5")]([SubResource("Resource_p4pyb"), SubResource("Resource_1fqos"), SubResource("Resource_smcht"), SubResource("Resource_4aahi"), SubResource("Resource_1t075"), SubResource("Resource_vi1cl"), SubResource("Resource_tugyi")])
+metadata/_latest_layer = -1
diff --git a/fonts/fusion-pixel-10px-proportional-zh_hans.otf b/fonts/fusion-pixel-10px-proportional-zh_hans.otf
diff --git a/fonts/fusion-pixel-10px-proportional-zh_hans.otf.import b/fonts/fusion-pixel-10px-proportional-zh_hans.otf.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://dkcus8d34pbhm"
+path="res://.godot/imported/fusion-pixel-10px-proportional-zh_hans.otf-b9a1767ff3f15c2df5b9cffaada6e34c.fontdata"
+
+[deps]
+
+source_file="res://fonts/fusion-pixel-10px-proportional-zh_hans.otf"
+dest_files=["res://.godot/imported/fusion-pixel-10px-proportional-zh_hans.otf-b9a1767ff3f15c2df5b9cffaada6e34c.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+disable_embedded_bitmaps=true
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}
diff --git a/levels/base_level/base_level.tscn b/levels/base_level/base_level.tscn
@@ -8,7 +8,7 @@
 [ext_resource type="Texture2D" uid="uid://cyl7cqhs4xnux" path="res://objects/styled_button/return2.png" id="4_sctgt"]
 [ext_resource type="AudioStream" uid="uid://c6rflw11edxrt" path="res://levels/base_level/wrong_answer.wav" id="4_yxsxp"]
 [ext_resource type="Texture2D" uid="uid://b48fn2ikxq33d" path="res://objects/styled_button/return3.png" id="5_u8ht0"]
-[ext_resource type="Theme" uid="uid://dw7iarpemcvv6" path="res://themes/default_theme_big.tres" id="7_eghqb"]
+[ext_resource type="FontFile" uid="uid://dkcus8d34pbhm" path="res://fonts/fusion-pixel-10px-proportional-zh_hans.otf" id="7_bplkw"]
 [ext_resource type="Texture2D" uid="uid://cuyseoi8y3567" path="res://objects/styled_button/replay1.png" id="7_xfna7"]
 [ext_resource type="Texture2D" uid="uid://dhjiokm51casd" path="res://objects/styled_button/replay2.png" id="8_60asn"]
 [ext_resource type="Texture2D" uid="uid://btyxqeveaeh6h" path="res://objects/styled_button/replay3.png" id="9_gpaci"]
@@ -69,11 +69,11 @@ animation = &"return"
 centered = false
 
 [node name="Title" type="Label" parent="HUDs"]
-offset_left = 76.0
-offset_top = 6.0
-offset_right = 579.0
-offset_bottom = 48.0
-theme = ExtResource("7_eghqb")
+offset_top = 10.0
+offset_right = 640.0
+offset_bottom = 42.0
+theme_override_fonts/font = ExtResource("7_bplkw")
+theme_override_font_sizes/font_size = 20
 text = "Title"
 horizontal_alignment = 1
 vertical_alignment = 1

diff --git a/levels/chapter_menu/level_menu/level_menu.tscn b/levels/chapter_menu/level_menu/level_menu.tscn
@@ -1,10 +1,11 @@
-[gd_scene load_steps=6 format=3 uid="uid://doirpa1bwbjhr"]
+[gd_scene load_steps=7 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="Script" path="res://levels/chapter_menu/level_menu/level_menu_camera.gd" id="2_4o5wo"]
 [ext_resource type="PackedScene" uid="uid://drl1xe103umpi" path="res://objects/styled_button/styled_button.tscn" id="2_66j1c"]
 [ext_resource type="PackedScene" uid="uid://fxcs5dmb21q2" path="res://scripts/smooth_movement/smooth_movement.tscn" id="3_1jj52"]
 [ext_resource type="Theme" uid="uid://dw7iarpemcvv6" path="res://themes/default_theme_big.tres" id="5_y07je"]
+[ext_resource type="FontFile" uid="uid://dkcus8d34pbhm" path="res://fonts/fusion-pixel-10px-proportional-zh_hans.otf" id="6_o20ik"]
 
 [node name="LevelMenu" type="Node2D"]
 script = ExtResource("1_sd65g")
@@ -31,10 +32,12 @@ offset_right = 640.0
 offset_bottom = 214.0
 
 [node name="Title" type="Label" parent="UI"]
-offset_top = 9.0
+offset_top = 10.0
 offset_right = 640.0
-offset_bottom = 51.0
+offset_bottom = 42.0
 theme = ExtResource("5_y07je")
+theme_override_fonts/font = ExtResource("6_o20ik")
+theme_override_font_sizes/font_size = 20
 text = "Title"
 horizontal_alignment = 1
 vertical_alignment = 1