From f1103fe5166f420af8fb367ae21ac5c2d132cc9f Mon Sep 17 00:00:00 2001
From: Maxim-Godovikov <unity-max@mail.ru>
Date: Sun, 17 Oct 2021 18:28:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D1=8B:=20?=
 =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=D0=B8=D1=81=D1=82=D0=B8=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=BE=D0=B2=20=D1=83=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B5=D1=80=D0=BE=D0=B9=20=D0=B8=20=D0=BC=D0=B8=D0=BA?=
 =?UTF-8?q?=D1=80=D0=BE=D1=84=D0=BE=D0=BD=D0=BE=D0=BC=20=D0=B8=D0=B3=D1=80?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/CameraSizeController.cs | 38 +++++++-------------------
 Assets/Scripts/PlayerFollower.cs       | 10 ++-----
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/Assets/Scripts/CameraSizeController.cs b/Assets/Scripts/CameraSizeController.cs
index 7c83b935..90ed864f 100644
--- a/Assets/Scripts/CameraSizeController.cs
+++ b/Assets/Scripts/CameraSizeController.cs
@@ -1,21 +1,17 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
 using Cinemachine;
-using System;
+using UnityEngine;
 
 public class CameraSizeController : MonoBehaviour
 {
-    public float maxSize = 7.5f, camExpandSmoothness = 0.01f;
-    public TileOwner trackingPlayer = TileOwner.Ariost;
+    [SerializeField] private float _maxSize = 7.5f;
+    [SerializeField] private float _camExpandSmoothness = 0.01f;
+    [SerializeField] private TileOwner _trackingPlayer = TileOwner.Ariost;
+    [SerializeField] private CinemachineVirtualCamera _cam;
 
     private float _startSize;
 
-    [SerializeField] private CinemachineVirtualCamera _cam;
-
     private void Awake()
     {
-        //TileManagment.OnAnyTileCaptured += UpdateCamSize;
         _startSize = _cam.m_Lens.OrthographicSize;
     }
 
@@ -24,29 +20,15 @@ public class CameraSizeController : MonoBehaviour
         UpdateCamSize();
     }
 
-    private void UpdateCamSize(PlayerState player)
-    {
-        if (player.ownerIndex != trackingPlayer)
-        {
-            return;
-        }
-        int maxTilesNumber = TileManagment.levelTiles.Count;
-        int playerTilesNumber = TileManagment.charTiles[(int)player.ownerIndex].Count;
-
-        float camSizeDelta = maxSize - _startSize;
-
-        _cam.m_Lens.OrthographicSize = _startSize + (float)playerTilesNumber / maxTilesNumber * camSizeDelta;
-    }
-
     private void UpdateCamSize()
     {
         int maxTilesNumber = TileManagment.levelTiles.Count;
-        int playerTilesNumber = TileManagment.charTiles[(int)trackingPlayer].Count;
+        int playerTilesNumber = TileManagment.charTiles[(int) _trackingPlayer].Count;
 
-        float camSizeDelta = maxSize - _startSize;
+        float camSizeDelta = _maxSize - _startSize;
 
-        float targetSize = _startSize + (float)playerTilesNumber / maxTilesNumber * camSizeDelta;
+        float targetSize = _startSize + (float) playerTilesNumber / maxTilesNumber * camSizeDelta;
 
-        _cam.m_Lens.OrthographicSize = Mathf.Lerp(_cam.m_Lens.OrthographicSize, targetSize, camExpandSmoothness);
+        _cam.m_Lens.OrthographicSize = Mathf.Lerp(_cam.m_Lens.OrthographicSize, targetSize, _camExpandSmoothness);
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/PlayerFollower.cs b/Assets/Scripts/PlayerFollower.cs
index 89edac58..c39d6600 100644
--- a/Assets/Scripts/PlayerFollower.cs
+++ b/Assets/Scripts/PlayerFollower.cs
@@ -1,17 +1,11 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
 public class PlayerFollower : MonoBehaviour
 {
-    [SerializeField] GameObject _player;
+    [SerializeField] private GameObject _player;
 
     private void LateUpdate()
     {
-        if (_player == null)
-        {
-            return;
-        }
         transform.position = _player.transform.position;
     }
-}
+}
\ No newline at end of file