diff --git a/Assets/GadGame/Scenes/Scene 5.unity b/Assets/GadGame/Scenes/Scene 5.unity index 2196c7c..b3cc4e4 100644 --- a/Assets/GadGame/Scenes/Scene 5.unity +++ b/Assets/GadGame/Scenes/Scene 5.unity @@ -1246,6 +1246,7 @@ MonoBehaviour: GameTime: 60 _basket: {fileID: 1254852291} _lerp: 10 + _speed: 20 _spawnTime: 0.5 _bombChange: 0.2 _spawnArea: diff --git a/Assets/GadGame/Scripts/Manager/GameManager.cs b/Assets/GadGame/Scripts/Manager/GameManager.cs index 1a32d3c..015adee 100644 --- a/Assets/GadGame/Scripts/Manager/GameManager.cs +++ b/Assets/GadGame/Scripts/Manager/GameManager.cs @@ -18,6 +18,7 @@ namespace GadGame.Manager public void UpdateScore(int value) { _score += value; + if (_score <= 0) _score = 0; OnScoreUpdate?.Invoke(_score); } diff --git a/Assets/GadGame/Scripts/MiniGame/MiniGameController.cs b/Assets/GadGame/Scripts/MiniGame/MiniGameController.cs index bbee0f7..1ab49c6 100644 --- a/Assets/GadGame/Scripts/MiniGame/MiniGameController.cs +++ b/Assets/GadGame/Scripts/MiniGame/MiniGameController.cs @@ -15,6 +15,7 @@ namespace GadGame.MiniGame public int GameTime; [SerializeField] private Transform _basket; [SerializeField] private float _lerp; + [SerializeField] private float _speed; [SerializeField] private float _spawnTime; [SerializeField, Range(0,1)] private float _bombChange; [SerializeField] private Rect _spawnArea; @@ -30,16 +31,14 @@ namespace GadGame.MiniGame [SerializeField] private Pool[] _bombPools; private GameManager _gameManager; - private Camera _camera; private float _spawnTimer; - + private void Start() { _gameManager = GameManager.Instance; _gameManager.OnPause += Pause; _gameManager.OnResume += Resume; _gameManager.OnScoreUpdate += OnScoreUpdate; - _camera = Camera.main; SetState(); _time.text = GameTime.ToString(); } @@ -73,16 +72,13 @@ namespace GadGame.MiniGame { //640x480; var inputData = DataReceiver.Instance.DataReceived.PosPoint; - var inputNormalize = new Vector2(inputData.x / 640, inputData.y / 480); - var input = new Vector2(); - input.x = Mathf.Lerp(0, _canvas.pixelRect.width, inputNormalize.x); - input.y = -Mathf.Lerp(0, _canvas.pixelRect.height, inputNormalize.y); - if (input != Vector2.zero) + var inputNormalize = new Vector2(inputData.x / 640, -inputData.y / 480).normalized; + if (inputNormalize != Vector2.zero) { - var mousePos = input; - var pos = _camera.ScreenToWorldPoint(mousePos); + var dirMove = inputNormalize; var currentPosition = _basket.position; - pos.x *= -1; + var pos = currentPosition + (Vector3)dirMove * (_speed * Time.deltaTime); + pos.x = Mathf.Clamp(pos.x, -2.25f, 2.25f); pos.y = currentPosition.y; pos.z = 0; _basket.position = Vector3.Lerp(currentPosition, pos, _lerp * Time.deltaTime);