From 0f54bcfd5c879ff622b777823b7a4b998688bd67 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Thu, 19 Oct 2023 08:16:22 +0300 Subject: [PATCH] Godot4 --- scenes/canvas.tscn | 20 +++--- scenes/count_all_pad.tscn | 6 +- scenes/sector.tscn | 4 +- scenes/журнал.tscn | 8 +-- scenes/работа.tscn | 40 +++++------ scenes/состояния-эмс.tscn | 20 +++--- scenes/эмс.tscn | 144 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 193 insertions(+), 49 deletions(-) create mode 100644 scenes/эмс.tscn diff --git a/scenes/canvas.tscn b/scenes/canvas.tscn index 920c04ad..5df10425 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_pga55"] -[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_4el78"] -[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_fqm6d"] -[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_ymx7b"] +[ext_resource type="Material" uid="uid://s6xe8igevnv2" path="res://shaders/shader_edu.tres" id="1_rlqpd"] +[ext_resource type="Script" path="res://scenes/canvas.gd" id="2_epit6"] +[ext_resource type="PackedScene" uid="uid://c73ahpv8uiuc7" path="res://scenes/sector.tscn" id="3_p4snc"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="4_uljjp"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2bft1"] size = Vector2(1600, 1200) -[sub_resource type="ShaderMaterial" id="ShaderMaterial_doacg"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_ekn8l"] resource_local_to_scene = true -shader = ExtResource("4_ymx7b") +shader = ExtResource("4_uljjp") 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_pga55") +material = ExtResource("1_rlqpd") texture = SubResource("PlaceholderTexture2D_2bft1") centered = false -script = ExtResource("2_4el78") +script = ExtResource("2_epit6") -[node name="строб" parent="." instance=ExtResource("3_fqm6d")] -material = SubResource("ShaderMaterial_doacg") +[node name="строб" parent="." instance=ExtResource("3_p4snc")] +material = SubResource("ShaderMaterial_ekn8l") position = Vector2(560, 560) scale = Vector2(1100, 1100) diff --git a/scenes/count_all_pad.tscn b/scenes/count_all_pad.tscn index d234fa5a..eb730721 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_lkevq"] +[ext_resource type="FontFile" uid="uid://befva8r034a4v" path="res://data/DSEG7Classic-Regular.ttf" id="1_omx3t"] [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_lkevq") +theme_override_fonts/font = ExtResource("1_omx3t") 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_lkevq") +theme_override_fonts/font = ExtResource("1_omx3t") theme_override_font_sizes/font_size = 20 text = "00" vertical_alignment = 1 diff --git a/scenes/sector.tscn b/scenes/sector.tscn index e65c1e72..dddbccf4 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_0ypek"] +[ext_resource type="Shader" path="res://shaders/sector.gdshader" id="1_jalbg"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_xo5or"] resource_local_to_scene = true -shader = ExtResource("1_0ypek") +shader = ExtResource("1_jalbg") 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/журнал.tscn b/scenes/журнал.tscn index 6d2d1889..e811e308 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_nh6ok"] -[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_0fb07"] +[ext_resource type="Script" path="res://scenes/журнал.gd" id="1_jtuvb"] +[ext_resource type="Script" path="res://addons/godot-logger/scripts/logger_output.gd" id="2_wm8il"] [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_nh6ok") +script = ExtResource("1_jtuvb") [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_0fb07") +script = ExtResource("2_wm8il") [node name="btn_save" type="Button" parent="."] layout_mode = 0 diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 9fc60543..fd9e9746 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_2ystu"] -[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_lhktp"] -[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_3ca56"] -[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_1i71s"] -[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_mlvo5"] -[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_5ujdv"] -[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_cjh6l"] -[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_lknwf"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_jmjm2"] +[ext_resource type="Script" path="res://scenes/работа.gd" id="1_p02b1"] +[ext_resource type="PackedScene" uid="uid://nl1vklubr5kr" path="res://scenes/bip.tscn" id="2_ypwe8"] +[ext_resource type="PackedScene" uid="uid://dem3fcec25awh" path="res://scenes/grd_side.tscn" id="3_c0dic"] +[ext_resource type="PackedScene" uid="uid://b5kjdyxuwsot5" path="res://scenes/canvas.tscn" id="4_h6th4"] +[ext_resource type="PackedScene" uid="uid://cnkbk53mi7viu" path="res://scenes/grd_btns.tscn" id="5_6qu62"] +[ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_slsok"] +[ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_ueybb"] +[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_eofgo"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_gj0op"] [node name="Работа" type="Panel"] -script = ExtResource("1_2ystu") -Bip = ExtResource("2_lhktp") +script = ExtResource("1_p02b1") +Bip = ExtResource("2_ypwe8") 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_3ca56")] +[node name="grd_side" parent="." instance=ExtResource("3_c0dic")] 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("4_1i71s")] +[node name="canvas" parent="." instance=ExtResource("4_h6th4")] metadata/_edit_lock_ = true -[node name="grd_btns" parent="." instance=ExtResource("5_mlvo5")] +[node name="grd_btns" parent="." instance=ExtResource("5_6qu62")] 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_5ujdv")] +[node name="count_all_pad" parent="." instance=ExtResource("6_slsok")] 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_cjh6l")] +[node name="count_danger_pad" parent="." instance=ExtResource("7_ueybb")] 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_lknwf")] +[node name="btn_auto_threat" parent="." instance=ExtResource("8_eofgo")] 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_lknwf")] +[node name="btn_strob" parent="." instance=ExtResource("8_eofgo")] 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_lknwf")] +[node name="btn_view" parent="." instance=ExtResource("8_eofgo")] 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("9_jmjm2")] +[node name="btn_scale" parent="." instance=ExtResource("9_gj0op")] layout_mode = 0 offset_left = 952.0 offset_top = 1038.0 diff --git a/scenes/состояния-эмс.tscn b/scenes/состояния-эмс.tscn index a0b95bc7..89ab18ef 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_4sp0y"] -[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_a1kfw"] -[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_caoso"] -[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_hoe6v"] -[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_aogws"] +[ext_resource type="Script" path="res://scenes/состояния-эмс.gd" id="1_5cq67"] +[ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_don4l"] +[ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_lu634"] +[ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_b33qw"] +[ext_resource type="Texture2D" uid="uid://dvl3sq036gn75" path="res://data/эмс-бланк-замыкание.png" id="5_q2yfw"] [sub_resource type="SpriteFrames" id="SpriteFrames_ow7xh"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("2_a1kfw") +"texture": ExtResource("2_don4l") }, { "duration": 1.0, -"texture": ExtResource("3_caoso") +"texture": ExtResource("3_lu634") }, { "duration": 1.0, -"texture": ExtResource("4_hoe6v") +"texture": ExtResource("4_b33qw") }, { "duration": 1.0, -"texture": ExtResource("5_aogws") +"texture": ExtResource("5_q2yfw") }], "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_4sp0y") +script = ExtResource("1_5cq67") [node name="sprite" type="AnimatedSprite2D" parent="."] position = Vector2(34, 9) diff --git a/scenes/эмс.tscn b/scenes/эмс.tscn new file mode 100644 index 00000000..444fca62 --- /dev/null +++ b/scenes/эмс.tscn @@ -0,0 +1,144 @@ +[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")