Merge remote-tracking branch 'origin/dev_maxim' into dev_danil

# Conflicts:
#	scripts/PRD.gd

PRD_MP550.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=49 format=3 uid="uid://cvor2jm4xk3ha"]
+[gd_scene load_steps=53 format=3 uid="uid://cvor2jm4xk3ha"]
 
 [ext_resource type="Script" path="res://scripts/PRD.gd" id="1_v273n"]
 [ext_resource type="Texture2D" uid="uid://cdxdluvyb5uei" path="res://table/on.png" id="2_dv7xx"]
@@ -7,14 +7,15 @@
 [ext_resource type="Texture2D" uid="uid://cfktmk2rowmul" path="res://table/off.png" id="3_qvuyu"]
 [ext_resource type="Shader" path="res://Shaders/ray.gdshader" id="4_uy5o2"]
 [ext_resource type="Texture2D" uid="uid://co8dxcd8eckjs" path="res://Web.png" id="5_i3nvb"]
-[ext_resource type="Shader" path="res://ray_2.gdshader" id="8_12mng"]
+[ext_resource type="Shader" path="res://Shaders/ray_2.gdshader" id="8_12mng"]
 [ext_resource type="Texture2D" uid="uid://cgtg4gbqnuxrc" path="res://nine-patch-round.png" id="9_0r2qk"]
 [ext_resource type="Script" path="res://scripts/control_panel.gd" id="9_akagi"]
 [ext_resource type="Script" path="res://scripts/ems_g.gd" id="9_g1wia"]
-[ext_resource type="Shader" path="res://load.gdshader" id="10_lf1xh"]
+[ext_resource type="Shader" path="res://Shaders/load.gdshader" id="10_lf1xh"]
 [ext_resource type="PackedScene" uid="uid://bdb0bhfu7366l" path="res://kasseta-fs-kd.tscn" id="10_tdh2s"]
 [ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://table/элемент-в.tscn" id="11_fg7ul"]
 [ext_resource type="Script" path="res://scripts/modul_fs.gd" id="15_b4pr1"]
+[ext_resource type="Shader" path="res://Shaders/loadead.gdshader" id="16_4osrw"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_eib3t"]
 bg_color = Color(0.223529, 0.168627, 0.223529, 1)
@@ -129,6 +130,35 @@ shader_parameter/inner_radius = 0.32
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_ooo4i"]
 
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_cm644"]
+shader = ExtResource("16_4osrw")
+shader_parameter/dot_scale = 0.5
+shader_parameter/ring_radius = 0.2
+shader_parameter/num_points = 8
+shader_parameter/gap_ratio = 0.102
+shader_parameter/all_dots_same_size = false
+shader_parameter/dot_color_start = Color(0.5, 0, 0.5, 1)
+shader_parameter/dot_color_end = Color(0.8, 0.5, 1, 1)
+shader_parameter/enable_shadow = true
+shader_parameter/shadow_color = Color(0, 0, 0, 0.35)
+shader_parameter/shadow_offset = Vector2(0.03, 0.01)
+shader_parameter/rotation_speed = 1.5
+shader_parameter/icon_size = 0.15
+shader_parameter/enable_icon_rotation = false
+shader_parameter/reverse_icon_rotation = false
+shader_parameter/icon_rotation_speed = 1.0
+shader_parameter/show_icon = false
+
+[sub_resource type="Gradient" id="Gradient_kvhy4"]
+colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_2sr0p"]
+gradient = SubResource("Gradient_kvhy4")
+width = 100
+height = 150
+fill = 1
+fill_from = Vector2(0.521368, 0.512821)
+
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_slcfo"]
 shader = ExtResource("10_lf1xh")
 shader_parameter/frequency = 5.0
@@ -739,6 +769,15 @@ offset_bottom = 782.0
 color = Color(0, 0, 0, 0.596078)
 metadata/_edit_lock_ = true
 
+[node name="win_load" type="TextureButton" parent="TabContainer/EMS_G/load_boadr"]
+material = SubResource("ShaderMaterial_cm644")
+layout_mode = 0
+offset_left = 730.0
+offset_top = 311.0
+offset_right = 830.0
+offset_bottom = 461.0
+texture_normal = SubResource("GradientTexture2D_2sr0p")
+
 [node name="load" type="Sprite2D" parent="TabContainer/EMS_G/load_boadr"]
 material = SubResource("ShaderMaterial_slcfo")
 position = Vector2(785.001, 361.5)
@@ -747,6 +786,7 @@ texture = SubResource("GradientTexture2D_0pk2o")
 metadata/_edit_lock_ = true
 
 [node name="Load_text" type="Label" parent="TabContainer/EMS_G/load_boadr"]
+visible = false
 layout_mode = 0
 offset_left = 693.0
 offset_top = 341.0
@@ -909,6 +949,18 @@ offset_bottom = 827.0
 theme = SubResource("Theme_yblys")
 text = "Сохранить все настройки"
 
+[node name="can_macro" type="Label" parent="."]
+offset_left = 226.0
+offset_top = 876.0
+offset_right = 1055.0
+offset_bottom = 916.0
+
+[node name="can" type="Label" parent="."]
+offset_left = 224.0
+offset_top = 844.0
+offset_right = 959.0
+offset_bottom = 889.0
+
 [connection signal="pressed" from="Background/side_panel/select_prd" to="." method="_on_prd_select"]
 [connection signal="pressed" from="Background/side_panel/select_control" to="." method="_on_control_button"]
 [connection signal="pressed" from="Background/side_panel/select_ems_g" to="." method="_on_emsg_select"]