From 31e4698db4c41ad6163ab6b7d73b58164682fddd Mon Sep 17 00:00:00 2001 From: sasha80 Date: Thu, 16 Nov 2023 15:17:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81?= =?UTF-8?q?=D1=81=D0=B5.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B2=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=BE=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/работа.tscn | 10 +++++----- scripts/signaller.gd | 2 +- scripts/threats.gd | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 23163e61..23bebdc2 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -8,13 +8,13 @@ [ext_resource type="PackedScene" uid="uid://dymo732qc2doa" path="res://scenes/count_all_pad.tscn" id="6_e3re7"] [ext_resource type="PackedScene" uid="uid://bwti82byphl68" path="res://scenes/count_danger_pad.tscn" id="7_2arls"] [ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat.tscn" id="8_k0iv2"] -[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_scale.tscn" id="9_oey3x"] +[ext_resource type="PackedScene" uid="uid://0uqi1ghf7sma" path="res://scenes/btn_zoom.tscn" id="9_oey3x"] [ext_resource type="PackedScene" uid="uid://bbq6nklh36yij" path="res://scenes/tilemap.tscn" id="10_gtwyg"] [ext_resource type="Shader" path="res://shaders/tilemap.gdshader" id="11_ekapd"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_idugi"] resource_local_to_scene = true -shader = ExtResource("11_7ohqv") +shader = ExtResource("11_ekapd") shader_parameter/radius = 0.39 [node name="Работа" type="Panel"] @@ -44,10 +44,10 @@ offset_right = 1594.0 offset_bottom = 1170.0 metadata/_edit_lock_ = true -[node name="tilemap" parent="." instance=ExtResource("10_wpi4s")] +[node name="tilemap" parent="." instance=ExtResource("10_gtwyg")] material = SubResource("ShaderMaterial_idugi") -[node name="canvas" parent="." instance=ExtResource("7_pvt8f")] +[node name="canvas" parent="." instance=ExtResource("4_lryxs")] metadata/_edit_lock_ = true [node name="grd_btns" parent="." instance=ExtResource("5_2jnbs")] @@ -128,7 +128,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 text = "Вид" -[node name="btn_zoom" parent="." instance=ExtResource("8_xddop")] +[node name="btn_zoom" parent="." instance=ExtResource("9_oey3x")] layout_mode = 0 offset_left = 952.0 offset_top = 1038.0 diff --git a/scripts/signaller.gd b/scripts/signaller.gd index ca395a5b..5f11b149 100644 --- a/scripts/signaller.gd +++ b/scripts/signaller.gd @@ -22,7 +22,7 @@ signal threat_unselected(threats: Dictionary, th) signal full_screen(id: int) -## Вызывается, когда пользователь выбирает цель +## Вызывается, когда пользователь выбирает цель ## [param bip] - Отметка цели на экране signal rto_threat_sel (bip: Control) diff --git a/scripts/threats.gd b/scripts/threats.gd index 97c22f2e..b74c8836 100644 --- a/scripts/threats.gd +++ b/scripts/threats.gd @@ -69,14 +69,14 @@ func on_timer_check_lost(time_lost: int, threats: Dictionary): call_deferred('emit_signal', 'threats_resized', threats) -## Выбирает цель, если нажать по отметке цели. +## Выбирает цель, если нажать по отметке цели. func on_rto_threat_sel(bip, threats): for threat in threats.values(): threat.selected = false threats[bip.name.to_int()].selected = true -## Выбирает цель, если выбрать в таблице +## Выбирает цель, если выбрать в таблице func on_threat_selected(th, threats): for threat in threats.values(): threat.selected = false @@ -91,7 +91,7 @@ func on_interfer_init(btn, threats): sel_threats.append(threat) if len(sel_threats): signaller.emit_signal('interfer_create', btn, sel_threats) - + ## Производит приём целей