Skip to content

Commit 210d34d

Browse files
committed
Add idle and production animations for buildings and vehicles
Introduced Animator and animation clips for EnergyTower, Hangar, MainStation, and various vehicles. Updated Hangar logic to trigger production animation and adjusted vehicle spawn point. Refactored and extended animation controllers and clips to support idle and production states, and updated prefabs to use new animations.
1 parent fa7bd77 commit 210d34d

File tree

53 files changed

+3701
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3701
-224
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class Building : Unit.Unit
1111
[Networked] public float health { get; set; }
1212
public float maxHealth;
1313
public string buildingName;
14+
public Animator animator;
1415

1516
public override void Spawned()
1617
{
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: EnergyTowerAnimController
10+
serializedVersion: 5
11+
m_AnimatorParameters: []
12+
m_AnimatorLayers:
13+
- serializedVersion: 5
14+
m_Name: Base Layer
15+
m_StateMachine: {fileID: 3062849852250059945}
16+
m_Mask: {fileID: 0}
17+
m_Motions: []
18+
m_Behaviours: []
19+
m_BlendingMode: 0
20+
m_SyncedLayerIndex: -1
21+
m_DefaultWeight: 0
22+
m_IKPass: 0
23+
m_SyncedLayerAffectsTiming: 0
24+
m_Controller: {fileID: 9100000}
25+
--- !u!1107 &3062849852250059945
26+
AnimatorStateMachine:
27+
serializedVersion: 6
28+
m_ObjectHideFlags: 1
29+
m_CorrespondingSourceObject: {fileID: 0}
30+
m_PrefabInstance: {fileID: 0}
31+
m_PrefabAsset: {fileID: 0}
32+
m_Name: Base Layer
33+
m_ChildStates:
34+
- serializedVersion: 1
35+
m_State: {fileID: 7769492884632598875}
36+
m_Position: {x: 200, y: 0, z: 0}
37+
m_ChildStateMachines: []
38+
m_AnyStateTransitions: []
39+
m_EntryTransitions: []
40+
m_StateMachineTransitions: {}
41+
m_StateMachineBehaviours: []
42+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
43+
m_EntryPosition: {x: 50, y: 120, z: 0}
44+
m_ExitPosition: {x: 800, y: 120, z: 0}
45+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
46+
m_DefaultState: {fileID: 7769492884632598875}
47+
--- !u!1102 &7769492884632598875
48+
AnimatorState:
49+
serializedVersion: 6
50+
m_ObjectHideFlags: 1
51+
m_CorrespondingSourceObject: {fileID: 0}
52+
m_PrefabInstance: {fileID: 0}
53+
m_PrefabAsset: {fileID: 0}
54+
m_Name: EnergyTowerIdleAnim
55+
m_Speed: 1
56+
m_CycleOffset: 0
57+
m_Transitions: []
58+
m_StateMachineBehaviours: []
59+
m_Position: {x: 50, y: 50, z: 0}
60+
m_IKOnFeet: 0
61+
m_WriteDefaultValues: 1
62+
m_Mirror: 0
63+
m_SpeedParameterActive: 0
64+
m_MirrorParameterActive: 0
65+
m_CycleOffsetParameterActive: 0
66+
m_TimeParameterActive: 0
67+
m_Motion: {fileID: 7400000, guid: c553b791408e96a42bca2c70ad435051, type: 2}
68+
m_Tag:
69+
m_SpeedParameter:
70+
m_MirrorParameter:
71+
m_CycleOffsetParameter:
72+
m_TimeParameter:

Red Strike/Assets/BuildingPlacement/Buildings/EnergyTower/EnergyTowerAnimController.controller.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: EnergyTowerIdleAnim
10+
serializedVersion: 7
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves:
19+
- curve:
20+
serializedVersion: 2
21+
m_Curve:
22+
- serializedVersion: 3
23+
time: 0
24+
value: {x: 2.2, y: 2.2, z: 2.2}
25+
inSlope: {x: 0, y: 0, z: 0}
26+
outSlope: {x: 0, y: 0, z: 0}
27+
tangentMode: 0
28+
weightedMode: 0
29+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
30+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
31+
- serializedVersion: 3
32+
time: 1
33+
value: {x: 2.1, y: 2.1, z: 2.1}
34+
inSlope: {x: 0, y: 0, z: 0}
35+
outSlope: {x: 0, y: 0, z: 0}
36+
tangentMode: 0
37+
weightedMode: 0
38+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
39+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
40+
- serializedVersion: 3
41+
time: 2
42+
value: {x: 2.2, y: 2.2, z: 2.2}
43+
inSlope: {x: 0, y: 0, z: 0}
44+
outSlope: {x: 0, y: 0, z: 0}
45+
tangentMode: 0
46+
weightedMode: 0
47+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
48+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
49+
m_PreInfinity: 2
50+
m_PostInfinity: 2
51+
m_RotationOrder: 4
52+
path:
53+
m_FloatCurves: []
54+
m_PPtrCurves: []
55+
m_SampleRate: 60
56+
m_WrapMode: 0
57+
m_Bounds:
58+
m_Center: {x: 0, y: 0, z: 0}
59+
m_Extent: {x: 0, y: 0, z: 0}
60+
m_ClipBindingConstant:
61+
genericBindings:
62+
- serializedVersion: 2
63+
path: 0
64+
attribute: 3
65+
script: {fileID: 0}
66+
typeID: 4
67+
customType: 0
68+
isPPtrCurve: 0
69+
isIntCurve: 0
70+
isSerializeReferenceCurve: 0
71+
pptrCurveMapping: []
72+
m_AnimationClipSettings:
73+
serializedVersion: 2
74+
m_AdditiveReferencePoseClip: {fileID: 0}
75+
m_AdditiveReferencePoseTime: 0
76+
m_StartTime: 0
77+
m_StopTime: 2
78+
m_OrientationOffsetY: 0
79+
m_Level: 0
80+
m_CycleOffset: 0
81+
m_HasAdditiveReferencePose: 0
82+
m_LoopTime: 1
83+
m_LoopBlend: 0
84+
m_LoopBlendOrientation: 0
85+
m_LoopBlendPositionY: 0
86+
m_LoopBlendPositionXZ: 0
87+
m_KeepOriginalOrientation: 0
88+
m_KeepOriginalPositionY: 1
89+
m_KeepOriginalPositionXZ: 0
90+
m_HeightFromFeet: 0
91+
m_Mirror: 0
92+
m_EditorCurves:
93+
- serializedVersion: 2
94+
curve:
95+
serializedVersion: 2
96+
m_Curve:
97+
- serializedVersion: 3
98+
time: 0
99+
value: 2.2
100+
inSlope: 0
101+
outSlope: 0
102+
tangentMode: 136
103+
weightedMode: 0
104+
inWeight: 0.33333334
105+
outWeight: 0.33333334
106+
- serializedVersion: 3
107+
time: 1
108+
value: 2.1
109+
inSlope: 0
110+
outSlope: 0
111+
tangentMode: 136
112+
weightedMode: 0
113+
inWeight: 0.33333334
114+
outWeight: 0.33333334
115+
- serializedVersion: 3
116+
time: 2
117+
value: 2.2
118+
inSlope: 0
119+
outSlope: 0
120+
tangentMode: 136
121+
weightedMode: 0
122+
inWeight: 0.33333334
123+
outWeight: 0.33333334
124+
m_PreInfinity: 2
125+
m_PostInfinity: 2
126+
m_RotationOrder: 4
127+
attribute: m_LocalScale.x
128+
path:
129+
classID: 4
130+
script: {fileID: 0}
131+
flags: 0
132+
- serializedVersion: 2
133+
curve:
134+
serializedVersion: 2
135+
m_Curve:
136+
- serializedVersion: 3
137+
time: 0
138+
value: 2.2
139+
inSlope: 0
140+
outSlope: 0
141+
tangentMode: 136
142+
weightedMode: 0
143+
inWeight: 0.33333334
144+
outWeight: 0.33333334
145+
- serializedVersion: 3
146+
time: 1
147+
value: 2.1
148+
inSlope: 0
149+
outSlope: 0
150+
tangentMode: 136
151+
weightedMode: 0
152+
inWeight: 0.33333334
153+
outWeight: 0.33333334
154+
- serializedVersion: 3
155+
time: 2
156+
value: 2.2
157+
inSlope: 0
158+
outSlope: 0
159+
tangentMode: 136
160+
weightedMode: 0
161+
inWeight: 0.33333334
162+
outWeight: 0.33333334
163+
m_PreInfinity: 2
164+
m_PostInfinity: 2
165+
m_RotationOrder: 4
166+
attribute: m_LocalScale.y
167+
path:
168+
classID: 4
169+
script: {fileID: 0}
170+
flags: 0
171+
- serializedVersion: 2
172+
curve:
173+
serializedVersion: 2
174+
m_Curve:
175+
- serializedVersion: 3
176+
time: 0
177+
value: 2.2
178+
inSlope: 0
179+
outSlope: 0
180+
tangentMode: 136
181+
weightedMode: 0
182+
inWeight: 0.33333334
183+
outWeight: 0.33333334
184+
- serializedVersion: 3
185+
time: 1
186+
value: 2.1
187+
inSlope: 0
188+
outSlope: 0
189+
tangentMode: 136
190+
weightedMode: 0
191+
inWeight: 0.33333334
192+
outWeight: 0.33333334
193+
- serializedVersion: 3
194+
time: 2
195+
value: 2.2
196+
inSlope: 0
197+
outSlope: 0
198+
tangentMode: 136
199+
weightedMode: 0
200+
inWeight: 0.33333334
201+
outWeight: 0.33333334
202+
m_PreInfinity: 2
203+
m_PostInfinity: 2
204+
m_RotationOrder: 4
205+
attribute: m_LocalScale.z
206+
path:
207+
classID: 4
208+
script: {fileID: 0}
209+
flags: 0
210+
m_EulerEditorCurves: []
211+
m_HasGenericRootTransform: 0
212+
m_HasMotionFloatCurves: 0
213+
m_Events: []

Red Strike/Assets/BuildingPlacement/Buildings/EnergyTower/EnergyTowerIdleAnim.anim.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Red Strike/Assets/BuildingPlacement/Buildings/Hangar/Hangar.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class Hangar : Building
2121
private void Start()
2222
{
2323
audioSource = GetComponent<AudioSource>();
24-
vehicleSpawnPoint = transform.position + transform.forward * 20f;
24+
vehicleSpawnPoint = transform.position + transform.forward * 5f;
2525
vehicleSpawnPoint.y += 2f;
2626
}
2727

@@ -53,6 +53,7 @@ public void CreateVehicle(VehicleTypes vehicleType)
5353
InProductionUnitName = vehicleType.ToString();
5454
IsReady = false;
5555
audioSource.PlayOneShot(vehicleCreateSound);
56+
animator.SetTrigger("isProducing");
5657
CreateVehicleInstance(vehicleType);
5758
}
5859
else

0 commit comments

Comments
 (0)