diff --git a/_Core/managers/UIFontManager.gd b/_Core/managers/UIFontManager.gd index e1315f5..c7ec527 100644 --- a/_Core/managers/UIFontManager.gd +++ b/_Core/managers/UIFontManager.gd @@ -2,7 +2,7 @@ extends Node # Enforce a Chinese-capable font for every UI control, including controls # constructed dynamically after their scene has loaded. -const UI_FONT: FontFile = preload("res://assets/fonts/msyh.ttc") +const UI_FONT: FontFile = preload("res://assets/fonts/msyh-web.ttf") func _enter_tree() -> void: get_tree().node_added.connect(_on_node_added) diff --git a/assets/fonts/msyh-web.ttf b/assets/fonts/msyh-web.ttf new file mode 100644 index 0000000..9154d23 Binary files /dev/null and b/assets/fonts/msyh-web.ttf differ diff --git a/assets/fonts/msyh-web.ttf.import b/assets/fonts/msyh-web.ttf.import new file mode 100644 index 0000000..e9df735 --- /dev/null +++ b/assets/fonts/msyh-web.ttf.import @@ -0,0 +1,36 @@ +[remap] + +importer="font_data_dynamic" +type="FontFile" +uid="uid://cy7uxq32lpgou" +path="res://.godot/imported/msyh-web.ttf-0b9bbf1e573e29d7e152628e09746417.fontdata" + +[deps] + +source_file="res://assets/fonts/msyh-web.ttf" +dest_files=["res://.godot/imported/msyh-web.ttf-0b9bbf1e573e29d7e152628e09746417.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 +modulate_color_glyphs=false +hinting=1 +subpixel_positioning=4 +keep_rounding_remainders=true +oversampling=0.0 +Fallbacks=null +fallbacks=[] +Compress=null +compress=true +preload=[] +language_support={} +script_support={} +opentype_features={} diff --git a/assets/ui/world_text_theme.tres b/assets/ui/world_text_theme.tres index ebd07e1..a43f972 100644 --- a/assets/ui/world_text_theme.tres +++ b/assets/ui/world_text_theme.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" format=3 uid="uid://brk6ca2npglqc"] -[ext_resource type="FontFile" uid="uid://ce7ujbeobblyr" path="res://assets/fonts/msyh.ttc" id="1_font"] +[ext_resource type="FontFile" uid="uid://cy7uxq32lpgou" path="res://assets/fonts/msyh-web.ttf" id="1_font"] [resource] resource_local_to_scene = true diff --git a/export_presets.cfg b/export_presets.cfg index 405d297..5870c37 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,7 +8,7 @@ dedicated_server=false custom_features="" export_filter="scenes" export_files=PackedStringArray("res://scenes/ui/WebBootstrap.tscn") -include_filter="Config/*.gd,Config/*.json,_Core/*.gd,_Core/managers/*.gd,_Core/systems/*.gd,_Core/utils/*.gd,assets/audio/ui/*.wav,assets/fonts/*.ttc" +include_filter="Config/*.gd,Config/*.json,_Core/*.gd,_Core/managers/*.gd,_Core/systems/*.gd,_Core/utils/*.gd,assets/audio/ui/*.wav,assets/fonts/msyh-web.ttf" exclude_filter="" export_path="build/web/index.html" patches=PackedStringArray() @@ -84,7 +84,7 @@ dedicated_server=false custom_features="" export_filter="scenes" export_files=PackedStringArray("res://scenes/Maps/square.tscn") -include_filter="scenes/Maps/*.gd,scenes/characters/*.gd,scenes/characters/*.tscn,scenes/prefabs/items/*.gd,scenes/prefabs/items/*.tscn,scenes/prefabs/ui/*.gd,scenes/prefabs/ui/*.tscn,scenes/ui/*.gd,scenes/ui/*.tscn,scenes/ui/mall/*.gd,scenes/ui/mall/*.tscn,assets/audio/ui/*.wav,assets/characters/*.png,assets/characters/skins/*.png,assets/fonts/*.ttc,assets/ui/*.tres,assets/ui/auth/generated/*.png,assets/ui/datawhale_honor/*.png,assets/ui/mall/branding/*.png,assets/ui/mall/icons/processed/*.png,assets/ui/mall/items/*.png,assets/ui/mall/skins/*_product.png,assets/ui/settings/*.png" +include_filter="scenes/Maps/*.gd,scenes/characters/*.gd,scenes/characters/*.tscn,scenes/prefabs/items/*.gd,scenes/prefabs/items/*.tscn,scenes/prefabs/ui/*.gd,scenes/prefabs/ui/*.tscn,scenes/ui/*.gd,scenes/ui/*.tscn,scenes/ui/mall/*.gd,scenes/ui/mall/*.tscn,assets/audio/ui/*.wav,assets/characters/*.png,assets/characters/skins/*.png,assets/ui/*.tres,assets/ui/auth/generated/*.png,assets/ui/datawhale_honor/*.png,assets/ui/mall/branding/*.png,assets/ui/mall/icons/processed/*.png,assets/ui/mall/items/*.png,assets/ui/mall/skins/*_product.png,assets/ui/settings/*.png" exclude_filter="assets/maps/work_zone/**/*.png,assets/maps/personal_space/**/*.png,assets/maps/cafe/**/*.png" export_path="build/packs/square.pck" patches=PackedStringArray() @@ -112,7 +112,7 @@ dedicated_server=false custom_features="" export_filter="scenes" export_files=PackedStringArray("res://scenes/Maps/work_zone.tscn") -include_filter="scenes/Maps/*.gd,scenes/characters/*.gd,scenes/characters/*.tscn,scenes/prefabs/items/*.gd,scenes/prefabs/items/*.tscn,scenes/prefabs/ui/*.gd,scenes/prefabs/ui/*.tscn,scenes/ui/*.gd,scenes/ui/*.tscn,scenes/ui/mall/*.gd,scenes/ui/mall/*.tscn,assets/characters/*.png,assets/fonts/*.ttc,assets/ui/*.tres,assets/ui/auth/generated/*.png,assets/ui/datawhale_honor/*.png" +include_filter="scenes/Maps/*.gd,scenes/characters/*.gd,scenes/characters/*.tscn,scenes/prefabs/items/*.gd,scenes/prefabs/items/*.tscn,scenes/prefabs/ui/*.gd,scenes/prefabs/ui/*.tscn,scenes/ui/*.gd,scenes/ui/*.tscn,scenes/ui/mall/*.gd,scenes/ui/mall/*.tscn,assets/characters/*.png,assets/ui/*.tres,assets/ui/auth/generated/*.png,assets/ui/datawhale_honor/*.png" exclude_filter="assets/maps/square/**/*.png,assets/maps/personal_space/**/*.png,assets/maps/cafe/**/*.png" export_path="build/packs/work_zone.pck" patches=PackedStringArray() @@ -140,7 +140,7 @@ dedicated_server=false custom_features="" export_filter="scenes" export_files=PackedStringArray("res://scenes/Maps/cafe_interior.tscn") -include_filter="scenes/Maps/*.gd,scenes/characters/*.gd,scenes/characters/*.tscn,scenes/prefabs/items/*.gd,scenes/prefabs/items/*.tscn,scenes/prefabs/ui/*.gd,scenes/prefabs/ui/*.tscn,scenes/ui/*.gd,scenes/ui/*.tscn,scenes/ui/mall/*.gd,scenes/ui/mall/*.tscn,assets/characters/*.png,assets/fonts/*.ttc,assets/ui/*.tres,assets/ui/auth/generated/*.png,assets/ui/datawhale_honor/*.png" +include_filter="scenes/Maps/*.gd,scenes/characters/*.gd,scenes/characters/*.tscn,scenes/prefabs/items/*.gd,scenes/prefabs/items/*.tscn,scenes/prefabs/ui/*.gd,scenes/prefabs/ui/*.tscn,scenes/ui/*.gd,scenes/ui/*.tscn,scenes/ui/mall/*.gd,scenes/ui/mall/*.tscn,assets/characters/*.png,assets/ui/*.tres,assets/ui/auth/generated/*.png,assets/ui/datawhale_honor/*.png" exclude_filter="assets/maps/square/**/*.png,assets/maps/work_zone/**/*.png,assets/maps/personal_space/**/*.png" export_path="build/packs/cafe_interior.pck" patches=PackedStringArray() @@ -168,7 +168,7 @@ dedicated_server=false custom_features="" export_filter="scenes" export_files=PackedStringArray("res://scenes/Maps/personal_space.tscn") -include_filter="scenes/Maps/*.gd,scenes/characters/*.gd,scenes/characters/*.tscn,scenes/prefabs/items/*.gd,scenes/prefabs/items/*.tscn,scenes/prefabs/ui/*.gd,scenes/prefabs/ui/*.tscn,scenes/ui/*.gd,scenes/ui/*.tscn,scenes/ui/mall/*.gd,scenes/ui/mall/*.tscn,assets/characters/*.png,assets/fonts/*.ttc,assets/ui/*.tres,assets/ui/auth/generated/*.png,assets/ui/datawhale_honor/*.png,assets/maps/personal_space/v1/decor/*.png" +include_filter="scenes/Maps/*.gd,scenes/characters/*.gd,scenes/characters/*.tscn,scenes/prefabs/items/*.gd,scenes/prefabs/items/*.tscn,scenes/prefabs/ui/*.gd,scenes/prefabs/ui/*.tscn,scenes/ui/*.gd,scenes/ui/*.tscn,scenes/ui/mall/*.gd,scenes/ui/mall/*.tscn,assets/characters/*.png,assets/ui/*.tres,assets/ui/auth/generated/*.png,assets/ui/datawhale_honor/*.png,assets/maps/personal_space/v1/base/personal_room_25d_sidewalls_wider_not_longer_v1.png,assets/maps/personal_space/v1/decor/*.png" exclude_filter="assets/maps/square/**/*.png,assets/maps/work_zone/**/*.png,assets/maps/cafe/**/*.png" export_path="build/packs/personal_space.pck" patches=PackedStringArray() @@ -196,7 +196,7 @@ dedicated_server=false custom_features="" export_filter="scenes" export_files=PackedStringArray("res://scenes/ui/AuthScene.tscn") -include_filter="scenes/ui/AuthScene.gd,assets/audio/ui/*.wav,assets/characters/player_pixel_spritesheet.png,assets/characters/skins/*.png,assets/fonts/*.ttc,assets/ui/auth/generated/*.png,assets/ui/auth/redesign/*.png,assets/ui/auth/registration_choice/redesign/*.png,assets/ui/auth/v1/*.png" +include_filter="scenes/ui/AuthScene.gd,assets/characters/player_pixel_spritesheet.png,assets/characters/skins/*.png,assets/ui/auth/v1/bg_auth_scene.png,assets/ui/auth/redesign/whaletown_login_panel_hd.png,assets/ui/auth/redesign/whaletown_register_panel_compact_hd.png,assets/ui/auth/registration_choice/redesign/main_panel.png,assets/ui/auth/registration_choice/redesign/top_whale.png,assets/ui/auth/registration_choice/redesign/card_base.png,assets/ui/auth/registration_choice/redesign/card_selected.png,assets/ui/auth/registration_choice/redesign/header_pill.png,assets/ui/auth/registration_choice/redesign/primary_button.png,assets/ui/auth/registration_choice/redesign/footer_bar.png,assets/ui/auth/registration_choice/redesign/skin_slot_base.png,assets/ui/auth/registration_choice/redesign/skin_slot_selected.png,assets/ui/auth/registration_choice/redesign/upload_file_box.png,assets/ui/auth/registration_choice/redesign/spritesheet_grid_box.png,assets/ui/auth/registration_choice/redesign/reference_upload_box.png,assets/ui/auth/registration_choice/redesign/image_placeholder_box.png" exclude_filter="assets/maps/**/*.png,assets/ui/mall/**/*.png,assets/ui/settings/*.png" export_path="build/packs/auth.pck" patches=PackedStringArray() diff --git a/project.godot b/project.godot index 74977bf..f07653c 100644 --- a/project.godot +++ b/project.godot @@ -43,7 +43,7 @@ window/stretch/aspect="expand" [gui] -theme/custom_font="res://assets/fonts/msyh.ttc" +theme/custom_font="res://assets/fonts/msyh-web.ttf" [input] diff --git a/scenes/ui/AuthScene.gd b/scenes/ui/AuthScene.gd index 91522df..0c80bcc 100644 --- a/scenes/ui/AuthScene.gd +++ b/scenes/ui/AuthScene.gd @@ -24,7 +24,7 @@ const REGISTRATION_CHOICE_UPLOAD_FILE_BOX_PATH: String = REGISTRATION_CHOICE_ASS const REGISTRATION_CHOICE_SPRITESHEET_GRID_BOX_PATH: String = REGISTRATION_CHOICE_ASSET_DIR + "/spritesheet_grid_box.png" const REGISTRATION_CHOICE_REFERENCE_UPLOAD_BOX_PATH: String = REGISTRATION_CHOICE_ASSET_DIR + "/reference_upload_box.png" const REGISTRATION_CHOICE_IMAGE_PLACEHOLDER_BOX_PATH: String = REGISTRATION_CHOICE_ASSET_DIR + "/image_placeholder_box.png" -const UI_FONT_PATH: String = "res://assets/fonts/msyh.ttc" +const UI_FONT_PATH: String = "res://assets/fonts/msyh-web.ttf" const NetworkConfig = preload("res://_Core/utils/NetworkConfig.gd") const WebFilePicker = preload("res://_Core/utils/WebFilePicker.gd") const SKIN_GENERATION_CREATE_ENDPOINT: String = "/api/skin-generation/jobs" diff --git a/scenes/ui/DatawhaleHonorRankingPanel.gd b/scenes/ui/DatawhaleHonorRankingPanel.gd index dfa3bd0..bbe1d45 100644 --- a/scenes/ui/DatawhaleHonorRankingPanel.gd +++ b/scenes/ui/DatawhaleHonorRankingPanel.gd @@ -29,7 +29,7 @@ const TEX_TAB_LABEL_PRODUCTIVE = preload("res://assets/ui/datawhale_honor/honor_ const TEX_TAB_LABEL_SOCIAL = preload("res://assets/ui/datawhale_honor/honor_tab_label_social.png") const TEX_TAB_LABEL_RISING = preload("res://assets/ui/datawhale_honor/honor_tab_label_rising.png") const TEX_TAB_LABEL_COMPREHENSIVE = preload("res://assets/ui/datawhale_honor/honor_tab_label_comprehensive.png") -const FONT_UI = preload("res://assets/fonts/msyh.ttc") +const FONT_UI = preload("res://assets/fonts/msyh-web.ttf") const TEX_AVATAR_FALLBACK_1 = preload("res://assets/ui/auth/generated/auth_character_preview_front.png") const TEX_AVATAR_FALLBACK_2 = preload("res://assets/ui/auth/generated/auth_character_preview_left.png") const TEX_AVATAR_FALLBACK_3 = preload("res://assets/ui/auth/generated/auth_character_preview_right.png")