squash commits

Assets/Scripts/Characters/CharacterDescriptor.cs

@@ -1,5 +1,8 @@
 using UnityEngine;
 using UnityEngine.AI;
+using UMA;
+using UMA.CharacterSystem;
+using System.Collections.Generic;
 
 public class CharacterDescriptor : MonoBehaviour
 {
@@ -7,8 +10,12 @@ public class CharacterDescriptor : MonoBehaviour
     public CharacterSex Sex;
     private NavMeshAgent _navMeshAgent;
 
+    private DynamicCharacterAvatar _avatar;
+    private Dictionary<string, DnaSetter> _dna;
+
     private void Start()
     {
+        _avatar = GetComponent<DynamicCharacterAvatar>();
         _navMeshAgent = GetComponentInParent<NavMeshAgent>();
     }
 
@@ -19,4 +26,12 @@ public class CharacterDescriptor : MonoBehaviour
             transform.parent.position = _navMeshAgent.nextPosition;
         }
     }
+
+    public void ChangeSex(bool isMale)
+    {
+        if (isMale)
+            _avatar.ChangeRace("HumanMale");
+        else
+            _avatar.ChangeRace("HumanFemale");
+    }
 }

Assets/Scripts/EditorInit.cs

@@ -7,9 +7,9 @@ public class EditorInit
 {
     static EditorInit()
     {
-        var pathOfFirstScene = EditorBuildSettings.scenes[0].path;
-        var sceneAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(pathOfFirstScene);
-        EditorSceneManager.playModeStartScene = sceneAsset;
-        Debug.Log(pathOfFirstScene + " was set as default play mode scene");
+        //var pathOfFirstScene = EditorBuildSettings.scenes[0].path;
+        //var sceneAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(pathOfFirstScene);
+        //EditorSceneManager.playModeStartScene = sceneAsset;
+        //Debug.Log(pathOfFirstScene + " was set as default play mode scene");
     }
 }

Assets/Scripts/Managers/CameraSystem.cs

@@ -9,7 +9,11 @@ public class CameraSystem : MonoBehaviour
     public Camera MainCamera => _mainCamera;
 
     [SerializeField]
-    private CinemachineCamera _camera;
+    private CinemachineCamera _gameCamera;
+    
+    [SerializeField]
+    private CinemachineCamera _characterCreatorCamera;
+
     [SerializeField]
     private float _fieldOfViewMax = 60f;
     [SerializeField]
@@ -46,7 +50,15 @@ public class CameraSystem : MonoBehaviour
 
     private void Awake()
     {
-        _cinemachineTransposer = _camera.GetCinemachineComponent(CinemachineCore.Stage.Body) as CinemachineFollow;
+        _cinemachineTransposer = _gameCamera.GetCinemachineComponent(CinemachineCore.Stage.Body) as CinemachineFollow;
+        _characterCreatorCamera.enabled = true;
+        _gameCamera.enabled = false;
+    }
+
+    public void StartGame()
+    {
+        _characterCreatorCamera.enabled = false;
+        _gameCamera.enabled = true;
     }
 
     private void Start()
@@ -140,8 +152,8 @@ public class CameraSystem : MonoBehaviour
             _targetFieldOfView += 5;
         _targetFieldOfView = Mathf.Clamp(_targetFieldOfView, _fieldOfViewMin, _fieldOfViewMax);
 
-        Mathf.Lerp(_camera.Lens.FieldOfView, _targetFieldOfView, Time.deltaTime * _zoomSpeed);
-        _camera.Lens.FieldOfView = _targetFieldOfView;
+        Mathf.Lerp(_gameCamera.Lens.FieldOfView, _targetFieldOfView, Time.deltaTime * _zoomSpeed);
+        _gameCamera.Lens.FieldOfView = _targetFieldOfView;
     }
 
     private void HandleCameraMovement(Vector2 inputDir)

Assets/Scripts/Managers/GameManager.cs

@@ -8,7 +8,7 @@ public class GameManager : MonoBehaviour
     private UISystem _uiSystem;
 
 
-    private bool _isPause;
+    private bool _isPause = true;
     private InputSystem _inputSystem;
     private SceneManager _sceneManager;
     private TimeSystem _timeSystem;
@@ -38,7 +38,22 @@ public class GameManager : MonoBehaviour
             _timeSystem = new TimeSystem();
             _gameMouseHandler = new InGameMouseHandler(_cameraSystem.MainCamera);
         }
+        CreateCharacter();
     }
+
+    public void CreateCharacter()
+    {
+        UI.enabled = false;
+    }
+
+    public void StartGame()
+    {
+        Resume();
+        UI.enabled = true;
+        _cameraSystem.StartGame();
+        Instance.Scene.Change("City");
+    }
+
     private void OnEnable()
     {
         Instance._inputSystem?.Enable();
@@ -59,6 +74,7 @@ public class GameManager : MonoBehaviour
         Instance._isPause = false;
     }
 
+
     private void Update()
     {
         if (!Instance._isPause)

Assets/Scripts/StartUp.cs

@@ -5,6 +5,6 @@ public class StartUp : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        GameManager.Instance.Scene.Change("City");
+       // GameManager.Instance.Scene.Change("City");
     }
 }