End of day 13

Enemies now bite back! Also some sound.
Papiertig0r · Jan 13, 2018 · 84a77c8 · 84a77c8
1 parent a175a93
commit 84a77c8
Show file tree

Hide file tree

Showing 118 changed files with 1,711 additions and 31 deletions.
diff --git a/Assets/Animations/Pogo Puschel/Attack_Down.anim b/Assets/Animations/Pogo Puschel/Attack_Down.anim
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Attack_Down
+  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: 21300304, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300316, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: 21300304, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    - {fileID: 21300316, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.16666667
+    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: []
diff --git a/Assets/Animations/Pogo Puschel/Attack_Down.anim.meta b/Assets/Animations/Pogo Puschel/Attack_Down.anim.meta
diff --git a/Assets/Animations/Pogo Puschel/Attack_Left.anim b/Assets/Animations/Pogo Puschel/Attack_Left.anim
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Attack_Left
+  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: 21300362, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300364, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: 21300362, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    - {fileID: 21300364, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.16666667
+    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: []
diff --git a/Assets/Animations/Pogo Puschel/Attack_Left.anim.meta b/Assets/Animations/Pogo Puschel/Attack_Left.anim.meta
diff --git a/Assets/Animations/Pogo Puschel/Attack_Up.anim b/Assets/Animations/Pogo Puschel/Attack_Up.anim
@@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Attack_Up
+  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: 21300336, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300338, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 12
+  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: 21300336, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+    - {fileID: 21300338, guid: 42b8861285bb6884b80691136e39df32, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.16666667
+    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: []
diff --git a/Assets/Animations/Pogo Puschel/Attack_Up.anim.meta b/Assets/Animations/Pogo Puschel/Attack_Up.anim.meta
diff --git a/Assets/Animations/Pogo Puschel/PogoPuschel.overrideController b/Assets/Animations/Pogo Puschel/PogoPuschel.overrideController
@@ -24,3 +24,11 @@ AnimatorOverrideController:
     m_OverrideClip: {fileID: 7400000, guid: 73bda66b0753cd845aa4c719d438f9a2, type: 2}
   - m_OriginalClip: {fileID: 7400000, guid: 50eb03e70517abf4aaebc18013617b5f, type: 2}
     m_OverrideClip: {fileID: 7400000, guid: 4e7ed613f80ccb54d9ba73dc1febee2e, type: 2}
+  - m_OriginalClip: {fileID: 7400000, guid: dbc77285a9b9a4e4490d9fdf8508d7f4, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 74447bc6e3f661d49a89622d90b6b368, type: 2}
+  - m_OriginalClip: {fileID: 7400000, guid: 9b4fce2496863b94699034eb0aa219cf, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 74447bc6e3f661d49a89622d90b6b368, type: 2}
+  - m_OriginalClip: {fileID: 7400000, guid: 31f636fcbcef9934da237792108e8ae7, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 29626b904ff1d7044aaf5802f204f1c5, type: 2}
+  - m_OriginalClip: {fileID: 7400000, guid: 2d782981d567dcb4b97e398de49f6715, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 6b87074c2def79d4999b268ca23ee4fd, type: 2}
diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity
@@ -327,7 +327,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 290345893}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 594, y: 309.5, z: 0}
+  m_LocalPosition: {x: 320, y: 309.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -547,6 +547,9 @@ MonoBehaviour:
   stats: {fileID: 11400000, guid: 71dc1671cbf0a2e40b3e96e74c2564e4, type: 2}
   bloodParticle: {fileID: 1102623789891546, guid: 122b81b47e1ed9c4db6a54a06dd509c4,
     type: 2}
+  takeDamageClip: {fileID: 8300000, guid: 02b7e645b6c23ba4dbe216c890952095, type: 3}
+  hitClip: {fileID: 8300000, guid: faffc1e3aebfb734993c6419825fa5dd, type: 3}
+  walking: {fileID: 8300000, guid: cdd7bf8b09364e940a405d99bf8c0f93, type: 3}
   target: {fileID: 1124556317}
   attackCollider: {fileID: 922113626}
   inventory: {fileID: 0}
@@ -715,9 +718,10 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 562499914}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -8.85, y: 0.75, z: 0}
+  m_LocalPosition: {x: -8, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 609801519}
   m_Father: {fileID: 0}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -735,11 +739,17 @@ MonoBehaviour:
   stats: {fileID: 11400000, guid: ce0ab895fe0fb1542ad73dae15aaa98c, type: 2}
   bloodParticle: {fileID: 1102623789891546, guid: 122b81b47e1ed9c4db6a54a06dd509c4,
     type: 2}
+  takeDamageClip: {fileID: 0}
+  hitClip: {fileID: 0}
+  attackCollider: {fileID: 609801516}
   isTethered: 1
   tetherRange: 5
   idleTime: 3
   targetDistance: 0.1
   corpseIsContainer: 0
+  attackDelay: 1
+  attackRange: 0.75
+  attackCoolDown: 1
 --- !u!58 &562499919
 CircleCollider2D:
   m_ObjectHideFlags: 0
@@ -800,6 +810,77 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 0.6875, y: 0.5}
   m_EdgeRadius: 0
+--- !u!1 &609801516
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 609801519}
+  - component: {fileID: 609801518}
+  - component: {fileID: 609801517}
+  m_Layer: 0
+  m_Name: AttackCollider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!114 &609801517
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 609801516}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c148c8fd319b684b91ef110351786da, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!60 &609801518
+PolygonCollider2D:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 609801516}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 0, y: 0.6}
+      - {x: -0.42426, y: 0.42426}
+      - {x: -0.28284, y: 0.28284}
+      - {x: 0, y: 0.4}
+      - {x: 0.28284, y: 0.28284}
+      - {x: 0.42426, y: 0.42426}
+--- !u!4 &609801519
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 609801516}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.25, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 0}
+  m_Children: []
+  m_Father: {fileID: 562499917}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &611589639
 Prefab:
   m_ObjectHideFlags: 0