Add networked rocket targeting and explosion effects

EnesEfeTokta · EnesEfeTokta · commit 56cf38cf84b7 · 2025-12-18T23:12:31.000+03:00
Introduces networked rocket targeting by passing NetworkId to rockets and synchronizing their movement. Explosion effects for rockets are now spawned via RPC on the server. AirVehicle movement is now networked for smooth multiplayer synchronization. GameHUD adds more vehicle creation buttons. Minor material and fuel consumption adjustments.
diff --git a/Red Strike/Assets/AmmunitionSystem/Ammunition.cs b/Red Strike/Assets/AmmunitionSystem/Ammunition.cs
@@ -12,5 +12,6 @@ public class Ammunition : ScriptableObject
         public float range;
         public float lifetime;
         public GameObject ammunitionPrefab;
+        public GameObject explosionEffectPrefab;
     }
 }
diff --git a/Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunition.cs b/Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunition.cs
@@ -1,5 +1,4 @@
 using UnityEngine;
-using VehicleSystem.Vehicles;
 using Fusion;
 
 namespace AmmunitionSystem.Ammunitions
@@ -11,9 +10,8 @@ public class Ammunition : NetworkBehaviour
         public AmmunitionSystem.Ammunition ammunitionData;
 
         [Networked] public int OwnerTeamId { get; set; } = -1;
-        
         [Networked] public NetworkId OwnerVehicleId { get; set; }
 
-        public virtual void SetRocket(Transform targetTransform) { }
+        public virtual void SetRocketTarget(NetworkId targetId) { }
     }
 }
diff --git a/Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicRocket/BasicRocket.asset b/Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicRocket/BasicRocket.asset
@@ -19,3 +19,4 @@ MonoBehaviour:
   range: -1
   lifetime: 10
   ammunitionPrefab: {fileID: 595683329615967435, guid: ab318667f38c4db4ebc5472f6d16eed0, type: 3}
+  explosionEffectPrefab: {fileID: 100012, guid: 3364c97de68d3a147af572d1c71c6455, type: 3}
diff --git a/Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicRocket/BasicRocket.cs b/Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicRocket/BasicRocket.cs
@@ -1,56 +1,60 @@
 using UnityEngine;
 using Fusion;
+using NetworkingSystem;
 
 namespace AmmunitionSystem.Ammunitions.BasicRocket
 {
     [RequireComponent(typeof(Rigidbody))]
     public class BasicRocket : Ammunition
     {
         private Rigidbody rb;
-        public GameObject explosionEffectPrefab;
-        public Transform target;
         public float speed = 20f;
         public float rotationSpeed = 5f;
         public float accelerationRate = 1.5f;
 
         private bool hasExploded = false;
         private float currentSpeed;
+        [Networked] public NetworkId TargetId { get; set; }
 
         private void Awake()
         {
             rb = GetComponent<Rigidbody>();
             currentSpeed = speed * 0.5f;
         }
 
-        public override void SetRocket(Transform targetTransform)
+        public override void SetRocketTarget(NetworkId targetId)
         {
-            target = targetTransform;
+            TargetId = targetId;
         }
 
-        private void FixedUpdate()
+        public override void FixedUpdateNetwork()
         {
+            if (!Object.HasStateAuthority) return;
             if (hasExploded) return;
 
-            currentSpeed = Mathf.Lerp(currentSpeed, speed, Time.fixedDeltaTime * accelerationRate);
+            currentSpeed = Mathf.Lerp(currentSpeed, speed, Runner.DeltaTime * accelerationRate);
 
-            if (target != null)
+            if (TargetId.IsValid)
             {
-                Vector3 direction = (target.position - transform.position).normalized;
-                Quaternion targetRotation = Quaternion.LookRotation(direction);
-                rb.MoveRotation(Quaternion.Slerp(rb.rotation, targetRotation, Time.fixedDeltaTime * rotationSpeed));
-
-                rb.linearVelocity = transform.forward * currentSpeed;
-            }
-            else
-            {
-                rb.linearVelocity = transform.forward * currentSpeed;
+                var targetObj = Runner.FindObject(TargetId);
+
+                if (targetObj != null)
+                {
+                    Vector3 direction = (targetObj.transform.position - transform.position).normalized;
+                    if (direction != Vector3.zero)
+                    {
+                        Quaternion targetRotation = Quaternion.LookRotation(direction);
+                        rb.MoveRotation(Quaternion.Slerp(rb.rotation, targetRotation, Runner.DeltaTime * rotationSpeed));
+                    }
+                }
             }
+
+            rb.linearVelocity = transform.forward * currentSpeed;
         }
 
         private void OnCollisionEnter(Collision collision)
         {
-            if (Object.HasStateAuthority == false) return;
-
+            if (!Object.HasStateAuthority) return;
             if (hasExploded) return;
 
             if (collision.gameObject.TryGetComponent<NetworkObject>(out var netObj))
@@ -72,12 +76,7 @@ private void OnCollisionEnter(Collision collision)
             unit.TakeDamage(ammunitionData.damage);
 
             hasExploded = true;
-
-            if (explosionEffectPrefab != null)
-            {
-                GameObject explosionEffect = Instantiate(explosionEffectPrefab, transform.position, Quaternion.identity);
-                Destroy(explosionEffect, 2f);
-            }
+            CommanderData.LocalCommander.RPC_SpawnExplosionEffect(transform.position);
 
             DespawnBullet();
         }
diff --git a/Red Strike/Assets/InputController/InputController.cs b/Red Strike/Assets/InputController/InputController.cs
@@ -7,7 +7,6 @@
 using UnityEngine.UIElements;
 using NetworkingSystem;
 using AmmunitionSystem;
-using Fusion;
 
 namespace InputController
 {
@@ -40,8 +39,7 @@ public class InputController : MonoBehaviour
 
         private SelectionHighlighter targetHighlighter;
         private SelectionHighlighter tempBuildingHighlighter;
-
-        // Limitleme için sayaç (İsteğe bağlı, şimdilik basit tutuyoruz)
+        
         private Dictionary<string, int> buildingCounts = new Dictionary<string, int>();
 
         private void Awake()
@@ -77,16 +75,12 @@ private void Update()
             {
                 if ((Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl)) && Input.GetKeyDown(KeyCode.R))
                 {
-                    // Highlight edilen objenin Building scriptini bul
                     var building = tempBuildingHighlighter.GetComponent<BuildingPlacement.Buildings.Building>();
 
-                    // Eğer script o objede değilse parent'a bak
                     if (building == null) building = tempBuildingHighlighter.GetComponentInParent<BuildingPlacement.Buildings.Building>();
 
                     if (building != null)
                     {
-                        Debug.Log("Dönme isteği gönderiliyor...");
-                        // 2. RPC'Yİ BURADAN ÇAĞIRIN
                         building.RPC_Rotate90();
                     }
                 }
@@ -264,7 +258,7 @@ private SelectionHighlighter GetHighlighter(GameObject obj)
             if (hl == null) hl = obj.GetComponentInParent<SelectionHighlighter>();
             return hl;
         }
-
+        
         private bool IsPointerOverUI()
         {
             if (gameUIDocument == null) return false;
diff --git a/Red Strike/Assets/NetworkingSystem/CommanderData.cs b/Red Strike/Assets/NetworkingSystem/CommanderData.cs
@@ -117,7 +117,12 @@ public void RPC_SpawnVehicle(string vehicleName, Vector3 position)
 
 
         [Rpc(RpcSources.InputAuthority, RpcTargets.StateAuthority)]
-        public void RPC_SpawnAmmunition(string ammunitionName, Vector3 position, Quaternion rotation, NetworkObject ownerVehicleNetObj)
+        public void RPC_SpawnAmmunition(
+            string ammunitionName, 
+            Vector3 position, 
+            Quaternion rotation, 
+            NetworkObject ownerVehicleNetObj, 
+            NetworkId targetId = default)
         {
             if (Runner == null || !Runner.IsServer) return;
 
@@ -137,12 +142,30 @@ public void RPC_SpawnAmmunition(string ammunitionName, Vector3 position, Quatern
                     ammunitionScript.OwnerTeamId = vehicleScript.teamId;
                     ammunitionScript.OwnerVehicleId = ownerVehicleNetObj.Id;
 
+                    if (ammunitionData.ammunitionType == AmmunitionSystem.AmmunitionType.Rocket && targetId.IsValid)
+                    {
+                        ammunitionScript.SetRocketTarget(targetId);
+                    }
+
                     Debug.Log($"Mühimmat fırlatıldı: {ammunitionName}. Takım: {vehicleScript.teamId}");
                 }
             }
-            else
+        }
+
+        [Rpc(RpcSources.InputAuthority, RpcTargets.StateAuthority)]
+        public void RPC_SpawnExplosionEffect(Vector3 position)
+        {
+            if (Runner == null || !Runner.IsServer) return;
+
+            if (InputController.InputController.Instance == null) return;
+
+            var explosionEffectPrefab = InputController.InputController.Instance.ammunitionDatabase.ammunitions.
+                FirstOrDefault(e => e.ammunitionType == AmmunitionSystem.AmmunitionType.Rocket)?.explosionEffectPrefab;
+
+            if (explosionEffectPrefab != null)
             {
-                Debug.LogError($"Server: {ammunitionName} prefabı bulunamadı!");
+                Runner.Spawn(explosionEffectPrefab, position, Quaternion.identity, Object.InputAuthority);
+                Debug.Log($"Patlama efekti oluşturuldu.");
             }
         }
 
diff --git a/Red Strike/Assets/PlanetAtmosphereSystem/AtmosphereMaterial.mat b/Red Strike/Assets/PlanetAtmosphereSystem/AtmosphereMaterial.mat
@@ -47,7 +47,7 @@ Material:
     - _GunesYonu: {r: -0.91, g: 0.4, b: 3.24, a: 0}
     - _RenkUzak: {r: 0, g: 0.10166844, b: 2.152374, a: 1}
     - _RenkYakin: {r: 0, g: 5.670685, b: 8, a: 1}
-    - _SunDirection: {r: -0.16461955, g: 0.31825417, b: 0.93360317, a: 0}
+    - _SunDirection: {r: -0.019243166, g: -0.9938409, b: 0.10913344, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
 --- !u!114 &1522106816477559216
diff --git a/Red Strike/Assets/PlanetAtmosphereSystem/CloudMaterial.mat b/Red Strike/Assets/PlanetAtmosphereSystem/CloudMaterial.mat
@@ -43,7 +43,7 @@ Material:
     m_Colors:
     - _Color: {r: 0, g: 3.8274493, b: 5.992155, a: 1}
     - _GunesYonu: {r: -1, g: 0, b: 0, a: 0}
-    - _SunDirection: {r: -0.16461955, g: 0.31825417, b: 0.93360317, a: 0}
+    - _SunDirection: {r: -0.019243166, g: -0.9938409, b: 0.10913344, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
 --- !u!114 &8499732345945835446
diff --git a/Red Strike/Assets/PlanetAtmosphereSystem/FogMaterial.mat b/Red Strike/Assets/PlanetAtmosphereSystem/FogMaterial.mat
@@ -54,6 +54,6 @@ Material:
     - _QueueControl: 0
     - _QueueOffset: 0
     m_Colors:
-    - _SunDirection: {r: -0.16461955, g: 0.31825417, b: 0.93360317, a: 0}
+    - _SunDirection: {r: -0.019243166, g: -0.9938409, b: 0.10913344, a: 0}
   m_BuildTextureStacks: []
   m_AllowLocking: 1
diff --git a/Red Strike/Assets/UISystem/GameHUD.uxml b/Red Strike/Assets/UISystem/GameHUD.uxml
@@ -33,7 +33,13 @@
                     <ui:Label text="In production:" name="in-production-label" class="details-text" />
                     <ui:ScrollView mode="Vertical" style="max-height: 300px;">
                         <ui:Button text="Create Infantry" name="infantry-create-button" class="action-button" />
-                        <!-- Diğer butonlar... -->
+                        <ui:Button text="Create Trike" name="trike-create-button" class="action-button" />
+                        <ui:Button text="Create Quad" name="quad-create-button" class="action-button" />
+                        <ui:Button text="Create Tank Combat" name="tank-combat-create-button" class="action-button" />
+                        <ui:Button text="Create Tank Heavy A" name="tank-heavy-a-create-button" class="action-button" />
+                        <ui:Button text="Create Tank Heavy B" name="tank-heavy-b-create-button" class="action-button" />
+                        <ui:Button text="Create Ornithopter A" name="ornithopter-a-create-button" class="action-button" />
+                        <ui:Button text="Create Ornithopter B" name="ornithopter-b-create-button" class="action-button" />
                     </ui:ScrollView>
                 </ui:VisualElement>
             </ui:VisualElement>
diff --git a/Red Strike/Assets/VehicleSystem/Vehicles/AirVehicle.cs b/Red Strike/Assets/VehicleSystem/Vehicles/AirVehicle.cs
@@ -1,4 +1,5 @@
 using UnityEngine;
+using Fusion;
 
 namespace VehicleSystem.Vehicles
 {
@@ -38,9 +39,13 @@ private enum RefuelStage { Calculating, Approaching, Gliding, Landed }
         private float effectiveRocketRange;
         private float altitudeOffset;
 
+        [Networked] private Vector3 NetworkedPosition { get; set; }
+        [Networked] private Quaternion NetworkedRotation { get; set; }
+
         protected override void Start()
         {
             base.Start();
+
             loiterCenterPoint = new Vector3(transform.position.x, cruisingAltitude, transform.position.z);
             loiterTimer = Random.Range(0f, 100f);
 
@@ -51,10 +56,50 @@ protected override void Start()
             altitudeOffset = Random.Range(-altitudeVariance, altitudeVariance);
         }
 
+        public override void FixedUpdateNetwork()
+        {
+            if (!Object.HasStateAuthority) return;
+
+            if (fuelLevel <= 0 || isRefueling)
+            {
+                if (currentState != AirState.Refueling)
+                {
+                    currentState = AirState.Refueling;
+                    currentRefuelStage = RefuelStage.Calculating;
+                }
+                HandleRefueling();
+            }
+            else
+            {
+                // Durum makinesi
+                switch (currentState)
+                {
+                    case AirState.TakingOff: HandleTakingOff(); break;
+                    case AirState.Loitering: HandleLoitering(); break;
+                    case AirState.Engaging: HandleEngaging(); break;
+                    case AirState.Attacking: HandleAttacking(); break;
+                }
+
+                isMoving = true;
+                ConsumeFuel();
+            }
+
+            // Konumu Network'e yaz
+            NetworkedPosition = transform.position;
+            NetworkedRotation = transform.rotation;
+        }
+
         protected override void Update()
         {
             base.Update();
 
+            if (!Object.HasStateAuthority)
+            {
+                transform.position = Vector3.Lerp(transform.position, NetworkedPosition, Time.deltaTime * 5f);
+                transform.rotation = Quaternion.Slerp(transform.rotation, NetworkedRotation, Time.deltaTime * 5f);
+                return;
+            }
+
             if (fuelLevel <= 0 || isRefueling)
             {
                 if (currentState != AirState.Refueling)
@@ -79,6 +124,28 @@ protected override void Update()
             ConsumeFuel();
         }
 
+        private void MoveAndLook(Vector3 targetPosition, float turnMultiplier = 0.25f)
+        {
+            Vector3 directionToTarget = (targetPosition - transform.position).normalized;
+            if (directionToTarget.sqrMagnitude > 0.01f)
+            {
+                float dt = Runner.DeltaTime;
+
+                transform.position += transform.forward * effectiveSpeed * dt;
+
+                Vector3 localTargetDir = transform.InverseTransformDirection(directionToTarget);
+                float targetBankAngle = -localTargetDir.x * maxBankAngle;
+                currentBankAngleZ = Mathf.Lerp(currentBankAngleZ, targetBankAngle, dt * bankSpeed);
+
+                Quaternion targetLookRotation = Quaternion.LookRotation(directionToTarget);
+                Vector3 euler = targetLookRotation.eulerAngles;
+                euler.z = currentBankAngleZ;
+
+                Quaternion finalRotation = Quaternion.Euler(euler);
+                transform.rotation = Quaternion.Slerp(transform.rotation, finalRotation, dt * effectiveTurnSpeed * turnMultiplier);
+            }
+        }
+
         private void HandleRefueling()
         {
             isRefueling = true;
@@ -306,22 +373,5 @@ private void CheckAndFireWeapons(float distance, bool fireRockets, bool fireBull
                 if (fireBullets) TryFireBullets();
             }
         }
-
-        private void MoveAndLook(Vector3 targetPosition, float turnMultiplier = 0.25f)
-        {
-            Vector3 directionToTarget = (targetPosition - transform.position).normalized;
-            if (directionToTarget.sqrMagnitude > 0.01f)
-            {
-                transform.position += transform.forward * effectiveSpeed * Time.deltaTime;
-                Vector3 localTargetDir = transform.InverseTransformDirection(directionToTarget);
-                float targetBankAngle = -localTargetDir.x * maxBankAngle;
-                currentBankAngleZ = Mathf.Lerp(currentBankAngleZ, targetBankAngle, Time.deltaTime * bankSpeed);
-                Quaternion targetLookRotation = Quaternion.LookRotation(directionToTarget);
-                Vector3 euler = targetLookRotation.eulerAngles;
-                euler.z = currentBankAngleZ;
-                Quaternion finalRotation = Quaternion.Euler(euler);
-                transform.rotation = Quaternion.Slerp(transform.rotation, finalRotation, Time.deltaTime * effectiveTurnSpeed * turnMultiplier);
-            }
-        }
     }
 }
diff --git a/Red Strike/Assets/VehicleSystem/Vehicles/OrnithopterA/OrnithopterA.asset b/Red Strike/Assets/VehicleSystem/Vehicles/OrnithopterA/OrnithopterA.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
   stoppingDistance: 15
   maxHealth: 100
   fuelCapacity: 100
-  fuelConsumptionRate: 5
+  fuelConsumptionRate: 0.2
   explosionEffect: {fileID: 19800006, guid: e0609132424a24844b1d53ad3d704fd9, type: 3}
   ammunitionSettings:
   - isEnabled: 1
diff --git a/Red Strike/Assets/VehicleSystem/Vehicles/OrnithopterA/OrnithopterA.cs b/Red Strike/Assets/VehicleSystem/Vehicles/OrnithopterA/OrnithopterA.cs

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ public class Ammunition : ScriptableObject`
`12`	`12`	`public float range;`
`13`	`13`	`public float lifetime;`
`14`	`14`	`public GameObject ammunitionPrefab;`
	`15`	`+ public GameObject explosionEffectPrefab;`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using UnityEngine;`
`2`		`-using VehicleSystem.Vehicles;`
`3`	`2`	`using Fusion;`
`4`	`3`
`5`	`4`	`namespace AmmunitionSystem.Ammunitions`
`@@ -11,9 +10,8 @@ public class Ammunition : NetworkBehaviour`
`11`	`10`	`public AmmunitionSystem.Ammunition ammunitionData;`
`12`	`11`
`13`	`12`	`[Networked] public int OwnerTeamId { get; set; } = -1;`
`14`		`-`
`15`	`13`	`[Networked] public NetworkId OwnerVehicleId { get; set; }`
`16`	`14`
`17`		`- public virtual void SetRocket(Transform targetTransform) { }`
	`15`	`+ public virtual void SetRocketTarget(NetworkId targetId) { }`
`18`	`16`	`}`
`19`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using UnityEngine.UIElements;`
`8`	`8`	`using NetworkingSystem;`
`9`	`9`	`using AmmunitionSystem;`
`10`		`-using Fusion;`
`11`	`10`
`12`	`11`	`namespace InputController`
`13`	`12`	`{`
`@@ -40,8 +39,7 @@ public class InputController : MonoBehaviour`
`40`	`39`
`41`	`40`	`private SelectionHighlighter targetHighlighter;`
`42`	`41`	`private SelectionHighlighter tempBuildingHighlighter;`
`43`		`-`
`44`		`- // Limitleme için sayaç (İsteğe bağlı, şimdilik basit tutuyoruz)`
	`42`	`+`
`45`	`43`	`private Dictionary<string, int> buildingCounts = new Dictionary<string, int>();`
`46`	`44`
`47`	`45`	`private void Awake()`
`@@ -77,16 +75,12 @@ private void Update()`
`77`	`75`	`{`
`78`	`76`	`if ((Input.GetKey(KeyCode.LeftControl) \|\| Input.GetKey(KeyCode.RightControl)) && Input.GetKeyDown(KeyCode.R))`
`79`	`77`	`{`
`80`		`- // Highlight edilen objenin Building scriptini bul`
`81`	`78`	`var building = tempBuildingHighlighter.GetComponent<BuildingPlacement.Buildings.Building>();`
`82`	`79`
`83`		`- // Eğer script o objede değilse parent'a bak`
`84`	`80`	`if (building == null) building = tempBuildingHighlighter.GetComponentInParent<BuildingPlacement.Buildings.Building>();`
`85`	`81`
`86`	`82`	`if (building != null)`
`87`	`83`	`{`
`88`		`- Debug.Log("Dönme isteği gönderiliyor...");`
`89`		`- // 2. RPC'Yİ BURADAN ÇAĞIRIN`
`90`	`84`	`building.RPC_Rotate90();`
`91`	`85`	`}`
`92`	`86`	`}`
`@@ -264,7 +258,7 @@ private SelectionHighlighter GetHighlighter(GameObject obj)`
`264`	`258`	`if (hl == null) hl = obj.GetComponentInParent<SelectionHighlighter>();`
`265`	`259`	`return hl;`
`266`	`260`	`}`
`267`		`-`
	`261`	`+`
`268`	`262`	`private bool IsPointerOverUI()`
`269`	`263`	`{`
`270`	`264`	`if (gameUIDocument == null) return false;`