From dd289bd8cfcd3646f2923d781687c7b12c50367b Mon Sep 17 00:00:00 2001 From: bbd_pc Date: Tue, 15 Jul 2025 19:25:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A4=E5=84=BF=E9=99=A2=E6=A1=8C=E6=A4=85?= =?UTF-8?q?=E7=A2=B0=E6=92=9E=E6=8B=89=E5=AE=BD=EF=BC=9B=E5=AD=97=E5=B9=95?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8A=E6=B5=B7=E8=AF=9D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/config_manager/global_config_manager.gd | 6 +++--- scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn | 3 ++- scene/trailer.gd | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/manager/config_manager/global_config_manager.gd b/manager/config_manager/global_config_manager.gd index 3fe329b0..7fd8879b 100644 --- a/manager/config_manager/global_config_manager.gd +++ b/manager/config_manager/global_config_manager.gd @@ -45,9 +45,9 @@ func _set_config(val: GlobalConfig) -> void: # -1 null; 0 zh; 1 en -var language_options = ["中文", "English"] -var caption_options_dict = {0: ["简体中文", "上海话"], 1: [""]} -var caption_loacles_dict = {0: ["zh_CN", "zh_SH"], 1: ["en"]} +var language_options = ["简体中文", "English"] +var caption_options_dict = {0: ["上海话", "普通话"], 1: [""]} +var caption_loacles_dict = {0: ["zh_SH", "zh_CN"], 1: ["en"]} # return example: "中文_简体中文" "English_" diff --git a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn index 904cff5e..051e9ec1 100644 --- a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn +++ b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn @@ -362,8 +362,9 @@ shape = SubResource("RectangleShape2D_1ojoa") debug_color = Color(0.519778, 0.447036, 0.929413, 0.42) [node name="Interactable桌椅" parent="Ground/DeployLayer" index="12" instance=ExtResource("12_idjp0")] -position = Vector2(2881, 49) +position = Vector2(2907, 53) enable_snapper = false +collision_width_and_x = Vector2(80, 0) one_shot = false [node name="【站立小孩-3】" parent="Ground/DeployLayer" index="13" instance=ExtResource("8_ouldg")] diff --git a/scene/trailer.gd b/scene/trailer.gd index 06fa1631..3a266b51 100644 --- a/scene/trailer.gd +++ b/scene/trailer.gd @@ -31,6 +31,10 @@ func _ready() -> void: video_player.play() video_player.finished.connect(_on_video_finished) + lang_label.text = GlobalConfigManager.get_locale_language_name() + caption_label.text = GlobalConfigManager.get_locale_caption_name() + if caption_label.text == "": + caption_box.hide() lang_left_btn.pressed.connect(_on_lang_left_btn_pressed) lang_right_btn.pressed.connect(_on_lang_right_btn_pressed) caption_left_btn.pressed.connect(_on_caption_left_btn_pressed)