Commit c49671f8 authored by 18류지석's avatar 18류지석

고블린 패치

parent 74c55490
......@@ -29,7 +29,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.0166667
time: 0.7
value: 1
inSlope: Infinity
outSlope: Infinity
......@@ -38,7 +38,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.4833333
time: 0.75
value: 0
inSlope: Infinity
outSlope: Infinity
......@@ -57,15 +57,15 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 21300000, guid: b0d499510f5dd4144bc2b110a4fba53c, type: 3}
- time: 0.18333334
- time: 0.11666667
value: {fileID: 21300000, guid: 37e5cfde8d3541845a184c4d6ab25e21, type: 3}
- time: 0.41666666
- time: 0.25
value: {fileID: 21300000, guid: 2806c6904b006114bad1fb3f64d64c14, type: 3}
- time: 1.0166667
- time: 0.7
value: {fileID: 21300000, guid: 6234b3bf70d0272478b444abdd572f09, type: 3}
- time: 1.2666667
- time: 0.8333333
value: {fileID: 21300000, guid: f7d12f4a971df594c8d297610a3f9e57, type: 3}
- time: 1.4833333
- time: 0.96666664
value: {fileID: 21300000, guid: b2382ef0803ec1c4c811783916c7aa49, type: 3}
attribute: m_Sprite
path:
......@@ -104,7 +104,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.5
m_StopTime: 0.9833333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
......@@ -133,7 +133,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.0166667
time: 0.7
value: 1
inSlope: Infinity
outSlope: Infinity
......@@ -142,7 +142,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1.4833333
time: 0.75
value: 0
inSlope: Infinity
outSlope: Infinity
......
......@@ -260,13 +260,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
monsterID: 117
maxHealth: 5
weight: 1
maxHealth: 15
weight: 10
patrolRange: 2
noticeRange: 2
attackRange: 1
patrolSpeed: 2.5
trackSpeed: 3.5
patrolSpeed: 1.5
trackSpeed: 2.5
playerDistance: 0
untouchable: 0
--- !u!114 &114173716467154830
......@@ -292,7 +292,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 908a1b16b9926f747807d321c5ecc8af, type: 3}
m_Name:
m_EditorClassIdentifier:
damage: 1
damage: 4
--- !u!212 &212540714587432698
SpriteRenderer:
m_ObjectHideFlags: 1
......
......@@ -75,7 +75,8 @@ public class Enemy : MonoBehaviour {
return;
}
animator.SetFloat("knockbackDistance", attack.damage / this.weight * attack.knockBackMultiplier);
animator.SetTrigger("DamagedTrigger");
if(attack.damage / this.weight >= 0.25f)
animator.SetTrigger("DamagedTrigger");
}
// Animation Event
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment