Merge branch 'MaxBondarev' into 'develop'

добавление команды 'запуск добычи руды' See merge request max.bondarev/universo!10

Merge branch 'MaxBondarev' into 'develop'
добавление команды 'запуск добычи руды' See merge request max.bondarev/universo!10
017482d2 · Max Bondarev · 75f4f1bb · 84e63cfc · 017482d2 · 017482d2
--- a/blokoj/rajtigo/rajtigo.tscn
+++ b/blokoj/rajtigo/rajtigo.tscn
@@ -76,6 +76,9 @@ margin_left = 380.0
 margin_top = 275.0
 margin_right = 630.0
 margin_bottom = 305.0
+__meta__ = {
+"_edit_use_anchors_": false
+}
 [node name="message" type="Label" parent="."]
 margin_left = 385.0

--- a/blokoj/rcentro/resursa_centro.gd
+++ b/blokoj/rcentro/resursa_centro.gd
--- a/blokoj/rcentro/resursa_centro.tscn
+++ b/blokoj/rcentro/resursa_centro.tscn
@@ -2,11 +2,12 @@
 [ext_resource path="res://blokoj/title_screen/Menu/fonts/18957.otf" type="DynamicFontData" id=1]
 [ext_resource path="res://blokoj/title_screen/Menu/fonts/Buttons_stylel.tres" type="StyleBox" id=2]
-[ext_resource path="res://blokoj/rcentro/resursa_centro.gd" type="Script" id=3]
+[ext_resource path="res://blokoj/rcentro/rcentro.gd" type="Script" id=3]
 [ext_resource path="res://blokoj/rcentro/skriptoj/item_list.gd" type="Script" id=4]
 [ext_resource path="res://blokoj/rcentro/skriptoj/http_resurso_request.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 1 )

--- a/blokoj/title_screen/Item_Icons/mining_icon.png
+++ b/blokoj/title_screen/Item_Icons/mining_icon.png
--- a/blokoj/title_screen/Item_Icons/mining_icon.png.import
+++ b/blokoj/title_screen/Item_Icons/mining_icon.png.import
+[remap]
+importer="texture"
+type="StreamTexture"
+path="res://.import/mining_icon.png-62b5111e610f285e7cb92ab88a342ba9.stex"
+metadata={
+"vram_texture": false
+}
+[deps]
+source_file="res://blokoj/title_screen/Item_Icons/mining_icon.png"
+dest_files=[ "res://.import/mining_icon.png-62b5111e610f285e7cb92ab88a342ba9.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/title_screen/Item_Icons/mining_icon1.png
+++ b/blokoj/title_screen/Item_Icons/mining_icon1.png
--- a/blokoj/title_screen/Item_Icons/mining_icon1.png.import
+++ b/blokoj/title_screen/Item_Icons/mining_icon1.png.import
+[remap]
+importer="texture"
+type="StreamTexture"
+path="res://.import/mining_icon1.png-c21eb5a8a65bcdcb4cb3709dc370edb1.stex"
+metadata={
+"vram_texture": false
+}
+[deps]
+source_file="res://blokoj/title_screen/Item_Icons/mining_icon1.png"
+dest_files=[ "res://.import/mining_icon1.png-c21eb5a8a65bcdcb4cb3709dc370edb1.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/title_screen/Menu/Menu_buttons/Account_button.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Account_button.tscn
@@ -2,7 +2,8 @@
 [ext_resource path="res://blokoj/title_screen/Item_Icons/Профиль1.png" type="Texture" id=1]
 [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]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]

--- a/blokoj/title_screen/Menu/Menu_buttons/Exit_button.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Exit_button.tscn
@@ -3,7 +3,8 @@
 [ext_resource path="res://blokoj/title_screen/Item_Icons/Exit.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]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 3 )

--- a/blokoj/title_screen/Menu/Menu_buttons/Laborcenter_button.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Laborcenter_button.tscn
@@ -3,7 +3,8 @@
 [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]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 3 )

--- a/blokoj/title_screen/Menu/Menu_buttons/Options_button.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Options_button.tscn
@@ -3,7 +3,8 @@
 [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]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 3 )

--- a/blokoj/title_screen/Menu/Menu_buttons/Panelo_button.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Panelo_button.tscn
@@ -3,7 +3,8 @@
 [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]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 3 )

--- a/blokoj/title_screen/Menu/Menu_buttons/Resurso Center_button.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Resurso Center_button.tscn
@@ -3,7 +3,8 @@
 [ext_resource path="res://blokoj/title_screen/Menu/fonts/18957.otf" type="DynamicFontData" id=1]
 [ext_resource path="res://blokoj/title_screen/Menu/fonts/Buttons_stylel.tres" type="StyleBox" id=2]
 [ext_resource path="res://blokoj/title_screen/Item_Icons/Центр1.png" type="Texture" id=4]
-[ext_resource path="res://blokoj/title_screen/Menu/Scripts/Start Game.gd" type="Script" id=5]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 1 )

--- a/blokoj/title_screen/Menu/Menu_buttons/Server.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Server.tscn
@@ -3,7 +3,7 @@
 [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]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 3 )

--- a/blokoj/title_screen/Menu/Menu_buttons/Start_game_button.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Start_game_button.tscn
@@ -2,7 +2,8 @@
 [ext_resource path="res://blokoj/title_screen/Menu/fonts/Buttons_stylel.tres" type="StyleBox" id=2]
 [ext_resource path="res://blokoj/title_screen/Menu/fonts/new_dynamicfont.tres" type="DynamicFont" id=3]
-[ext_resource path="res://blokoj/title_screen/Menu/Scripts/Start Game.gd" type="Script" id=4]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=4]
 [node name="Start Game" type="Button"]
 margin_top = 350.0

--- a/blokoj/title_screen/Menu/Menu_buttons/Task_button.tscn
+++ b/blokoj/title_screen/Menu/Menu_buttons/Task_button.tscn
@@ -3,7 +3,8 @@
 [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]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/StartGame.gd" type="Script" id=5]
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 3 )

--- a/blokoj/title_screen/Menu/Scripts/Start Game.gd
+++ b/blokoj/title_screen/Menu/Scripts/Start Game.gd
--- a/blokoj/title_screen/Menu/Scripts/mining.gd
+++ b/blokoj/title_screen/Menu/Scripts/mining.gd
+extends Button
+func _on_MiningButton_pressed():
+	Net.send_command("start_mining")
--- a/blokoj/title_screen/Menu/scene/ResursoCenter.tscn
+++ b/blokoj/title_screen/Menu/scene/ResursoCenter.tscn
 [gd_scene load_steps=3 format=2]
 [ext_resource path="res://blokoj/title_screen/Menu/scene/Scene_page.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/rcentro/resursa_centro.tscn" type="PackedScene" id=2]
+[ext_resource path="res://blokoj/rcentro/rcentro.tscn" type="PackedScene" id=2]

--- a/blokoj/title_screen/Menu/scene/Server.tscn
+++ b/blokoj/title_screen/Menu/scene/Server.tscn
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=7 format=2]
 [ext_resource path="res://blokoj/title_screen/Menu/scene/Scene_page.tscn" type="PackedScene" id=1]
 [ext_resource path="res://blokoj/title_screen/Menu/Scripts/server.gd" type="Script" id=2]
+[ext_resource path="res://blokoj/title_screen/Item_Icons/mining_icon1.png" type="Texture" id=3]
+[ext_resource path="res://blokoj/title_screen/Menu/Scripts/mining.gd" type="Script" id=4]
+[ext_resource path="res://blokoj/title_screen/Menu/fonts/new_dynamicfont.tres" type="DynamicFont" id=5]
+[ext_resource path="res://blokoj/title_screen/Menu/fonts/Buttons_stylel.tres" type="StyleBox" id=6]
 [node name="Options" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
@@ -18,5 +22,20 @@ readonly = true
 __meta__ = {
 "_edit_use_anchors_": false
 }
+[node name="Mining" type="Button" parent="." index="2"]
+margin_left = 61.961
+margin_top = 6.08759
+margin_right = 113.961
+margin_bottom = 52.0876
+hint_tooltip = "Запустить добычу руды"
+custom_styles/focus = ExtResource( 6 )
+custom_fonts/font = ExtResource( 5 )
+icon = ExtResource( 3 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 [connection signal="tree_entered" from="." to="." method="_on_Options_tree_entered"]
 [connection signal="tree_exiting" from="." to="." method="_on_Options_tree_exiting"]
+[connection signal="pressed" from="Mining" to="Mining" method="_on_MiningButton_pressed"]