From b20c3b0982fa37854661495917475f21bb00bc25 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Wed, 18 Oct 2023 16:31:19 +0300 Subject: [PATCH] Godot4 --- scenes/canvas.tscn | 20 +++--- scenes/count_all_pad.tscn | 6 +- scenes/sector.tscn | 4 +- scenes/tab-switch.tscn | 24 +++---- scenes/журнал.tscn | 10 +-- scenes/работа.tscn | 40 +++++------ scenes/состояния-эмс.tscn | 20 +++--- scenes/эмс.tscn | 144 -------------------------------------- 8 files changed, 62 insertions(+), 206 deletions(-) delete mode 100644 scenes/эмс.tscn diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index 8dcb94eb..365e4a99 100644 --- a/scenes/canvas.tscn +++ b/scenes/canvas.tscn @@ -1,16 +1,16 @@ [gd_scene load_steps=7 format=3 uid="uid://b5kjdyxuwsot5"] -[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_uxbga"] -[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_vkwmy"] -[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_uhdvc"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_gb4a1"] +[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_ha3yh"] +[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_8se1s"] +[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_7ta34"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_m7dli"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_iqsw2"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_1nxnr"] resource_local_to_scene = true -shader = ExtResource("4_gb4a1") +shader = ExtResource("4_m7dli") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 @@ -20,12 +20,12 @@ shader_parameter/dir = 0.08 shader_parameter/inner_clip = 0.045 [node name="canvas" type="Sprite2D"] -material = ExtResource("1_uxbga") +material = ExtResource("1_ha3yh") texture = SubResource("PlaceholderTexture2D_2bft1") centered = false -script = ExtResource("2_vkwmy") +script = ExtResource("2_8se1s") -[node name="строб" parent="." instance=ExtResource("3_uhdvc")] -material = SubResource("ShaderMaterial_iqsw2") +[node name="строб" parent="." instance=ExtResource("3_7ta34")] +material = SubResource("ShaderMaterial_1nxnr") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/count_all_pad.tscn b/scenes/count_all_pad.tscn index eb2d7c5e..ca0c75d3 100644 --- a/scenes/count_all_pad.tscn +++ b/scenes/count_all_pad.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=2 format=3 uid="uid://dymo732qc2doa"] -[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_di0yu"] +[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_llb8n"] [node name="count_all_pad" type="Label"] self_modulate = Color(0.403922, 0.403922, 0.403922, 1) offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_di0yu") +theme_override_fonts/font = ExtResource("1_llb8n") theme_override_font_sizes/font_size = 20 text = "88" vertical_alignment = 1 @@ -15,7 +15,7 @@ vertical_alignment = 1 layout_mode = 0 offset_right = 33.0 offset_bottom = 23.0 -theme_override_fonts/font = ExtResource("1_di0yu") +theme_override_fonts/font = ExtResource("1_llb8n") theme_override_font_sizes/font_size = 20 text = "00" vertical_alignment = 1 diff --git a/scenes/sector.tscn b/scenes/sector.tscn index 6e7d6b97..9670ad1a 100644 --- a/scenes/sector.tscn +++ b/scenes/sector.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=4 format=3 uid="uid://c73ahpv8uiuc7"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_aikdh"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_nwvyo"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_xo5or"] resource_local_to_scene = true -shader = ExtResource("1_aikdh") +shader = ExtResource("1_nwvyo") shader_parameter/color = Color(1, 1, 1, 0.168627) shader_parameter/clip_color = Color(1, 0.5, 0.5, 1) shader_parameter/width = 45.0 diff --git a/scenes/tab-switch.tscn b/scenes/tab-switch.tscn index c2c1e3cb..ebe4bcec 100644 --- a/scenes/tab-switch.tscn +++ b/scenes/tab-switch.tscn @@ -1,32 +1,32 @@ [gd_scene load_steps=7 format=3 uid="uid://3slb0i3pvowc"] -[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_qroqt"] -[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_pdbvn"] -[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_2apbp"] -[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_yq6c0"] -[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/ЭМС.tscn" id="5_tlyql"] -[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_rxq15"] +[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_jjaev"] +[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_ottu4"] +[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_50u6g"] +[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_jbm5n"] +[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс.tscn" id="5_014x4"] +[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_06u87"] [node name="tab_switch" type="TabContainer"] offset_right = 1600.0 offset_bottom = 1200.0 -script = ExtResource("1_qroqt") +script = ExtResource("1_jjaev") -[node name="Работа" parent="." instance=ExtResource("2_pdbvn")] +[node name="Работа" parent="." instance=ExtResource("2_ottu4")] layout_mode = 2 -[node name="Контроль" parent="." instance=ExtResource("3_2apbp")] +[node name="Контроль" parent="." instance=ExtResource("3_50u6g")] visible = false layout_mode = 2 -[node name="Журнал" parent="." instance=ExtResource("4_yq6c0")] +[node name="Журнал" parent="." instance=ExtResource("4_jbm5n")] visible = false layout_mode = 2 -[node name="ЭМС" parent="." instance=ExtResource("5_tlyql")] +[node name="ЭМС" parent="." instance=ExtResource("5_014x4")] visible = false layout_mode = 2 -[node name="Настройки" parent="." instance=ExtResource("6_rxq15")] +[node name="Настройки" parent="." instance=ExtResource("6_06u87")] visible = false layout_mode = 2 diff --git a/scenes/журнал.tscn b/scenes/журнал.tscn index 35f8343c..84813643 100644 --- a/scenes/журнал.tscn +++ b/scenes/журнал.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://trt0q8th3bn2"] -[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_ifi7q"] -[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_i478f"] +[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_o4bid"] +[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_2css8"] [node name="журнал" type="Panel"] anchors_preset = 15 @@ -13,7 +13,7 @@ offset_right = -2.0 offset_bottom = -1.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_ifi7q") +script = ExtResource("1_o4bid") [node name="content" type="RichTextLabel" parent="."] layout_mode = 0 @@ -26,7 +26,7 @@ theme_override_colors/selection_color = Color(0.72549, 0.270588, 0.133333, 1) threaded = true selection_enabled = true deselect_on_focus_loss_enabled = false -script = ExtResource("2_i478f") +script = ExtResource("2_2css8") [node name="btn_save" type="Button" parent="."] layout_mode = 0 @@ -46,8 +46,8 @@ text = "Очистить" [node name="dlg_file" type="FileDialog" parent="."] gui_embed_subwindows = true -title = "Сохранить журнал работы в файл" initial_position = 2 +title = "Сохранить журнал работы в файл" size = Vector2i(900, 900) borderless = true ok_button_text = "Да" diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 4530f07c..fc2712c4 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=10 format=3 uid="uid://b276iygic5itk"] -[ext_resource type="Script" path="res://scenes/работа.gd" id="1_vmjjl"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_ew6j4"] -[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_7lxgd"] -[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_0a5o3"] -[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_l7wyl"] -[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_f41cy"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="7_pvt8f"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_r2k1p"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="8_xddop"] +[ext_resource type="Script" path="res://scenes/работа.gd" id="1_mwan0"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_w87w3"] +[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_a6x3x"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_1nelj"] +[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_kkt1m"] +[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_lribk"] +[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_wg1cv"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_nxux2"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_qmu1r"] [node name="Работа" type="Panel"] -script = ExtResource("1_vmjjl") -Bip = ExtResource("2_ew6j4") +script = ExtResource("1_mwan0") +Bip = ExtResource("2_w87w3") col_grey = Color(0.34902, 0.643137, 0.772549, 0.168627) col_red = Color(1, 0.568627, 0.431373, 0.239216) drag_scale_band = 0.05 @@ -29,31 +29,31 @@ strob_min_width = 5.0 metadata/_edit_vertical_guides_ = [] metadata/_edit_lock_ = true -[node name="grd_side" parent="." instance=ExtResource("3_7lxgd")] +[node name="grd_side" parent="." instance=ExtResource("3_a6x3x")] layout_mode = 0 offset_left = 1114.0 offset_top = 7.0 offset_right = 1594.0 offset_bottom = 1170.0 -[node name="canvas" parent="." instance=ExtResource("7_pvt8f")] +[node name="canvas" parent="." instance=ExtResource("4_1nelj")] metadata/_edit_lock_ = true -[node name="grd_btns" parent="." instance=ExtResource("5_0a5o3")] +[node name="grd_btns" parent="." instance=ExtResource("5_kkt1m")] layout_mode = 0 offset_left = 10.0 offset_top = 1116.0 offset_right = 1106.0 offset_bottom = 1170.0 -[node name="count_all_pad" parent="." instance=ExtResource("6_l7wyl")] +[node name="count_all_pad" parent="." instance=ExtResource("6_lribk")] layout_mode = 0 offset_left = 100.0 offset_top = 117.0 offset_right = 133.0 offset_bottom = 140.0 -[node name="count_danger_pad" parent="." instance=ExtResource("7_f41cy")] +[node name="count_danger_pad" parent="." instance=ExtResource("7_wg1cv")] layout_mode = 0 offset_left = 96.0 offset_top = 29.0 @@ -85,7 +85,7 @@ offset_right = 83.0 offset_bottom = 72.0 text = "Опасных:" -[node name="btn_auto_threat" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_auto_threat" parent="." instance=ExtResource("8_nxux2")] layout_mode = 0 offset_left = 1034.0 offset_top = 7.0 @@ -95,7 +95,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Автомат" -[node name="btn_strob" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_strob" parent="." instance=ExtResource("8_nxux2")] layout_mode = 2 offset_left = 1034.0 offset_top = 67.0 @@ -106,7 +106,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" text = "Строб" -[node name="btn_view" parent="." instance=ExtResource("8_r2k1p")] +[node name="btn_view" parent="." instance=ExtResource("8_nxux2")] layout_mode = 2 offset_left = 874.0 offset_top = 1023.0 @@ -116,7 +116,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Вид" -[node name="btn_scale" parent="." instance=ExtResource("8_xddop")] +[node name="btn_scale" parent="." instance=ExtResource("9_qmu1r")] layout_mode = 0 offset_left = 952.0 offset_top = 1038.0 diff --git a/scenes/состояния-эмс.tscn b/scenes/состояния-эмс.tscn index 2667d5ba..aa2b493b 100644 --- a/scenes/состояния-эмс.tscn +++ b/scenes/состояния-эмс.tscn @@ -1,25 +1,25 @@ [gd_scene load_steps=7 format=3 uid="uid://by22sta8tt8dn"] -[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_fvtic"] -[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_6nlah"] -[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_1phdq"] -[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_8x71b"] -[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_rmevl"] +[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_01i4u"] +[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_rqcib"] +[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_quu6u"] +[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_15asl"] +[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_cwj2u"] [sub_resource type="SpriteFrames" id="SpriteFrames_ow7xh"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("2_6nlah") +"texture": ExtResource("2_rqcib") }, { "duration": 1.0, -"texture": ExtResource("3_1phdq") +"texture": ExtResource("3_quu6u") }, { "duration": 1.0, -"texture": ExtResource("4_8x71b") +"texture": ExtResource("4_15asl") }, { "duration": 1.0, -"texture": ExtResource("5_rmevl") +"texture": ExtResource("5_cwj2u") }], "loop": true, "name": &"default", @@ -35,7 +35,7 @@ offset_right = -1540.0 offset_bottom = -1182.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("1_fvtic") +script = ExtResource("1_01i4u") [node name="sprite" type="AnimatedSprite2D" parent="."] position = Vector2(34, 9) diff --git a/scenes/эмс.tscn b/scenes/эмс.tscn deleted file mode 100644 index 444fca62..00000000 --- a/scenes/эмс.tscn +++ /dev/null @@ -1,144 +0,0 @@ -[gd_scene load_steps=9 format=3 uid="uid://dab6loryocc73"] - -[ext_resource type="Script" path="res://scenes/эмс.gd" id="1_mk57x"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="2_eju8r"] -[ext_resource type="Texture2D" uid="uid://dd60btbqnpiqw" path="res://data/document-new-0.png" id="3_w7rqa"] -[ext_resource type="Texture2D" uid="uid://coqg6wsftvtxr" path="res://data/document-save-0.png" id="4_gyaoq"] -[ext_resource type="Texture2D" uid="uid://cywuevvpkxl7v" path="res://data/edit-copy-0.png" id="5_dxpqo"] -[ext_resource type="Texture2D" uid="uid://7h55yvh84cve" path="res://data/connect.png" id="6_axj2m"] -[ext_resource type="Texture2D" uid="uid://cjsr544qccftu" path="res://data/disconnect.png" id="7_yscbq"] -[ext_resource type="Script" path="res://table/table.gd" id="8_qcl30"] - -[node name="ЭМС" type="Panel"] -offset_right = 1598.0 -offset_bottom = 1201.0 -script = ExtResource("1_mk57x") - -[node name="lbl_online" type="Label" parent="."] -layout_mode = 0 -offset_left = 30.0 -offset_top = 4.0 -offset_right = 166.0 -offset_bottom = 30.0 -theme_override_colors/font_color = Color(0, 0.647059, 0.184314, 1) -text = "Ячейка на связи" - -[node name="btn_flash_read" parent="." instance=ExtResource("2_eju8r")] -layout_mode = 0 -offset_left = 1446.0 -offset_top = 55.0 -offset_right = 1583.0 -offset_bottom = 85.0 -text = "Прочитать" - -[node name="btn_flash_write" parent="." instance=ExtResource("2_eju8r")] -layout_mode = 0 -offset_left = 1446.0 -offset_top = 99.0 -offset_right = 1583.0 -offset_bottom = 129.0 -text = "Записать" - -[node name="btn_new" type="Button" parent="."] -layout_mode = 0 -offset_left = 1453.0 -offset_top = 960.0 -offset_right = 1509.0 -offset_bottom = 1016.0 -focus_mode = 0 -shortcut_feedback = false -shortcut_in_tooltip = false -icon = ExtResource("3_w7rqa") - -[node name="btn_save" type="Button" parent="."] -layout_mode = 0 -offset_left = 1453.0 -offset_top = 1017.0 -offset_right = 1509.0 -offset_bottom = 1073.0 -focus_mode = 0 -icon = ExtResource("4_gyaoq") - -[node name="btn_copy" type="Button" parent="."] -layout_mode = 0 -offset_left = 1454.0 -offset_top = 1074.0 -offset_right = 1510.0 -offset_bottom = 1130.0 -focus_mode = 0 -icon = ExtResource("5_dxpqo") - -[node name="btn_connect" type="Button" parent="."] -layout_mode = 0 -offset_left = 627.0 -offset_top = 55.0 -offset_right = 683.0 -offset_bottom = 111.0 -focus_mode = 0 -theme_override_colors/icon_normal_color = Color(1, 1, 1, 1) -icon = ExtResource("6_axj2m") - -[node name="btn_disconnect" type="Button" parent="."] -layout_mode = 0 -offset_left = 714.0 -offset_top = 741.0 -offset_right = 770.0 -offset_bottom = 815.0 -focus_mode = 0 -theme_override_colors/icon_normal_color = Color(1, 1, 1, 1) -icon = ExtResource("7_yscbq") - -[node name="scrollin" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 56.0 -offset_top = 52.0 -offset_right = 641.0 -offset_bottom = 679.0 - -[node name="tbl_in" type="GridContainer" parent="scrollin"] -layout_mode = 2 -script = ExtResource("8_qcl30") - -[node name="scrl_files" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 1047.0 -offset_top = 962.0 -offset_right = 1442.0 -offset_bottom = 1166.0 - -[node name="tbl_files" type="GridContainer" parent="scrl_files"] -layout_mode = 2 -script = ExtResource("8_qcl30") - -[node name="scrollout" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 657.0 -offset_top = 50.0 -offset_right = 1351.0 -offset_bottom = 679.0 - -[node name="tbl_out" type="GridContainer" parent="scrollout"] -layout_mode = 2 -script = ExtResource("8_qcl30") - -[node name="scrl_in_set" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 120.0 -offset_top = 776.0 -offset_right = 703.0 -offset_bottom = 942.0 - -[node name="tbl_in_set" type="GridContainer" parent="scrl_in_set"] -layout_mode = 2 -script = ExtResource("8_qcl30") - -[node name="scrl_out_set" type="ScrollContainer" parent="."] -layout_mode = 0 -offset_left = 719.0 -offset_top = 773.0 -offset_right = 1415.0 -offset_bottom = 924.0 - -[node name="tbl_out_set" type="GridContainer" parent="scrl_out_set"] -layout_mode = 2 -script = ExtResource("8_qcl30")