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

# Conflicts:
#	scripts/PRD.gd
#	scripts/network.gd

table/элемент-в.tscn

@@ -1,8 +1,11 @@
-[gd_scene load_steps=15 format=3 uid="uid://p2suppildvq0"]
+[gd_scene load_steps=12 format=3 uid="uid://p2suppildvq0"]
 
+[ext_resource type="Texture2D" uid="uid://ce3qpf070wgd2" path="res://состояние-исправности-0.png" id="1_2n7he"]
 [ext_resource type="Texture2D" uid="uid://cgtg4gbqnuxrc" path="res://nine-patch-round.png" id="2_4b43i"]
+[ext_resource type="Texture2D" uid="uid://byweg7pgt8o4h" path="res://состояние-исправности-1.png" id="2_38t58"]
 [ext_resource type="Shader" path="res://opt_btn.gdshader" id="2_ecsml"]
 [ext_resource type="Texture2D" uid="uid://dkef6xwxwdxi8" path="res://эмс-бланк.png" id="3_4kmgr"]
+[ext_resource type="Texture2D" uid="uid://bvikuv0lbvou8" path="res://состояние-исправности-2.png" id="3_i2t3v"]
 [ext_resource type="Texture2D" uid="uid://b15flrfytxkop" path="res://эмс-бланк-пост.png" id="4_omove"]
 [ext_resource type="Texture2D" uid="uid://ijdfo2mml54" path="res://эмс-бланк-перем.png" id="5_jia67"]
 
@@ -44,8 +47,8 @@ func _resize_children() -> void:
     $lbl_rname.position.y = margins[0]
     $lbl_fname.size.y = size.x
     $lbl_fname.position.y = size.y / 2 + $lbl_fname.size.x / 2
-    $light_ind.position.x = size.x / 2 - ($light_ind.size.x * $light_ind.scale.x) / 2
-    $light_ind.position.y = size.y - $light_ind.size.y * $light_ind.scale.x - margins[2]
+    $txr_state.position.x = size.x / 2 - ($txr_state.size.x * $txr_state.scale.x) / 2
+    $txr_state.position.y = size.y - $txr_state.size.y * $txr_state.scale.x - margins[2]
 
 
 func _on_nine_patch_rect_resized() -> void:
@@ -75,37 +78,6 @@ shader = ExtResource("2_ecsml")
 shader_parameter/range = 0.4
 shader_parameter/color = Color(0.764706, 0.764706, 0.764706, 1)
 
-[sub_resource type="Gradient" id="Gradient_x8k3w"]
-colors = PackedColorArray(1, 1, 1, 1, 0.393086, 0.393086, 0.393085, 1)
-
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_cgu2r"]
-gradient = SubResource("Gradient_x8k3w")
-width = 25
-height = 25
-fill = 1
-fill_from = Vector2(0.5, 0.5)
-fill_to = Vector2(1.125, 0)
-
-[sub_resource type="Gradient" id="Gradient_1tk1g"]
-colors = PackedColorArray(0.1, 1, 0.1, 1, 0.124744, 0.328804, 0.202483, 1)
-
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_d3qtt"]
-gradient = SubResource("Gradient_1tk1g")
-width = 25
-height = 25
-fill = 1
-fill_from = Vector2(0.5, 0.5)
-
-[sub_resource type="Gradient" id="Gradient_6e32x"]
-colors = PackedColorArray(1, 0.1, 0.1, 1, 0.329, 0.125, 0.202, 1)
-
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_k8o6s"]
-gradient = SubResource("Gradient_6e32x")
-width = 25
-height = 25
-fill = 1
-fill_from = Vector2(0.5, 0.5)
-
 [sub_resource type="SpriteFrames" id="SpriteFrames_nofpw"]
 animations = [{
 "frames": [{
@@ -133,7 +105,7 @@ anchors_preset = 0
 offset_right = 50.0
 offset_bottom = 150.0
 script = SubResource("GDScript_fbktk")
-textures = Array[Texture]([ExtResource("2_4b43i"), ExtResource("2_4b43i"), ExtResource("2_4b43i")])
+textures = Array[Texture]([ExtResource("1_2n7he"), ExtResource("2_38t58"), ExtResource("3_i2t3v")])
 metadata/ref_des = ""
 metadata/dec_num = ""
 
@@ -160,19 +132,16 @@ text = "Ячейка"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="light_ind" type="TextureButton" parent="."]
+[node name="txr_state" type="TextureRect" parent="."]
 material = SubResource("ShaderMaterial_45ast")
 layout_mode = 0
-offset_left = 13.0
-offset_top = 114.0
-offset_right = 38.0
-offset_bottom = 139.0
+offset_left = 14.0
+offset_top = 116.0
+offset_right = 238.0
+offset_bottom = 340.0
+scale = Vector2(0.1, 0.1)
 size_flags_vertical = 6
-toggle_mode = true
-button_mask = 0
-texture_normal = SubResource("GradientTexture2D_cgu2r")
-texture_pressed = SubResource("GradientTexture2D_d3qtt")
-texture_disabled = SubResource("GradientTexture2D_k8o6s")
+texture = ExtResource("1_2n7he")
 
 [node name="np_rect" type="NinePatchRect" parent="."]
 layout_mode = 0