Skip to content

Commit e3759e0

Browse files
committed
General improments on battle
- create squad base class - Move fade in/out to a helper class - Display damage (kinda)
1 parent 0e9fa56 commit e3759e0

43 files changed

Lines changed: 2400 additions & 301 deletions

Some content is hidden

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

ACKNOWLEDGEMENTS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- [HughSpectrum](https://opengameart.org/users/hughspectrum)
99
- [Sharm](https://opengameart.org/users/sharm)
1010
- [MrBeast](https://opengameart.org/content/cave-tileset-0)
11+
- [Trent Gamblin](https://opengameart.org/content/12-battle-backgrounds-240x110)
1112

1213
# Sounds
1314
## Freesound

Assets/Animations/ui/ActionsLogController.controller renamed to Assets/AnimationControllers/ActionsLogController.controller

File renamed without changes.

Assets/Animations/ui/ActionsLogController.controller.meta renamed to Assets/AnimationControllers/ActionsLogController.controller.meta

File renamed without changes.
Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
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_PrefabInternal: {fileID: 0}
8+
m_Name: Damage
9+
serializedVersion: 5
10+
m_AnimatorParameters:
11+
- m_Name: fade
12+
m_Type: 9
13+
m_DefaultFloat: 0
14+
m_DefaultInt: 0
15+
m_DefaultBool: 0
16+
m_Controller: {fileID: 0}
17+
- m_Name: show
18+
m_Type: 9
19+
m_DefaultFloat: 0
20+
m_DefaultInt: 0
21+
m_DefaultBool: 0
22+
m_Controller: {fileID: 0}
23+
m_AnimatorLayers:
24+
- serializedVersion: 5
25+
m_Name: Base Layer
26+
m_StateMachine: {fileID: 1107990656242198492}
27+
m_Mask: {fileID: 0}
28+
m_Motions: []
29+
m_Behaviours: []
30+
m_BlendingMode: 0
31+
m_SyncedLayerIndex: -1
32+
m_DefaultWeight: 0
33+
m_IKPass: 0
34+
m_SyncedLayerAffectsTiming: 0
35+
m_Controller: {fileID: 9100000}
36+
--- !u!1101 &1101256885540823120
37+
AnimatorStateTransition:
38+
m_ObjectHideFlags: 1
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInternal: {fileID: 0}
41+
m_Name:
42+
m_Conditions:
43+
- m_ConditionMode: 1
44+
m_ConditionEvent: fade
45+
m_EventTreshold: 0
46+
m_DstStateMachine: {fileID: 0}
47+
m_DstState: {fileID: 1102065630435415814}
48+
m_Solo: 0
49+
m_Mute: 0
50+
m_IsExit: 0
51+
serializedVersion: 3
52+
m_TransitionDuration: 0.25
53+
m_TransitionOffset: 0
54+
m_ExitTime: 0.75
55+
m_HasExitTime: 0
56+
m_HasFixedDuration: 1
57+
m_InterruptionSource: 0
58+
m_OrderedInterruption: 1
59+
m_CanTransitionToSelf: 1
60+
--- !u!1101 &1101736045922146972
61+
AnimatorStateTransition:
62+
m_ObjectHideFlags: 1
63+
m_CorrespondingSourceObject: {fileID: 0}
64+
m_PrefabInternal: {fileID: 0}
65+
m_Name:
66+
m_Conditions: []
67+
m_DstStateMachine: {fileID: 0}
68+
m_DstState: {fileID: 1102960919398998286}
69+
m_Solo: 0
70+
m_Mute: 0
71+
m_IsExit: 0
72+
serializedVersion: 3
73+
m_TransitionDuration: 0.25
74+
m_TransitionOffset: 0
75+
m_ExitTime: 0.75
76+
m_HasExitTime: 1
77+
m_HasFixedDuration: 1
78+
m_InterruptionSource: 0
79+
m_OrderedInterruption: 1
80+
m_CanTransitionToSelf: 1
81+
--- !u!1101 &1101985127604318318
82+
AnimatorStateTransition:
83+
m_ObjectHideFlags: 1
84+
m_CorrespondingSourceObject: {fileID: 0}
85+
m_PrefabInternal: {fileID: 0}
86+
m_Name:
87+
m_Conditions:
88+
- m_ConditionMode: 1
89+
m_ConditionEvent: show
90+
m_EventTreshold: 0
91+
m_DstStateMachine: {fileID: 0}
92+
m_DstState: {fileID: 1102881842968382734}
93+
m_Solo: 0
94+
m_Mute: 0
95+
m_IsExit: 0
96+
serializedVersion: 3
97+
m_TransitionDuration: 0.25
98+
m_TransitionOffset: 0
99+
m_ExitTime: 0.75
100+
m_HasExitTime: 0
101+
m_HasFixedDuration: 1
102+
m_InterruptionSource: 0
103+
m_OrderedInterruption: 1
104+
m_CanTransitionToSelf: 1
105+
--- !u!1102 &1102065630435415814
106+
AnimatorState:
107+
serializedVersion: 5
108+
m_ObjectHideFlags: 1
109+
m_CorrespondingSourceObject: {fileID: 0}
110+
m_PrefabInternal: {fileID: 0}
111+
m_Name: damage_fade_out
112+
m_Speed: 2
113+
m_CycleOffset: 0
114+
m_Transitions:
115+
- {fileID: 1101736045922146972}
116+
m_StateMachineBehaviours: []
117+
m_Position: {x: 50, y: 50, z: 0}
118+
m_IKOnFeet: 0
119+
m_WriteDefaultValues: 1
120+
m_Mirror: 0
121+
m_SpeedParameterActive: 0
122+
m_MirrorParameterActive: 0
123+
m_CycleOffsetParameterActive: 0
124+
m_TimeParameterActive: 0
125+
m_Motion: {fileID: 7400000, guid: 3cd13ce9ea9c9428b972ddbf127657a8, type: 2}
126+
m_Tag:
127+
m_SpeedParameter:
128+
m_MirrorParameter:
129+
m_CycleOffsetParameter:
130+
m_TimeParameter:
131+
--- !u!1102 &1102881842968382734
132+
AnimatorState:
133+
serializedVersion: 5
134+
m_ObjectHideFlags: 1
135+
m_CorrespondingSourceObject: {fileID: 0}
136+
m_PrefabInternal: {fileID: 0}
137+
m_Name: damage_visible
138+
m_Speed: 1
139+
m_CycleOffset: 0
140+
m_Transitions:
141+
- {fileID: 1101256885540823120}
142+
m_StateMachineBehaviours: []
143+
m_Position: {x: 50, y: 50, z: 0}
144+
m_IKOnFeet: 0
145+
m_WriteDefaultValues: 1
146+
m_Mirror: 0
147+
m_SpeedParameterActive: 0
148+
m_MirrorParameterActive: 0
149+
m_CycleOffsetParameterActive: 0
150+
m_TimeParameterActive: 0
151+
m_Motion: {fileID: 7400000, guid: a830e5b51c3b04b0c9b3ffde059fe0f6, type: 2}
152+
m_Tag:
153+
m_SpeedParameter:
154+
m_MirrorParameter:
155+
m_CycleOffsetParameter:
156+
m_TimeParameter:
157+
--- !u!1102 &1102960919398998286
158+
AnimatorState:
159+
serializedVersion: 5
160+
m_ObjectHideFlags: 1
161+
m_CorrespondingSourceObject: {fileID: 0}
162+
m_PrefabInternal: {fileID: 0}
163+
m_Name: damage_invisible
164+
m_Speed: 1
165+
m_CycleOffset: 0
166+
m_Transitions: []
167+
m_StateMachineBehaviours: []
168+
m_Position: {x: 50, y: 50, z: 0}
169+
m_IKOnFeet: 0
170+
m_WriteDefaultValues: 1
171+
m_Mirror: 0
172+
m_SpeedParameterActive: 0
173+
m_MirrorParameterActive: 0
174+
m_CycleOffsetParameterActive: 0
175+
m_TimeParameterActive: 0
176+
m_Motion: {fileID: 7400000, guid: 1192aedccbecf464ea8fa7ae15f1cd08, type: 2}
177+
m_Tag:
178+
m_SpeedParameter:
179+
m_MirrorParameter:
180+
m_CycleOffsetParameter:
181+
m_TimeParameter:
182+
--- !u!1107 &1107990656242198492
183+
AnimatorStateMachine:
184+
serializedVersion: 5
185+
m_ObjectHideFlags: 1
186+
m_CorrespondingSourceObject: {fileID: 0}
187+
m_PrefabInternal: {fileID: 0}
188+
m_Name: Base Layer
189+
m_ChildStates:
190+
- serializedVersion: 1
191+
m_State: {fileID: 1102881842968382734}
192+
m_Position: {x: 200, y: 0, z: 0}
193+
- serializedVersion: 1
194+
m_State: {fileID: 1102065630435415814}
195+
m_Position: {x: 235, y: 65, z: 0}
196+
- serializedVersion: 1
197+
m_State: {fileID: 1102960919398998286}
198+
m_Position: {x: 270, y: 130, z: 0}
199+
m_ChildStateMachines: []
200+
m_AnyStateTransitions:
201+
- {fileID: 1101985127604318318}
202+
m_EntryTransitions: []
203+
m_StateMachineTransitions: {}
204+
m_StateMachineBehaviours: []
205+
m_AnyStatePosition: {x: 48, y: 24, z: 0}
206+
m_EntryPosition: {x: 50, y: 120, z: 0}
207+
m_ExitPosition: {x: 800, y: 120, z: 0}
208+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
209+
m_DefaultState: {fileID: 1102960919398998286}

Assets/AnimationControllers/Damage.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.

0 commit comments

Comments
 (0)