From ca451ac6acd069c0454655bb0a23caaa937e3751 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 18 Aug 2023 09:52:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20ip=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=85=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consts.gd | 4 ++-- main.tscn | 18 +++++++++--------- threats.gd | 2 +- кнопка-4.tscn | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/consts.gd b/consts.gd index 744135b..94cf869 100644 --- a/consts.gd +++ b/consts.gd @@ -4,8 +4,8 @@ const MENU_SCENE_FILE: String = 'res://меню.tscn' # Адрес имитатора -const MAIN_ADDR = [ 'localhost', 50005 ] -const DST_ADDR = [ 'localhost', 50079 ] +const MAIN_ADDR = [ '127.0.0.1', 50005 ] +const DST_ADDR = [ '127.0.0.1', 50079 ] const TABLE_ROW_HIGHT = 34 # Высота строки таблицы в пикселях diff --git a/main.tscn b/main.tscn index 29d9874..76fc90e 100644 --- a/main.tscn +++ b/main.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=5 format=3 uid="uid://87gtvqd7bbje"] -[ext_resource type="Script" path="res://main.gd" id="1_1ftv4"] -[ext_resource type="Script" path="res://table/table.gd" id="2_7svpe"] -[ext_resource type="Texture2D" uid="uid://cex4jiu1pcj3x" path="res://edit-add-0.png" id="3_furhm"] -[ext_resource type="Texture2D" uid="uid://cx746np1wexnd" path="res://edit-add-1.png" id="4_h0btf"] +[ext_resource type="Script" path="res://main.gd" id="1_fr0qe"] +[ext_resource type="Script" path="res://table/table.gd" id="2_8llri"] +[ext_resource type="Texture2D" uid="uid://cex4jiu1pcj3x" path="res://edit-add-0.png" id="3_1fkmd"] +[ext_resource type="Texture2D" uid="uid://cx746np1wexnd" path="res://edit-add-1.png" id="4_gkkg8"] [node name="main" type="Node2D"] -script = ExtResource("1_1ftv4") +script = ExtResource("1_fr0qe") [node name="tabs" type="TabContainer" parent="."] offset_right = 1594.0 @@ -26,7 +26,7 @@ offset_right = 1.0 offset_bottom = 10.0 grow_horizontal = 2 grow_vertical = 2 -script = ExtResource("2_7svpe") +script = ExtResource("2_8llri") node_type_file = "res://ячейка-1.tscn" [node name="btn_add" type="TextureButton" parent="tabs/threats"] @@ -35,8 +35,8 @@ offset_left = 1533.0 offset_top = -2.0 offset_right = 1581.0 offset_bottom = 46.0 -texture_normal = ExtResource("3_furhm") -texture_pressed = ExtResource("4_h0btf") +texture_normal = ExtResource("3_1fkmd") +texture_pressed = ExtResource("4_gkkg8") [node name="btn_del" type="TextureButton" parent="tabs/threats"] layout_mode = 0 @@ -54,5 +54,5 @@ layout_mode = 0 offset_top = 100.0 offset_right = 1587.0 offset_bottom = 861.0 -script = ExtResource("2_7svpe") +script = ExtResource("2_8llri") node_type_file = "res://ячейка-1.tscn" diff --git a/threats.gd b/threats.gd index 47f67df..37b9007 100644 --- a/threats.gd +++ b/threats.gd @@ -407,5 +407,5 @@ func get_threats_data(): func set_ticks(treat): var tick = Time.get_ticks_msec() - var cell = g_table.get_node2(COLUMN_TICK,treat.row_id) + var cell = g_table.get_node2(COLUMN_TICK, treat.row_id) cell.text = str(treat.set_tick(str(tick%60000))) diff --git a/кнопка-4.tscn b/кнопка-4.tscn index 25eeb73..5512ad8 100644 --- a/кнопка-4.tscn +++ b/кнопка-4.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://ccxre8mwhndjk"] -[ext_resource type="Texture2D" uid="uid://dag8n0gknjwak" path="res://индикатор-1-0.png" id="1_bo5pc"] -[ext_resource type="Texture2D" uid="uid://b3ext3w4ftgg2" path="res://индикатор-1-1.png" id="2_b0mq6"] +[ext_resource type="Texture2D" uid="uid://dag8n0gknjwak" path="res://индикатор-1-0.png" id="1_1da8b"] +[ext_resource type="Texture2D" uid="uid://b3ext3w4ftgg2" path="res://индикатор-1-1.png" id="2_lx7xh"] [node name="indicator_1" type="TextureButton"] modulate = Color(1, 0.596078, 0.4, 1) @@ -9,5 +9,5 @@ offset_right = 35.0 offset_bottom = 29.0 toggle_mode = true button_mask = 0 -texture_normal = ExtResource("1_bo5pc") -texture_pressed = ExtResource("2_b0mq6") +texture_normal = ExtResource("1_1da8b") +texture_pressed = ExtResource("2_lx7xh")