diff --git a/export_presets.cfg b/export_presets.cfg index a76f8f5a..582c32b4 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../衔蝶demo0.2.3.exe" +export_path="../demo0.3/xiandie.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -22,7 +22,7 @@ script_export_mode=2 custom_template/debug="" custom_template/release="" -debug/export_console_wrapper=1 +debug/export_console_wrapper=0 binary_format/embed_pck=false texture_format/s3tc_bptc=true texture_format/etc2_astc=false @@ -37,8 +37,8 @@ application/modify_resources=true application/icon="uid://cxgwspjv16j7m" application/console_wrapper_icon="uid://cxgwspjv16j7m" application/icon_interpolation=4 -application/file_version="0.2.3.0" -application/product_version="0.2.3.0" +application/file_version="0.3.0.0" +application/product_version="0.3.0.0" application/company_name="包包丁" application/product_name="衔蝶" application/file_description="衔蝶" diff --git a/scene/dialog/balloon.gd b/scene/dialog/balloon.gd index c6bf1e2b..bf4cbd3a 100755 --- a/scene/dialog/balloon.gd +++ b/scene/dialog/balloon.gd @@ -272,6 +272,8 @@ func _on_mutated(_mutation: Dictionary) -> void: func _on_balloon_gui_input(event: InputEvent) -> void: # 根据全局配置,是否允许忽略输入 if temporary_game_states.has(GlobalConfig.DIALOG_IGNORE_INPUT): + if event.is_action_pressed("interact") or event.is_action_pressed("cancel"): + get_viewport().set_input_as_handled() return if dialogue_line.responses.size() > 0: @@ -299,13 +301,13 @@ func _on_balloon_gui_input(event: InputEvent) -> void: # next(dialogue_line.next_id) # elif event.is_action_pressed(next_action) and get_viewport().gui_get_focus_owner() == balloon: if event.is_action_pressed("interact") or event.is_action_pressed("cancel"): + get_viewport().set_input_as_handled() if current_line_ban_skip: # debug 模式下不禁用 if not GlobalConfig.DEBUG: return print("debug mode, #ban_skip is disabled") SceneManager.pop_debug_dialog_info("程序", "调试模式 #ban_skip 不生效") - get_viewport().set_input_as_handled() manually_skipped_line.emit(dialogue_line.next_id) next(dialogue_line.next_id) diff --git a/scene/entity/audio/sfx2d.gd b/scene/entity/audio/sfx2d.gd index 4629cd42..2056dc42 100644 --- a/scene/entity/audio/sfx2d.gd +++ b/scene/entity/audio/sfx2d.gd @@ -77,4 +77,4 @@ func easing_kill(duration: float = 2.0) -> Tween: tween.tween_callback(stop) # set volume_db back to default tween.tween_callback(func(): volume_db = default_db) - return tween \ No newline at end of file + return tween diff --git a/scene/ground/scene/c01/s05_院长房间.tscn b/scene/ground/scene/c01/s05_院长房间.tscn index c18a520b..f9fc1c21 100644 --- a/scene/ground/scene/c01/s05_院长房间.tscn +++ b/scene/ground/scene/c01/s05_院长房间.tscn @@ -763,7 +763,6 @@ translation_key = "ui_夜行船1" vertical = true [node name="水平排版" type="VBoxContainer" parent="Ground/AnimationPlayer/Intro/Content"] -visible = false layout_mode = 2 size_flags_horizontal = 4 size_flags_vertical = 4 diff --git a/scene/ground/scene/c01/s11_黄包车演出.gd b/scene/ground/scene/c01/s11_黄包车演出.gd index a26584e4..5d8d410d 100644 --- a/scene/ground/scene/c01/s11_黄包车演出.gd +++ b/scene/ground/scene/c01/s11_黄包车演出.gd @@ -56,13 +56,7 @@ func dialog1() -> void: if AudioManager.bgm_dict.has("黄包车背景音效"): $"黄包车背景音效".stop() return - # debug 模式允许跳过 - if GlobalConfig.DEBUG: - DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s11_车夫对话1") - else: - DialogueManager.show_dialogue_balloon( - dialogue_c01, "c01_s11_车夫对话1", [GlobalConfig.DIALOG_IGNORE_INPUT] - ) + DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s11_车夫对话1") func pop_title_1(): diff --git a/scene/ground/scene/c02/s01_公寓门口.gd b/scene/ground/scene/c02/s01_公寓门口.gd index 22e66cdf..59adbd0a 100644 --- a/scene/ground/scene/c02/s01_公寓门口.gd +++ b/scene/ground/scene/c02/s01_公寓门口.gd @@ -21,6 +21,6 @@ func _on_ground_ready() -> void: EventManager.set_stage_if_greater(&"handnote_c02_road_address", 1) SceneManager.pop_center_notification("ui_center_notify_check_note") ArchiveManager.set_chapter_if_greater(2) - SceneManager.enable_important_item("prop_眼镜盒") - SceneManager.enable_important_item("prop_船票") + SceneManager.enable_important_item("prop_眼镜盒", false) + SceneManager.enable_important_item("prop_船票", false) SceneManager.pop_os_with_str("c02_s01_下黄包车") \ No newline at end of file diff --git a/scene/little_game/general/draggable.gd b/scene/little_game/general/draggable.gd index bc921e67..97ce61ea 100644 --- a/scene/little_game/general/draggable.gd +++ b/scene/little_game/general/draggable.gd @@ -41,7 +41,8 @@ func _ready() -> void: sprite.offset = sprite_offset if Engine.is_editor_hint(): return - _toggle_outline(false) + # 初始化隐藏白边 + sprite.material.set("shader_parameter/thickness", 0.0) mouse_entered.connect(_on_mouse_entered) mouse_exited.connect(_on_mouse_exited)