velelepie/uarep-ctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'lepshiy-master'

Browse Source 
# Conflicts:
#	scenes/frame-ecm-list/frm-ecm-list.gd
#	scripts/signaller.gd
This commit is contained in:
sasha80
2025-02-03 11:44:38 +03:00
parent d6a8769bb1 9137845ac2
commit 5a8a08b69d
32 changed files with 779 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scenes/frame-ecm-list/frm-ecm-list.gd
View File

@@ -2,12 +2,13 @@ class_name frm_ecm_list extends NinePatchRect
const srn_sectors: Dictionary = {
'srni1': [4, 5, 6, 7, 8, 9, 10, 11] }
'srni1': [12, 13, 14, 15, 16, 17, 18, 19] }
const jtids_sectors: Dictionary = {
'svi1': [12, 13, 14, 15, 16, 17, 18, 19] }
'svi1': [4, 5, 6, 7, 8, 9, 10, 11] }
const kupd_sectors: Dictionary = {}
const kupd_sectors: Dictionary = {
'lchm1': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 20, 21, 22, 23, 24, 25, 26, 27] }
const panika_sectors: Dictionary = {
'lchm1': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 20, 21, 22, 23, 24, 25, 26, 27],
@@ -25,7 +26,7 @@ func on_btn_cancel_pressed(btn, nodes):
signaller.emit_signal('interfer_off_all')
await get_tree().create_timer(0.1).timeout
btn.pressed = false
nodes.any(func(b): b.pressed = false)
nodes.any(func(btn_node): btn_node.pressed = false)
func on_btn_pressed(btn_this, btn_others):

3
scenes/frame-ecm-list/scroll-ecm-list.gd
View File

@@ -126,6 +126,9 @@ func on_interfer_off(ecm, ecms, thrs, table_index):
rehash(table_index)
ecms.erase(ecm.ispp)
thrs.erase(ecm.ispp)
interfer.cu.erase(ecm.ispp)
interfer.fs.erase(ecm.ispp)
interfer.push_id(ecm.ispp)
## Перестраивает индекс таблицы. Вызывать при удалении строки