diff --git a/_Core/managers/NotificationSoundManager.gd b/_Core/managers/NotificationSoundManager.gd index 9fd5486..33752b1 100644 --- a/_Core/managers/NotificationSoundManager.gd +++ b/_Core/managers/NotificationSoundManager.gd @@ -78,10 +78,11 @@ func _load_streams() -> void: _friendStream = _load_wav_stream(FRIEND_NOTIFICATION_PATH) func _load_wav_stream(path: String) -> AudioStreamWAV: - var stream := AudioStreamWAV.load_from_file(ProjectSettings.globalize_path(path)) - if stream == null: + var resource := load(path) + if not (resource is AudioStreamWAV): push_warning("NotificationSoundManager: 提醒音效加载失败: %s" % path) - return stream + return null + return resource as AudioStreamWAV func _stream_for_kind(kind: String) -> AudioStream: match kind: diff --git a/assets/maps/cafe/cafe_service_hall_base_v1.png b/assets/maps/cafe/cafe_service_hall_base_v1.png new file mode 100644 index 0000000..43eb335 Binary files /dev/null and b/assets/maps/cafe/cafe_service_hall_base_v1.png differ diff --git a/assets/maps/cafe/cafe_service_hall_base_v1.png.import b/assets/maps/cafe/cafe_service_hall_base_v1.png.import new file mode 100644 index 0000000..18981cc --- /dev/null +++ b/assets/maps/cafe/cafe_service_hall_base_v1.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bm2qwm6tt2olw" +path="res://.godot/imported/cafe_service_hall_base_v1.png-ce34158d181833fc726a8c30a9be1e58.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/maps/cafe/cafe_service_hall_base_v1.png" +dest_files=["res://.godot/imported/cafe_service_hall_base_v1.png-ce34158d181833fc726a8c30a9be1e58.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/deploy/nginx/whaletown-front-v2.conf.example b/deploy/nginx/whaletown-front-v2.conf.example new file mode 100644 index 0000000..bbe83ea --- /dev/null +++ b/deploy/nginx/whaletown-front-v2.conf.example @@ -0,0 +1,35 @@ +server { + listen 80; + server_name whaletown.xinghangee.icu; + + root /var/www/whale-town-front-v2/build/web; + index index.html; + + location / { + try_files $uri $uri/ /index.html; + } + + location = /index.html { + add_header Cache-Control "no-cache"; + } + + location ~* \.wasm$ { + default_type application/wasm; + expires 5m; + add_header Cache-Control "public, max-age=300"; + try_files $uri =404; + } + + location ~* \.pck$ { + default_type application/octet-stream; + expires 5m; + add_header Cache-Control "public, max-age=300"; + try_files $uri =404; + } + + location ~* \.(?:js|png|ico)$ { + expires 5m; + add_header Cache-Control "public, max-age=300"; + try_files $uri =404; + } +} diff --git a/export_presets.cfg b/export_presets.cfg new file mode 100644 index 0000000..a52eaa1 --- /dev/null +++ b/export_presets.cfg @@ -0,0 +1,74 @@ +[preset.0] + +name="Web" +platform="Web" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="build/web/index.html" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.0.options] + +custom_template/debug="" +custom_template/release="" +variant/extensions_support=false +variant/thread_support=false +vram_texture_compression/for_desktop=true +vram_texture_compression/for_mobile=false +html/export_icon=true +html/custom_html_shell="" +html/head_include="" +html/canvas_resize_policy=2 +html/focus_canvas_on_start=true +html/experimental_virtual_keyboard=false +progressive_web_app/enabled=false +progressive_web_app/ensure_cross_origin_isolation_headers=true +progressive_web_app/offline_page="" +progressive_web_app/display=1 +progressive_web_app/orientation=0 +progressive_web_app/icon_144x144="" +progressive_web_app/icon_180x180="" +progressive_web_app/icon_512x512="" +progressive_web_app/background_color=Color(0, 0, 0, 1) + +[preset.1] + +name="Linux/X11" +platform="Linux" +runnable=false +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="build/linux/WhaleTown-V2.x86_64" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=true +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +architecture/x86_64=true +ssh_remote_deploy/enabled=false diff --git a/scenes/Maps/cafe_interior.tscn b/scenes/Maps/cafe_interior.tscn index 404710e..072cae6 100644 --- a/scenes/Maps/cafe_interior.tscn +++ b/scenes/Maps/cafe_interior.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://c2flhkqk5icab"] [ext_resource type="Script" uid="uid://ccesagjisqodl" path="res://scenes/Maps/CafeInterior.gd" id="1_script"] -[ext_resource type="Texture2D" path="res://output/novamailio-imagegen/cafe_interior_scene/whale_cafe_large_service_hall_base_v4.png" id="2_map"] -[ext_resource type="PackedScene" uid="uid://b2f8e24plwqgj" path="res://scenes/characters/player.tscn" id="3_player"] +[ext_resource type="Texture2D" path="res://assets/maps/cafe/cafe_service_hall_base_v1.png" id="2_map"] +[ext_resource type="PackedScene" path="res://scenes/characters/player.tscn" id="3_player"] [ext_resource type="PackedScene" path="res://scenes/ui/ChatUI.tscn" id="4_chatui"] [ext_resource type="PackedScene" path="res://scenes/ui/PlayerHud.tscn" id="5_playerhud"] [ext_resource type="PackedScene" path="res://scenes/ui/FriendListPanel.tscn" id="6_friendpanel"] diff --git a/scenes/Maps/square.tscn b/scenes/Maps/square.tscn index a30133c..664f429 100644 --- a/scenes/Maps/square.tscn +++ b/scenes/Maps/square.tscn @@ -11,8 +11,8 @@ [ext_resource type="Texture2D" uid="uid://ee1advqq4qwb" path="res://assets/maps/square/v1/props/sea_coast_bottom_left_boundary_extension_novamailio_v3.png" id="11_seaex"] [ext_resource type="Texture2D" uid="uid://c8ubnxut51f0r" path="res://assets/maps/square/v1/props/bottom_entrance_left_task_props_v2_hd_clean.png" id="12_lefttask"] [ext_resource type="Texture2D" uid="uid://b4bvp0r5hua1k" path="res://assets/maps/square/v1/props/bottom_entrance_right_service_props_v2_hd_clean.png" id="13_rightsvc"] -[ext_resource type="PackedScene" uid="uid://b2f8e24plwqgj" path="res://scenes/characters/player.tscn" id="14_u1t8b"] -[ext_resource type="PackedScene" uid="uid://npc2282a2new" path="res://scenes/characters/npc.tscn" id="17_qog0y"] +[ext_resource type="PackedScene" path="res://scenes/characters/player.tscn" id="14_u1t8b"] +[ext_resource type="PackedScene" path="res://scenes/characters/npc.tscn" id="17_qog0y"] [ext_resource type="Texture2D" uid="uid://c0kgmsaach8wh" path="res://assets/maps/square/v1/props/foliage_v13_concept_broadleaf_single/broadleaf_tree_v13_clean.png" id="19_edt5w"] [ext_resource type="PackedScene" path="res://scenes/characters/crayfish_npc.tscn" id="20_lemld"] [ext_resource type="Texture2D" uid="uid://q3vldth6fyvw" path="res://assets/maps/square/v1/props/foliage_v14_concept_evergreen_single/evergreen_tree_v14_clean.png" id="20_rixdf"] diff --git a/scenes/Maps/work_zone.tscn b/scenes/Maps/work_zone.tscn index ca82021..6741b32 100644 --- a/scenes/Maps/work_zone.tscn +++ b/scenes/Maps/work_zone.tscn @@ -1,7 +1,7 @@ [gd_scene format=4 uid="uid://t6mv7u1me35m"] [ext_resource type="Script" uid="uid://6de5gvosic2s" path="res://scenes/Maps/WorkZone.gd" id="1_workzone"] -[ext_resource type="PackedScene" uid="uid://b2f8e24plwqgj" path="res://scenes/characters/player.tscn" id="3_player"] +[ext_resource type="PackedScene" path="res://scenes/characters/player.tscn" id="3_player"] [ext_resource type="PackedScene" path="res://scenes/ui/ChatUI.tscn" id="5_chatui"] [ext_resource type="PackedScene" path="res://scenes/ui/PlayerHud.tscn" id="6_playerhud"] [ext_resource type="PackedScene" path="res://scenes/ui/FriendListPanel.tscn" id="7_friendpanel"]