From e2237742b4b3722d5ab07383809e305b95158212 Mon Sep 17 00:00:00 2001 From: TotMaxim Date: Tue, 9 Dec 2025 20:10:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=87=D0=B8=D1=85=20=D1=82=D0=B5=D0=BC=D0=BF=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D1=83=D1=80=20=D0=A3=D0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/pribor-prd-k.gd | 2 +- scenes/pribor-prd-n/pribor-prd-n.gd | 2 +- scenes/pribor-prd-v/pribor-prd-v.gd | 2 +- scenes/tabs-switch/tab-switch.tscn | 1 + scenes/контроль/блок-в.tscn | 10 +++++----- scenes/контроль/блок-к.tscn | 18 +++++++++--------- scenes/контроль/контроль.tscn | 1 + scenes/работа/работа.tscn | 2 +- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/scenes/pribor-prd-k/pribor-prd-k.gd b/scenes/pribor-prd-k/pribor-prd-k.gd index 9491754f..0ed27ad8 100644 --- a/scenes/pribor-prd-k/pribor-prd-k.gd +++ b/scenes/pribor-prd-k/pribor-prd-k.gd @@ -16,7 +16,7 @@ func _ready() -> void: unit_prd_k = prd_k_module.unit_control var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier') for temp in power_amplifier: - temp.value1 = -70 + temp.value1 = -100 # Подписываемся на сигналы signaller.conn(signaller.start_contol_device, Callable(self, '_on_start_control')) unit_prd_k.connect('control_is_over', Callable(self, 'on_press_device')) diff --git a/scenes/pribor-prd-n/pribor-prd-n.gd b/scenes/pribor-prd-n/pribor-prd-n.gd index f1de070e..9e16dce8 100644 --- a/scenes/pribor-prd-n/pribor-prd-n.gd +++ b/scenes/pribor-prd-n/pribor-prd-n.gd @@ -16,7 +16,7 @@ func _ready() -> void: unit_prd_n = prd_n_module.unit_control var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier') for temp in power_amplifier: - temp.value1 = -70 + temp.value1 = -100 # Подписываемся на сигналы signaller.conn(signaller.start_contol_device, Callable(self, '_on_start_control')) unit_prd_n.connect('control_is_over', Callable(self, 'on_press_device')) diff --git a/scenes/pribor-prd-v/pribor-prd-v.gd b/scenes/pribor-prd-v/pribor-prd-v.gd index 6a170636..7660fcf9 100644 --- a/scenes/pribor-prd-v/pribor-prd-v.gd +++ b/scenes/pribor-prd-v/pribor-prd-v.gd @@ -16,7 +16,7 @@ func _ready() -> void: unit_prd_v = prd_v_module.unit_control var power_amplifier: Array = get_tree().get_nodes_in_group('power_amplifier') for temp in power_amplifier: - temp.value1 = -70 + temp.value1 = -100 # Подписываемся на сигналы signaller.conn(signaller.start_contol_device, Callable(self, '_on_start_control')) unit_prd_v.connect('control_is_over', Callable(self, 'on_press_device')) diff --git a/scenes/tabs-switch/tab-switch.tscn b/scenes/tabs-switch/tab-switch.tscn index 110a4fdb..618318ed 100644 --- a/scenes/tabs-switch/tab-switch.tscn +++ b/scenes/tabs-switch/tab-switch.tscn @@ -97,6 +97,7 @@ offset_bottom = 27.0 tooltip_text = "Задействовать режим Тренаж" focus_mode = 0 theme_override_colors/font_hover_pressed_color = Color(0, 0, 0, 1) +theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_colors/font_pressed_color = Color(0, 0, 0, 1) theme_override_styles/hover = SubResource("StyleBoxFlat_cw2ss") theme_override_styles/pressed = SubResource("StyleBoxFlat_nmdfd") diff --git a/scenes/контроль/блок-в.tscn b/scenes/контроль/блок-в.tscn index 5275bec3..051eea41 100644 --- a/scenes/контроль/блок-в.tscn +++ b/scenes/контроль/блок-в.tscn @@ -35,7 +35,7 @@ signal pressed(control: PanelContainer) if not is_inside_tree(): return $margin/vbox/grid1/level7.value = v - $margin/vbox/grid1/level7.tint_progress = Color.RED if v >= 50 else Color.GOLD if v >= 40 else Color.WHITE + $margin/vbox/grid1/level7.tint_progress = Color.RED if v >= 70 else Color.GOLD if v >= 55 else Color.WHITE on_level_changed(v, $margin/vbox/grid1/level7, value1_info) @@ -273,9 +273,9 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_3nd2u") script = SubResource("GDScript_oj3k3") textures = [ExtResource("1_n1aqt"), ExtResource("2_rim3u"), ExtResource("3_3w8fg")] value0 = [20.0, 30.0, 40.0, 50.0, 60.0, 70.0] -min_value1 = -40.0 +min_value1 = -60.0 max_value0 = 1400.0 -max_value1 = 55.0 +max_value1 = 75.0 step0 = 1.0 step1 = 1.0 value_name0 = "P,%" @@ -478,8 +478,8 @@ tooltip_text = " Текущее: 0.00 Диапазон: -40.00…55.00" mouse_filter = 0 -min_value = -40.0 -max_value = 55.0 +min_value = -60.0 +max_value = 75.0 fill_mode = 3 nine_patch_stretch = true stretch_margin_left = 8 diff --git a/scenes/контроль/блок-к.tscn b/scenes/контроль/блок-к.tscn index 6ffeb644..1bf682fc 100644 --- a/scenes/контроль/блок-к.tscn +++ b/scenes/контроль/блок-к.tscn @@ -35,7 +35,7 @@ signal pressed(control: PanelContainer) if not is_inside_tree(): return $margin/vbox/grid1/level7.value = v - $margin/vbox/grid1/level7.tint_progress = Color.RED if v >= 50 else Color.GOLD if v >= 40 else Color.WHITE + $margin/vbox/grid1/level7.tint_progress = Color.RED if v >= 70 else Color.GOLD if v >= 55 else Color.WHITE on_level_changed(v, $margin/vbox/grid1/level7, value1_info) @@ -259,10 +259,10 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_3nd2u") script = SubResource("GDScript_oj3k3") textures = [ExtResource("1_uojqc"), ExtResource("2_a8ar3"), ExtResource("3_xwd13")] value0 = [20.0, 30.0, 40.0, 50.0, 60.0, 70.0] -value1 = -40.0 -min_value1 = -40.0 +value1 = -100.0 +min_value1 = -60.0 max_value0 = 1400.0 -max_value1 = 55.0 +max_value1 = 75.0 step0 = 1.0 step1 = 1.0 value_name0 = "P,%" @@ -365,12 +365,12 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 tooltip_text = " -Текущее: -40.00 -Диапазон: -40.00…55.00" +Текущее: -100.00 +Диапазон: -60.00…75.00" mouse_filter = 0 -min_value = -40.0 -max_value = 55.0 -value = -40.0 +min_value = -60.0 +max_value = 75.0 +value = -60.0 fill_mode = 3 nine_patch_stretch = true stretch_margin_left = 8 diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index fa22a302..316c3d61 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -635,6 +635,7 @@ texture = ExtResource("11_gjf0t") [node name="control_progress" type="TextureProgressBar" parent="pribor_uf"] visible = false +layout_mode = 0 offset_left = 9.0 offset_top = 191.0 offset_right = 102.0 diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index c8fd4dff..c08c2b77 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -383,8 +383,8 @@ texture_normal = ExtResource("14_ggrwd") [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] [connection signal="button_down" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_down"] -[connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_button_up"] [connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_plus_button_up"] +[connection signal="button_up" from="zoom_plus" to="tilemap" method="_on_zoom_button_up"] [connection signal="button_down" from="zoom_minus" to="tilemap" method="_on_zoom_minus_button_down"] [connection signal="button_up" from="zoom_minus" to="tilemap" method="_on_zoom_button_up"] [connection signal="pressed" from="btn_all_work" to="." method="_on_btn_all_work_pressed"]