diff --git a/asset/art/ui/index/佩戴耳机提示.png b/asset/art/ui/index/佩戴耳机提示.png deleted file mode 100644 index eb94ff67..00000000 Binary files a/asset/art/ui/index/佩戴耳机提示.png and /dev/null differ diff --git a/asset/art/ui/index/佩戴耳机提示.png.import b/asset/art/ui/index/佩戴耳机提示.png.import deleted file mode 100644 index 85425bda..00000000 --- a/asset/art/ui/index/佩戴耳机提示.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c0r4spqoga3of" -path="res://.godot/imported/佩戴耳机提示.png-6f3a0c112fefec49855e33fae80f4c1e.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://asset/art/ui/index/佩戴耳机提示.png" -dest_files=["res://.godot/imported/佩戴耳机提示.png-6f3a0c112fefec49855e33fae80f4c1e.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/asset/art/ui/index/佩戴耳机提示_下方无字.png b/asset/art/ui/index/佩戴耳机提示_下方无字.png deleted file mode 100644 index bad41cab..00000000 Binary files a/asset/art/ui/index/佩戴耳机提示_下方无字.png and /dev/null differ diff --git a/asset/art/ui/index/佩戴耳机提示_猫咪.png b/asset/art/ui/index/佩戴耳机提示_猫咪.png new file mode 100644 index 00000000..1d53d501 Binary files /dev/null and b/asset/art/ui/index/佩戴耳机提示_猫咪.png differ diff --git a/asset/art/ui/index/佩戴耳机提示_下方无字.png.import b/asset/art/ui/index/佩戴耳机提示_猫咪.png.import similarity index 65% rename from asset/art/ui/index/佩戴耳机提示_下方无字.png.import rename to asset/art/ui/index/佩戴耳机提示_猫咪.png.import index aa8b259e..f53e6b34 100644 --- a/asset/art/ui/index/佩戴耳机提示_下方无字.png.import +++ b/asset/art/ui/index/佩戴耳机提示_猫咪.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b1xp65ac7f1iq" -path="res://.godot/imported/佩戴耳机提示_下方无字.png-0dab5dbb3bc15567f09ddc523d4520b4.ctex" +path="res://.godot/imported/佩戴耳机提示_猫咪.png-a51f59639e44ecf847ede2d353dac595.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://asset/art/ui/index/佩戴耳机提示_下方无字.png" -dest_files=["res://.godot/imported/佩戴耳机提示_下方无字.png-0dab5dbb3bc15567f09ddc523d4520b4.ctex"] +source_file="res://asset/art/ui/index/佩戴耳机提示_猫咪.png" +dest_files=["res://.godot/imported/佩戴耳机提示_猫咪.png-a51f59639e44ecf847ede2d353dac595.ctex"] [params] diff --git a/asset/dialogue/item_description.csv b/asset/dialogue/item_description.csv index 818e0c9c..940e973a 100644 --- a/asset/dialogue/item_description.csv +++ b/asset/dialogue/item_description.csv @@ -7,6 +7,7 @@ ux_panel_线索笔记,线索,,,,,Clues ux_panel_设置,设置,,,,,Settings ux_panel_返回主菜单,返回主菜单,,,,,Return to Main Menu ux_panel_退出游戏,退出游戏,,,,,Exit Game +trailer_佩戴耳机,佩戴耳机游玩效果更佳,,,,,Best with headphones. setting_总音量,总音量,,,,,Master Volume setting_音效音量,音效音量,,,,,Sound Effects setting_对话音量,对话音量,,,,,Dialogue Volume diff --git a/asset/dialogue/item_description.dialogue b/asset/dialogue/item_description.dialogue index 60981cf8..ee862426 100644 --- a/asset/dialogue/item_description.dialogue +++ b/asset/dialogue/item_description.dialogue @@ -10,6 +10,7 @@ 返回主菜单 [ID:ux_panel_返回主菜单] 退出游戏 [ID:ux_panel_退出游戏] +佩戴耳机游玩效果更佳 [ID:trailer_佩戴耳机] 总音量[ID:setting_总音量] 音效音量[ID:setting_音效音量] diff --git a/scene/trailer.gd b/scene/trailer.gd index 3a266b51..bc601da9 100644 --- a/scene/trailer.gd +++ b/scene/trailer.gd @@ -1,7 +1,7 @@ extends Control @onready var video_player = $VideoStreamPlayer -@onready var earplug_notice = $"耳机提示" +@onready var earplug_notice = $"耳机提示" as Control @onready var sfx_click = $SfxClick as Sfx @onready var settings = %"设置界面" as Control diff --git a/scene/trailer.tscn b/scene/trailer.tscn index ac1ff6fd..bb089802 100644 --- a/scene/trailer.tscn +++ b/scene/trailer.tscn @@ -1,15 +1,21 @@ -[gd_scene load_steps=9 format=3 uid="uid://bpjjq1wdqm7um"] +[gd_scene load_steps=11 format=3 uid="uid://bpjjq1wdqm7um"] [ext_resource type="VideoStream" uid="uid://bkbulg542mj6v" path="res://asset/audio/专用/包包丁片头_5899532.ogv" id="1_24316"] [ext_resource type="Script" uid="uid://dbjwl8l8x1udp" path="res://scene/trailer.gd" id="1_tess7"] -[ext_resource type="Texture2D" uid="uid://b1xp65ac7f1iq" path="res://asset/art/ui/index/佩戴耳机提示_下方无字.png" id="3_a6l8g"] +[ext_resource type="Texture2D" uid="uid://b1xp65ac7f1iq" path="res://asset/art/ui/index/佩戴耳机提示_猫咪.png" id="3_a6l8g"] [ext_resource type="AudioStream" uid="uid://dq7h4qjtd72wk" path="res://asset/audio/sfx/交互/通用点击.ogg" id="4_y2lxw"] [ext_resource type="Script" uid="uid://rq6w1vuhuq1m" path="res://scene/entity/audio/sfx.gd" id="5_yb8ks"] [ext_resource type="Theme" uid="uid://be5scnhjobkux" path="res://config/settings_theme.tres" id="6_a6l8g"] [ext_resource type="FontVariation" uid="uid://1ryw42kej6lv" path="res://config/font_ui.tres" id="7_pe403"] +[sub_resource type="FontVariation" id="FontVariation_a6l8g"] +base_font = ExtResource("7_pe403") +variation_embolden = 0.3 + [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_2v8ms"] +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_a6l8g"] + [node name="Trailer" type="Control"] layout_mode = 3 anchors_preset = 15 @@ -48,19 +54,17 @@ volume_db = -8.0 expand = true bus = &"game_sfx" -[node name="耳机提示" type="TextureRect" parent="."] +[node name="耳机提示" type="ColorRect" parent="."] layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("3_a6l8g") -expand_mode = 1 -stretch_mode = 5 +color = Color(0, 0, 0, 1) -[node name="设置界面" type="MarginContainer" parent="耳机提示"] -unique_name_in_owner = true +[node name="VBoxContainer" type="VBoxContainer" parent="耳机提示"] +custom_minimum_size = Vector2(200, 230) layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 @@ -68,33 +72,61 @@ anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 offset_left = -85.0 -offset_top = -65.0 +offset_top = -118.0 offset_right = 85.0 grow_horizontal = 2 grow_vertical = 0 -[node name="VBoxContainer" type="VBoxContainer" parent="耳机提示/设置界面"] -custom_minimum_size = Vector2(0, 100) +[node name="TextureRect" type="TextureRect" parent="耳机提示/VBoxContainer"] +custom_minimum_size = Vector2(100, 100) layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 +texture = ExtResource("3_a6l8g") +expand_mode = 1 +stretch_mode = 5 + +[node name="MarginContainer" type="MarginContainer" parent="耳机提示/VBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +theme_override_constants/margin_bottom = 14 + +[node name="Label" type="Label" parent="耳机提示/VBoxContainer/MarginContainer"] +layout_mode = 2 +size_flags_horizontal = 4 +theme_override_fonts/font = SubResource("FontVariation_a6l8g") +theme_override_font_sizes/font_size = 20 +text = "trailer_佩戴耳机" + +[node name="设置界面" type="MarginContainer" parent="耳机提示/VBoxContainer"] +unique_name_in_owner = true +custom_minimum_size = Vector2(0, 118) +layout_mode = 2 +size_flags_vertical = 8 +theme_override_constants/margin_bottom = 38 + +[node name="VBoxContainer" type="VBoxContainer" parent="耳机提示/VBoxContainer/设置界面"] +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 0 theme = ExtResource("6_a6l8g") -[node name="语言" type="HBoxContainer" parent="耳机提示/设置界面/VBoxContainer"] +[node name="语言" type="HBoxContainer" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer"] layout_mode = 2 size_flags_horizontal = 4 -[node name="Label" type="Label" parent="耳机提示/设置界面/VBoxContainer/语言"] +[node name="Label" type="Label" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/语言"] custom_minimum_size = Vector2(50, 0) layout_mode = 2 text = "setting_语言" -[node name="VSeparator" type="VSeparator" parent="耳机提示/设置界面/VBoxContainer/语言"] +[node name="VSeparator" type="VSeparator" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/语言"] layout_mode = 2 theme_override_constants/separation = 31 theme_override_styles/separator = SubResource("StyleBoxEmpty_2v8ms") -[node name="LangLeft" type="Button" parent="耳机提示/设置界面/VBoxContainer/语言"] +[node name="LangLeft" type="Button" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/语言"] unique_name_in_owner = true layout_mode = 2 focus_neighbor_right = NodePath("../LangRight") @@ -104,14 +136,14 @@ focus_previous = NodePath("../../ConfirmButton") text = "<" flat = true -[node name="LangLabel" type="Label" parent="耳机提示/设置界面/VBoxContainer/语言"] +[node name="LangLabel" type="Label" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/语言"] unique_name_in_owner = true custom_minimum_size = Vector2(50, 0) layout_mode = 2 text = "中文" horizontal_alignment = 1 -[node name="LangRight" type="Button" parent="耳机提示/设置界面/VBoxContainer/语言"] +[node name="LangRight" type="Button" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/语言"] unique_name_in_owner = true layout_mode = 2 focus_neighbor_left = NodePath("../LangLeft") @@ -121,22 +153,22 @@ focus_previous = NodePath("../LangLeft") text = ">" flat = true -[node name="CaptionBox" type="HBoxContainer" parent="耳机提示/设置界面/VBoxContainer"] +[node name="CaptionBox" type="HBoxContainer" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 4 -[node name="Label" type="Label" parent="耳机提示/设置界面/VBoxContainer/CaptionBox"] +[node name="Label" type="Label" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/CaptionBox"] custom_minimum_size = Vector2(50, 0) layout_mode = 2 text = "setting_字幕" -[node name="VSeparator" type="VSeparator" parent="耳机提示/设置界面/VBoxContainer/CaptionBox"] +[node name="VSeparator" type="VSeparator" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/CaptionBox"] layout_mode = 2 theme_override_constants/separation = 31 theme_override_styles/separator = SubResource("StyleBoxEmpty_2v8ms") -[node name="CaptionLeft" type="Button" parent="耳机提示/设置界面/VBoxContainer/CaptionBox"] +[node name="CaptionLeft" type="Button" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/CaptionBox"] unique_name_in_owner = true layout_mode = 2 focus_neighbor_top = NodePath("../../语言/LangLeft") @@ -147,14 +179,14 @@ focus_previous = NodePath("../../语言/LangRight") text = "<" flat = true -[node name="CaptionLabel" type="Label" parent="耳机提示/设置界面/VBoxContainer/CaptionBox"] +[node name="CaptionLabel" type="Label" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/CaptionBox"] unique_name_in_owner = true custom_minimum_size = Vector2(50, 0) layout_mode = 2 text = "普通话" horizontal_alignment = 1 -[node name="CaptionRight" type="Button" parent="耳机提示/设置界面/VBoxContainer/CaptionBox"] +[node name="CaptionRight" type="Button" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer/CaptionBox"] unique_name_in_owner = true layout_mode = 2 focus_neighbor_left = NodePath("../CaptionLeft") @@ -166,7 +198,11 @@ focus_previous = NodePath("../CaptionLeft") text = ">" flat = true -[node name="ConfirmButton" type="Button" parent="耳机提示/设置界面/VBoxContainer"] +[node name="HSeparator" type="HSeparator" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer"] +layout_mode = 2 +theme_override_styles/separator = SubResource("StyleBoxEmpty_a6l8g") + +[node name="ConfirmButton" type="Button" parent="耳机提示/VBoxContainer/设置界面/VBoxContainer"] unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 6