Merge branch 'develop' into 'develop'

Кнопка и сцена Сервер. Сцена станции расстягивается See merge request tehnokom/universo!33

Merge branch 'develop' into 'develop'
Кнопка и сцена Сервер. Сцена станции расстягивается See merge request tehnokom/universo!33
8aeff27f · Vladimir levadnij · 74a6490e · 4cb79331 · 8aeff27f · 74a6490e
--- a/blokoj/kosmostacio/Kosmostacio.tscn
+++ b/blokoj/kosmostacio/Kosmostacio.tscn
 [gd_scene load_steps=2 format=2]

-[ext_resource path="res://blokoj/kosmostacio/hangar.jpg" type="Texture" id=1]
+[ext_resource path="res://blokoj/kosmostacio/kosmostacio.jpg" type="Texture" id=1]

 [node name="Node2D" type="Node2D"]

 [node name="ParallaxBackground" type="ParallaxBackground" parent="."]
+follow_viewport_enable = true

 [node name="TextureRect" type="TextureRect" parent="ParallaxBackground"]
-margin_right = 1024.0
-margin_bottom = 600.0
+anchor_right = 1.0
+anchor_bottom = 1.0
 texture = ExtResource( 1 )
 expand = true
 __meta__ = {

--- a/blokoj/kosmostacio/hangar.jpg
+++ b/blokoj/kosmostacio/hangar.jpg
--- a/blokoj/kosmostacio/kosmostacio.jpg
+++ b/blokoj/kosmostacio/kosmostacio.jpg
--- a/blokoj/kosmostacio/kosmostacio.jpg.import
+++ b/blokoj/kosmostacio/kosmostacio.jpg.import
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/kosmostacio.jpg-3e0026abf7cf241831fceaa20a27efa2.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://blokoj/kosmostacio/kosmostacio.jpg"
+dest_files=[ "res://.import/kosmostacio.jpg-3e0026abf7cf241831fceaa20a27efa2.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
--- a/blokoj/rajtigo/Button.gd
+++ b/blokoj/rajtigo/Button.gd
@@ -16,3 +16,8 @@ func _pressed():
 	var post_request = JSON.print(json_query)
 	
 	$HTTPRequest.request(URL, headers, false, 2, post_request)
+
+
+func _on_Button_pressed():
+	get_tree().change_scene('res://blokoj/kosmostacio/Kosmostacio.tscn')
+	
--- a/blokoj/rajtigo/auth_menu.gd
+++ b/blokoj/rajtigo/auth_menu.gd
@@ -8,5 +8,4 @@ func _enter_tree():
 func _exit_tree():
 	Title.set_visible(true)
 	
-
 	
--- a/blokoj/rajtigo/auth_menu.tscn
+++ b/blokoj/rajtigo/auth_menu.tscn
@@ -163,6 +163,9 @@ custom_fonts/font = SubResource( 8 )
 text = "eo"
 flat = true
 script = SubResource( 9 )
+__meta__ = {
+"_edit_use_anchors_": false
+}

 [node name="ParallaxBackground" type="ParallaxBackground" parent="."]

@@ -176,4 +179,5 @@ expand = true
 __meta__ = {
 "_edit_use_anchors_": false
 }
+[connection signal="pressed" from="Button" to="Button" method="_on_Button_pressed"]
 [connection signal="request_completed" from="Button/HTTPRequest" to="Button/HTTPRequest" method="_on_HTTPRequest_request_completed"]
--- a/blokoj/rajtigo/root.tscn
+++ b/blokoj/rajtigo/root.tscn
@@ -51,7 +51,6 @@ font_data = ExtResource( 1 )
 [node name="CanvasLayer" type="CanvasLayer" parent="."]

 [node name="WindowDialog" type="WindowDialog" parent="CanvasLayer"]
-visible = true
 margin_left = 138.0
 margin_top = 98.0
 margin_right = 944.0
@@ -82,8 +81,12 @@ margin_right = 797.0
 margin_bottom = 87.0
 custom_styles/normal = ExtResource( 2 )
 custom_fonts/font = SubResource( 4 )
+__meta__ = {
+"_edit_use_anchors_": false
+}

 [node name="ToolButton" type="ToolButton" parent="CanvasLayer"]
+visible = false
 margin_left = 5.0
 margin_top = 216.0
 margin_right = 163.0

--- a/blokoj/title_screen/Menu/Menu_buttons/Server.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Server.tscn
+[gd_scene load_steps=6 format=2]
+
+[ext_resource path="res://blokoj/title_screen/Item_Icons/Настройки1.png" type="Texture" id=1]
+[ext_resource path="res://blokoj/title_screen/Menu/fonts/18957.otf" type="DynamicFontData" id=3]
+[ext_resource path="res://blokoj/title_screen/Menu/fonts/Buttons_stylel.tres" type="StyleBox" id=4]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/Start Game.gd" type="Script" id=5]
+
+[sub_resource type="DynamicFont" id=1]
+font_data = ExtResource( 3 )
+
+[node name="Options" type="Button"]
+margin_top = 70.0
+margin_right = 52.0
+margin_bottom = 122.0
+custom_styles/focus = ExtResource( 4 )
+custom_fonts/font = SubResource( 1 )
+icon = ExtResource( 1 )
+script = ExtResource( 5 )
+__meta__ = {
+"_edit_group_": true,
+"_edit_use_anchors_": false
+}
+load_scene = "res://blokoj/title_screen/Menu/scene/Options.tscn"
--- a/blokoj/title_screen/Menu/Scripts/Menu_buttons.gd
+++ b/blokoj/title_screen/Menu/Scripts/Menu_buttons.gd
@@ -24,9 +24,11 @@ func _on_Task_pressed():
 func _on_Exit_pressed():
 	get_tree().change_scene('res://blokoj/title_screen/Menu/scene/Exit.tscn')

-
 func _on_Panelo_pressed():
 	get_tree().change_scene('res://blokoj/title_screen/Menu/scene/Panelo.tscn')
+	
+func _on_Server_pressed():
+	get_tree().change_scene('res://blokoj/title_screen/Menu/scene/Server.tscn')

 func set_visible(visible: bool):
 	$CanvasLayer/HBoxContainer.visible = visible

--- a/blokoj/title_screen/Menu/scene/Server.tscn
+++ b/blokoj/title_screen/Menu/scene/Server.tscn
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://blokoj/title_screen/Menu/scene/Scene_page.tscn" type="PackedScene" id=1]
+
+[node name="Options" instance=ExtResource( 1 )]
+
+[node name="Label" parent="." index="0"]
+text = "Server  Scene"
--- a/blokoj/title_screen/Title.tscn
+++ b/blokoj/title_screen/Title.tscn
@@ -63,10 +63,10 @@ __meta__ = {

 [node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer"]
 material = SubResource( 2 )
-margin_left = 4.30568
-margin_top = -97.0499
-margin_right = 56.3057
-margin_bottom = 252.95
+margin_left = 5.05
+margin_top = -71.0525
+margin_right = 57.05
+margin_bottom = 278.947
 alignment = 1
 __meta__ = {
 "_edit_use_anchors_": false
@@ -74,7 +74,7 @@ __meta__ = {

 [node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/HBoxContainer"]
 margin_right = 52.0
-margin_bottom = 350.0
+margin_bottom = 349.0
 rect_pivot_offset = Vector2( 222.936, 97.0559 )
 alignment = 1
 __meta__ = {
@@ -82,8 +82,8 @@ __meta__ = {
 }

 [node name="WorldControl" parent="CanvasLayer/HBoxContainer/VBoxContainer" instance=ExtResource( 9 )]
-margin_top = 102.0
-margin_bottom = 148.0
+margin_top = 76.0
+margin_bottom = 122.0
 hint_tooltip = "Управление Вселенной"
 theme = SubResource( 3 )
 custom_fonts/font = SubResource( 4 )
@@ -91,8 +91,8 @@ icon = ExtResource( 12 )
 script = null

 [node name="Account" parent="CanvasLayer/HBoxContainer/VBoxContainer" instance=ExtResource( 9 )]
-margin_top = 152.0
-margin_bottom = 198.0
+margin_top = 126.0
+margin_bottom = 172.0
 hint_tooltip = "Аккаунт"
 theme = SubResource( 3 )
 custom_fonts/font = SubResource( 4 )
@@ -118,6 +118,19 @@ hint_tooltip = "Настройки"
 custom_fonts/font = SubResource( 7 )
 script = null

+[node name="Task" parent="CanvasLayer/HBoxContainer/VBoxContainer" instance=ExtResource( 7 )]
+margin_top = 176.0
+margin_bottom = 222.0
+hint_tooltip = "Задачи"
+script = null
+
+[node name="Server" parent="CanvasLayer/HBoxContainer/VBoxContainer" instance=ExtResource( 6 )]
+margin_top = 226.0
+margin_bottom = 272.0
+hint_tooltip = "Cервер"
+custom_fonts/font = SubResource( 7 )
+script = null
+
 [node name="Laborcenter" parent="CanvasLayer/HBoxContainer/VBoxContainer" instance=ExtResource( 6 )]
 visible = false
 margin_top = 150.0
@@ -126,12 +139,6 @@ hint_tooltip = "Рабочий центр"
 custom_fonts/font = SubResource( 7 )
 script = null

-[node name="Task" parent="CanvasLayer/HBoxContainer/VBoxContainer" instance=ExtResource( 7 )]
-margin_top = 202.0
-margin_bottom = 248.0
-hint_tooltip = "Задачи"
-script = null
-
 [node name="Resurso Center" parent="CanvasLayer/HBoxContainer/VBoxContainer" instance=ExtResource( 7 )]
 visible = false
 margin_top = 200.0
@@ -155,6 +162,7 @@ script = null
 [connection signal="pressed" from="CanvasLayer/HBoxContainer/VBoxContainer/Account" to="." method="_on_Account_pressed"]
 [connection signal="pressed" from="CanvasLayer/HBoxContainer/VBoxContainer/Panelo" to="." method="_on_Panelo_pressed"]
 [connection signal="pressed" from="CanvasLayer/HBoxContainer/VBoxContainer/Options" to="." method="_on_Options_pressed"]
-[connection signal="pressed" from="CanvasLayer/HBoxContainer/VBoxContainer/Laborcenter" to="." method="_on_Laborcenter_pressed"]
 [connection signal="pressed" from="CanvasLayer/HBoxContainer/VBoxContainer/Task" to="." method="_on_Task_pressed"]
+[connection signal="pressed" from="CanvasLayer/HBoxContainer/VBoxContainer/Server" to="." method="_on_Server_pressed"]
+[connection signal="pressed" from="CanvasLayer/HBoxContainer/VBoxContainer/Laborcenter" to="." method="_on_Laborcenter_pressed"]
 [connection signal="pressed" from="CanvasLayer/HBoxContainer/VBoxContainer/Exit" to="." method="_on_Exit_pressed"]