Skip to content

Commit edbd41b

Browse files
treivizeamel-unity
andauthored
Added slash effect when player is triggering an attack (#356)
* Added slash effect when player is triggering an attack * Corrected after merge from main * renamed script to correct typing mistake Co-authored-by: Amel Negra <[email protected]>
1 parent ec5158d commit edbd41b

22 files changed

+5961
-319
lines changed

UOP1_Project/Assets/Art/Characters/PigChef/Animation/CaneHit.anim

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75675,7 +75675,14 @@ AnimationClip:
7567575675
m_HasGenericRootTransform: 0
7567675676
m_HasMotionFloatCurves: 0
7567775677
m_Events:
75678-
- time: 0.78333336
75678+
- time: 0.73333335
75679+
functionName: PlaySlashEffect
75680+
data:
75681+
objectReferenceParameter: {fileID: 0}
75682+
floatParameter: 0
75683+
intParameter: 0
75684+
messageOptions: 0
75685+
- time: 0.76666665
7567975686
functionName: EnableWeapon
7568075687
data:
7568175688
objectReferenceParameter: {fileID: 0}

UOP1_Project/Assets/Art/Characters/PigChef/Animation/CaneHit2.anim

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80121,6 +80121,13 @@ AnimationClip:
8012180121
m_HasGenericRootTransform: 0
8012280122
m_HasMotionFloatCurves: 0
8012380123
m_Events:
80124+
- time: 0.8666667
80125+
functionName: PlayReverseSlashEffect
80126+
data:
80127+
objectReferenceParameter: {fileID: 0}
80128+
floatParameter: 0
80129+
intParameter: 0
80130+
messageOptions: 0
8012480131
- time: 0.9166667
8012580132
functionName: EnableWeapon
8012680133
data:

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ AnimatorState:
603603
- {fileID: -4762902591384597963}
604604
- {fileID: -2033464475531255411}
605605
- {fileID: -890836485891151347}
606+
- {fileID: 4588335210444503344}
606607
m_StateMachineBehaviours: []
607608
m_Position: {x: 50, y: 50, z: 0}
608609
m_IKOnFeet: 0
@@ -826,6 +827,31 @@ AnimatorState:
826827
m_MirrorParameter:
827828
m_CycleOffsetParameter:
828829
m_TimeParameter:
830+
--- !u!1101 &2953684125489925025
831+
AnimatorStateTransition:
832+
m_ObjectHideFlags: 1
833+
m_CorrespondingSourceObject: {fileID: 0}
834+
m_PrefabInstance: {fileID: 0}
835+
m_PrefabAsset: {fileID: 0}
836+
m_Name:
837+
m_Conditions:
838+
- m_ConditionMode: 1
839+
m_ConditionEvent: IsAttacking
840+
m_EventTreshold: 0
841+
m_DstStateMachine: {fileID: 0}
842+
m_DstState: {fileID: -450912674566187584}
843+
m_Solo: 0
844+
m_Mute: 0
845+
m_IsExit: 0
846+
serializedVersion: 3
847+
m_TransitionDuration: 0.25
848+
m_TransitionOffset: 0
849+
m_ExitTime: 0.8943662
850+
m_HasExitTime: 1
851+
m_HasFixedDuration: 1
852+
m_InterruptionSource: 0
853+
m_OrderedInterruption: 1
854+
m_CanTransitionToSelf: 1
829855
--- !u!1102 &3444333041856388052
830856
AnimatorState:
831857
serializedVersion: 5
@@ -882,6 +908,31 @@ AnimatorStateTransition:
882908
m_InterruptionSource: 0
883909
m_OrderedInterruption: 1
884910
m_CanTransitionToSelf: 1
911+
--- !u!1101 &4588335210444503344
912+
AnimatorStateTransition:
913+
m_ObjectHideFlags: 1
914+
m_CorrespondingSourceObject: {fileID: 0}
915+
m_PrefabInstance: {fileID: 0}
916+
m_PrefabAsset: {fileID: 0}
917+
m_Name:
918+
m_Conditions:
919+
- m_ConditionMode: 1
920+
m_ConditionEvent: IsAttacking
921+
m_EventTreshold: 0
922+
m_DstStateMachine: {fileID: 0}
923+
m_DstState: {fileID: 5995182924539841906}
924+
m_Solo: 0
925+
m_Mute: 0
926+
m_IsExit: 0
927+
serializedVersion: 3
928+
m_TransitionDuration: 0.25
929+
m_TransitionOffset: 0
930+
m_ExitTime: 0.8828125
931+
m_HasExitTime: 1
932+
m_HasFixedDuration: 1
933+
m_InterruptionSource: 0
934+
m_OrderedInterruption: 1
935+
m_CanTransitionToSelf: 1
885936
--- !u!1101 &4910209328142922604
886937
AnimatorStateTransition:
887938
m_ObjectHideFlags: 1
@@ -999,6 +1050,7 @@ AnimatorState:
9991050
- {fileID: -3235251470832908421}
10001051
- {fileID: -1610815559573086160}
10011052
- {fileID: 5384281710731791955}
1053+
- {fileID: 2953684125489925025}
10021054
m_StateMachineBehaviours: []
10031055
m_Position: {x: 50, y: 50, z: 0}
10041056
m_IKOnFeet: 0

UOP1_Project/Assets/Art/Characters/PigChef/Effect.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.
Binary file not shown.

UOP1_Project/Assets/Art/Characters/PigChef/Effect/Slash.fbx.meta

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

UOP1_Project/Assets/Art/Characters/PigChef/Effect/Slash.png.meta

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