diff --git a/assets/自建资产/Persian Carpet.glb b/assets/自建资产/Persian Carpet.glb index 4700cf7..06ea8ba 100644 Binary files a/assets/自建资产/Persian Carpet.glb and b/assets/自建资产/Persian Carpet.glb differ diff --git a/assets/自建资产/Persian Carpet.glb.import b/assets/自建资产/Persian Carpet.glb.import index 3422270..fd2402e 100644 --- a/assets/自建资产/Persian Carpet.glb.import +++ b/assets/自建资产/Persian Carpet.glb.import @@ -39,7 +39,15 @@ import_script/path="" materials/extract=0 materials/extract_format=0 materials/extract_path="" -_subresources={} +_subresources={ +"materials": { +"openPBR_shader1": { +"use_external/enabled": true, +"use_external/fallback_path": "res://assets/自建资产/openPBR_shader1.tres", +"use_external/path": "uid://bs1qxb8yq1oew" +} +} +} gltf/naming_version=2 gltf/embedded_image_handling=1 gltf/texture_map_mode=1 diff --git a/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png new file mode 100644 index 0000000..61fc981 Binary files /dev/null and b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png differ diff --git a/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png.import b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png.import new file mode 100644 index 0000000..ea728b8 --- /dev/null +++ b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png.import @@ -0,0 +1,44 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://3j2dwvx52j8c" +path.s3tc="res://.godot/imported/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png-a855834c498bdbda88cd2508d5b48438.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "2df33ad6ba2688fad65ccafdfa9646a7" +} + +[deps] + +source_file="res://assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png" +dest_files=["res://.godot/imported/Persian Carpet_Persian Carpet_rug_openPBR_shader1_BaseColor.png-a855834c498bdbda88cd2508d5b48438.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 diff --git a/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png new file mode 100644 index 0000000..eb2e496 Binary files /dev/null and b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png differ diff --git a/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png.import b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png.import new file mode 100644 index 0000000..053c90b --- /dev/null +++ b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png.import @@ -0,0 +1,44 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://p446jb2yb6db" +path.s3tc="res://.godot/imported/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png-d69928b6f95332e11d46c1f252338dff.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "f6a7b2f72130b8e4033094cb3b4ab80c" +} + +[deps] + +source_file="res://assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png" +dest_files=["res://.godot/imported/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Emissive.png-d69928b6f95332e11d46c1f252338dff.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 diff --git a/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png new file mode 100644 index 0000000..70c6de8 Binary files /dev/null and b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png differ diff --git a/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png.import b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png.import new file mode 100644 index 0000000..18acb21 --- /dev/null +++ b/assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png.import @@ -0,0 +1,44 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4srmlt7y2x0g" +path.s3tc="res://.godot/imported/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png-f4403596b29cde6054373cbf1cfd741f.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} +generator_parameters={ +"md5": "44ff2d9844870d231bae654f4101184f" +} + +[deps] + +source_file="res://assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png" +dest_files=["res://.godot/imported/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png-f4403596b29cde6054373cbf1cfd741f.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=1 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=1 +roughness/src_normal="res://assets/自建资产/Persian Carpet_Persian Carpet_rug_openPBR_shader1_Normal.png" +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 diff --git a/character/player/player.tscn b/character/player/player.tscn index 5b66016..ee2ae21 100644 --- a/character/player/player.tscn +++ b/character/player/player.tscn @@ -35,7 +35,7 @@ shape = SubResource("CapsuleShape3D_rkbax") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0) [node name="Camera" type="Camera3D" parent="CameraRig" unique_id=52294557] -transform = Transform3D(10.406274, 0, 0, 0, 10.406274, 0, 0, 0, 10.406274, 0, -0.6916404, -0.11179829) +transform = Transform3D(10.4062605, 0, 0, 0, 10.4062605, 0, 0, 0, 10.4062605, 0, 0.36149764, -0.111798294) near = 0.01 [node name="InteractionRay" type="RayCast3D" parent="CameraRig/Camera" unique_id=388601766] diff --git a/world/main2.tscn b/world/main2.tscn index 66734bc..c67d309 100644 --- a/world/main2.tscn +++ b/world/main2.tscn @@ -4426,7 +4426,6 @@ shape = SubResource("ConcavePolygonShape3D_2j3qe") [node name="Persian Carpet2" parent="." unique_id=1887488815 instance=ExtResource("139_rsora")] transform = Transform3D(-9.540769e-08, 0, 2.932546, 0, 1, 0, -2.1826735, 0, -1.2818566e-07, -14.619053, 3.5706723, 7.6451044) -metadata/_edit_group_ = true [node name="CollisionBody" type="StaticBody3D" parent="Persian Carpet2" unique_id=1975292864] metadata/_mesh_collider_body = true @@ -4436,7 +4435,6 @@ shape = SubResource("ConcavePolygonShape3D_s6n1q") [node name="Persian Carpet3" parent="." unique_id=429794706 instance=ExtResource("139_rsora")] transform = Transform3D(-1.5072361e-07, 0, 4.620817, 0, 1, 0, -3.448154, 0, -2.0198233e-07, -10.799329, 3.5706723, 7.772053) -metadata/_edit_group_ = true [node name="CollisionBody" type="StaticBody3D" parent="Persian Carpet3" unique_id=1487653045] metadata/_mesh_collider_body = true @@ -4446,7 +4444,6 @@ shape = SubResource("ConcavePolygonShape3D_s6n1q") [node name="Persian Carpet5" parent="." unique_id=386206193 instance=ExtResource("139_rsora")] transform = Transform3D(-3.1806517, 0, -5.7481867e-07, 0, 1, 0, 2.7806138e-07, 0, -6.575159, -12.209799, 3.5706723, 24.324797) -metadata/_edit_group_ = true [node name="CollisionBody" type="StaticBody3D" parent="Persian Carpet5" unique_id=893684869] metadata/_mesh_collider_body = true @@ -4456,7 +4453,6 @@ shape = SubResource("ConcavePolygonShape3D_s6n1q") [node name="Persian Carpet6" parent="." unique_id=1677714148 instance=ExtResource("139_rsora")] transform = Transform3D(-3.1806517, 0, -5.7481867e-07, 0, 1, 0, 2.7806138e-07, 0, -6.575159, -12.2098, 3.5706723, 17.756786) -metadata/_edit_group_ = true [node name="CollisionBody" type="StaticBody3D" parent="Persian Carpet6" unique_id=1651308499] metadata/_mesh_collider_body = true