From f670debef6833d848a203721a6b5f4520f6abba8 Mon Sep 17 00:00:00 2001 From: lepshiy Date: Fri, 18 Jul 2025 15:15:40 +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=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=20-=20=D0=BA=D0=BE=D0=BF=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D1=8C/=D0=B2=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D1=82=D1=8C/=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB=D1=8F=D1=82=D1=8C?= =?UTF-8?q?=20=D0=B2=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80?= =?UTF-8?q?=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=BF=D0=BE=D0=BB=D1=8F=D1=85?= =?UTF-8?q?.=20=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20-=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B2=D0=BE=D0=B4=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D1=85?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BE=D1=80=D0=B4=D0=B8=D0=BD=D0=B0=D1=82=20?= =?UTF-8?q?=D0=B8=20=D0=BC=D0=B0=D1=81=D1=88=D1=82=D0=B0=D0=B1=D0=B0=20?= =?UTF-8?q?=D1=86=D0=B8=D1=84=D1=80=D0=B0=D0=BC=D0=B8,=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BA=D0=B0=D0=B7=20=D0=B7=D0=BD=D0=B0=D1=87=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=20=D0=BA=D0=BE=D1=80=D0=BE=D0=B1=D0=BB=D1=8F=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BA=D1=83=D1=89=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BE=D1=80=D0=B4?= =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D1=82=D1=8B=20=D0=BA=D0=BE=D1=80=D0=BE=D0=B1?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=80=D1=82=D0=B5,?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BA=D0=B0=D0=B7=20=D0=B7=D0=BD=D0=B0=D1=87?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=20=D0=B4=D1=80=D0=BE=D0=BD=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D0=B5=20=D1=86=D0=B5=D0=BB=D0=B8?= =?UTF-8?q?(=D1=83=D0=B3=D1=80=D0=BE=D0=B7=D1=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/count-danger/count_danger_pad.tscn | 2 +- scenes/pribor-uyep/sch3-view.gd | 2 +- scenes/tabs-switch/tab-switch.tscn | 7 +-- scenes/tilemap/ship.png | Bin 0 -> 7976 bytes scenes/tilemap/ship.png.import | 34 ++++++++++++ scenes/tilemap/ship1.png | Bin 0 -> 7117 bytes scenes/tilemap/ship1.png.import | 34 ++++++++++++ scenes/tilemap/ship2.png | Bin 0 -> 7019 bytes scenes/tilemap/ship2.png.import | 34 ++++++++++++ scenes/tilemap/ship_mark.tscn | 8 +++ scenes/tilemap/threat.png | Bin 0 -> 24318 bytes scenes/tilemap/threat.png.import | 34 ++++++++++++ scenes/tilemap/threat.tscn | 9 ++++ scenes/tilemap/tilemap.gd | 63 ++++++++++++++++++++-- scenes/tilemap/tilemap.tscn | 2 - scenes/настройки/настройки.gd | 9 ++-- scenes/работа/работа.gd | 13 ++++- scenes/работа/работа.tscn | 16 ++++++ scripts/signaller.gd | 10 ++++ table/table.gd | 11 ++++ 20 files changed, 273 insertions(+), 15 deletions(-) create mode 100644 scenes/tilemap/ship.png create mode 100644 scenes/tilemap/ship.png.import create mode 100644 scenes/tilemap/ship1.png create mode 100644 scenes/tilemap/ship1.png.import create mode 100644 scenes/tilemap/ship2.png create mode 100644 scenes/tilemap/ship2.png.import create mode 100644 scenes/tilemap/ship_mark.tscn create mode 100644 scenes/tilemap/threat.png create mode 100644 scenes/tilemap/threat.png.import create mode 100644 scenes/tilemap/threat.tscn diff --git a/scenes/count-danger/count_danger_pad.tscn b/scenes/count-danger/count_danger_pad.tscn index 03b5559..8f4dd4e 100644 --- a/scenes/count-danger/count_danger_pad.tscn +++ b/scenes/count-danger/count_danger_pad.tscn @@ -13,7 +13,7 @@ horizontal_alignment = 1 vertical_alignment = 1 [node name="count_danger" type="Label" parent="."] -modulate = Color(0.8, 0.533333, 0.27451, 1) +modulate = Color(0.890196, 0.486275, 0.196078, 1) layout_mode = 0 offset_right = 92.0 offset_bottom = 63.0 diff --git a/scenes/pribor-uyep/sch3-view.gd b/scenes/pribor-uyep/sch3-view.gd index 59891f3..c3cc215 100644 --- a/scenes/pribor-uyep/sch3-view.gd +++ b/scenes/pribor-uyep/sch3-view.gd @@ -36,7 +36,7 @@ func on_line_changed_sch3(unit_sch3): regs_input.clear() switches_sync = false $margin/vbox/grid1/lbl_freq.text = '<нет данных>' - $margin/vbox/grid1/lbl_freq.self_modulate = Color.CADET_BLUE + $margin/vbox/grid1/lbl_freq.self_modulate = Color(settings.C_BLUE) $margin/vbox/grid1/state_freq.texture = textures[STATE_VAL.NONE] $margin/vbox/grid/state.texture = textures[STATE_VAL.NONE] diff --git a/scenes/tabs-switch/tab-switch.tscn b/scenes/tabs-switch/tab-switch.tscn index b534326..44dafe7 100644 --- a/scenes/tabs-switch/tab-switch.tscn +++ b/scenes/tabs-switch/tab-switch.tscn @@ -28,22 +28,23 @@ theme_override_styles/panel = SubResource("StyleBoxEmpty_tidwt") [node name="tab_switch" type="TabContainer" parent="."] layout_mode = 0 +offset_top = 23.0 offset_right = 1600.0 -offset_bottom = 1200.0 +offset_bottom = 1223.0 tooltip_text = "Переключает режимы работы программы" theme_override_styles/tab_focus = SubResource("StyleBoxEmpty_41d34") theme_override_styles/tab_disabled = SubResource("StyleBoxEmpty_cw2ss") theme_override_styles/tabbar_background = SubResource("StyleBoxEmpty_nmdfd") theme_override_styles/panel = SubResource("StyleBoxEmpty_vap7n") -current_tab = 0 +current_tab = 1 script = ExtResource("1_fg0vd") [node name="Работа" parent="tab_switch" instance=ExtResource("2_u7p16")] +visible = false layout_mode = 2 metadata/_tab_index = 0 [node name="Контроль" parent="tab_switch" instance=ExtResource("3_txp0s")] -visible = false layout_mode = 2 metadata/_tab_index = 1 diff --git a/scenes/tilemap/ship.png b/scenes/tilemap/ship.png new file mode 100644 index 0000000000000000000000000000000000000000..25e3830d8b52494cc7ce6ab0488e478a58ad6b4f GIT binary patch literal 7976 zcmaJ_^;6Yf6aJ81x*LRh>24H|?(UXG>28p2knZkoq~QVr(v5`o64KHj0#fqw{RiG3 z_Uz8tnVn~L_w1f|V$@aTu+YiT0RX^KkeAkc(L*mH3qpN4T@h)%z9?jC2^9$dXimg< zG)DmdbOl=}DRp;EIY}A?87Tp7K>-1F9u95*kdMjN^43qiB^KSh{eYt@xq8u@=@0@y zXzM^@xCSM-DS&x6F24A;h-h?OLL$68d7a_VC3N}x=ev*U$HCVvO9|chqV6{4RjRaUNp{xc0@d!XRlN=qQcn@Hv6Qaq6I4}ql z)rmtmkOvwNf(_bv~kUnv*c&eni`a76VC> znBW9t5{^6Q5So-Er?0FpRYiY7+lt=}(nAXi=N@E)q*kf5();1x4f|LKH7DuI)-jxc zUxN$iO&GBWOjG6Qu*Xw&RnfupNjwS|3ik4FdG<1`GSLNG+dO54<0QxNja^Vna2-u% zaz_$Ql3L2c_|R?#q0qPJZDq6)I?b{)d`12bVtdHtg*=kkMKv1J)dk-{HPJ$ah6;{F zUh14$QPl)|o;mc>xx`YFW$dL(b2+xwwzoE%haTN%>tU~DGUqZE?0>yFJU9&dj&Ly>Krg_Gs1qt9}~@`)&U0zX|ST{k^2 z{h&r$$6ZHk$+reWyH*FM)fOa^;r$m(mvCt z(0fa)mdFU%qDc8tZOe`kvUo7@2+xO0eaU4vU8G|+`z#d;qn5i9WiONm3NKE7Wi2W9 znvZoKlRxI~yG|ouk2L?h5d4v+I0K%+n(=2xVi#j?Ubd_MSRYvb2IdFrgIS!qof4lO z!_GZj^2PJn@~?#)g>F63x&^v5x+A*bp0h`yia^K#dYe@d@Oj?S0Q z=c(Ut@qq-A$Q-!eT3$>gS^l!mvhAF|2;Zv0o3!ap9=0i+S14udWH^hm-r@Hl5&c-_ zOleWaxA9@k{++pnEf2hGxa`|*AMr9Arr^S&Rw z@W=Rwa+$nuig5yQqZzP_Pm?GaDjBzRS-PUSzPi`CD|HIX?~mDz9hdbS)G73GF>{4- zC)=y)bL)q_ave7bw+R!O7nrZLoM7B1k0Sm8 zJUpko99(*j%eMH2s)wtG4)v@ltc%_AulPwSl#(X#GrclNv>YpAE1e4cCe!!G&$<`d z7OzWldve$6e>i?$pAz{NQ2U_5kxMadJS1{1@#o@Jf7^9xC%-bca_}nYfYZdw#K7bM z`daNv9z(%0m*W_G*yty8(%(!-ROG|`%psEKh$v#AUtv^VMIU5Sq>namIWRl$)nmbf z@crad;@|!)-`~WSswid%UlH~YpdsWTUy$sPsFAag%U|)M#G~|}a$<@SNn)a58Bn{W zIuDTirns}@U9)D(nJ1b6{dfc)t*X>M;5EKhPfgF9>tid7I?oi;5SJ6 z^fn?3KeI(_FN{V~os(2;uhL0{ir{y6ZiJdlUrBt4Msr7};=7dneBJb$x9h?IQuj8I zYOT>{C9LmixEov z37XWT-r4kJwbRGo@+YKUriYj|PK(5wgWFiM+seoGVj*DCX0j#YNqt*iQ|Gsx@7nJK z&9H^?aw*nOJ-+nnwDC!&hChZ~mPF?1RyyZ)nM+2xK`bQcrgbiLRSkceWIOk_^;Aul zK3)4d!eASU9TTU=^2cSzPIb2i{f&xHJBg*a$P27`ip%&t3R6eL4Ub|!yX%DM*6E39 zBz|-LQ=_T&I{5Emfzlhl{2=2=-KYB6j=moZu;u=BZ~rUoFe)P9jq|jV-ZoYrJ$tB3 zz_ruDS?GEqxdlac|9;?lr<}Liw}M3fa{pI1GUvy39?lMHjs5*CXpWi!@vr5DT=sH< zong7BIo@q9hAh~F5_?}6H!D8*@2LMOo*7yjn%>L~>bM3S%lon}2=#l`v6ng)i4;T6 ze|;{^r!t|E>+5(9Jm=oA^c>|+)GH{;XA-%*+YL?KskEvr$X68;`JTPzd#n7IZEvh$ z47HY;Ef6E|I8*L0y&b>WI7l?U=ymx6xwU}PcPQ11G>FIrx;$;kHySw~f4H4I)qB_A z@kixYc>a7b=-zH%$$jPT3Wsr_FZ6umgrdWVVV$y*zWe&G*Uc%3H~N|Knz3J^Pvc`B z?CI#$J%Zm?1CBrcnhluE4jJH_W1~eC{7ZXYjM`d|o040im8FeO%%`TNz#@nK zwwg)Zs%)twn4JjJefB+euRYj&+I~=))qh;Qz_^Q>?Qig{zH&RSt!@+=r5&a2o$(d9 ztaz-Sfd`y-o_BAKLaDQv9>xEuU(MfJj#kd8-HIN3`uE6r8-De`F86l!<&#NcDX*yl z0DcSr5F8Ew_b*q$zW~6K3jmJH06-`U07zW&x;5UtIM7_=4cq|$gWx|w0CMt30f10J zL0UrFC+{>rz=d)zU{q{&Vg%+6mA@Vfm0g>T;a20G7v2?Z)Kg_p0jJxw-8{?QLCoNq4N@f+W) z-XvQK+$Q#8pR6@EFzU@dJqX;axc?wSV5Z+!7Lx|l=z@3C<8lLQY3L(ydw&!L`nx~- zkb;mrlfmM?q`Xf6!o*Mt?-Q~$HX;u)$c&aoDi{#>zvj@190I5Ws}hhv_KTeFXcj{s z4p2+7N|vUg*LcV=On#-wYy6rN`34VnkN|<~ zBPf94p(o^9$0wG{Ts=0s--IqoDF|*EY1y@YISu;Dcnutjvq)h(5d=6;&+X9xQkTvR zKUM4K?7(1NQl*ge#;2_kIasb_K2y&?%L;xI8?%;X3Q8F`8UyUHv-in)u-W7*x#h3_NC-FPJ5MRTD8UGp=97s+VMtMxH8H&E;pDBp`vFLLgs_ zWy}63$rQ4pG-fgt)20rOiJm9Mh+Fkhl|4B|DqV{h$mQde2QDdQ;~HD&h}(Z^DTep5 z;nT^v_E?!_6db(Q4oG=th8E&#;H||t@ef2UfrD(7MK&BV9E*}nq^bCZj1P|?-ItAE z@57AVwUYh@-kEGN*sUh;*L%r1No`ror4&6@@jdb^!imyUU>oYV?`A-#uY#^be9Jh& z1j8pcT*_AW{evx&D?#uz39+kl>7*q{E(=J-O)7q8!6fxY;o1t6E+_zMMYzNerd=P` zw~=U|(IP}K)l>`(J|I=0J72l_^$3On&-0)L9vpfmV;d9F+ay?f*17i>u?(H50)S}Sx7KuIajcgB2>;&$0WCP zB^FaN6c?{Zy~*l^v1in)IDFy#JedJAa|}ZdiQ}VR`j&gXMun&`M<)Fc2GR={8Y$-P zka7{n{jSXXrB)`oiEaf(iK_2WY%;=w_-2$WZ6p>-u))dlJexx$VuVN!(xHT-^?(>X z?3Ci;fiN0PNT`087$OhhJi150x?RD;Uq_7o6-s{CWL_=w4S_3AjDL&`kMT4=c@GAI zgij-MFiPY0zkQy`qi-9qFJ6lCs9U$X&@BDTqjcFRE>9;>_mx@;EJZOPKUD;&bq|;r zqDxw9YTrrNubMY8XAq9LpSB!e(yUN_mU<2UD;v!;hn$7&FR^+jZ-&9-mI5dtfJaaB z1;T`9f{$TI>IH21tp^RcG|N8|{l@38T1yQVxzo(b)bD?jiVjzKZ5xXz?+kZom~F%> z?bLFfCN$tNRl5zQ5V~bd$x4+dgo5d(+pQGCxq`Vgi2-vsI$BY=*?68KClIbXl~|V~ zlZ{<0k3UF%f~}Xx>w{V@G8~?>3z0Z%SGP*S|1U8|U@1zQyVRxnl}#^+E8~~8bqsVE z9oOr?wnAk}vA~r1?5Z7yHn;II{A8Q`8lIn>y{u$n9wH9w$pSZ>WvM! zQ~O(-3O61xt`usdI+RQG?RKJRlFe4OKzC>Vzgih|q4!XOaCNIDOH9P=C{^N{w>uaj zr~5o|z^piK%X5qZYFquoaaF5c-q-xWQ@SvJJm9}nUnhZ4>6STSOgGmZ8jhT}_3A|! zy=ECpBmRThcR4(hywd)sQmibE)VGMhCM4#vH^cfgl^b39Uf>4jyGuNQBNL(?Z;~ya zwSxV**;&>oHwF`>3X!Ov&+$b_R0p>6eN-;-+LwwqH-bv>8Z#PGuh5YsL91eE@GwYg zr zUyP$W)=I{~!Ov4H#MfNnJ(T z-(OosiDlkqaEw9`&OSxOa6!R5N0{Vs0!>)I+&Cx0R-5r}xNael@!$Kem+PHtwdvni z7oQ%m+fpQekMGz@#Kh79Exv`0En(zNi-Nh535Id0n&<8c&(QLNbkr8}O{qI>`n})v z(BtDL-(Ak(EAe1jVS;0k)MNdcVt9lI5Dk$@^=^mzK=14`S3;eBo^aOL^zCQt#mth* zN{u*;JxO&v;W)ka6G+XBLU3Jq{`C8l^SaH!V9jFYwtJwRL=_l;NAaGQyA1`wgAcOs zMc*b`8lv0@*m;fhSN z)s8DeD>mBTnhVFB7S9bX!@aPcrG`E&A?+B2;8b&{e@A5#=~+7Qf5gC`wo8ciO|YaN zVrfoY&052^hZ?Jw_+z*~jApZYKkn{e-FzWbuPGE}s&K`ZK_$qNd+PS1ePvOu0X-2% zI`)7>+$SDjmZf>Bfy_#J=~ZroQ0ZorB1zUfZI5%}gi2S~?6^6(F(FLH&V=-YFsws{ zu$!)^5K>7x^%|8ZaJ1tg_48M~0>S%4aWTcFiLc`E62G42&pqn>-ZX%wy<|UZgA`rI7iHW?R+oSf{hyMUN@$1pPMZ<(!&6zM* z&(bj6VCG;dAjItKM69noA8!eVgbm0M62fgHc&Ws{5)?EE-=h;%#0sjN@dR@Kez*5EZPmHkrH$SAhw zV|V*&85-7Q3ixNyGE>Jx!U$9?hEL0V7pd9&T4`Sk>D4S-U^2%I>Jy5xduW75ms*f2 zAmD+MOnvuLH`f;m|IzR1lzW*Srrcb7dk!>Ok!o(Taqr~*!o)*3&cs+?9*W!Yy%I-; zy3dvqFPBiGXdJhdESe#enfFtL$pYo_S zw{Mz|2R=O|^kqk9cnwP(X#MdV#g(jOHk6s4+W}hf>aXoD{Yl#2ca)1gaVUbIV>H2c z;=kc5o@-P%6pp%w(UkT3S(<2`8#kB7s{l5F^eh|{8@U;VNwT7+jwD5zGSv=_wcf;+> za{XabA68Re=Y<|PkXC5DA{v0C750}8b}i9_K}LZI@vH7l&DdrXMg~;4H-lt-kcYyt z&Kpj(wPk$n5)|gdQY<^cEvf}hqZK3aRs2+jW48+Nw4{+J%%y+lyd~rcdX3`Apz_7< zRjAcjLC+FHLtewmw+)HTi3UN=h&U)GA4bP3{jC_0% zWc`d-q2mwnkxXQUcX+0lpZ$tyhqUw;da~rBh%S-$XM||pu%TgCy1?lNUcT$beQ|Q*3&v^;)V!a_h zW_4aV)$F)IBa8OnqjXh$BX9S1i_E;ea#$X{poHxJA9{Fs_=cd(o2=~KPv;D z{Nw%v=B2(B)HdC&CM^LUszl`1J?Ko=zYZy8 z;`<+eUQ^DM|J zlDK$?QXun#CXlAD?`}NK$fiWK0s(JGT~BX)cjl6r!5#2}Acm1+YjqF{+b0r_1XXL$DS#P`zZ7JJ_dtGs?E`;*FI`xH^Mk3Jo_ z#=Hwm=yGl2d%G#6>N&!1F_`FY*vs~yehf67^t5ivvL-5H+hs?u&f_OWi;;gzH^|7l z402}zt79mF-ctO6y4pU*lF^0l8Pb)TP>D%)V!;&a--B>ckeL#D>AwU$_YVc#a`p?| zp|ix|DDv~T`V=zV$TDj;{=7Y8t2}V5NQxLgBz2N}`~Y#_gNUkQ<@E(r8ZFu%$y_jo zZQLA#*I2@M1%OlqqJanxlZ2<~jN`WCGMS0_?+|wM2a68M*SGxsUcfNg7>(5=GgdD zZP9%!=I9D>q%yr4lJZ6nE>H7^>KhCQ)R?YjN)94Xq+!k5NcsfWR#+7TTV8Y-?h^F5^rzPTRD3oI+1f+kQSw8t zn`gRFPY3jdBE;>M>GpHF-`wJB&NC%w2ralZuTOX2b#)n9^FP=wbUHZ_cktMf(xlLd z<@O1&N;%q%6E2cz%O38sIoie1Vcg(QQ|0lj_#Ef|+{!Q()9U%y@0IwEoODF>vCgVj znGxKJyyjdjr?UWW>piKik!{1ZsHu`}IfM+`N?>=yA}_^TXQ@hdZV~@cj5DPwGRb(I zx%0{Qti^ClJe!BbA(Pb}*$y0Pq6d#F@EZ2<4LY*!9GTKSUSJFzA!jw6q1T({XveubEol2+am4${57};+M3ArJ1YI9H9_@o0d|R7yeQ(^r|>q0!!=c zwe3R>v&OVD#Y@z9Ka+0LY(0^ejt}T>ku5fayzQWnKyTdnLQG3$|7%oO&bze5mXV%B zRnW3YBAiQI3h7E&*Li2d05{b=qgRtRuh6q50`u%z8;y%%Ono}w_>g%&ZyU|nVPhR@=3qv2ye%rbsJyWq6-+e=+9ha2U*N>C|$6Z&m_4WPdPmst%V zthT)RWXxOOxD|SRuGuvrUt-%rYaapS6xv&;X->x_0VwbhAKPaw;2y)t-FAjgd zs1h{FRp$*FrF@uiJLoHD)Cs!OR3ks}I`r$3M4Hm*bu)Ya3ie5Ek3SESD;w8z)1x;z zyb77qS?+~dq9r>X-Z}r=8>X53X|IXFyxP-npfCOj{C!j^<9!oN%j0A%+(~r=Yu33C zjjN<0ddVYqO literal 0 HcmV?d00001 diff --git a/scenes/tilemap/ship.png.import b/scenes/tilemap/ship.png.import new file mode 100644 index 0000000..e7819c4 --- /dev/null +++ b/scenes/tilemap/ship.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bry3qqgbuvpdt" +path="res://.godot/imported/ship.png-1e5b46229cc4c1adf618fcb5da01fb4c.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/tilemap/ship.png" +dest_files=["res://.godot/imported/ship.png-1e5b46229cc4c1adf618fcb5da01fb4c.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/tilemap/ship1.png b/scenes/tilemap/ship1.png new file mode 100644 index 0000000000000000000000000000000000000000..e2057b1dc0356ce8e85bda4e2de98e21a3827d5b GIT binary patch literal 7117 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 literal 0 HcmV?d00001 diff --git a/scenes/tilemap/ship1.png.import b/scenes/tilemap/ship1.png.import new file mode 100644 index 0000000..850c04e --- /dev/null +++ b/scenes/tilemap/ship1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dct2op842kyxo" +path="res://.godot/imported/ship1.png-fb0d0fe319583fdccb34710f90651bfb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/tilemap/ship1.png" +dest_files=["res://.godot/imported/ship1.png-fb0d0fe319583fdccb34710f90651bfb.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/tilemap/ship2.png b/scenes/tilemap/ship2.png new file mode 100644 index 0000000000000000000000000000000000000000..74acd04fa13f8145178b5083fa9af6edb9c27558 GIT binary patch literal 7019 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 JPDHLkV1f>ba-aYJ literal 0 HcmV?d00001 diff --git a/scenes/tilemap/ship2.png.import b/scenes/tilemap/ship2.png.import new file mode 100644 index 0000000..cb7b68f --- /dev/null +++ b/scenes/tilemap/ship2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b3i0dm4vk3fvu" +path="res://.godot/imported/ship2.png-dfba13504c314fdc4446dacd0ce91bc5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/tilemap/ship2.png" +dest_files=["res://.godot/imported/ship2.png-dfba13504c314fdc4446dacd0ce91bc5.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/tilemap/ship_mark.tscn b/scenes/tilemap/ship_mark.tscn new file mode 100644 index 0000000..580f3a0 --- /dev/null +++ b/scenes/tilemap/ship_mark.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://c2523fcn14gn4"] + +[ext_resource type="Texture2D" uid="uid://b3i0dm4vk3fvu" path="res://scenes/tilemap/ship2.png" id="1_o15fj"] + +[node name="Ship_mark" type="Sprite2D"] +position = Vector2(2.38419e-07, -1.19209e-07) +scale = Vector2(0.496428, 0.496429) +texture = ExtResource("1_o15fj") diff --git a/scenes/tilemap/threat.png b/scenes/tilemap/threat.png new file mode 100644 index 0000000000000000000000000000000000000000..bfa952e0a52a529afb30905694d7697e8277e8cf GIT binary patch literal 24318 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 void: var unit_nav = network.units[key] unit_nav.connect('data_received', on_data_received) ProjectSettings.connect('settings_changed', _settings_changed) + threats.connect('threat_new', Callable(self, '_on_threat_new')) + threats.connect('threat_lost', Callable(self, '_on_threat_lost')) + threats.connect('threat_update', Callable(self, '_on_threat_update')) func _settings_changed(): @@ -150,7 +161,7 @@ func _on_resize() -> void: $canvas/spr_mask.scale = $canvas.size / default_size -## Создаёт новую отметку из координат экрана +## Создаёт новую отметку из координат экранаa func add_mark_from_screen_pos(id: int, scr_xy: Vector2, mark: Node) -> bool: if _marks.has(id): return false @@ -238,6 +249,7 @@ func _input(e) -> void: func multiply_zoom(multiplier: float, pivot: Vector2) -> void: var p1: = screen_to_world(_xyz, pivot) _xyz.z = clampf(_xyz.z * multiplier, min_zoom_level, max_zoom_level) + update_scale_label() var p2: = screen_to_world(_xyz, pivot) _xyz.x -= p2.x - p1.x _xyz.y -= p2.y - p1.y @@ -279,6 +291,7 @@ func _draw() -> void: var scr_pos = world_to_screen(dot.position) scr_pos.x = posmod(scr_pos.x, dx) dot.mark.position = scr_pos + dot.mark.visible = is_mark_visible(dot) dot.mark.visible = c.distance_to(scr_pos) < (r - dot.gap_size) visible_marks_count += int(dot.mark.visible) # Рисование границ @@ -349,6 +362,8 @@ func _process(delta) -> void: push_error('запрос \"%s\" не отправлен' % tile.url) if _queue.is_empty(): emit_signal('load_completed') + + update_scale_label() func _response(result, code, _headers: Array, body: PackedByteArray, req, tile: Tile) -> void: @@ -552,8 +567,9 @@ func get_tile(x: int, y: int, z: int) -> Tile: var req = get_node_or_null(NodePath(str(idx))) if req: tile = req.get_meta('tile') - tile.t = now - return tile + if tile != null: + tile.t = now + return tile tile = _cache.get(idx) if tile: @@ -670,8 +686,49 @@ func set_coordinates(lon: float, lat: float) -> void: anim.track_insert_key(0, animation_time, new_pos.x) anim.track_insert_key(1, animation_time, new_pos.y) $player.play('goto') + update_coordinates_label(lon, lat) + if not _marks.has(ship_id): + ship_instance = ship_mark.instantiate() + add_mark_from_lon_lat(ship_id, lon, lat, ship_instance, 0.0) + else: + _marks[ship_id].position = lonlat_to_world(lon, lat) func blend_mask(val: bool) -> void: $canvas/spr_mask.visible = val queue_redraw() + + +func update_coordinates_label(lon: float, lat: float) -> void: + coordinates_label = "Координаты:\nNS:%f\nEW: %f" % [lat, lon] + signaller.emit_signal('update_coordinates_map', coordinates_label) + + +func update_scale_label() -> void: + scale_label = "Масштаб: " + str(round(_xyz.z)) + signaller.emit_signal('update_scale_map', scale_label) + + +func _on_threat_new(th) -> void: + var bip_instance = threat_mark.instantiate() + if bip_instance: + bip_instance.name = str(th.id) + bip_instance.position = lonlat_to_world(th.lon, th.lat) + add_mark_from_lon_lat(th.id, th.lon, th.lat, bip_instance, 32) + + +func _on_threat_update(th) -> void: + var target = get_parent().get_node(str(th.id)) + if not target: + return + var new_position = lonlat_to_world(th.lon, th.lat) + if _marks.has(th.id): + _marks[th.id].position = new_position + if new_position != target.position: + target.position = new_position + + +func _on_threat_lost(th) -> void: + var target = get_parent().get_node(str(th.id)) + if target: + target.queue_free() diff --git a/scenes/tilemap/tilemap.tscn b/scenes/tilemap/tilemap.tscn index 40e8eb5..aee2951 100644 --- a/scenes/tilemap/tilemap.tscn +++ b/scenes/tilemap/tilemap.tscn @@ -28,8 +28,6 @@ size = Vector2(400, 400) [node name="tilemap" type="CanvasGroup" groups=["gui_items"]] script = ExtResource("1_l64tp") -border_scene = "uid://bumg0moa26skt" -zoom_step = 0.1 [node name="canvas" type="TextureRect" parent="." groups=["gui_items"]] clip_contents = true diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index 6f262cd..4e07d7e 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -165,11 +165,12 @@ func setting_tab(): var tootip_text = tbl_row[3] name_to_line_index[param_name] = i $scroll_set/table.add_row([node_label, node_value]) - var label_instance = $scroll_set/table.get_node2(0, i) + var label_instance = $scroll_set/table.get_node2(0, i) label_instance.text = param_name label_instance.tooltip_text = tootip_text $scroll_set/table.set_node_editable(0, i, false) var node_values = $scroll_set/table.get_node2(1, i).get_children() + var edit_node = $scroll_set/table.get_node2(1, i) if node_values.size(): var child = node_values[0] if child is CheckButton: @@ -181,15 +182,15 @@ func setting_tab(): var val = settings_data[param_name] if typeof(val) == TYPE_STRING: $scroll_set/table.get_node2(1, i).text = settings_data[param_name] - + if edit_node: + if edit_node is LineEdit: + $scroll_set/table.set_node_control(1, i, true) $scroll_set/table.set_node_editable(1, COMMIT, false) $scroll_set/table.set_columns_min_size([600, 950]) $scroll_set/table.set_columns_alignments(ALIGNMENT) $scroll_set/table.connect('row_pressed', Callable(self, 'on_row_pressed')) - var commit_instance = $scroll_set/table.get_node2(1, COMMIT) commit_instance.text = '%s' % commit.VCS_HEAD - for i in SETTING_TABLE.size(): var param_name = SETTING_TABLE[i][0] if not settings.UnitProfiles.has(param_name): diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index 1d07491..a6f78ac 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -31,6 +31,7 @@ var strob_dir_begin: float ## Направление антенны var strob_width_begin: float ## Ширина строба по углу в момент начала перетаскивания. var view_mode: MapViewMode ## Режим отображения карты + signal drag_begin ## Вызывается в момент начала перетаскивания. signal drag_continue ## Вызывается во время продолжения перетаскивания. signal drag_end ## Вызывается в момент завершения перетаскивания. @@ -140,6 +141,8 @@ func _ready(): signaller.connect('interfer_prinuditelno', Callable(self, 'on_chk_interfer_prinuditelno')) signaller.connect('fs_update_state', Callable(self, 'on_fs_update_state')) signaller.connect('map_user_panning', Callable(self, 'on_user_panning')) + signaller.connect('update_coordinates_map', Callable(self, 'on_update_coordinates_label')) + signaller.connect('update_scale_map', Callable(self, 'on_update_scale_label')) on_btn_center_toggled(true) on_btn_activate_toggled(false) @@ -509,4 +512,12 @@ func on_btn_center_toggled(toggled_on: bool) -> void: func on_btn_activate_toggled(toggled_on: bool) -> void: - $btn_activate.tooltip_text = 'Включает падавление (%s)' % ('включено' if toggled_on else 'отключено') + $btn_activate.tooltip_text = 'Включает подавление (%s)' % ('включено' if toggled_on else 'отключено') + + +func on_update_coordinates_label(coordinates_label) -> void: + $coordinates_map.text = str(coordinates_label) + + +func on_update_scale_label(scale_label) -> void: + $scale_map.text = str(scale_label) diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 1b179b1..4bb6358 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -284,6 +284,22 @@ button_pressed = true texture_normal = ExtResource("12_5ffal") texture_pressed = ExtResource("13_ggrwd") +[node name="coordinates_map" type="Label" parent="."] +layout_mode = 0 +offset_left = 1000.0 +offset_top = 128.0 +offset_right = 1112.0 +offset_bottom = 147.0 +text = "Координаты:" + +[node name="scale_map" type="Label" parent="."] +layout_mode = 0 +offset_left = 1000.0 +offset_top = 192.0 +offset_right = 1110.0 +offset_bottom = 213.0 +text = "Масштаб:" + [connection signal="drag_begin" from="." to="." method="_on_drag_begin"] [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] diff --git a/scripts/signaller.gd b/scripts/signaller.gd index b3a6597..d6c9b97 100644 --- a/scripts/signaller.gd +++ b/scripts/signaller.gd @@ -179,3 +179,13 @@ signal ems2_hide_pressed(state) ## Вызывается при нажатии на кнопку экранной клавиатуры ## [param state] - состояние скрытия кнопки ЭМС2 signal emit_changed(state) + + +## Вызывается при изменении детализации карты.[br] +## [param new_scale] - обновленное значение масштаба ([b]true[/b] +signal update_scale_map(new_scale) + + +## Вызывается при изменении текущих координат.[br] +## [param new_coordinates] - обновленное значение координат ([b]true[/b] +signal update_coordinates_map(new_coordinates) diff --git a/table/table.gd b/table/table.gd index d096da1..4d6e220 100644 --- a/table/table.gd +++ b/table/table.gd @@ -599,6 +599,17 @@ func set_node_frame(i_col: int, i_row: int, node_name: String, val: int) -> void func set_node_editable(i_col: int, i_row: int, val: bool) -> void: var key: = get_node_key(NODE_KEY_FORMAT, i_col, i_row) nodes[key].editable = val + + +## Устанавливает контекстное меню для ячейки таблицы. Ячейка должна иметь свойство [param context_menu].[br] +## [param i_col] - Индекс колонки.[br] +## [param i_row] - Индекс ряда.[br] +## [param val] - Включить или отключить контекстное меню. +func set_node_control(i_col: int, i_row: int, val: bool) -> void: + var key: = get_node_key(NODE_KEY_FORMAT, i_col, i_row) + nodes[key].shortcut_keys_enabled = val + nodes[key].selecting_enabled = val + nodes[key].deselect_on_focus_loss_enabled = val ## Разрешает редактирование ряда. Ячейки ряда должны иметь свойство [param editable].[br]