From 9405cb73288c924fda4388a9879a88d95f6e95db Mon Sep 17 00:00:00 2001 From: kittyegg Date: Fri, 29 May 2026 01:07:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3,=20=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=20=D1=81=20=D1=82=D1=83?= =?UTF-8?q?=D1=80=D0=B5=D0=BB=D1=8F=D0=BC=D0=B8=20=D0=BF=D0=BE=D1=8F=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=BB=D0=B0=D1=81=D1=8C=20=D1=80=D0=B0=D0=BD=D1=8C?= =?UTF-8?q?=D1=88=D0=B5=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Island.unity | 6 +++++- Assets/Scripts/UI/TurretsShopViewer.cs | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Assets/Scenes/Island.unity b/Assets/Scenes/Island.unity index 96954d2..f84bd51 100644 --- a/Assets/Scenes/Island.unity +++ b/Assets/Scenes/Island.unity @@ -4942,6 +4942,7 @@ MonoBehaviour: _sandPathBuildService: {fileID: 305503} _spawnDeathControl: {fileID: 694046010} _tower: {fileID: 1739395621} + _blockDetector: {fileID: 709556715} --- !u!1 &645921916 GameObject: m_ObjectHideFlags: 0 @@ -13694,6 +13695,10 @@ MonoBehaviour: _shop: {fileID: 1311268619} _wallet: {fileID: 1030979928} _buttonPrefab: {fileID: 3635012363401127766, guid: f87d5d34136775b41907fc1187ef4bc2, type: 3} + _ignoreBlocks: + - {fileID: 1987853413} + - {fileID: 1569763699} + - {fileID: 1331592355} --- !u!95 &1789632543 Animator: serializedVersion: 7 @@ -14015,7 +14020,6 @@ MonoBehaviour: _levels: - {fileID: 11400000, guid: db2c2aace91545d4d9deea106eef0f8b, type: 2} - {fileID: 11400000, guid: 16db44f3b18ae8344877ec2245286b7d, type: 2} - _pathBuildService: {fileID: 305503} _onStateChanged: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scripts/UI/TurretsShopViewer.cs b/Assets/Scripts/UI/TurretsShopViewer.cs index 16a3c31..15c7dae 100644 --- a/Assets/Scripts/UI/TurretsShopViewer.cs +++ b/Assets/Scripts/UI/TurretsShopViewer.cs @@ -8,6 +8,7 @@ public class TurretsShopViewer : MonoBehaviour [SerializeField] private TurretsShop _shop; [SerializeField] private Wallet _wallet; [SerializeField] private Button _buttonPrefab; + [SerializeField] private List _ignoreBlocks; private Animator _animator; private bool _hidden = true; @@ -54,6 +55,13 @@ public class TurretsShopViewer : MonoBehaviour private void OnBlockSelected(BlockScript block) { + // Чтобы анимация не воспроизводилась когда не надо + if (_ignoreBlocks.Contains(block)) + { + _ignoreBlocks.Clear(); + return; + } + if (!_hidden) return;