diff --git a/project.godot b/project.godot index 4e4c6857..dc2a071e 100644 --- a/project.godot +++ b/project.godot @@ -74,7 +74,6 @@ gdscript/warnings/unassigned_variable_op_assign=2 gdscript/warnings/unused_signal=0 gdscript/warnings/shadowed_variable=2 gdscript/warnings/shadowed_variable_base_class=2 -gdscript/warnings/shadowed_global_identifier=2 gdscript/warnings/unsafe_cast=1 gdscript/warnings/assert_always_true=2 gdscript/warnings/assert_always_false=2 diff --git a/scenes/контроль/контроль.tscn b/scenes/контроль/контроль.tscn index 5f2c8459..ac8b04bf 100644 --- a/scenes/контроль/контроль.tscn +++ b/scenes/контроль/контроль.tscn @@ -12,7 +12,7 @@ [ext_resource type="Texture2D" uid="uid://c6nve6f8sfyj2" path="res://data/состояние-исправности-0.png" id="7_6j01w"] [ext_resource type="Texture2D" uid="uid://u3tnejvpm8it" path="res://data/disconnect-a.png" id="8_gs2be"] [ext_resource type="Texture2D" uid="uid://dnreyfh3cd1k2" path="res://data/состояние-исправности-1.png" id="8_isjua"] -[ext_resource type="Shader" uid="uid://83fx15q1xlid" path="res://shaders/two-color.gdshader" id="9_71ec4"] +[ext_resource type="Shader" path="res://shaders/two-color.gdshader" id="9_71ec4"] [ext_resource type="Texture2D" uid="uid://b4isaggma6q3" path="res://data/Грани22.png" id="9_iqgf5"] [ext_resource type="Texture2D" uid="uid://c6booa8753u5t" path="res://data/состояние-исправности-2.png" id="9_ll0vs"] [ext_resource type="Texture2D" uid="uid://bktiige0i2lhl" path="res://data/У-РЭП-РПД-Н.png" id="9_qe1go"] @@ -23,7 +23,7 @@ [ext_resource type="Texture2D" uid="uid://vdhmga62vjsj" path="res://data/АФСП-РТР.png" id="13_32yvq"] [ext_resource type="Texture2D" uid="uid://dm350ta8noa0v" path="res://data/У-РЭП-РПД-К.png" id="16_32yvq"] [ext_resource type="Texture2D" uid="uid://c3cyog3gy24ft" path="res://data/У-ЭП.png" id="16_gjf0t"] -[ext_resource type="Script" uid="uid://xjs7owe2iexn" path="res://scenes/контроль/control_prd.gd" id="18_lbx5w"] +[ext_resource type="Script" path="res://scenes/контроль/control_prd.gd" id="18_lbx5w"] [ext_resource type="Texture2D" uid="uid://b2vf7en1jj8dv" path="res://data/У-РЭП-РПД-В.png" id="20_l5wui"] [ext_resource type="Texture2D" uid="uid://cllxcfa130vqu" path="res://data/УА-РЭП.png" id="22_1s34a"] diff --git a/scenes/эмс2/эмс2.tscn b/scenes/эмс2/эмс2.tscn index b8e71422..7581536a 100644 --- a/scenes/эмс2/эмс2.tscn +++ b/scenes/эмс2/эмс2.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=35 format=3 uid="uid://musb21x2u0xs"] [ext_resource type="Texture2D" uid="uid://hkcvl2waf63s" path="res://data/вид сверху.png" id="1_b7vcf"] -[ext_resource type="Script" uid="uid://bvlqgv7aapebl" path="res://scenes/эмс2/эмс_тг.gd" id="1_l3ueu"] +[ext_resource type="Script" path="res://scenes/эмс2/эмс_тг.gd" id="1_l3ueu"] [ext_resource type="Texture2D" uid="uid://0w6q4vfst0ry" path="res://data/OP-63.png" id="3_8gk36"] [ext_resource type="Texture2D" uid="uid://coxhivvc6uibs" path="res://data/Состояние РЭС 40.png" id="4_b3mus"] [ext_resource type="Texture2D" uid="uid://073el51yholj" path="res://data/454.png" id="4_nqi0i"] @@ -34,10 +34,8 @@ [ext_resource type="Texture2D" uid="uid://3siondd3feev" path="res://data/Скруглённый прямоугольник белый.png" id="33_5ifkb"] [sub_resource type="CompressedTexture2D" id="CompressedTexture2D_5u4bk"] -load_path = "res://.godot/imported/Окно частот0.png-6b01791c971bddb01337caf9077bf060.ctex" [sub_resource type="CompressedTexture2D" id="CompressedTexture2D_l3ueu"] -load_path = "res://.godot/imported/Скруглённый квадрат серый.png-4655829309cca3b1dec2c9ae01376d54.ctex" [node name="Panel" type="Panel"] script = ExtResource("1_l3ueu") diff --git a/scripts/interfer.gd b/scripts/interfer.gd index bf8770a8..7dc0e726 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -654,7 +654,7 @@ func get_krp(threat: threats.Threat): if not ecm_params.has('files'): continue if typeof(ecm_params['files']) == TYPE_DICTIONARY: for value in ecm_params['files'].values(): - if typeof(value) == TYPE_STRING: + if typeof(value) == TYPE_STRING: if value == threat.rparams['filename']: krp = key return krp diff --git a/scripts/pribor-prd.gd b/scripts/pribor-prd.gd index 4a22200e..bc86e8ab 100644 --- a/scripts/pribor-prd.gd +++ b/scripts/pribor-prd.gd @@ -290,7 +290,7 @@ func _process(_delta: float) -> void: func on_data_received(unit_pribor: Object) -> void: var status: PackedByteArray = unit_pribor.status if status.size() < 100: push_error('Принимаемые значения от ЯУ-07б:%s не коррентны. (размер пакета: %d)' % [self_name, status.size()]); return - + temperature_um = check_temperature_um(status) flags.temperature_ok = check_overheating(temperature_um) block_ip_config = check_block_ip(status, block_ip_config)