From 73b9ad95e8f7a88cfde2fcb79b8723c51c3611b2 Mon Sep 17 00:00:00 2001 From: DyatelO Date: Wed, 19 Jan 2022 21:31:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=203=D0=94=20=D0=B7=D0=B2=D1=83=D0=BA=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D0=B5=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D0=BB=D0=B8.=20=D0=9E=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D1=86=D0=B5=D0=BB=20=D0=B2=D0=BE=20=D0=B2=D1=80=D0=B5?= =?UTF-8?q?=D0=BC=D1=8F=20=D0=BF=D1=80=D0=B5=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Controller/GameInit.cs | 2 +- Assets/Scripts/MusicController.cs | 2 ++ Assets/Scripts/Units/PlayerControl.cs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index ac2d5c1a..3ee4c992 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -57,7 +57,7 @@ namespace Controller player.onPlayerSpawned += cameraControl.InitCameraControl; units.Add(player); - player.OnDeath += uiController.AdsMob.ShowCanvas; + // player.OnDeath += uiController.AdsMob.ShowCanvas; player.OnDeath += paintedController.PaintOnDeath; } else diff --git a/Assets/Scripts/MusicController.cs b/Assets/Scripts/MusicController.cs index e8963ccd..5a6d396a 100644 --- a/Assets/Scripts/MusicController.cs +++ b/Assets/Scripts/MusicController.cs @@ -26,6 +26,7 @@ public class MusicController { _sources[source].clip = clip; _sources[source].volume = _data.Settings.sfxVolume; + _sources[source].spatialBlend = 1f; _sources[source].Play(); } @@ -35,6 +36,7 @@ public class MusicController value.clip = clips[Random.Range(0, clips.Count - 1)]; value.volume = _data.Settings.sfxVolume; + value.spatialBlend = 1f; value.Play(); } diff --git a/Assets/Scripts/Units/PlayerControl.cs b/Assets/Scripts/Units/PlayerControl.cs index 9dfdc8e9..90657fb1 100644 --- a/Assets/Scripts/Units/PlayerControl.cs +++ b/Assets/Scripts/Units/PlayerControl.cs @@ -83,7 +83,7 @@ namespace Chars private void AimCanvas(Vector2 attackDir) { - if (!_unit.IsBusy) + if (!_unit.IsBusy || _attackJoystick.enabled) { _unit.UnitView.AimCanvas.SetActive(true); _unit.Aim(attackDir);