场景 新增窗帘 light switch 宴会桌及摆件

assets/CC-BY/Chalice by Quaternius - VZencXtC2I.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bmfsqins86dwg"
+path="res://.godot/imported/Chalice by Quaternius - VZencXtC2I.glb-af6d23c77cdbee337672fd083b0ec8d7.scn"
+
+[deps]
+
+source_file="res://assets/CC-BY/Chalice by Quaternius - VZencXtC2I.glb"
+dest_files=["res://.godot/imported/Chalice by Quaternius - VZencXtC2I.glb-af6d23c77cdbee337672fd083b0ec8d7.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/CC-BY/Light switch by Poly by Google - 8sR1PkyAg-F.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://1wlg811mf7wu"
+path="res://.godot/imported/Light switch by Poly by Google - 8sR1PkyAg-F.glb-d046051d1ef2ce3186641c56319ce2d9.scn"
+
+[deps]
+
+source_file="res://assets/CC-BY/Light switch by Poly by Google - 8sR1PkyAg-F.glb"
+dest_files=["res://.godot/imported/Light switch by Poly by Google - 8sR1PkyAg-F.glb-d046051d1ef2ce3186641c56319ce2d9.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/CC-BY/Time Hotel December Curtains by S. Paul Michael - 3YmINBsAteR.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://ca0ndulkuavmm"
+path="res://.godot/imported/Time Hotel December Curtains by S. Paul Michael - 3YmINBsAteR.glb-a6e0de863e588552b76d5af3e62cac1d.scn"
+
+[deps]
+
+source_file="res://assets/CC-BY/Time Hotel December Curtains by S. Paul Michael - 3YmINBsAteR.glb"
+dest_files=["res://.godot/imported/Time Hotel December Curtains by S. Paul Michael - 3YmINBsAteR.glb-a6e0de863e588552b76d5af3e62cac1d.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/CC-BY/candle- b07YM_KsRhb.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://di8imuponpg55"
+path="res://.godot/imported/candle- b07YM_KsRhb.glb-d35035c14ad94736834f0c7f11d21dad.scn"
+
+[deps]
+
+source_file="res://assets/CC-BY/candle- b07YM_KsRhb.glb"
+dest_files=["res://.godot/imported/candle- b07YM_KsRhb.glb-d35035c14ad94736834f0c7f11d21dad.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/CC-BY/plants.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://ca8qrq4pj5hsu"
+path="res://.godot/imported/plants.glb-858cf0493f44ee731e0584c5284a46f7.scn"
+
+[deps]
+
+source_file="res://assets/CC-BY/plants.glb"
+dest_files=["res://.godot/imported/plants.glb-858cf0493f44ee731e0584c5284a46f7.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+mesh_library/use_node_names_as_mesh_names=false
+array_mesh/deduplicate_surfaces=true
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
+gltf/texture_map_mode=1

assets/CC-BY/plants_orchidTxt.png.import

@@ -0,0 +1,44 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://yyieskp4j2y8"
+path.s3tc="res://.godot/imported/plants_orchidTxt.png-49b21dcfd49627cc1594cf4c906c7a66.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={
+"md5": "3c6053e85832172750aab59d10dbc633"
+}
+
+[deps]
+
+source_file="res://assets/CC-BY/plants_orchidTxt.png"
+dest_files=["res://.godot/imported/plants_orchidTxt.png-49b21dcfd49627cc1594cf4c906c7a66.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+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=true
+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=0

shader/stylized.gdshader

@@ -0,0 +1,109 @@
+shader_type spatial;
+
+group_uniforms Shader.Albedo;
+uniform vec4 albedo_color : source_color  = vec4(1.0);
+uniform sampler2D albedo_texture;
+uniform float albedo_affect : hint_range(0.0, 1.0, 0.05) = 0.0;
+
+group_uniforms Shader.Light;
+uniform bool use_stepped = true;
+uniform float steps = 3.0;
+uniform float step_smoothness : hint_range(0.0, 1.0, 0.05) = 0.3;
+uniform vec4 shadow_tint : source_color;
+uniform float shadow_tint_amount : hint_range(0.0, 1.0, 0.1) = 0.4;
+
+group_uniforms Shader.Specular;
+uniform float specular : hint_range(0.0, 1.0, 0.05) = 0.0;
+
+group_uniforms Shader.Normal;
+uniform float normal_strength : hint_range(0.0, 1.0, 0.05) = 0.0;
+uniform sampler2D normal_texture;
+
+group_uniforms Shader.Rim;
+uniform bool use_rim = true;
+uniform vec4 rim_color : source_color = vec4(1.0);
+uniform float rim_amount = 2.0;
+uniform float rim_smoothness = 0.2;
+uniform float rim_mask_shadow : hint_range(0.0, 1.0, 0.05) = 1.0;
+uniform float rim_blend : hint_range(0.0, 1.0, 0.05) = 1.0;
+
+group_uniforms Shader.Pattern;
+uniform bool use_pattern = true;
+uniform sampler2D pattern_texture;
+uniform int pattern_uv_mode : hint_enum("UV", "Screen", "Local Screen") = 2;
+uniform float pattern_tiling = 32.0;
+uniform float pattern_amount : hint_range(0.0, 1.0, 0.05) = 0.5;
+uniform float pattern_smoothness : hint_range(0.0, 1.0, 0.05) = 0.5;
+uniform float pattern_blend : hint_range(0.0, 1.0, 0.05) = 0.2;
+
+varying vec4 node_position;
+
+float fresnel(float amount, vec3 normal, vec3 view)
+{
+	return pow((1.0 - clamp(dot(normalize(normal), normalize(view)), 0.0, 1.0 )), amount);
+}
+
+vec2 pattern_uv(vec2 uv, vec2 screen_uv){
+	vec2 p_uv = uv;
+	if(pattern_uv_mode == 1) { p_uv = screen_uv; }
+	if(pattern_uv_mode == 2) { p_uv = (screen_uv * 2.0 - 1.0) * node_position.w - node_position.xy; }
+	return p_uv;
+}
+
+float shape_value(float value, vec2 uv, vec2 screen_size){
+	float aspect = screen_size.y / screen_size.x;
+	vec2 pattern_uv = uv * pattern_tiling * vec2(1.0, aspect);
+	float shadow_pattern = texture(pattern_texture, pattern_uv).r;
+	shadow_pattern = clamp(smoothstep(shadow_pattern - pattern_smoothness, shadow_pattern + pattern_smoothness, value + pattern_amount), 0.0, value + pattern_amount);
+	return shadow_pattern;
+}
+
+void vertex() {
+	 node_position = (PROJECTION_MATRIX * vec4(NODE_POSITION_VIEW, 1.0));
+}
+
+void fragment() {
+	vec4 albedo = texture(albedo_texture, UV) * albedo_color;
+	vec4 normal_map = texture(normal_texture, UV);
+
+	ALBEDO = albedo.rgb;
+
+	NORMAL_MAP = mix(vec3(0.5,0.5,1.0), normal_map.rgb, normal_strength);
+
+	SPECULAR = specular;
+}
+
+void light () {
+	float ndotl = clamp(dot(NORMAL,LIGHT),0.0,1.0) * ATTENUATION;
+
+	float light = ndotl;
+
+	if(use_stepped){
+		float light_mult = light * steps;
+		float step_base = floor(light_mult);
+		float light_factor = light_mult - step_base;
+
+		light_factor = smoothstep(0.5 - step_smoothness, 0.5 + step_smoothness, light_factor);
+		light = (step_base + light_factor) / steps;
+	}
+
+	if(use_pattern){
+		vec2 p_uv = pattern_uv(UV, SCREEN_UV);
+
+		light = mix(light, shape_value(light, p_uv, VIEWPORT_SIZE), pattern_blend);
+	}
+
+	vec3 diffuse = vec3(pow(light, 1.0)) * (LIGHT_COLOR / PI);
+	diffuse = (shadow_tint.rgb * (1.0 - (light)) * shadow_tint_amount) + diffuse * light;
+
+	if(use_rim){
+		float rim_value = fresnel(rim_amount, NORMAL, VIEW);
+		rim_value = smoothstep(0.5 - (rim_smoothness / 2.0), 0.5 + (rim_smoothness / 2.0), rim_value);
+		rim_value = mix(rim_value, rim_value * light, rim_mask_shadow);
+
+		diffuse += rim_color.rgb * rim_value * rim_blend;
+	}
+
+	DIFFUSE_LIGHT += mix(diffuse, ALBEDO * diffuse, albedo_affect);
+	SPECULAR_LIGHT += vec3(pow(light, 50.0)) * specular;
+}

shader/stylized.gdshader.uid

@@ -0,0 +1 @@
+uid://rupeboy0gpf2

world/main.tscn

@@ -2,7 +2,6 @@
 
 [ext_resource type="Script" uid="uid://11rbhffe5dhv" path="res://world/main.gd" id="1_hyim0"]
 [ext_resource type="PackedScene" uid="uid://bekuuw153mv03" path="res://character/player/player.tscn" id="2_4f7fj"]
-[ext_resource type="PackedScene" path="res://world/ocean/sea.tscn" id="3_sea"]
 [ext_resource type="Shader" uid="uid://cvd0x7lon1ur6" path="res://addons/sky_3d/shaders/SkyMaterial.gdshader" id="5_8q2wj"]
 [ext_resource type="Texture2D" uid="uid://cfqk60lpl5ljv" path="res://addons/sky_3d/assets/resources/SNoise.tres" id="6_60vd7"]
 [ext_resource type="Texture2D" uid="uid://cecwdqjol0ckd" path="res://addons/sky_3d/assets/textures/noiseClouds.png" id="7_e63cu"]
@@ -34,7 +33,7 @@ shader_parameter/atm_level_params = Vector3(1, 0, 0)
 shader_parameter/atm_thickness = 0.7
 shader_parameter/atm_beta_ray = Vector3(5.804544e-06, 1.3562913e-05, 3.311258e-05)
 shader_parameter/atm_beta_mie = Vector3(3.038e-08, 3.038e-08, 3.038e-08)
-shader_parameter/sun_light_color = Color(1, 1, 1, 1)
+shader_parameter/sun_light_color = Color(0.999247, 0.9820411, 0.9734193, 1)
 shader_parameter/sun_disk_color = Color(0.996094, 0.541334, 0.140076, 1)
 shader_parameter/sun_disk_intensity = 30.0
 shader_parameter/sun_disk_size = 0.02
@@ -56,7 +55,7 @@ shader_parameter/starmap_flip_u = false
 shader_parameter/starmap_flip_v = false
 shader_parameter/starmap_alignment = Vector3(2.68288, -0.25891, 0.40101)
 shader_parameter/star_rotation_offset = 9.38899
-shader_parameter/star_rotation = -10.508823420903425
+shader_parameter/star_rotation = -10.364803549398014
 shader_parameter/star_tilt = -1.2915436464758039
 shader_parameter/star_field_color = Color(1, 1, 1, 1)
 shader_parameter/star_field_texture = ExtResource("10_h1iki")
@@ -72,8 +71,8 @@ shader_parameter/cirrus_absorption = 2.0
 shader_parameter/cirrus_sky_tint_fade = 0.5
 shader_parameter/cirrus_size = 1.0
 shader_parameter/cirrus_uv = Vector2(0.16, 0.11)
-shader_parameter/cirrus_position1 = Vector2(0.06373336, 0.06373336)
+shader_parameter/cirrus_position1 = Vector2(0.043840162, 0.043840162)
-shader_parameter/cirrus_position2 = Vector2(0.06373336, 0.06373336)
+shader_parameter/cirrus_position2 = Vector2(0.043840162, 0.043840162)
 shader_parameter/cirrus_texture = ExtResource("6_60vd7")
 shader_parameter/cumulus_visible = true
 shader_parameter/cumulus_intensity = 0.6
@@ -83,7 +82,7 @@ shader_parameter/cumulus_absorption = 2.0
 shader_parameter/cumulus_noise_freq = 2.7
 shader_parameter/cumulus_sky_tint_fade = 0.0
 shader_parameter/cumulus_size = 0.5
-shader_parameter/cumulus_position = Vector2(0.3186651, 0.3186651)
+shader_parameter/cumulus_position = Vector2(0.2192056, 0.2192056)
 shader_parameter/cumulus_texture = ExtResource("7_e63cu")
 shader_parameter/cumulus_partial_mie_phase = Vector3(0.957564, 1.042436, 0.412)
 shader_parameter/cumulus_mie_intensity = 1.0
@@ -93,7 +92,7 @@ shader_parameter/azimuthal_grid_rotation_offset = 0.03
 shader_parameter/show_equatorial_grid = false
 shader_parameter/equatorial_grid_color = Color(0, 0.75, 1, 1)
 shader_parameter/equatorial_grid_rotation_offset = 0.03
-shader_parameter/moon_matrix = Basis(0.5231242, -0.81924146, -0.2349137, 0.3627591, 0.46346128, -0.8084612, 0.77119833, 0.33770853, 0.5396352)
+shader_parameter/moon_matrix = Basis(0.40065408, -0.88073635, -0.25254706, 0.39105374, 0.41364843, -0.82217526, 0.8285852, 0.23064837, 0.51014507)
 
 [sub_resource type="Sky" id="Sky_n7uhj"]
 sky_material = SubResource("ShaderMaterial_sgblq")
@@ -102,7 +101,7 @@ sky_material = SubResource("ShaderMaterial_sgblq")
 background_mode = 2
 sky = SubResource("Sky_n7uhj")
 ambient_light_source = 3
-ambient_light_color = Color(0.96969974, 0.96969974, 0.96969974, 1)
+ambient_light_color = Color(0.88051164, 0.86535025, 0.8577529, 1)
 reflected_light_source = 2
 tonemap_mode = 3
 tonemap_white = 6.0
@@ -113,9 +112,6 @@ tonemap_white = 6.0
 script = ExtResource("1_hyim0")
 player_scene = ExtResource("2_4f7fj")
 
-[node name="Sea" parent="." unique_id=1379614066 instance=ExtResource("3_sea")]
-transform = Transform3D(0.97957206, 0, 0, 0, 0.97957206, 0, 0, 0, 0.97957206, 0, -1.5, 0)
-
 [node name="MultiplayerSpawner" type="MultiplayerSpawner" parent="." unique_id=1020023513]
 spawn_path = NodePath("..")
 
@@ -135,28 +131,33 @@ mesh = SubResource("BoxMesh_i1eo7")
 environment = SubResource("Environment_8l5dh")
 camera_attributes = SubResource("CameraAttributesPractical_6lvsd")
 script = ExtResource("12_d6btn")
-current_time = 9.188613333331746
+game_time_enabled = false
+current_time = 8.64
+minutes_per_day = 0.0
 wind_direction = 2.35619451204804
 metadata/_custom_type_script = "uid://deo0gxkmk2ahd"
 
 [node name="SunLight" type="DirectionalLight3D" parent="Sky3D" unique_id=1160740787]
-transform = Transform3D(0.69260204, -0.4109358, 0.59281886, 0, 0.82185286, 0.56969976, -0.7213199, -0.3945752, 0.56921697, 0.59281886, 0.56969976, 0.56921697)
+transform = Transform3D(0.6204089, -0.37737533, 0.6875177, 0, 0.87662435, 0.48117518, -0.78427845, -0.29852536, 0.5438656, 0.6875177, 0.48117518, 0.5438656)
+light_color = Color(0.999247, 0.9820411, 0.9734193, 1)
 shadow_enabled = true
 
 [node name="MoonLight" type="DirectionalLight3D" parent="Sky3D" unique_id=733450219]
-transform = Transform3D(0, -0.6365949, 0.77119833, 0.8476899, 0.4091145, 0.3377085, -0.53049195, 0.65373707, 0.5396351, 0.77119833, 0.3377085, 0.5396351)
+transform = Transform3D(0, -0.55986303, 0.82858515, 0.9111961, 0.34135452, 0.23064834, -0.41197276, 0.7550036, 0.51014507, 0.82858515, 0.23064834, 0.51014507)
 light_color = Color(0.572549, 0.776471, 0.956863, 1)
 light_energy = 0.0
 
 [node name="SkyDome" type="Node" parent="Sky3D" unique_id=1881177694]
 script = ExtResource("13_wc2es")
-sun_azimuth = -2.3358865
+sun_azimuth = -2.2400603
-sun_altitude = -0.9646558
+sun_altitude = -1.0688015
-moon_azimuth = -2.181345
+moon_azimuth = -2.122667
-moon_altitude = -1.226315
+moon_altitude = -1.3380524
 wind_direction = 2.35619451204804
 
 [node name="TimeOfDay" type="Node" parent="Sky3D" unique_id=270602983]
 script = ExtResource("14_gk3u8")
+game_time_enabled = false
 dome_path = NodePath("../SkyDome")
-current_time = 9.188613333331746
+minutes_per_day = 0.0
+current_time = 8.64