Skip to content

Commit

Permalink
Merge pull request #47 from ES2-UFPI/eryckkawa#31
Browse files Browse the repository at this point in the history
finalizado a issue de feedback de combate ao player #31
  • Loading branch information
EryckKawa authored Jul 22, 2024
2 parents a86d9ad + 8085d05 commit 793ff38
Show file tree
Hide file tree
Showing 1,229 changed files with 1,123,598 additions and 110 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,55 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-4706274242182295134
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GetHit
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -4642801339335204001}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7055355079433224739, guid: 83e28e7ec15604e4e936c71d31a7ebad, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-4642801339335204001
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.625
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-4037403896531961312
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -127,8 +176,12 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 2709659091000914528}
m_Position: {x: 710, y: 310, z: 0}
- serializedVersion: 1
m_State: {fileID: -4706274242182295134}
m_Position: {x: 840, y: 370, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_AnyStateTransitions:
- {fileID: 5262493328447011984}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
Expand Down Expand Up @@ -164,6 +217,12 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
- m_Name: IsDamage
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down Expand Up @@ -260,6 +319,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &5262493328447011984
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsDamage
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4706274242182295134}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.24999999
m_TransitionOffset: 0
m_ExitTime: 0.05033083
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &6284907373218244504
AnimatorState:
serializedVersion: 6
Expand Down
8 changes: 8 additions & 0 deletions Assets/Imported Assets/Fantasy Sfx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Imported Assets/Fantasy Sfx/Mp3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Imported Assets/Fantasy Sfx/Mp3/Ambience_Cave_00.mp3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Imported Assets/Fantasy Sfx/Mp3/Dragon_Growl_00.mp3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
23 changes: 23 additions & 0 deletions Assets/Imported Assets/Fantasy Sfx/Mp3/Dragon_Growl_01.mp3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Imported Assets/Fantasy Sfx/Mp3/Footsteps.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Loading

0 comments on commit 793ff38

Please sign in to comment.