diff --git a/Ch1S2.tscn b/Ch1S2.tscn index b7eb976..4c44ed3 100644 --- a/Ch1S2.tscn +++ b/Ch1S2.tscn @@ -14,13 +14,6 @@ [node name="LivingRoom" type="Node2D"] -[node name="CanvasLayer" type="CanvasLayer" parent="."] - -[node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )] -margin_right = 960.0 -margin_bottom = 480.0 -rect_clip_content = true - [node name="Sky" type="TileMap" parent="."] tile_set = ExtResource( 8 ) cell_size = Vector2( 60, 60 ) @@ -100,3 +93,7 @@ tile_set = ExtResource( 14 ) cell_size = Vector2( 30, 30 ) format = 1 tile_data = PoolIntArray( 458755, 52, 0 ) + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )] diff --git a/Tiles/Furniture/coffee table.png b/Tiles/Furniture/coffee table.png deleted file mode 100644 index b3a3125..0000000 Binary files a/Tiles/Furniture/coffee table.png and /dev/null differ diff --git a/UI.tscn b/UI.tscn index e3034f0..983713c 100644 --- a/UI.tscn +++ b/UI.tscn @@ -1,8 +1,19 @@ [gd_scene format=2] [node name="UI" type="Control"] -margin_right = 40.0 -margin_bottom = 40.0 +margin_right = 960.0 +margin_bottom = 480.0 +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="PopupDialog" type="PopupDialog" parent="."] +visible = true +margin_left = 180.0 +margin_right = 900.0 +margin_bottom = 120.0 +popup_exclusive = true __meta__ = { "_edit_use_anchors_": false } diff --git a/game.pck b/game.pck deleted file mode 100644 index 51c8d95..0000000 Binary files a/game.pck and /dev/null differ