This commit is contained in:
bbd_pc 2025-07-09 18:16:49 +08:00
parent 9809324efc
commit b97beaa66d
7 changed files with 13 additions and 17 deletions

View File

@ -9,7 +9,7 @@ custom_features=""
export_filter="all_resources" export_filter="all_resources"
include_filter="" include_filter=""
exclude_filter="" exclude_filter=""
export_path="../衔蝶demo0.2.3.exe" export_path="../demo0.3/xiandie.exe"
patches=PackedStringArray() patches=PackedStringArray()
encryption_include_filters="" encryption_include_filters=""
encryption_exclude_filters="" encryption_exclude_filters=""
@ -22,7 +22,7 @@ script_export_mode=2
custom_template/debug="" custom_template/debug=""
custom_template/release="" custom_template/release=""
debug/export_console_wrapper=1 debug/export_console_wrapper=0
binary_format/embed_pck=false binary_format/embed_pck=false
texture_format/s3tc_bptc=true texture_format/s3tc_bptc=true
texture_format/etc2_astc=false texture_format/etc2_astc=false
@ -37,8 +37,8 @@ application/modify_resources=true
application/icon="uid://cxgwspjv16j7m" application/icon="uid://cxgwspjv16j7m"
application/console_wrapper_icon="uid://cxgwspjv16j7m" application/console_wrapper_icon="uid://cxgwspjv16j7m"
application/icon_interpolation=4 application/icon_interpolation=4
application/file_version="0.2.3.0" application/file_version="0.3.0.0"
application/product_version="0.2.3.0" application/product_version="0.3.0.0"
application/company_name="包包丁" application/company_name="包包丁"
application/product_name="衔蝶" application/product_name="衔蝶"
application/file_description="衔蝶" application/file_description="衔蝶"

View File

@ -272,6 +272,8 @@ func _on_mutated(_mutation: Dictionary) -> void:
func _on_balloon_gui_input(event: InputEvent) -> void: func _on_balloon_gui_input(event: InputEvent) -> void:
# 根据全局配置,是否允许忽略输入 # 根据全局配置,是否允许忽略输入
if temporary_game_states.has(GlobalConfig.DIALOG_IGNORE_INPUT): 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 return
if dialogue_line.responses.size() > 0: if dialogue_line.responses.size() > 0:
@ -299,13 +301,13 @@ func _on_balloon_gui_input(event: InputEvent) -> void:
# next(dialogue_line.next_id) # next(dialogue_line.next_id)
# elif event.is_action_pressed(next_action) and get_viewport().gui_get_focus_owner() == balloon: # 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"): if event.is_action_pressed("interact") or event.is_action_pressed("cancel"):
get_viewport().set_input_as_handled()
if current_line_ban_skip: if current_line_ban_skip:
# debug 模式下不禁用 # debug 模式下不禁用
if not GlobalConfig.DEBUG: if not GlobalConfig.DEBUG:
return return
print("debug mode, #ban_skip is disabled") print("debug mode, #ban_skip is disabled")
SceneManager.pop_debug_dialog_info("程序", "调试模式 #ban_skip 不生效") SceneManager.pop_debug_dialog_info("程序", "调试模式 #ban_skip 不生效")
get_viewport().set_input_as_handled()
manually_skipped_line.emit(dialogue_line.next_id) manually_skipped_line.emit(dialogue_line.next_id)
next(dialogue_line.next_id) next(dialogue_line.next_id)

View File

@ -763,7 +763,6 @@ translation_key = "ui_夜行船1"
vertical = true vertical = true
[node name="水平排版" type="VBoxContainer" parent="Ground/AnimationPlayer/Intro/Content"] [node name="水平排版" type="VBoxContainer" parent="Ground/AnimationPlayer/Intro/Content"]
visible = false
layout_mode = 2 layout_mode = 2
size_flags_horizontal = 4 size_flags_horizontal = 4
size_flags_vertical = 4 size_flags_vertical = 4

View File

@ -56,13 +56,7 @@ func dialog1() -> void:
if AudioManager.bgm_dict.has("黄包车背景音效"): if AudioManager.bgm_dict.has("黄包车背景音效"):
$"黄包车背景音效".stop() $"黄包车背景音效".stop()
return return
# debug 模式允许跳过
if GlobalConfig.DEBUG:
DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s11_车夫对话1") DialogueManager.show_dialogue_balloon(dialogue_c01, "c01_s11_车夫对话1")
else:
DialogueManager.show_dialogue_balloon(
dialogue_c01, "c01_s11_车夫对话1", [GlobalConfig.DIALOG_IGNORE_INPUT]
)
func pop_title_1(): func pop_title_1():

View File

@ -21,6 +21,6 @@ func _on_ground_ready() -> void:
EventManager.set_stage_if_greater(&"handnote_c02_road_address", 1) EventManager.set_stage_if_greater(&"handnote_c02_road_address", 1)
SceneManager.pop_center_notification("ui_center_notify_check_note") SceneManager.pop_center_notification("ui_center_notify_check_note")
ArchiveManager.set_chapter_if_greater(2) ArchiveManager.set_chapter_if_greater(2)
SceneManager.enable_important_item("prop_眼镜盒") SceneManager.enable_important_item("prop_眼镜盒", false)
SceneManager.enable_important_item("prop_船票") SceneManager.enable_important_item("prop_船票", false)
SceneManager.pop_os_with_str("c02_s01_下黄包车") SceneManager.pop_os_with_str("c02_s01_下黄包车")

View File

@ -41,7 +41,8 @@ func _ready() -> void:
sprite.offset = sprite_offset sprite.offset = sprite_offset
if Engine.is_editor_hint(): if Engine.is_editor_hint():
return return
_toggle_outline(false) # 初始化隐藏白边
sprite.material.set("shader_parameter/thickness", 0.0)
mouse_entered.connect(_on_mouse_entered) mouse_entered.connect(_on_mouse_entered)
mouse_exited.connect(_on_mouse_exited) mouse_exited.connect(_on_mouse_exited)