From c7283297ab5a6d3cea432d2209622e6e25451c29 Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Mon, 3 Jun 2024 11:11:43 -0600 Subject: [PATCH] more broke --- level/level.tscn | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/level/level.tscn b/level/level.tscn index e6a2993..e4b2581 100644 --- a/level/level.tscn +++ b/level/level.tscn @@ -1,13 +1,11 @@ -[gd_scene load_steps=14 format=3 uid="uid://b00brfkibo5cj"] +[gd_scene load_steps=13 format=3 uid="uid://b00brfkibo5cj"] [ext_resource type="PackedScene" uid="uid://bq654gwim6col" path="res://level/level.glb" id="1_s37in"] [ext_resource type="Environment" uid="uid://covjrwmk4rplw" path="res://level/world_environment.tres" id="2_ptkl6"] [ext_resource type="Script" path="res://level/level.gd" id="2_s1bx6"] -[ext_resource type="Script" path="res://level/StaticBody3D.gd" id="4_6rwm2"] [ext_resource type="Script" path="res://addons/smoother/smoother.gd" id="5_2tyle"] [ext_resource type="Script" path="res://level/PlayerSpawner.gd" id="6_7ww0m"] [ext_resource type="MeshLibrary" uid="uid://cgh6y5j8wgi36" path="res://level/mesh_library/level_mesh_library.glb" id="6_d34iv"] -[ext_resource type="Script" path="res://level/Ground.gd" id="8_fuivp"] [sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_ujmev"] margin = 2.067 @@ -21,6 +19,7 @@ size = Vector2(100, 100) [sub_resource type="BoxShape3D" id="BoxShape3D_m3lo5"] [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_285vp"] + [sub_resource type="BoxShape3D" id="BoxShape3D_kefm0"] size = Vector3(6.87, 1, 1) @@ -38,7 +37,6 @@ transform = Transform3D(25.5862, 0, 0, 0, 25.5862, 0, 0, 0, 25.5862, 0.00464344, visible = false [node name="StaticBody3D" type="StaticBody3D" parent="Plane" index="0" groups=["ground"]] -script = ExtResource("4_6rwm2") [node name="CollisionShape3D" type="CollisionShape3D" parent="Plane/StaticBody3D" index="0"] transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) @@ -94,23 +92,26 @@ skeleton = NodePath("../Cube") transform = Transform3D(100, 0, 0, 0, 100, 0, 0, 0, 1, 0, 0, -0.5) shape = SubResource("BoxShape3D_m3lo5") -[node name="StaticBody3D" type="StaticBody3D" parent="." index="9"] - -[node name="GlobalMessage" type="Label" parent="SharedUI" index="0"] -unique_name_in_owner = true -layout_mode = 2 -offset_right = 1152.0 -offset_bottom = 23.0 -theme_override_colors/font_color = Color(1, 0, 0, 1) -text = "Waiting for at least 2 players to join" -horizontal_alignment = 1 - -[node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="." index="10"] +[node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="." index="9"] replication_config = SubResource("SceneReplicationConfig_285vp") -[connection signal="despawned" from="PlayerSpawner" to="." method="client_remove_player"] -[connection signal="spawned" from="PlayerSpawner" to="." method="client_add_player"] +[node name="StaticBody3D" type="StaticBody3D" parent="." index="10"] + [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"] transform = Transform3D(1.5, 0, 0, 0, 3.2, 0, 0, 0, 10, 5.01694, 11.1202, -5.176) shape = SubResource("BoxShape3D_kefm0") -script = ExtResource("8_fuivp") + +[node name="SharedUI" type="Control" parent="." index="11"] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 + +[node name="GlobalMessage" type="Label" parent="SharedUI" index="0"] +unique_name_in_owner = true +layout_mode = 0 +offset_right = 40.0 +offset_bottom = 23.0 + +[connection signal="despawned" from="PlayerSpawner" to="." method="client_remove_player"] +[connection signal="spawned" from="PlayerSpawner" to="." method="client_add_player"]