Enhance vehicle selection and targeting logic

Refactored InputController to support selecting vehicles and sending them to attack enemies. Improved vehicle selection highlighting and UI updates. Updated GroundVehicle and Vehicle classes to better handle movement, fuel, and attack logic, including a new SetTargetEnemy method and improved smoke effect handling. Scene and NavMesh asset changes reflect these logic updates.

Author: EnesEfeTokta

Red Strike/Assets/InputController/InputController.cs

@@ -18,7 +18,8 @@ public class InputController : MonoBehaviour
         private Camera mainCamera;
         public BuildingsDatabase buildingsDatabase;
         private Dictionary<string, int> buildingCounts = new Dictionary<string, int>();
-        private Building selectedBuilding;
+        private Building currentSelectedBuilding;
+        private Vehicle currentSelectedVehicle;
         private List<GameObject> placedObjects = new List<GameObject>();
         public float minDistanceBetweenObjects = 5f;
         public VehiclesHUDController vehiclesHUDController;
@@ -33,10 +34,9 @@ private void Start()
 
         private void Update()
         {
-            if (Input.GetMouseButtonDown(1) && selectedBuilding != null)
+            if (Input.GetMouseButtonDown(1) && currentSelectedBuilding != null)
             {
-                Debug.Log("Bina yerleştirme iptal edildi.");
-                selectedBuilding = null;
+                DeselectAll();
                 return;
             }
 
@@ -47,7 +47,7 @@ private void Update()
                     return;
                 }
 
-                if (selectedBuilding != null)
+                if (currentSelectedBuilding != null)
                 {
                     PlaceBuilding();
                 }
@@ -84,25 +84,25 @@ private void PlaceBuilding()
 
                 if (IsPositionValid(spawnPosition))
                 {
-                    if (buildingCounts.ContainsKey(selectedBuilding.buildingName) &&
-                        buildingCounts[selectedBuilding.buildingName] >= selectedBuilding.maxCreatedUnits)
+                    if (buildingCounts.ContainsKey(currentSelectedBuilding.buildingName) &&
+                        buildingCounts[currentSelectedBuilding.buildingName] >= currentSelectedBuilding.maxCreatedUnits)
                     {
-                        Debug.Log(selectedBuilding.buildingName + " için maksimum yerleştirme limitine ulaşıldı.");
+                        Debug.Log(currentSelectedBuilding.buildingName + " için maksimum yerleştirme limitine ulaşıldı.");
                         return;
                     }
-                    GameObject placedObject = Instantiate(selectedBuilding.buildingPrefab, spawnPosition, Quaternion.identity);
+                    GameObject placedObject = Instantiate(currentSelectedBuilding.buildingPrefab, spawnPosition, Quaternion.identity);
 
                     if (placedObject.GetComponent<SelectionHighlighter>() == null)
                         placedObject.AddComponent<SelectionHighlighter>();
 
                     placedObjects.Add(placedObject);
 
-                    if (buildingCounts.ContainsKey(selectedBuilding.buildingName))
-                        buildingCounts[selectedBuilding.buildingName]++;
+                    if (buildingCounts.ContainsKey(currentSelectedBuilding.buildingName))
+                        buildingCounts[currentSelectedBuilding.buildingName]++;
                     else
-                        buildingCounts[selectedBuilding.buildingName] = 1;
+                        buildingCounts[currentSelectedBuilding.buildingName] = 1;
 
-                    selectedBuilding = null;
+                    currentSelectedBuilding = null;
                     Debug.Log(placedObject.name + " yerleştirildi.");
                 }
                 else
@@ -118,8 +118,8 @@ public void SelectBuildingToPlace(string buildingName)
 
             if (buildingToSelect != null)
             {
-                selectedBuilding = buildingToSelect;
-                Debug.Log("Seçilen bina: " + selectedBuilding.buildingName + ". Yerleştirmek için araziye tıklayın.");
+                currentSelectedBuilding = buildingToSelect;
+                Debug.Log("Seçilen bina: " + currentSelectedBuilding.buildingName + ". Yerleştirmek için araziye tıklayın.");
             }
             else
             {
@@ -134,31 +134,40 @@ private void SelectObject()
 
             if (Physics.Raycast(ray, out hitInfo, Mathf.Infinity, selectableLayer))
             {
-                DeselectAll();
+                GameObject hitObject = hitInfo.collider.gameObject;
+
+                if (currentSelectedVehicle != null && hitObject.CompareTag("Enemy"))
+                {
+                    Debug.Log($"Araç ({currentSelectedVehicle.name}) hedefe ({hitObject.name}) gönderiliyor.");
+                    currentSelectedVehicle.SetTargetEnemy(hitObject);
+                    DeselectAll();
 
-                currentSelectionHighlighter = hitInfo.collider.GetComponent<SelectionHighlighter>();
+                    return;
+                }
 
+                DeselectAll();
 
-                if (currentSelectionHighlighter != null)
-                    currentSelectionHighlighter.EnableHighlight();
+                currentSelectionHighlighter = hitObject.GetComponent<SelectionHighlighter>();
+                if (currentSelectionHighlighter == null) currentSelectionHighlighter = hitObject.GetComponentInParent<SelectionHighlighter>();
 
-                switch (hitInfo.collider.tag)
+                switch (hitObject.tag)
                 {
-                    case "Build":
-                        BuildingPlacement.Buildings.Building clickedBuilding = hitInfo.collider.GetComponent<BuildingPlacement.Buildings.Building>();
+                    case "Vehicle":
+                        if (currentSelectionHighlighter != null) currentSelectionHighlighter.EnableHighlight();
 
-                        if (clickedBuilding != null)
+                        Vehicle v = hitObject.GetComponent<Vehicle>();
+                        if (v != null)
                         {
-                            buildingHUDController.ShowBuildingDetails(clickedBuilding);
-                            if (vehiclesHUDController != null) vehiclesHUDController.HideVehicleDetails();
+                            currentSelectedVehicle = v;
+                            if (vehiclesHUDController != null) vehiclesHUDController.ShowVehicleDetails(v);
                         }
                         break;
 
-                    case "Vehicle":
-                        Vehicle clickedVehicle = hitInfo.collider.GetComponent<Vehicle>();
+                    case "Build":
+                        if (currentSelectionHighlighter != null) currentSelectionHighlighter.EnableHighlight();
 
-                        if (vehiclesHUDController != null) vehiclesHUDController.ShowVehicleDetails(clickedVehicle);
-                        buildingHUDController.HideBuildingDetails();
+                        var b = hitObject.GetComponent<BuildingPlacement.Buildings.Building>();
+                        if (b != null) buildingHUDController.ShowBuildingDetails(b);
                         break;
 
                     default:
@@ -174,14 +183,20 @@ private void SelectObject()
 
         private void DeselectAll()
         {
+            // UI Gizle 
             if (vehiclesHUDController != null) vehiclesHUDController.HideVehicleDetails();
-            buildingHUDController.HideBuildingDetails();
+            if (buildingHUDController != null) buildingHUDController.HideBuildingDetails();
 
+            // Outline Kapat
             if (currentSelectionHighlighter != null)
             {
                 currentSelectionHighlighter.DisableHighlight();
                 currentSelectionHighlighter = null;
             }
+
+            // Hafızayı temizle
+            currentSelectedVehicle = null;
+            currentSelectedBuilding = null;
         }
 
         private bool IsPositionValid(Vector3 position)

Red Strike/Assets/Scenes/SampleScene.unity

@@ -890,6 +890,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Quad
       objectReference: {fileID: 0}
+    - target: {fileID: 1855602119919018044, guid: 16678156d05891545a8ea7f1b6b4e7f6, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5052494845539565231, guid: 16678156d05891545a8ea7f1b6b4e7f6, type: 3}
       propertyPath: targetObject
       value: 
@@ -1012,7 +1016,7 @@ Transform:
   m_GameObject: {fileID: 1702380761}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.0737457, y: -10.843618, z: -5.863739}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Red Strike/Assets/Scenes/SampleScene/NavMesh-NavMesh Surface.asset

@@ -22,52 +22,57 @@ protected override void Start()
 
         protected override void Update()
         {
-            base.Update();
-
-            if (targetObject == null)
+            if (fuelLevel <= 0)
             {
-                if (agent.hasPath)
-                {
-                    agent.isStopped = true;
-                    agent.ResetPath();
-                }
+                fuelLevel = 0;
+                if (agent.enabled) agent.isStopped = true;
                 StopAttacking();
                 isMoving = false;
                 return;
             }
 
-            if (fuelLevel <= 0)
+            if (targetObject == null)
             {
-                fuelLevel = 0;
-                agent.isStopped = true;
+                if (agent.enabled && agent.hasPath)
+                {
+                    agent.isStopped = true;
+                    agent.ResetPath();
+                }
                 StopAttacking();
                 isMoving = false;
                 return;
             }
 
+            isMoving = true;
             LookAtTarget();
 
-            agent.SetDestination(targetObject.transform.position);
-
-            if (agent.remainingDistance <= agent.stoppingDistance)
+            if (agent.enabled)
             {
-                isMoving = false;
+                agent.isStopped = false;
+                agent.SetDestination(targetObject.transform.position);
 
-                if (!isAttacking)
+                if (agent.remainingDistance <= agent.stoppingDistance && !agent.pathPending)
                 {
-                    StartAttacking();
+                    if (!isAttacking) StartAttacking();
+                }
+                else
+                {
+                    StopAttacking();
+                    ConsumeFuel();
                 }
-            }
-            else
-            {
-                agent.isStopped = false;
-                isMoving = true;
-                StopAttacking();
-
-                ConsumeFuel();
             }
 
             UpdateSmokeEffect();
         }
+
+        protected override void UpdateSmokeEffect()
+        {
+            if (smokeEffect == null) return;
+
+            bool actuallyMoving = agent.velocity.sqrMagnitude > 0.1f && isMoving;
+
+            if (actuallyMoving && !smokeEffect.isPlaying) smokeEffect.Play();
+            else if (!actuallyMoving && smokeEffect.isPlaying) smokeEffect.Stop();
+        }
     }
 }

Red Strike/Assets/VehicleSystem/Vehicles/GroundVehicle.cs

@@ -8,50 +8,41 @@ namespace VehicleSystem.Vehicles
     public class Vehicle : MonoBehaviour
     {
         public VehicleSystem.Vehicle vehicleData;
+
+        public GameObject targetObject;
+        public ParticleSystem smokeEffect;
+
         protected float speed;
-        protected float coverageAreaRadius;
         protected float turnSpeed;
         protected float fuelLevel;
         protected float fuelConsumptionRate;
         protected float health;
-        private float maxHealth = 100f;
-        private float stoppingDistance = 1.5f;
+        protected float maxHealth;
+        protected float stoppingDistance;
+
         protected int maxAmmunition = 30;
         protected int currentAmmunition = 30;
         protected int reloadCounter = 0;
         protected float bulletDamage = 10f;
         protected float bulletSpeed = 20f;
         protected float reloadTime = 1.5f;
-
         protected GameObject bulletPrefab;
 
-        public GameObject targetObject;
-
-        public ParticleSystem smokeEffect;
-
-        private NavMeshAgent agent;
-
         protected bool isMoving = false;
         protected bool isAttacking = false;
-
         private Coroutine attackCoroutine;
 
         protected virtual void Start()
         {
             Setup();
-            agent = GetComponent<NavMeshAgent>();
-            agent.speed = speed;
-            agent.stoppingDistance = stoppingDistance;
         }
 
         private void Setup()
         {
             speed = vehicleData.speed;
-            coverageAreaRadius = vehicleData.coverageAreaRadius;
             turnSpeed = vehicleData.turnSpeed;
             fuelLevel = vehicleData.fuelCapacity;
             fuelConsumptionRate = vehicleData.fuelConsumptionRate;
-            stoppingDistance = vehicleData.stoppingDistance;
             maxAmmunition = vehicleData.maxAmmunition;
             currentAmmunition = maxAmmunition;
             bulletDamage = vehicleData.bulletDamage;
@@ -60,13 +51,22 @@ private void Setup()
             bulletPrefab = vehicleData.bulletPrefab;
             maxHealth = vehicleData.maxHealth;
             health = maxHealth;
+            stoppingDistance = vehicleData.stoppingDistance;
         }
 
         public (string, float, int, int, float) GetVehicleStatus()
         {
             return (vehicleData.vehicleName, fuelLevel, currentAmmunition, maxAmmunition, health);
         }
 
+        public virtual void SetTargetEnemy(GameObject enemy)
+        {
+            if (fuelLevel <= 0) return;
+
+            targetObject = enemy;
+            isMoving = true;
+        }
+
         protected virtual void Update()
         {
         }
@@ -82,10 +82,14 @@ protected virtual void ConsumeFuel()
 
         protected virtual void LookAtTarget()
         {
-            Vector3 direction = (targetObject.transform.position - transform.position).normalized;
-            direction.y = 0;
-            Quaternion lookRotation = Quaternion.LookRotation(direction);
-            transform.rotation = Quaternion.Slerp(transform.rotation, lookRotation, agent.angularSpeed * Time.deltaTime);
+             if (targetObject == null) return;
+             Vector3 direction = (targetObject.transform.position - transform.position).normalized;
+             direction.y = 0;
+             if (direction != Vector3.zero)
+             {
+                 Quaternion lookRotation = Quaternion.LookRotation(direction);
+                 transform.rotation = Quaternion.Slerp(transform.rotation, lookRotation, turnSpeed * Time.deltaTime);
+             }
         }
 
         protected virtual void UpdateSmokeEffect()