diff --git a/addons/godot-git-plugin/windows/~libgit_plugin.windows.editor.x86_64.dll b/addons/godot-git-plugin/windows/~libgit_plugin.windows.editor.x86_64.dll new file mode 100644 index 00000000..c82fa6ee Binary files /dev/null and b/addons/godot-git-plugin/windows/~libgit_plugin.windows.editor.x86_64.dll differ diff --git a/export_presets.cfg b/export_presets.cfg index 8b94a91f..e57b7874 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -26,7 +26,7 @@ debug/export_console_wrapper=1 binary_format/embed_pck=false texture_format/s3tc_bptc=true texture_format/etc2_astc=false -binary_format/architecture="x86_64" +binary_format/architecture="x86_32" codesign/enable=false codesign/timestamp=true codesign/timestamp_server_url="" @@ -34,15 +34,15 @@ codesign/digest_algorithm=1 codesign/description="" codesign/custom_options=PackedStringArray() application/modify_resources=true -application/icon="" -application/console_wrapper_icon="" +application/icon="uid://cxgwspjv16j7m" +application/console_wrapper_icon="uid://cxgwspjv16j7m" application/icon_interpolation=4 -application/file_version="" -application/product_version="" -application/company_name="" -application/product_name="" -application/file_description="" -application/copyright="" +application/file_version="0.1.0.0" +application/product_version="0.1.0.0" +application/company_name="包包丁" +application/product_name="衔蝶" +application/file_description="衔蝶" +application/copyright="包包丁" application/trademarks="" application/export_angle=0 application/export_d3d12=0 diff --git a/manager/config_manager/global_config.gd b/manager/config_manager/global_config.gd index dae54281..6b4c96d9 100644 --- a/manager/config_manager/global_config.gd +++ b/manager/config_manager/global_config.gd @@ -1,7 +1,7 @@ class_name GlobalConfig extends Resource -const DEBUG = true -# const DEBUG = false +#const DEBUG = true +const DEBUG = false # .res would be binary encoded, .tres is text encoded const RES_FILE_FORMAT = ".tres" diff --git a/project.godot b/project.godot index a23a3b9c..5060e1de 100644 --- a/project.godot +++ b/project.godot @@ -34,7 +34,7 @@ config/features=PackedStringArray("4.4", "Mobile") boot_splash/image="uid://dt7dddmd3igrc" config/icon="uid://dgllr7ej7rnuq" config/macos_native_icon="res://游戏启动图标.icns" -config/windows_native_icon="res://游戏启动图标.ico" +config/windows_native_icon="res://游戏启动图标256.ico" boot_splash/minimum_display_time=1000 [audio] diff --git a/rcedit-x64.exe b/rcedit-x64.exe new file mode 100644 index 00000000..0d817e90 Binary files /dev/null and b/rcedit-x64.exe differ diff --git a/scene/character/main_player.gd b/scene/character/main_player.gd index e95d4eee..280c2dc0 100644 --- a/scene/character/main_player.gd +++ b/scene/character/main_player.gd @@ -511,4 +511,4 @@ func _after_walk_to() -> void: current_status = PlayerAnimationConfig.MOVEMENT_IDLE _play_animation() SceneManager.unlock_player() - # _check_status(facing_direction) \ No newline at end of file + # _check_status(facing_direction) diff --git a/scene/trailer.gd b/scene/trailer.gd index c8b71daa..e72a9894 100644 --- a/scene/trailer.gd +++ b/scene/trailer.gd @@ -8,8 +8,8 @@ var packed_index_page := preload("res://scene/index_page.tscn") func _ready() -> void: - # video_player.play() - # await video_player.finished + video_player.play() + await video_player.finished mask.visible = true earplug_notice.visible = true earplug_notice.modulate.a = 0 diff --git a/游戏启动图标128.ico b/游戏启动图标128.ico new file mode 100644 index 00000000..32efc0ef Binary files /dev/null and b/游戏启动图标128.ico differ diff --git a/游戏启动图标128.png b/游戏启动图标128.png new file mode 100644 index 00000000..452a736f Binary files /dev/null and b/游戏启动图标128.png differ diff --git a/游戏启动图标.png.import b/游戏启动图标128.png.import similarity index 66% rename from 游戏启动图标.png.import rename to 游戏启动图标128.png.import index 5c6abef1..f3df428a 100644 --- a/游戏启动图标.png.import +++ b/游戏启动图标128.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cvq7pkjm223q3" -path="res://.godot/imported/游戏启动图标.png-8e83451c3b5866d601cc8ae72deaac4b.ctex" +uid="uid://dtyjyhhsowfqw" +path="res://.godot/imported/游戏启动图标128.png-d410e0c154a7805b9f1580a4a016c81c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://游戏启动图标.png" -dest_files=["res://.godot/imported/游戏启动图标.png-8e83451c3b5866d601cc8ae72deaac4b.ctex"] +source_file="res://游戏启动图标128.png" +dest_files=["res://.godot/imported/游戏启动图标128.png-d410e0c154a7805b9f1580a4a016c81c.ctex"] [params] diff --git a/游戏启动图标.ico b/游戏启动图标256.ico similarity index 100% rename from 游戏启动图标.ico rename to 游戏启动图标256.ico diff --git a/游戏启动图标.png b/游戏启动图标256.png similarity index 100% rename from 游戏启动图标.png rename to 游戏启动图标256.png diff --git a/游戏启动图标256.png.import b/游戏启动图标256.png.import new file mode 100644 index 00000000..2bacbbf0 --- /dev/null +++ b/游戏启动图标256.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxgwspjv16j7m" +path="res://.godot/imported/游戏启动图标256.png-fb3b929732e3909566a3b385bb38e196.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://游戏启动图标256.png" +dest_files=["res://.godot/imported/游戏启动图标256.png-fb3b929732e3909566a3b385bb38e196.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