From b29e33f18752fa092a717e0f7a10efa88d9df32b Mon Sep 17 00:00:00 2001 From: cakipaul Date: Tue, 22 Jul 2025 00:37:12 +0800 Subject: [PATCH 1/2] win quit method --- manager/config_manager/global_config_manager.gd | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/manager/config_manager/global_config_manager.gd b/manager/config_manager/global_config_manager.gd index 17e62249..a03a4ed4 100644 --- a/manager/config_manager/global_config_manager.gd +++ b/manager/config_manager/global_config_manager.gd @@ -55,14 +55,25 @@ func _apply_compatibility() -> void: print("[Compatibility] Switching to 'opengl3' rendering driver.") # 重启游戏以应用新渲染器 var args = ["--rendering-driver", "opengl3"] - # 启动新实例 var executable_path = OS.get_executable_path() - OS.create_process(executable_path, args) - get_tree().quit() + var result = OS.create_process(executable_path, args) + if result == OK: + if OS.get_name() == "Windows": + # 使用线程来延迟退出 + var thread = Thread.new() + thread.start(_delayed_quit) + else: + get_tree().quit() elif config.compatibility_mode == 3: print("[Compatibility] Running on 'non-opengl3' rendering driver.") +func _delayed_quit() -> void: + OS.delay_msec(500) # 等待 500 毫秒 + OS.kill(OS.get_process_id()) + get_tree().quit() + + func _apply_debug_mode() -> void: if config.debug_mode: GlobalConfig.DEBUG = true From 520171f9ed5df0dc376f4ce85d58cab2826f07e5 Mon Sep 17 00:00:00 2001 From: bbd_pc Date: Tue, 22 Jul 2025 00:42:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?demo=200.6.0=20=E5=85=BC=E5=AE=B9=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=90=AF=E5=8A=A8=EF=BC=9Bsfx=E9=9F=B3=E6=95=88?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- export_presets.cfg | 6 +++--- manager/archive_manager/archive_manager.gd | 2 +- manager/config_manager/global_config_manager.gd | 17 ++++++++--------- scene/trailer.gd | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index eae11aa7..d0e2567d 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.5.3/xiandie.exe" +export_path="../demo0.6.0/xiandie.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -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.5.3.0" -application/product_version="0.5.3.0" +application/file_version="0.6.0.0" +application/product_version="0.6.0.0" application/company_name="包包丁" application/product_name="衔蝶" application/file_description="衔蝶" diff --git a/manager/archive_manager/archive_manager.gd b/manager/archive_manager/archive_manager.gd index ad71c5fa..caec879b 100644 --- a/manager/archive_manager/archive_manager.gd +++ b/manager/archive_manager/archive_manager.gd @@ -366,4 +366,4 @@ func unlock_memory(id: int) -> void: print("memory already unlocked. id=", id) return archive.mem_display_dict[id] = true - SceneManager.pop_notification("ui_notify_mem_update") \ No newline at end of file + SceneManager.pop_notification("ui_notify_mem_update") diff --git a/manager/config_manager/global_config_manager.gd b/manager/config_manager/global_config_manager.gd index a03a4ed4..d3e20e47 100644 --- a/manager/config_manager/global_config_manager.gd +++ b/manager/config_manager/global_config_manager.gd @@ -56,20 +56,19 @@ func _apply_compatibility() -> void: # 重启游戏以应用新渲染器 var args = ["--rendering-driver", "opengl3"] var executable_path = OS.get_executable_path() - var result = OS.create_process(executable_path, args) - if result == OK: - if OS.get_name() == "Windows": - # 使用线程来延迟退出 - var thread = Thread.new() - thread.start(_delayed_quit) - else: - get_tree().quit() + OS.create_process(executable_path, args) + if OS.get_name() == "Windows": + # 使用线程来延迟退出 + var thread = Thread.new() + thread.start(_delayed_quit) + else: + get_tree().quit() elif config.compatibility_mode == 3: print("[Compatibility] Running on 'non-opengl3' rendering driver.") func _delayed_quit() -> void: - OS.delay_msec(500) # 等待 500 毫秒 + OS.delay_msec(100) # 等待 100 毫秒 OS.kill(OS.get_process_id()) get_tree().quit() diff --git a/scene/trailer.gd b/scene/trailer.gd index 0bab11c3..4422bdd0 100644 --- a/scene/trailer.gd +++ b/scene/trailer.gd @@ -156,4 +156,4 @@ func _on_caption_change(direction: int) -> void: sfx_click.play() var config = GlobalConfigManager.config GlobalConfigManager.update_locale(config.language, config.caption + direction) - caption_label.text = GlobalConfigManager.get_locale_caption_name() \ No newline at end of file + caption_label.text = GlobalConfigManager.get_locale_caption_name()