Skip to content

Commit 8f99105

Browse files
committed
Adds attack and battle animations and method to attach/detach
1 parent 8244b99 commit 8f99105

20 files changed

+895
-55
lines changed

Assets/_Project/Prefabs/AnimationPrefabs.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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:09f1c56e725a6a15dbcefaa94599a2f1d4e3ed087f7e297f28a5394391fe08cf
3+
size 3673

Assets/_Project/Prefabs/AnimationPrefabs/attack-memoryflare.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:63b54bd421b4bb33f99876ba36eba4a4f4990c531484c2577d0dadb2bb0a8aad
3+
size 3397

Assets/_Project/Prefabs/AnimationPrefabs/battle-rumble-anim-back.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:72521a17b125c60e846cc7cf46af22bd8b207a265f75dfa8518cbbb540236a3d
3+
size 3347

Assets/_Project/Prefabs/AnimationPrefabs/battle-rumble-anim-front.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9af454d928daae25e64d1f1592ad353a6ec85de9caf74f067322a0c065d31554
3-
size 19742
2+
oid sha256:b555ab1e0a7815d919e94d07b612c76777784bd361b57c0d22c42b61755dfe45
3+
size 21221

Assets/_Project/Scenes/tally-viz.unity

Lines changed: 80 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,7 +1591,7 @@ MonoBehaviour:
15911591
m_Name:
15921592
m_EditorClassIdentifier:
15931593
chosenHost: 1
1594-
chosenEndpoint: 0
1594+
chosenEndpoint: 6
15951595
path:
15961596
--- !u!114 &481131869
15971597
MonoBehaviour:
@@ -1641,7 +1641,7 @@ RectTransform:
16411641
m_RootOrder: 0
16421642
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
16431643
m_AnchorMin: {x: 0, y: 0}
1644-
m_AnchorMax: {x: 1, y: 1}
1644+
m_AnchorMax: {x: 0, y: 0}
16451645
m_AnchoredPosition: {x: 0, y: 0}
16461646
m_SizeDelta: {x: 20, y: 20}
16471647
m_Pivot: {x: 0.5, y: 0.5}
@@ -2177,7 +2177,7 @@ GameObject:
21772177
m_Icon: {fileID: 0}
21782178
m_NavMeshLayer: 0
21792179
m_StaticEditorFlags: 0
2180-
m_IsActive: 0
2180+
m_IsActive: 1
21812181
--- !u!114 &832129568
21822182
MonoBehaviour:
21832183
m_ObjectHideFlags: 0
@@ -2462,6 +2462,8 @@ MonoBehaviour:
24622462
m_EditorClassIdentifier:
24632463
worldContainerCollider: {fileID: 215753798}
24642464
playerPrefab: {fileID: 9008334923571228613, guid: ecec1fc7bdc6441a691ca908dfadc8b4, type: 3}
2465+
currentPlayerObj: {fileID: 0}
2466+
currentPlayerScript: {fileID: 0}
24652467
playerCount: 0
24662468
avatars:
24672469
- {fileID: 21300000, guid: 8d9c45a6d65954fa9af3d58238d60180, type: 3}
@@ -2480,6 +2482,9 @@ MonoBehaviour:
24802482
- {fileID: 21300000, guid: 1a0cc98517c1c41d5a819fdb063e4bcc, type: 3}
24812483
- {fileID: 21300000, guid: 70f96b99f6876446bbb957877383d0b8, type: 3}
24822484
- {fileID: 21300000, guid: e4572dc84b36f448c83e75a66e1fb2b1, type: 3}
2485+
attackSpriteAnim: {fileID: 7167580533093022045, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
2486+
battleSpriteAnimFront: {fileID: 7167580533093022045, guid: b3da786dd6edc4bcf82cc83ed7c0b4db, type: 3}
2487+
battleSpriteAnimBack: {fileID: 7167580533093022045, guid: aa2c349942b0c4a87ad4915e702781fa, type: 3}
24832488
--- !u!1 &945187312
24842489
GameObject:
24852490
m_ObjectHideFlags: 0
@@ -3042,6 +3047,11 @@ CanvasRenderer:
30423047
m_PrefabAsset: {fileID: 0}
30433048
m_GameObject: {fileID: 1213503735}
30443049
m_CullTransparentMesh: 0
3050+
--- !u!4 &1219136106 stripped
3051+
Transform:
3052+
m_CorrespondingSourceObject: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
3053+
m_PrefabInstance: {fileID: 1849886682}
3054+
m_PrefabAsset: {fileID: 0}
30453055
--- !u!1 &1236176044
30463056
GameObject:
30473057
m_ObjectHideFlags: 0
@@ -3558,7 +3568,7 @@ PrefabInstance:
35583568
objectReference: {fileID: 0}
35593569
- target: {fileID: 7489948669748588920, guid: ecec1fc7bdc6441a691ca908dfadc8b4, type: 3}
35603570
propertyPath: m_RootOrder
3561-
value: 0
3571+
value: 1
35623572
objectReference: {fileID: 0}
35633573
- target: {fileID: 7489948669748588920, guid: ecec1fc7bdc6441a691ca908dfadc8b4, type: 3}
35643574
propertyPath: m_LocalEulerAnglesHint.x
@@ -3679,7 +3689,7 @@ Transform:
36793689
m_Children:
36803690
- {fileID: 1455422368}
36813691
m_Father: {fileID: 1660593872}
3682-
m_RootOrder: 1
3692+
m_RootOrder: 2
36833693
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36843694
--- !u!1 &1343860835
36853695
GameObject:
@@ -4031,7 +4041,7 @@ RectTransform:
40314041
m_AnchorMin: {x: 0, y: 1}
40324042
m_AnchorMax: {x: 1, y: 1}
40334043
m_AnchoredPosition: {x: 0, y: -100.00002}
4034-
m_SizeDelta: {x: 0, y: 40.11}
4044+
m_SizeDelta: {x: 0, y: 0}
40354045
m_Pivot: {x: 0.5, y: 0.5}
40364046
--- !u!114 &1617634874
40374047
MonoBehaviour:
@@ -4171,6 +4181,7 @@ Transform:
41714181
m_LocalPosition: {x: 0, y: 0, z: 0}
41724182
m_LocalScale: {x: 1, y: 1, z: 1}
41734183
m_Children:
4184+
- {fileID: 1219136106}
41744185
- {fileID: 970291500}
41754186
- {fileID: 1339374950}
41764187
m_Father: {fileID: 0}
@@ -4388,6 +4399,67 @@ RectTransform:
43884399
m_AnchoredPosition: {x: 0, y: 0}
43894400
m_SizeDelta: {x: -20, y: -20}
43904401
m_Pivot: {x: 0.5, y: 0.5}
4402+
--- !u!1001 &1849886682
4403+
PrefabInstance:
4404+
m_ObjectHideFlags: 0
4405+
serializedVersion: 2
4406+
m_Modification:
4407+
m_TransformParent: {fileID: 1660593872}
4408+
m_Modifications:
4409+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4410+
propertyPath: m_LocalPosition.x
4411+
value: 4.43
4412+
objectReference: {fileID: 0}
4413+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4414+
propertyPath: m_LocalPosition.y
4415+
value: 0
4416+
objectReference: {fileID: 0}
4417+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4418+
propertyPath: m_LocalPosition.z
4419+
value: 0
4420+
objectReference: {fileID: 0}
4421+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4422+
propertyPath: m_LocalRotation.x
4423+
value: -0
4424+
objectReference: {fileID: 0}
4425+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4426+
propertyPath: m_LocalRotation.y
4427+
value: -0
4428+
objectReference: {fileID: 0}
4429+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4430+
propertyPath: m_LocalRotation.z
4431+
value: -0
4432+
objectReference: {fileID: 0}
4433+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4434+
propertyPath: m_LocalRotation.w
4435+
value: 1
4436+
objectReference: {fileID: 0}
4437+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4438+
propertyPath: m_RootOrder
4439+
value: 0
4440+
objectReference: {fileID: 0}
4441+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4442+
propertyPath: m_LocalEulerAnglesHint.x
4443+
value: 0
4444+
objectReference: {fileID: 0}
4445+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4446+
propertyPath: m_LocalEulerAnglesHint.y
4447+
value: 0
4448+
objectReference: {fileID: 0}
4449+
- target: {fileID: 7167580533093022032, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4450+
propertyPath: m_LocalEulerAnglesHint.z
4451+
value: 0
4452+
objectReference: {fileID: 0}
4453+
- target: {fileID: 7167580533093022045, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4454+
propertyPath: m_Name
4455+
value: attack-memoryflare
4456+
objectReference: {fileID: 0}
4457+
- target: {fileID: 7167580533093022045, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
4458+
propertyPath: m_IsActive
4459+
value: 0
4460+
objectReference: {fileID: 0}
4461+
m_RemovedComponents: []
4462+
m_SourcePrefab: {fileID: 100100000, guid: 428693ccec54b425e90574f5bc568b9e, type: 3}
43914463
--- !u!1 &1855256569
43924464
GameObject:
43934465
m_ObjectHideFlags: 0
@@ -4423,9 +4495,9 @@ RectTransform:
44234495
m_RootOrder: 0
44244496
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
44254497
m_AnchorMin: {x: 0, y: 0}
4426-
m_AnchorMax: {x: 1, y: 1}
4498+
m_AnchorMax: {x: 0, y: 0}
44274499
m_AnchoredPosition: {x: 0, y: 0}
4428-
m_SizeDelta: {x: -17, y: 0}
4500+
m_SizeDelta: {x: 0, y: 0}
44294501
m_Pivot: {x: 0, y: 1}
44304502
--- !u!114 &1855256571
44314503
MonoBehaviour:

Assets/_Project/Scripts/Effects/TallyAnimController.cs renamed to Assets/_Project/Scripts/Effects/AnimController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Play animations attached to this object's Animator
77
*/
88

9-
public class TallyAnimController : MonoBehaviour {
9+
public class AnimController : MonoBehaviour {
1010

1111
public Animator animator;
1212
public int currentAnimation = 0; // the animation to play

0 commit comments

Comments
 (0)