Skip to content

Commit 927e8f1

Browse files
committed
Added and integrated new attack animation for plant critter
1 parent ccb3a30 commit 927e8f1

File tree

7 files changed

+35914
-8565
lines changed

7 files changed

+35914
-8565
lines changed

UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/Attack.anim

Lines changed: 16269 additions & 8553 deletions
Large diffs are not rendered by default.

UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/Attack.anim.meta

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

UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/OldAttack.anim

Lines changed: 19467 additions & 0 deletions
Large diffs are not rendered by default.

UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/OldAttack.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.

UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritter.controller

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!1107 &-6906756954081474660
44
AnimatorStateMachine:
5-
serializedVersion: 5
5+
serializedVersion: 6
66
m_ObjectHideFlags: 1
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
@@ -89,7 +89,7 @@ AnimatorStateTransition:
8989
m_CanTransitionToSelf: 1
9090
--- !u!1102 &-5704565605198617748
9191
AnimatorState:
92-
serializedVersion: 5
92+
serializedVersion: 6
9393
m_ObjectHideFlags: 1
9494
m_CorrespondingSourceObject: {fileID: 0}
9595
m_PrefabInstance: {fileID: 0}
@@ -144,7 +144,7 @@ AnimatorStateTransition:
144144
m_CanTransitionToSelf: 1
145145
--- !u!1102 &-4820672301618440199
146146
AnimatorState:
147-
serializedVersion: 5
147+
serializedVersion: 6
148148
m_ObjectHideFlags: 1
149149
m_CorrespondingSourceObject: {fileID: 0}
150150
m_PrefabInstance: {fileID: 0}
@@ -195,7 +195,7 @@ AnimatorStateTransition:
195195
m_CanTransitionToSelf: 1
196196
--- !u!1102 &-4130062669359518069
197197
AnimatorState:
198-
serializedVersion: 5
198+
serializedVersion: 6
199199
m_ObjectHideFlags: 1
200200
m_CorrespondingSourceObject: {fileID: 0}
201201
m_PrefabInstance: {fileID: 0}
@@ -247,7 +247,7 @@ AnimatorStateTransition:
247247
m_CanTransitionToSelf: 1
248248
--- !u!1102 &-3077816066201406678
249249
AnimatorState:
250-
serializedVersion: 5
250+
serializedVersion: 6
251251
m_ObjectHideFlags: 1
252252
m_CorrespondingSourceObject: {fileID: 0}
253253
m_PrefabInstance: {fileID: 0}
@@ -276,7 +276,7 @@ AnimatorState:
276276
m_TimeParameter:
277277
--- !u!1102 &-1129748727142868905
278278
AnimatorState:
279-
serializedVersion: 5
279+
serializedVersion: 6
280280
m_ObjectHideFlags: 1
281281
m_CorrespondingSourceObject: {fileID: 0}
282282
m_PrefabInstance: {fileID: 0}
@@ -427,7 +427,7 @@ AnimatorStateTransition:
427427
m_CanTransitionToSelf: 1
428428
--- !u!1102 &2524807526743509888
429429
AnimatorState:
430-
serializedVersion: 5
430+
serializedVersion: 6
431431
m_ObjectHideFlags: 1
432432
m_CorrespondingSourceObject: {fileID: 0}
433433
m_PrefabInstance: {fileID: 0}
@@ -477,7 +477,7 @@ AnimatorStateTransition:
477477
m_CanTransitionToSelf: 1
478478
--- !u!1102 &3282315440550505860
479479
AnimatorState:
480-
serializedVersion: 5
480+
serializedVersion: 6
481481
m_ObjectHideFlags: 1
482482
m_CorrespondingSourceObject: {fileID: 0}
483483
m_PrefabInstance: {fileID: 0}
@@ -530,7 +530,7 @@ AnimatorStateTransition:
530530
m_CanTransitionToSelf: 1
531531
--- !u!1102 &7857801635076326762
532532
AnimatorState:
533-
serializedVersion: 5
533+
serializedVersion: 6
534534
m_ObjectHideFlags: 1
535535
m_CorrespondingSourceObject: {fileID: 0}
536536
m_PrefabInstance: {fileID: 0}
@@ -550,7 +550,7 @@ AnimatorState:
550550
m_MirrorParameterActive: 0
551551
m_CycleOffsetParameterActive: 0
552552
m_TimeParameterActive: 0
553-
m_Motion: {fileID: 7400000, guid: d369cba3ba8337d4b8a1c2d6f5d277f1, type: 2}
553+
m_Motion: {fileID: 7400000, guid: c0cbef4ef0e73ea46b6c82f467c853a1, type: 2}
554554
m_Tag:
555555
m_SpeedParameter:
556556
m_MirrorParameter:
Binary file not shown.

UOP1_Project/Assets/Art/Characters/PlantCritter/Animation/PlantCritterAttack.fbx.meta

Lines changed: 158 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)