Fix corridor B

This commit is contained in:
2025-06-29 15:47:56 -07:00
parent 6826fecd16
commit 5d49842c04

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=37 format=4 uid="uid://dooy8nc5pgaxm"] [gd_scene load_steps=40 format=4 uid="uid://dooy8nc5pgaxm"]
[ext_resource type="Script" uid="uid://fk3jis6rsipv" path="res://src/map/dungeon/code/corridor.gd" id="1_71ggh"] [ext_resource type="Script" uid="uid://fk3jis6rsipv" path="res://src/map/dungeon/code/corridor.gd" id="1_71ggh"]
[ext_resource type="Script" uid="uid://csxfet8l04swm" path="res://src/map/dungeon/code/CorridorRoom.cs" id="2_5ibpy"] [ext_resource type="Script" uid="uid://csxfet8l04swm" path="res://src/map/dungeon/code/CorridorRoom.cs" id="2_5ibpy"]
@@ -8,22 +8,20 @@
[ext_resource type="Texture2D" uid="uid://cot8ff6r8lloh" path="res://src/map/dungeon/models/Set B/37. Corridor B/37_A2_CORRIDOR_B_WHITE_layer_brick1.png" id="5_lolyr"] [ext_resource type="Texture2D" uid="uid://cot8ff6r8lloh" path="res://src/map/dungeon/models/Set B/37. Corridor B/37_A2_CORRIDOR_B_WHITE_layer_brick1.png" id="5_lolyr"]
[ext_resource type="Texture2D" uid="uid://bltjwwsy7cieh" path="res://src/map/dungeon/models/Set B/37. Corridor B/37_A2_CORRIDOR_B_area_2_tile_3.png" id="6_lsept"] [ext_resource type="Texture2D" uid="uid://bltjwwsy7cieh" path="res://src/map/dungeon/models/Set B/37. Corridor B/37_A2_CORRIDOR_B_area_2_tile_3.png" id="6_lsept"]
[ext_resource type="Texture2D" uid="uid://dqj533i8quohm" path="res://src/map/dungeon/models/Set B/37. Corridor B/37_A2_CORRIDOR_B_CORRIDOR_PANEL_UPPER.png" id="7_sx4i6"] [ext_resource type="Texture2D" uid="uid://dqj533i8quohm" path="res://src/map/dungeon/models/Set B/37. Corridor B/37_A2_CORRIDOR_B_CORRIDOR_PANEL_UPPER.png" id="7_sx4i6"]
[ext_resource type="Texture2D" uid="uid://bkvegamuqdsdd" path="res://src/map/dungeon/models/Set A/18. Corridor A/CORRIDOR test_FLOOR1.jpg" id="8_4fw8l"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l2f0d"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l2f0d"]
resource_name = "Material.014" resource_name = "Material.014"
cull_mode = 0
shading_mode = 0 shading_mode = 0
albedo_texture = ExtResource("2_ijgu6") albedo_texture = ExtResource("2_ijgu6")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xxxok"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xxxok"]
resource_name = "Material.015" resource_name = "Material.015"
cull_mode = 0
shading_mode = 0 shading_mode = 0
albedo_texture = ExtResource("3_nbkbi") albedo_texture = ExtResource("3_nbkbi")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jej4e"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jej4e"]
resource_name = "CEILNG.007" resource_name = "CEILNG.007"
cull_mode = 0
shading_mode = 0 shading_mode = 0
albedo_texture = ExtResource("4_05q7p") albedo_texture = ExtResource("4_05q7p")
@@ -109,13 +107,11 @@ shadow_mesh = SubResource("ArrayMesh_sgiro")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8fh0t"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8fh0t"]
resource_name = "WALL.007" resource_name = "WALL.007"
cull_mode = 0
shading_mode = 0 shading_mode = 0
albedo_texture = ExtResource("5_lolyr") albedo_texture = ExtResource("5_lolyr")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_51wvk"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_51wvk"]
resource_name = "FLOOR.007" resource_name = "FLOOR.007"
cull_mode = 0
shading_mode = 0 shading_mode = 0
albedo_texture = ExtResource("6_lsept") albedo_texture = ExtResource("6_lsept")
@@ -431,17 +427,80 @@ _surfaces = [{
blend_shape_mode = 0 blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_c82nn") shadow_mesh = SubResource("ArrayMesh_c82nn")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2qrwe"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7c8qf"]
transparency = 1
albedo_color = Color(1, 1, 1, 0)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_htf4s"]
albedo_texture = ExtResource("8_4fw8l")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dll0t"]
transparency = 1 transparency = 1
shading_mode = 0
albedo_color = Color(1, 1, 1, 0) albedo_color = Color(1, 1, 1, 0)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ix6wn"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ix6wn"]
resource_name = "BOTTOM TRIM.007" resource_name = "BOTTOM TRIM.007"
cull_mode = 0
shading_mode = 0 shading_mode = 0
albedo_texture = ExtResource("7_sx4i6") albedo_texture = ExtResource("7_sx4i6")
[sub_resource type="ArrayMesh" id="ArrayMesh_jtq5r"]
_surfaces = [{
"aabb": AABB(-0.984553, -23.5008, -0.95724, 2.00022, 24.4466, 1e-05),
"format": 34896613377,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAADAAEA"),
"name": "WALL.007",
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 4,
"vertex_data": PackedByteArray("AAAAAAAAAAD/////AAAAAP//AAAAAAAAAAD//wAAAAA=")
}, {
"aabb": AABB(-0.984553, -36.1633, -0.95724, 2.00022, 12.6625, 1e-05),
"format": 34896613377,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAADAAEA"),
"name": "BOTTOM TRIM.007",
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 4,
"vertex_data": PackedByteArray("AAAAAAAAAAD/////AAAAAP//AAAAAAAAAAD//wAAAAA=")
}]
blend_shape_mode = 0
[sub_resource type="ArrayMesh" id="ArrayMesh_opeel"]
resource_name = "37_A2_CORRIDOR_B_Cube_002"
_surfaces = [{
"aabb": AABB(-0.984553, -23.5008, -0.95724, 2.00022, 24.4466, 1e-05),
"attribute_data": PackedByteArray("//+haWxv//9sb6Fp/v///w=="),
"format": 34896613399,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAADAAEA"),
"material": SubResource("StandardMaterial3D_8fh0t"),
"name": "WALL.007",
"primitive": 3,
"uv_scale": Vector4(2.47834, 2.42346, 0, 0),
"vertex_count": 4,
"vertex_data": PackedByteArray("AAAAAAAA////////AAD/////AAAAAP//AAD//wAA////f/9//3//f/9//3//f/9/")
}, {
"aabb": AABB(-0.984553, -36.1633, -0.95724, 2.00022, 12.6625, 1e-05),
"attribute_data": PackedByteArray("/3///////3///////3//fw=="),
"format": 34896613399,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAADAAEA"),
"material": SubResource("StandardMaterial3D_ix6wn"),
"name": "BOTTOM TRIM.007",
"primitive": 3,
"uv_scale": Vector4(2, 2, 0, 0),
"vertex_count": 4,
"vertex_data": PackedByteArray("AAAAAAAAAID/////AAAAgP//AAAAAACAAAD//wAAAID/f////3////9/////f///")
}]
blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_jtq5r")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_olt0a"]
transparency = 1
albedo_color = Color(1, 1, 1, 0)
[sub_resource type="ArrayMesh" id="ArrayMesh_7ylfw"] [sub_resource type="ArrayMesh" id="ArrayMesh_7ylfw"]
_surfaces = [{ _surfaces = [{
"aabb": AABB(-0.984553, -23.5008, 1.0428, 2.00022, 24.4466, 1e-05), "aabb": AABB(-0.984553, -23.5008, 1.0428, 2.00022, 24.4466, 1e-05),
@@ -496,9 +555,8 @@ _surfaces = [{
blend_shape_mode = 0 blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_7ylfw") shadow_mesh = SubResource("ArrayMesh_7ylfw")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lepkf"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ns6xm"]
transparency = 1 transparency = 1
shading_mode = 0
albedo_color = Color(1, 1, 1, 0) albedo_color = Color(1, 1, 1, 0)
[sub_resource type="ArrayMesh" id="ArrayMesh_b15e2"] [sub_resource type="ArrayMesh" id="ArrayMesh_b15e2"]
@@ -555,11 +613,6 @@ _surfaces = [{
blend_shape_mode = 0 blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_b15e2") shadow_mesh = SubResource("ArrayMesh_b15e2")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0m8h3"]
transparency = 1
shading_mode = 0
albedo_color = Color(1, 1, 1, 0)
[sub_resource type="ArrayMesh" id="ArrayMesh_4ude8"] [sub_resource type="ArrayMesh" id="ArrayMesh_4ude8"]
_surfaces = [{ _surfaces = [{
"aabb": AABB(1.01566, -23.5008, -0.95724, 1e-05, 24.4466, 2.00004), "aabb": AABB(1.01566, -23.5008, -0.95724, 1e-05, 24.4466, 2.00004),
@@ -614,65 +667,10 @@ _surfaces = [{
blend_shape_mode = 0 blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_4ude8") shadow_mesh = SubResource("ArrayMesh_4ude8")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4xu2u"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bcqgr"]
transparency = 1 transparency = 1
shading_mode = 0
albedo_color = Color(1, 1, 1, 0) albedo_color = Color(1, 1, 1, 0)
[sub_resource type="ArrayMesh" id="ArrayMesh_jtq5r"]
_surfaces = [{
"aabb": AABB(-0.984553, -23.5008, -0.95724, 2.00022, 24.4466, 1e-05),
"format": 34896613377,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAADAAEA"),
"name": "WALL.007",
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 4,
"vertex_data": PackedByteArray("AAAAAAAAAAD/////AAAAAP//AAAAAAAAAAD//wAAAAA=")
}, {
"aabb": AABB(-0.984553, -36.1633, -0.95724, 2.00022, 12.6625, 1e-05),
"format": 34896613377,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAADAAEA"),
"name": "BOTTOM TRIM.007",
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 4,
"vertex_data": PackedByteArray("AAAAAAAAAAD/////AAAAAP//AAAAAAAAAAD//wAAAAA=")
}]
blend_shape_mode = 0
[sub_resource type="ArrayMesh" id="ArrayMesh_opeel"]
resource_name = "37_A2_CORRIDOR_B_Cube_002"
_surfaces = [{
"aabb": AABB(-0.984553, -23.5008, -0.95724, 2.00022, 24.4466, 1e-05),
"attribute_data": PackedByteArray("//+haWxv//9sb6Fp/v///w=="),
"format": 34896613399,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAADAAEA"),
"material": SubResource("StandardMaterial3D_8fh0t"),
"name": "WALL.007",
"primitive": 3,
"uv_scale": Vector4(2.47834, 2.42346, 0, 0),
"vertex_count": 4,
"vertex_data": PackedByteArray("AAAAAAAA////////AAD/////AAAAAP//AAD//wAA////f/9//3//f/9//3//f/9/")
}, {
"aabb": AABB(-0.984553, -36.1633, -0.95724, 2.00022, 12.6625, 1e-05),
"attribute_data": PackedByteArray("/3///////3///////3//fw=="),
"format": 34896613399,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAADAAEA"),
"material": SubResource("StandardMaterial3D_ix6wn"),
"name": "BOTTOM TRIM.007",
"primitive": 3,
"uv_scale": Vector4(2, 2, 0, 0),
"vertex_count": 4,
"vertex_data": PackedByteArray("AAAAAAAAAID/////AAAAgP//AAAAAACAAAD//wAAAID/f////3////9/////f///")
}]
blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_jtq5r")
[node name="Corridor" type="Node3D"] [node name="Corridor" type="Node3D"]
script = ExtResource("1_71ggh") script = ExtResource("1_71ggh")
voxel_scale = Vector3(4, 4, 4) voxel_scale = Vector3(4, 4, 4)
@@ -712,49 +710,73 @@ skeleton = NodePath("")
[node name="Doors" type="Node3D" parent="."] [node name="Doors" type="Node3D" parent="."]
[node name="DOOR?_F_CUT" type="CSGBox3D" parent="Doors"] [node name="DOOR?" type="CSGBox3D" parent="Doors"]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.0339368, -0.095025, 1.87165) transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 0.0498385, 0.0586318, -2.03732)
use_collision = true use_collision = true
size = Vector3(3.8, 3.8, 0.25) size = Vector3(3.90674, 4, 0.1)
material = SubResource("StandardMaterial3D_2qrwe") material = SubResource("StandardMaterial3D_7c8qf")
[node name="CB_WALL_4" type="MeshInstance3D" parent="Doors/DOOR?_F_CUT"] [node name="Box" type="CSGBox3D" parent="Doors/DOOR?"]
transform = Transform3D(-2, 0, 1.74846e-07, 0, 0.10779, 0, -1.74846e-07, 0, -2, -0.129782, 2.05207, 1.86676) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00166607, -3.72529e-08, 0.0620437)
material_override = SubResource("StandardMaterial3D_htf4s")
size = Vector3(4, 4, 0.203003)
material = SubResource("StandardMaterial3D_dll0t")
[node name="CB_WALL_2" type="MeshInstance3D" parent="Doors/DOOR?"]
transform = Transform3D(-8.74228e-08, 0.10779, 1.73929e-20, -2, -4.71165e-09, 3.97904e-13, 3.97904e-13, 0, 2, 1.89841, -0.0460071, 2.04221)
mesh = SubResource("ArrayMesh_opeel")
skeleton = NodePath("")
[node name="DOOR?2" type="CSGBox3D" parent="Doors"]
transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 0.0498385, 0.0586318, 1.96147)
use_collision = true
size = Vector3(3.90674, 4, 0.1)
material = SubResource("StandardMaterial3D_7c8qf")
[node name="Box" type="CSGBox3D" parent="Doors/DOOR?2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00166607, -3.72529e-08, 0.0620437)
material_override = SubResource("StandardMaterial3D_htf4s")
size = Vector3(4, 4, 0.203003)
material = SubResource("StandardMaterial3D_olt0a")
[node name="CB_WALL_4" type="MeshInstance3D" parent="Doors/DOOR?2"]
transform = Transform3D(-8.74228e-08, 0.10779, 1.73929e-20, -2, -4.71165e-09, 3.97904e-13, 3.97904e-13, 0, 2, 1.89841, -0.0460066, -1.95658)
mesh = SubResource("ArrayMesh_jb11o") mesh = SubResource("ArrayMesh_jb11o")
skeleton = NodePath("") skeleton = NodePath("")
[node name="DOOR?_R_CUT" type="CSGBox3D" parent="Doors"] [node name="DOOR?3" type="CSGBox3D" parent="Doors"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.87415, -0.109414, -0.094615) transform = Transform3D(1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -1.95513, 0.0586318, -0.00728679)
use_collision = true use_collision = true
size = Vector3(3.8, 3.8, 0.25) size = Vector3(3.90674, 4, 0.1)
material = SubResource("StandardMaterial3D_lepkf") material = SubResource("StandardMaterial3D_7c8qf")
[node name="CB_WALL_1" type="MeshInstance3D" parent="Doors/DOOR?_R_CUT"] [node name="Box" type="CSGBox3D" parent="Doors/DOOR?3"]
transform = Transform3D(-8.74228e-08, 0, -2, 0, 0.10779, 0, 2, 0, -8.74228e-08, -0.0995048, 2.06646, 1.97) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00166607, -3.72529e-08, 0.0620437)
material_override = SubResource("StandardMaterial3D_htf4s")
size = Vector3(4, 4, 0.203003)
material = SubResource("StandardMaterial3D_ns6xm")
[node name="CB_WALL_1" type="MeshInstance3D" parent="Doors/DOOR?3"]
transform = Transform3D(3.82137e-15, 0.10779, 8.74228e-08, 8.74228e-08, -4.71165e-09, 2, 2, -3.88032e-22, -8.74228e-08, 1.89841, 0.0121765, 2.05098)
mesh = SubResource("ArrayMesh_ogsb3") mesh = SubResource("ArrayMesh_ogsb3")
skeleton = NodePath("") skeleton = NodePath("")
[node name="DOOR?_L_CUT" type="CSGBox3D" parent="Doors"] [node name="DOOR?4" type="CSGBox3D" parent="Doors"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.98471, -0.0715388, -0.0946158) transform = Transform3D(1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, 1.95208, 0.0586318, -0.00681353)
use_collision = true use_collision = true
size = Vector3(3.8, 3.8, 0.25) size = Vector3(3.90674, 4, 0.1)
material = SubResource("StandardMaterial3D_0m8h3") material = SubResource("StandardMaterial3D_7c8qf")
[node name="CB_WALL_3" type="MeshInstance3D" parent="Doors/DOOR?_L_CUT"] [node name="CB_WALL_3" type="MeshInstance3D" parent="Doors/DOOR?4"]
transform = Transform3D(-8.74228e-08, 0, -2, 0, 0.10779, 0, 2, 0, -8.74228e-08, -0.0995054, 2.02859, -1.88886) transform = Transform3D(3.82137e-15, 0.10779, 8.74228e-08, 8.74228e-08, -4.71165e-09, 2, 2, -3.88032e-22, -8.74228e-08, 1.89842, 0.011703, -1.85623)
mesh = SubResource("ArrayMesh_eoqpa") mesh = SubResource("ArrayMesh_eoqpa")
skeleton = NodePath("") skeleton = NodePath("")
[node name="DOOR?_B_CUT" type="CSGBox3D" parent="Doors"] [node name="Box" type="CSGBox3D" parent="Doors/DOOR?4"]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.0339377, -0.127415, -2.00389) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00166607, -3.72529e-08, 0.0620437)
use_collision = true material_override = SubResource("StandardMaterial3D_htf4s")
size = Vector3(3.8, 3.8, 0.25) size = Vector3(4, 4, 0.203003)
material = SubResource("StandardMaterial3D_4xu2u") material = SubResource("StandardMaterial3D_bcqgr")
[node name="CB_WALL_2" type="MeshInstance3D" parent="Doors/DOOR?_B_CUT"]
transform = Transform3D(-2, 0, 1.74846e-07, 0, 0.10779, 0, -1.74846e-07, 0, -2, -0.129783, 2.08446, -2.00878)
mesh = SubResource("ArrayMesh_opeel")
skeleton = NodePath("")
[node name="Spawn Points" type="Node3D" parent="."] [node name="Spawn Points" type="Node3D" parent="."]