Skip to content

Commit

Permalink
Arreglado problema de colisiones
Browse files Browse the repository at this point in the history
  • Loading branch information
Sounagix committed Mar 12, 2019
1 parent c328f03 commit 40e003f
Show file tree
Hide file tree
Showing 60 changed files with 4,059 additions and 406 deletions.
80 changes: 80 additions & 0 deletions Goblin Slayer/Assets/Animations/Explosion.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Explosion
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300036, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.083333336
value: {fileID: 21300038, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.16666667
value: {fileID: 21300040, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.25
value: {fileID: 21300042, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.33333334
value: {fileID: 21300044, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300036, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300038, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300040, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300042, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300044, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.35000002
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []

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

101 changes: 101 additions & 0 deletions Goblin Slayer/Assets/Animations/fireBallAnim.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: fireBallAnim
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.06666667
value: {fileID: 21300002, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.15
value: {fileID: 21300004, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.21666667
value: {fileID: 21300006, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.28333333
value: {fileID: 21300008, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.35
value: {fileID: 21300010, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.43333334
value: {fileID: 21300012, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.5
value: {fileID: 21300014, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.56666666
value: {fileID: 21300016, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.6333333
value: {fileID: 21300018, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.71666664
value: {fileID: 21300020, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- time: 0.78333336
value: {fileID: 21300022, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300002, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300004, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300006, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300008, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300010, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300012, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300014, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300016, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300018, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300020, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
- {fileID: 21300022, guid: 2f48a06ea2809804586dc7d768562dd8, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.8
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Goblin Slayer/Assets/Animations/fireBallAnim.anim.meta

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

116 changes: 0 additions & 116 deletions Goblin Slayer/Assets/Animations/fireball.anim

This file was deleted.

Loading

0 comments on commit 40e003f

Please sign in to comment.