Skip to content

Commit fc394d6

Browse files
EnesEfeToktaEnesEfeTokta
committed
Add team and playerType to vehicles, improve collision logic
Added teamId and playerType fields to all vehicle prefabs for team-based logic. Updated BasicBullet and Building scripts to use team checks and improved collision handling. Adjusted OrnithopterA fuel consumption. Added Infantry units to GameScene. Set vehicle status icons for all vehicles.
1 parent fdb83f9 commit fc394d6

File tree

12 files changed

+193
-42
lines changed

12 files changed

+193
-42
lines changed

‎Red Strike/Assets/AmmunitionSystem/Ammunitions/Ammunitions/BasicBullet/BasicBullet.cs‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using UnityEngine;
2+
using VehicleSystem.Vehicles;
3+
using BuildingPlacement.Buildings;
24

35
namespace AmmunitionSystem.Ammunitions.BasicBullet
46
{
@@ -15,23 +17,27 @@ private void Awake()
1517
private void Start()
1618
{
1719
rb.linearVelocity = transform.forward * ammunitionData.speed;
18-
20+
1921
Destroy(gameObject, ammunitionData.lifetime);
2022
}
2123

2224
private void OnCollisionEnter(Collision collision)
2325
{
24-
if (ownerVehicle != null && collision.gameObject == ownerVehicle.gameObject) return;
25-
26-
if (collision.gameObject.CompareTag("Ammunition")) return;
26+
if (ownerVehicle != null && collision.gameObject == ownerVehicle.gameObject)
27+
return;
28+
29+
var unit = collision.gameObject.GetComponent<Unit.Unit>();
30+
if (unit == null)
31+
return;
2732

28-
if (collision.gameObject.CompareTag("Enemy"))
29-
{
30-
Debug.Log($"Hit enemy: {collision.gameObject.name}, Damage: {ammunitionData.damage}");
31-
// collision.gameObject.GetComponent<HealthSystem>()?.TakeDamage(ammunitionData.damage);
32-
}
33+
if (unit.teamId == ownerVehicle.teamId)
34+
return;
35+
36+
Debug.Log($"Hit unit: {collision.gameObject.name}, Damage: {ammunitionData.damage}");
37+
// unit.GetComponent<HealthSystem>()?.TakeDamage(ammunitionData.damage);
3338

3439
Destroy(gameObject);
3540
}
41+
3642
}
3743
}

‎Red Strike/Assets/BuildingPlacement/Buildings/Building.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,14 @@ private void Start()
2626

2727
private void OnCollisionEnter(Collision collision)
2828
{
29-
if (collision.gameObject.CompareTag("Bullet"))
30-
{
31-
// Burada hasar hesaplaması yapılabilir.
32-
}
29+
var unit = collision.gameObject.GetComponent<Unit.Unit>();
30+
if (unit == null)
31+
return;
32+
33+
if (unit.teamId == teamId)
34+
return;
35+
36+
Debug.Log($"Building {BuildingName} collided with unit: {collision.gameObject.name}");
3337
}
3438
}
3539

‎Red Strike/Assets/Scenes/GameScene.unity‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,11 @@ MonoBehaviour:
762762
precomputeOutline: 0
763763
bakeKeys: []
764764
bakeValues: []
765+
--- !u!1 &483664587 stripped
766+
GameObject:
767+
m_CorrespondingSourceObject: {fileID: 224654450759790032, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
768+
m_PrefabInstance: {fileID: 1717414439}
769+
m_PrefabAsset: {fileID: 0}
765770
--- !u!1001 &496563313
766771
PrefabInstance:
767772
m_ObjectHideFlags: 0
@@ -1034,6 +1039,72 @@ Transform:
10341039
m_Children: []
10351040
m_Father: {fileID: 0}
10361041
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1042+
--- !u!1 &880533910 stripped
1043+
GameObject:
1044+
m_CorrespondingSourceObject: {fileID: 224654450759790032, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1045+
m_PrefabInstance: {fileID: 1022531920}
1046+
m_PrefabAsset: {fileID: 0}
1047+
--- !u!1001 &1022531920
1048+
PrefabInstance:
1049+
m_ObjectHideFlags: 0
1050+
serializedVersion: 2
1051+
m_Modification:
1052+
serializedVersion: 3
1053+
m_TransformParent: {fileID: 0}
1054+
m_Modifications:
1055+
- target: {fileID: 224654450759790032, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1056+
propertyPath: m_Name
1057+
value: Infantry
1058+
objectReference: {fileID: 0}
1059+
- target: {fileID: 3693194386570448113, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1060+
propertyPath: targetObject
1061+
value:
1062+
objectReference: {fileID: 483664587}
1063+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1064+
propertyPath: m_LocalPosition.x
1065+
value: -4.4014053
1066+
objectReference: {fileID: 0}
1067+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1068+
propertyPath: m_LocalPosition.y
1069+
value: 0
1070+
objectReference: {fileID: 0}
1071+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1072+
propertyPath: m_LocalPosition.z
1073+
value: 26.784975
1074+
objectReference: {fileID: 0}
1075+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1076+
propertyPath: m_LocalRotation.w
1077+
value: 1
1078+
objectReference: {fileID: 0}
1079+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1080+
propertyPath: m_LocalRotation.x
1081+
value: 0
1082+
objectReference: {fileID: 0}
1083+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1084+
propertyPath: m_LocalRotation.y
1085+
value: 0
1086+
objectReference: {fileID: 0}
1087+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1088+
propertyPath: m_LocalRotation.z
1089+
value: 0
1090+
objectReference: {fileID: 0}
1091+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1092+
propertyPath: m_LocalEulerAnglesHint.x
1093+
value: 0
1094+
objectReference: {fileID: 0}
1095+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1096+
propertyPath: m_LocalEulerAnglesHint.y
1097+
value: 0
1098+
objectReference: {fileID: 0}
1099+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1100+
propertyPath: m_LocalEulerAnglesHint.z
1101+
value: 0
1102+
objectReference: {fileID: 0}
1103+
m_RemovedComponents: []
1104+
m_RemovedGameObjects: []
1105+
m_AddedGameObjects: []
1106+
m_AddedComponents: []
1107+
m_SourcePrefab: {fileID: 100100000, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
10371108
--- !u!1001 &1062271675
10381109
PrefabInstance:
10391110
m_ObjectHideFlags: 0
@@ -1210,6 +1281,67 @@ Transform:
12101281
m_Children: []
12111282
m_Father: {fileID: 0}
12121283
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1284+
--- !u!1001 &1717414439
1285+
PrefabInstance:
1286+
m_ObjectHideFlags: 0
1287+
serializedVersion: 2
1288+
m_Modification:
1289+
serializedVersion: 3
1290+
m_TransformParent: {fileID: 0}
1291+
m_Modifications:
1292+
- target: {fileID: 224654450759790032, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1293+
propertyPath: m_Name
1294+
value: Infantry (1)
1295+
objectReference: {fileID: 0}
1296+
- target: {fileID: 3693194386570448113, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1297+
propertyPath: targetObject
1298+
value:
1299+
objectReference: {fileID: 880533910}
1300+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1301+
propertyPath: m_LocalPosition.x
1302+
value: -26.317492
1303+
objectReference: {fileID: 0}
1304+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1305+
propertyPath: m_LocalPosition.y
1306+
value: 0
1307+
objectReference: {fileID: 0}
1308+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1309+
propertyPath: m_LocalPosition.z
1310+
value: -22.739992
1311+
objectReference: {fileID: 0}
1312+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1313+
propertyPath: m_LocalRotation.w
1314+
value: 1
1315+
objectReference: {fileID: 0}
1316+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1317+
propertyPath: m_LocalRotation.x
1318+
value: 0
1319+
objectReference: {fileID: 0}
1320+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1321+
propertyPath: m_LocalRotation.y
1322+
value: 0
1323+
objectReference: {fileID: 0}
1324+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1325+
propertyPath: m_LocalRotation.z
1326+
value: 0
1327+
objectReference: {fileID: 0}
1328+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1329+
propertyPath: m_LocalEulerAnglesHint.x
1330+
value: 0
1331+
objectReference: {fileID: 0}
1332+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1333+
propertyPath: m_LocalEulerAnglesHint.y
1334+
value: 0
1335+
objectReference: {fileID: 0}
1336+
- target: {fileID: 6013372402639038236, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
1337+
propertyPath: m_LocalEulerAnglesHint.z
1338+
value: 0
1339+
objectReference: {fileID: 0}
1340+
m_RemovedComponents: []
1341+
m_RemovedGameObjects: []
1342+
m_AddedGameObjects: []
1343+
m_AddedComponents: []
1344+
m_SourcePrefab: {fileID: 100100000, guid: 652e336fe8416d44694bb7c08b2b9f16, type: 3}
12131345
--- !u!1660057539 &9223372036854775807
12141346
SceneRoots:
12151347
m_ObjectHideFlags: 0
@@ -1227,3 +1359,5 @@ SceneRoots:
12271359
- {fileID: 496563313}
12281360
- {fileID: 127145441}
12291361
- {fileID: 1062271675}
1362+
- {fileID: 1022531920}
1363+
- {fileID: 1717414439}

‎Red Strike/Assets/VehicleSystem/Vehicles/Infantry/Infantry.prefab‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ MonoBehaviour:
215215
m_Script: {fileID: 11500000, guid: 03c758935046a67489542a05c26f0445, type: 3}
216216
m_Name:
217217
m_EditorClassIdentifier:
218+
teamId: 0
219+
playerType: 0
218220
vehicleData: {fileID: 11400000, guid: b049ed01ebeaf174e82c98ba0beb4efa, type: 2}
219221
targetObject: {fileID: 0}
220222
smokeEffect: {fileID: 6418470162434313253}
@@ -291,9 +293,9 @@ MonoBehaviour:
291293
m_Script: {fileID: 11500000, guid: 650cec5020a2d824390b2a1467f157c6, type: 3}
292294
m_Name:
293295
m_EditorClassIdentifier:
294-
warningIcon: {fileID: 0}
295-
refuelingIcon: {fileID: 0}
296-
vehicleStatusIcon: {fileID: 0}
296+
warningIcon: {fileID: 21300000, guid: 16226a473d4c20e4ab2b9a59d7d6e1cd, type: 3}
297+
refuelingIcon: {fileID: 21300000, guid: df18adcb4e7a18e408cf2f8b48d22c32, type: 3}
298+
vehicleStatusIcon: {fileID: 4785686242897834873}
297299
--- !u!1 &2526253149603484897
298300
GameObject:
299301
m_ObjectHideFlags: 0

‎Red Strike/Assets/VehicleSystem/Vehicles/OrnithopterA/OrnithopterA.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ MonoBehaviour:
2121
stoppingDistance: 15
2222
maxHealth: 100
2323
fuelCapacity: 100
24-
fuelConsumptionRate: 20
24+
fuelConsumptionRate: 5
2525
ammunitionSettings:
2626
- isEnabled: 1
2727
ammunitionType: 0

‎Red Strike/Assets/VehicleSystem/Vehicles/OrnithopterB/OrnithopterB.prefab‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35108,6 +35108,8 @@ MonoBehaviour:
3510835108
m_Script: {fileID: 11500000, guid: dba6f2c3499a5e940899e97e54715f47, type: 3}
3510935109
m_Name:
3511035110
m_EditorClassIdentifier:
35111+
teamId: 0
35112+
playerType: 0
3511135113
vehicleData: {fileID: 11400000, guid: e188ef8daa801334c82cd841cb6d6fcc, type: 2}
3511235114
targetObject: {fileID: 0}
3511335115
smokeEffect: {fileID: 4491444995112395927}
@@ -35206,9 +35208,9 @@ MonoBehaviour:
3520635208
m_Script: {fileID: 11500000, guid: 650cec5020a2d824390b2a1467f157c6, type: 3}
3520735209
m_Name:
3520835210
m_EditorClassIdentifier:
35209-
warningIcon: {fileID: 0}
35210-
refuelingIcon: {fileID: 0}
35211-
vehicleStatusIcon: {fileID: 0}
35211+
warningIcon: {fileID: 21300000, guid: 16226a473d4c20e4ab2b9a59d7d6e1cd, type: 3}
35212+
refuelingIcon: {fileID: 21300000, guid: df18adcb4e7a18e408cf2f8b48d22c32, type: 3}
35213+
vehicleStatusIcon: {fileID: 3398489534093135366}
3521235214
--- !u!1 &6213352748912140885
3521335215
GameObject:
3521435216
m_ObjectHideFlags: 0

‎Red Strike/Assets/VehicleSystem/Vehicles/Quad/Quad.prefab‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24712,6 +24712,8 @@ MonoBehaviour:
2471224712
m_Script: {fileID: 11500000, guid: c46abc4e03cd62e47a3915024872b2a7, type: 3}
2471324713
m_Name:
2471424714
m_EditorClassIdentifier:
24715+
teamId: 0
24716+
playerType: 0
2471524717
vehicleData: {fileID: 11400000, guid: ce97c2204a6a39643bf1b985564c1deb, type: 2}
2471624718
targetObject: {fileID: 0}
2471724719
smokeEffect: {fileID: 5801744656638912643}
@@ -24791,9 +24793,9 @@ MonoBehaviour:
2479124793
m_Script: {fileID: 11500000, guid: 650cec5020a2d824390b2a1467f157c6, type: 3}
2479224794
m_Name:
2479324795
m_EditorClassIdentifier:
24794-
warningIcon: {fileID: 0}
24795-
refuelingIcon: {fileID: 0}
24796-
vehicleStatusIcon: {fileID: 0}
24796+
warningIcon: {fileID: 21300000, guid: 16226a473d4c20e4ab2b9a59d7d6e1cd, type: 3}
24797+
refuelingIcon: {fileID: 21300000, guid: df18adcb4e7a18e408cf2f8b48d22c32, type: 3}
24798+
vehicleStatusIcon: {fileID: 8277337813219073883}
2479724799
--- !u!1 &2066256228391248142
2479824800
GameObject:
2479924801
m_ObjectHideFlags: 0

‎Red Strike/Assets/VehicleSystem/Vehicles/TankCombat/TankCombat.prefab‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29232,6 +29232,8 @@ MonoBehaviour:
2923229232
m_Script: {fileID: 11500000, guid: bf2ece4367702df40b58ebd200083e17, type: 3}
2923329233
m_Name:
2923429234
m_EditorClassIdentifier:
29235+
teamId: 0
29236+
playerType: 0
2923529237
vehicleData: {fileID: 11400000, guid: 1f1539dd50fac9945990afd398d5ff90, type: 2}
2923629238
targetObject: {fileID: 0}
2923729239
smokeEffect: {fileID: 6588546040348854375}
@@ -29287,9 +29289,9 @@ MonoBehaviour:
2928729289
m_Script: {fileID: 11500000, guid: 650cec5020a2d824390b2a1467f157c6, type: 3}
2928829290
m_Name:
2928929291
m_EditorClassIdentifier:
29290-
warningIcon: {fileID: 0}
29291-
refuelingIcon: {fileID: 0}
29292-
vehicleStatusIcon: {fileID: 0}
29292+
warningIcon: {fileID: 21300000, guid: 16226a473d4c20e4ab2b9a59d7d6e1cd, type: 3}
29293+
refuelingIcon: {fileID: 21300000, guid: df18adcb4e7a18e408cf2f8b48d22c32, type: 3}
29294+
vehicleStatusIcon: {fileID: 1977454829142698248}
2929329295
--- !u!1 &6622382545202222822
2929429296
GameObject:
2929529297
m_ObjectHideFlags: 0

‎Red Strike/Assets/VehicleSystem/Vehicles/TankHeavyA/TankHeavyA.prefab‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29160,6 +29160,8 @@ MonoBehaviour:
2916029160
m_Script: {fileID: 11500000, guid: 85efa6e2bb0f3474a95e59186e5c9199, type: 3}
2916129161
m_Name:
2916229162
m_EditorClassIdentifier:
29163+
teamId: 0
29164+
playerType: 0
2916329165
vehicleData: {fileID: 11400000, guid: 0d1e17da9fb2af947b26c9a568ced7d5, type: 2}
2916429166
targetObject: {fileID: 0}
2916529167
smokeEffect: {fileID: 1812400203402951035}
@@ -29215,9 +29217,9 @@ MonoBehaviour:
2921529217
m_Script: {fileID: 11500000, guid: 650cec5020a2d824390b2a1467f157c6, type: 3}
2921629218
m_Name:
2921729219
m_EditorClassIdentifier:
29218-
warningIcon: {fileID: 0}
29219-
refuelingIcon: {fileID: 0}
29220-
vehicleStatusIcon: {fileID: 0}
29220+
warningIcon: {fileID: 21300000, guid: 16226a473d4c20e4ab2b9a59d7d6e1cd, type: 3}
29221+
refuelingIcon: {fileID: 21300000, guid: df18adcb4e7a18e408cf2f8b48d22c32, type: 3}
29222+
vehicleStatusIcon: {fileID: 889566359980266360}
2922129223
--- !u!1 &5909316639376877922
2922229224
GameObject:
2922329225
m_ObjectHideFlags: 0

‎Red Strike/Assets/VehicleSystem/Vehicles/TankHeavyB/TankHeavyB.prefab‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34160,6 +34160,8 @@ MonoBehaviour:
3416034160
m_Script: {fileID: 11500000, guid: a1537c636a236fc42af5e0eaa5de9861, type: 3}
3416134161
m_Name:
3416234162
m_EditorClassIdentifier:
34163+
teamId: 0
34164+
playerType: 0
3416334165
vehicleData: {fileID: 11400000, guid: 2401c75b324e39040b0b2d2edbfe5039, type: 2}
3416434166
targetObject: {fileID: 0}
3416534167
smokeEffect: {fileID: 8104774168561090950}
@@ -34258,9 +34260,9 @@ MonoBehaviour:
3425834260
m_Script: {fileID: 11500000, guid: 650cec5020a2d824390b2a1467f157c6, type: 3}
3425934261
m_Name:
3426034262
m_EditorClassIdentifier:
34261-
warningIcon: {fileID: 0}
34262-
refuelingIcon: {fileID: 0}
34263-
vehicleStatusIcon: {fileID: 0}
34263+
warningIcon: {fileID: 21300000, guid: 16226a473d4c20e4ab2b9a59d7d6e1cd, type: 3}
34264+
refuelingIcon: {fileID: 21300000, guid: df18adcb4e7a18e408cf2f8b48d22c32, type: 3}
34265+
vehicleStatusIcon: {fileID: 8540710005414183809}
3426434266
--- !u!1 &7141264988768546558
3426534267
GameObject:
3426634268
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)