Skip to content

Commit 12e3701

Browse files
committed
Add vehicle status UI to prefabs and refactor scene
Introduced vehicle status MonoBehaviour and UI Canvas elements to Infantry, OrnithopterA, OrnithopterB, and Quad prefabs. Updated GameScene.unity to remove legacy vehicle status UI and moved status display logic into individual vehicle prefabs. Also added lowEnergyThreshold property to relevant prefabs for energy status indication.
1 parent 7fff0cd commit 12e3701

File tree

10 files changed

+1569
-210
lines changed

10 files changed

+1569
-210
lines changed

Red Strike/Assets/Scenes/GameScene.unity

Lines changed: 1 addition & 202 deletions
Original file line numberDiff line numberDiff line change
@@ -255,108 +255,6 @@ PrefabInstance:
255255
m_AddedGameObjects: []
256256
m_AddedComponents: []
257257
m_SourcePrefab: {fileID: 100100000, guid: 85da885807e881b4a911c69742b4cab6, type: 3}
258-
--- !u!1 &290739807
259-
GameObject:
260-
m_ObjectHideFlags: 0
261-
m_CorrespondingSourceObject: {fileID: 0}
262-
m_PrefabInstance: {fileID: 0}
263-
m_PrefabAsset: {fileID: 0}
264-
serializedVersion: 6
265-
m_Component:
266-
- component: {fileID: 290739808}
267-
- component: {fileID: 290739811}
268-
- component: {fileID: 290739810}
269-
- component: {fileID: 290739809}
270-
m_Layer: 5
271-
m_Name: Canvas
272-
m_TagString: Untagged
273-
m_Icon: {fileID: 0}
274-
m_NavMeshLayer: 0
275-
m_StaticEditorFlags: 0
276-
m_IsActive: 1
277-
--- !u!224 &290739808
278-
RectTransform:
279-
m_ObjectHideFlags: 0
280-
m_CorrespondingSourceObject: {fileID: 0}
281-
m_PrefabInstance: {fileID: 0}
282-
m_PrefabAsset: {fileID: 0}
283-
m_GameObject: {fileID: 290739807}
284-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
285-
m_LocalPosition: {x: 0, y: 0, z: 0}
286-
m_LocalScale: {x: 1, y: 1, z: 1}
287-
m_ConstrainProportionsScale: 0
288-
m_Children:
289-
- {fileID: 498261803}
290-
m_Father: {fileID: 769341608}
291-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
292-
m_AnchorMin: {x: 0, y: 0}
293-
m_AnchorMax: {x: 0, y: 0}
294-
m_AnchoredPosition: {x: 0, y: 4}
295-
m_SizeDelta: {x: 1.8, y: 1.8}
296-
m_Pivot: {x: 0.5, y: 0.5}
297-
--- !u!114 &290739809
298-
MonoBehaviour:
299-
m_ObjectHideFlags: 0
300-
m_CorrespondingSourceObject: {fileID: 0}
301-
m_PrefabInstance: {fileID: 0}
302-
m_PrefabAsset: {fileID: 0}
303-
m_GameObject: {fileID: 290739807}
304-
m_Enabled: 1
305-
m_EditorHideFlags: 0
306-
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
307-
m_Name:
308-
m_EditorClassIdentifier:
309-
m_IgnoreReversedGraphics: 1
310-
m_BlockingObjects: 0
311-
m_BlockingMask:
312-
serializedVersion: 2
313-
m_Bits: 4294967295
314-
--- !u!114 &290739810
315-
MonoBehaviour:
316-
m_ObjectHideFlags: 0
317-
m_CorrespondingSourceObject: {fileID: 0}
318-
m_PrefabInstance: {fileID: 0}
319-
m_PrefabAsset: {fileID: 0}
320-
m_GameObject: {fileID: 290739807}
321-
m_Enabled: 1
322-
m_EditorHideFlags: 0
323-
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
324-
m_Name:
325-
m_EditorClassIdentifier:
326-
m_UiScaleMode: 0
327-
m_ReferencePixelsPerUnit: 100
328-
m_ScaleFactor: 1
329-
m_ReferenceResolution: {x: 800, y: 600}
330-
m_ScreenMatchMode: 0
331-
m_MatchWidthOrHeight: 0
332-
m_PhysicalUnit: 3
333-
m_FallbackScreenDPI: 96
334-
m_DefaultSpriteDPI: 96
335-
m_DynamicPixelsPerUnit: 1
336-
m_PresetInfoIsWorld: 1
337-
--- !u!223 &290739811
338-
Canvas:
339-
m_ObjectHideFlags: 0
340-
m_CorrespondingSourceObject: {fileID: 0}
341-
m_PrefabInstance: {fileID: 0}
342-
m_PrefabAsset: {fileID: 0}
343-
m_GameObject: {fileID: 290739807}
344-
m_Enabled: 1
345-
serializedVersion: 3
346-
m_RenderMode: 2
347-
m_Camera: {fileID: 0}
348-
m_PlaneDistance: 100
349-
m_PixelPerfect: 0
350-
m_ReceivesEvents: 1
351-
m_OverrideSorting: 0
352-
m_OverridePixelPerfect: 0
353-
m_SortingBucketNormalizedSize: 0
354-
m_VertexColorAlwaysGammaSpace: 0
355-
m_AdditionalShaderChannelsFlag: 0
356-
m_UpdateRectTransformForStandalone: 0
357-
m_SortingLayerID: 0
358-
m_SortingOrder: 0
359-
m_TargetDisplay: 0
360258
--- !u!1001 &296709975
361259
PrefabInstance:
362260
m_ObjectHideFlags: 0
@@ -365,22 +263,6 @@ PrefabInstance:
365263
serializedVersion: 3
366264
m_TransformParent: {fileID: 0}
367265
m_Modifications:
368-
- target: {fileID: 3041903315896096941, guid: a35a82b670e35ac4aa3594152075595d, type: 3}
369-
propertyPath: warningIcon
370-
value:
371-
objectReference: {fileID: 21300000, guid: 16226a473d4c20e4ab2b9a59d7d6e1cd, type: 3}
372-
- target: {fileID: 3041903315896096941, guid: a35a82b670e35ac4aa3594152075595d, type: 3}
373-
propertyPath: refuelingIcon
374-
value:
375-
objectReference: {fileID: 21300000, guid: df18adcb4e7a18e408cf2f8b48d22c32, type: 3}
376-
- target: {fileID: 3041903315896096941, guid: a35a82b670e35ac4aa3594152075595d, type: 3}
377-
propertyPath: vehicleStatusIcon
378-
value:
379-
objectReference: {fileID: 498261804}
380-
- target: {fileID: 3041903315896096941, guid: a35a82b670e35ac4aa3594152075595d, type: 3}
381-
propertyPath: defaultWarningIcon
382-
value:
383-
objectReference: {fileID: 21300000, guid: 16226a473d4c20e4ab2b9a59d7d6e1cd, type: 3}
384266
- target: {fileID: 4442516632743243454, guid: a35a82b670e35ac4aa3594152075595d, type: 3}
385267
propertyPath: m_LocalPosition.x
386268
value: 0.5636215
@@ -427,10 +309,7 @@ PrefabInstance:
427309
objectReference: {fileID: 0}
428310
m_RemovedComponents: []
429311
m_RemovedGameObjects: []
430-
m_AddedGameObjects:
431-
- targetCorrespondingSourceObject: {fileID: 4442516632743243454, guid: a35a82b670e35ac4aa3594152075595d, type: 3}
432-
insertIndex: -1
433-
addedObject: {fileID: 290739808}
312+
m_AddedGameObjects: []
434313
m_AddedComponents: []
435314
m_SourcePrefab: {fileID: 100100000, guid: a35a82b670e35ac4aa3594152075595d, type: 3}
436315
--- !u!1 &330585543
@@ -997,81 +876,6 @@ PrefabInstance:
997876
m_AddedGameObjects: []
998877
m_AddedComponents: []
999878
m_SourcePrefab: {fileID: 100100000, guid: 85da885807e881b4a911c69742b4cab6, type: 3}
1000-
--- !u!1 &498261802
1001-
GameObject:
1002-
m_ObjectHideFlags: 0
1003-
m_CorrespondingSourceObject: {fileID: 0}
1004-
m_PrefabInstance: {fileID: 0}
1005-
m_PrefabAsset: {fileID: 0}
1006-
serializedVersion: 6
1007-
m_Component:
1008-
- component: {fileID: 498261803}
1009-
- component: {fileID: 498261805}
1010-
- component: {fileID: 498261804}
1011-
m_Layer: 5
1012-
m_Name: InfoImage
1013-
m_TagString: Untagged
1014-
m_Icon: {fileID: 0}
1015-
m_NavMeshLayer: 0
1016-
m_StaticEditorFlags: 0
1017-
m_IsActive: 1
1018-
--- !u!224 &498261803
1019-
RectTransform:
1020-
m_ObjectHideFlags: 0
1021-
m_CorrespondingSourceObject: {fileID: 0}
1022-
m_PrefabInstance: {fileID: 0}
1023-
m_PrefabAsset: {fileID: 0}
1024-
m_GameObject: {fileID: 498261802}
1025-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1026-
m_LocalPosition: {x: 0, y: 0, z: 0}
1027-
m_LocalScale: {x: 1, y: 1, z: 1}
1028-
m_ConstrainProportionsScale: 0
1029-
m_Children: []
1030-
m_Father: {fileID: 290739808}
1031-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1032-
m_AnchorMin: {x: 0, y: 0}
1033-
m_AnchorMax: {x: 1, y: 1}
1034-
m_AnchoredPosition: {x: 0, y: 0}
1035-
m_SizeDelta: {x: 0, y: 0}
1036-
m_Pivot: {x: 0.5, y: 0.5}
1037-
--- !u!114 &498261804
1038-
MonoBehaviour:
1039-
m_ObjectHideFlags: 0
1040-
m_CorrespondingSourceObject: {fileID: 0}
1041-
m_PrefabInstance: {fileID: 0}
1042-
m_PrefabAsset: {fileID: 0}
1043-
m_GameObject: {fileID: 498261802}
1044-
m_Enabled: 1
1045-
m_EditorHideFlags: 0
1046-
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
1047-
m_Name:
1048-
m_EditorClassIdentifier:
1049-
m_Material: {fileID: 0}
1050-
m_Color: {r: 1, g: 1, b: 1, a: 1}
1051-
m_RaycastTarget: 1
1052-
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
1053-
m_Maskable: 1
1054-
m_OnCullStateChanged:
1055-
m_PersistentCalls:
1056-
m_Calls: []
1057-
m_Sprite: {fileID: 0}
1058-
m_Type: 0
1059-
m_PreserveAspect: 0
1060-
m_FillCenter: 1
1061-
m_FillMethod: 4
1062-
m_FillAmount: 1
1063-
m_FillClockwise: 1
1064-
m_FillOrigin: 0
1065-
m_UseSpriteMesh: 0
1066-
m_PixelsPerUnitMultiplier: 1
1067-
--- !u!222 &498261805
1068-
CanvasRenderer:
1069-
m_ObjectHideFlags: 0
1070-
m_CorrespondingSourceObject: {fileID: 0}
1071-
m_PrefabInstance: {fileID: 0}
1072-
m_PrefabAsset: {fileID: 0}
1073-
m_GameObject: {fileID: 498261802}
1074-
m_CullTransparentMesh: 1
1075879
--- !u!1001 &538656817
1076880
PrefabInstance:
1077881
m_ObjectHideFlags: 0
@@ -1238,11 +1042,6 @@ Transform:
12381042
m_Children: []
12391043
m_Father: {fileID: 0}
12401044
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1241-
--- !u!4 &769341608 stripped
1242-
Transform:
1243-
m_CorrespondingSourceObject: {fileID: 4442516632743243454, guid: a35a82b670e35ac4aa3594152075595d, type: 3}
1244-
m_PrefabInstance: {fileID: 296709975}
1245-
m_PrefabAsset: {fileID: 0}
12461045
--- !u!1 &832575517
12471046
GameObject:
12481047
m_ObjectHideFlags: 0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ private void LookAtTarget(Vector3 targetPos)
152152
Quaternion lookRot = Quaternion.LookRotation(dirToTarget);
153153
transform.rotation = Quaternion.Slerp(transform.rotation, lookRot, vehicleData.turnSpeed * Time.deltaTime);
154154
}
155-
}
155+
}
156156

157157
private void HandleCombat()
158158
{

0 commit comments

Comments
 (0)