diff --git a/Assets/Racing_Game/Scence/Main/Main.unity b/Assets/Racing_Game/Scence/Main/Main.unity index e54c6882..6516a362 100644 Binary files a/Assets/Racing_Game/Scence/Main/Main.unity and b/Assets/Racing_Game/Scence/Main/Main.unity differ diff --git a/Assets/Racing_Game/UI/MainUI/Scripts/SelectCarPlayerScript.cs b/Assets/Racing_Game/UI/MainUI/Scripts/SelectCarPlayerScript.cs index c693c636..5d3c2c67 100644 --- a/Assets/Racing_Game/UI/MainUI/Scripts/SelectCarPlayerScript.cs +++ b/Assets/Racing_Game/UI/MainUI/Scripts/SelectCarPlayerScript.cs @@ -32,7 +32,7 @@ public class SelectCarPlayerScript : MonoBehaviour _IndexCar = (_IndexCar == _Cars.Count) ? 0 : _IndexCar; _Cars[_IndexCar].SetActive(true); StaticDataMap.CarPlayers[_IndexPlayer] = _Cars[_IndexCar].name; - Debug.Log($"{StaticDataMap.CarPlayers[_IndexPlayer]}"); + //Debug.Log($"{StaticDataMap.CarPlayers[_IndexPlayer]}"); } public void SelectPrevious() @@ -42,6 +42,6 @@ public class SelectCarPlayerScript : MonoBehaviour _IndexCar = (_IndexCar == -1) ? _Cars.Count - 1 : _IndexCar; _Cars[_IndexCar].SetActive(true); StaticDataMap.CarPlayers[_IndexPlayer] = _Cars[_IndexCar].name; - Debug.Log($"{StaticDataMap.CarPlayers[_IndexPlayer]}"); + //Debug.Log($"{StaticDataMap.CarPlayers[_IndexPlayer]}"); } } diff --git a/Assets/Racing_Game/UI/MainUI/Scripts/StartInfoSelectedScript.cs b/Assets/Racing_Game/UI/MainUI/Scripts/StartInfoSelectedScript.cs index f969fbb6..ad14e77b 100644 --- a/Assets/Racing_Game/UI/MainUI/Scripts/StartInfoSelectedScript.cs +++ b/Assets/Racing_Game/UI/MainUI/Scripts/StartInfoSelectedScript.cs @@ -18,10 +18,10 @@ public class StartInfoSelectedScript : MonoBehaviour private void Awake() { StaticDataMap.SelectedMap ??= _MapImages[0].name; - StaticDataMap.Time = "День"; - StaticDataMap.NumPlayer = 1; - StaticDataMap.CarPlayers[0] = _CarsFirstPlayer[0].name; - StaticDataMap.CarPlayers[1] = _CarsSecondPlayer[0].name; + StaticDataMap.Time ??= "День"; + StaticDataMap.NumPlayer ??= 1; + StaticDataMap.CarPlayers[0] ??= _CarsFirstPlayer[0].name; + StaticDataMap.CarPlayers[1] ??= _CarsSecondPlayer[0].name; } private void OnEnable() diff --git a/Assets/TestScript.cs b/Assets/TestScript.cs new file mode 100644 index 00000000..a0681688 --- /dev/null +++ b/Assets/TestScript.cs @@ -0,0 +1,30 @@ +using UnityEngine; + +public class TestScript : MonoBehaviour +{ + void Awake() + { + if (StaticDataMap.SelectedMap == null) + { + Debug.Log("карта не указана"); + } + if (StaticDataMap.Time == null) + { + Debug.Log("Время не указано"); + } + if (StaticDataMap.NumPlayer == null) + { + Debug.Log("Игроки не указаны"); + StaticDataMap.NumPlayer = 123; + Debug.Log(StaticDataMap.NumPlayer); + } + if (StaticDataMap.CarPlayers[0] == null) + { + Debug.Log("Первый игрок не указан"); + } + if (StaticDataMap.CarPlayers[1] == null) + { + Debug.Log("Второй игрок не указан"); + } + } +} diff --git a/Assets/TestScript.cs.meta b/Assets/TestScript.cs.meta new file mode 100644 index 00000000..52a17866 --- /dev/null +++ b/Assets/TestScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bf9493dadb5d98f40900562c9fc29991 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: