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

서로 공격 들어감. 현재 적이 아이템 드랍하지 않음.

parent 539e6417
...@@ -30,7 +30,7 @@ AnimationClip: ...@@ -30,7 +30,7 @@ AnimationClip:
value: {fileID: 21300000, guid: 0587a0b1b851de04585d1478bbdb94d6, type: 3} value: {fileID: 21300000, guid: 0587a0b1b851de04585d1478bbdb94d6, type: 3}
- time: 0.5 - time: 0.5
value: {fileID: 21300000, guid: b59c1dc664dd2244f9cd6e616c9cff3f, type: 3} value: {fileID: 21300000, guid: b59c1dc664dd2244f9cd6e616c9cff3f, type: 3}
- time: 0.6 - time: 0.6166667
value: {fileID: 21300000, guid: 0215c969b3c53c0488a9415e3281c949, type: 3} value: {fileID: 21300000, guid: 0215c969b3c53c0488a9415e3281c949, type: 3}
- time: 0.7 - time: 0.7
value: {fileID: 21300000, guid: 2eeae0d0619773f49912b81cd6dd5646, type: 3} value: {fileID: 21300000, guid: 2eeae0d0619773f49912b81cd6dd5646, type: 3}
......
...@@ -44,7 +44,6 @@ GameObject: ...@@ -44,7 +44,6 @@ GameObject:
- component: {fileID: 61129044981816742} - component: {fileID: 61129044981816742}
- component: {fileID: 114402380471012178} - component: {fileID: 114402380471012178}
- component: {fileID: 60342798607647292} - component: {fileID: 60342798607647292}
- component: {fileID: 114190796731463818}
m_Layer: 0 m_Layer: 0
m_Name: AttackColider m_Name: AttackColider
m_TagString: Untagged m_TagString: Untagged
...@@ -195,22 +194,6 @@ Animator: ...@@ -195,22 +194,6 @@ Animator:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0 m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &114190796731463818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1862495014651308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
m_Name:
m_EditorClassIdentifier:
damage: 0
knockBackMultiplier: 1
debuffNum: 0
debuffType:
debuffTime: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
--- !u!114 &114294925164316638 --- !u!114 &114294925164316638
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -279,13 +262,8 @@ MonoBehaviour: ...@@ -279,13 +262,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3} m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
attackRaw: attack: 000000
- 0 cancel: 0
- 0
- 0
attackKeyState: 000000000000000000000000
cancelRaw: 0
cancelKeyState: 0
playingSkill: 0 playingSkill: 0
comboTime: 1 comboTime: 1
time: {fileID: 0} time: {fileID: 0}
...@@ -295,10 +273,11 @@ MonoBehaviour: ...@@ -295,10 +273,11 @@ MonoBehaviour:
anim: {fileID: 95992411616135034} anim: {fileID: 95992411616135034}
aoc: {fileID: 0} aoc: {fileID: 0}
normalAttack: normalAttack:
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2} - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2} - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2} - {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
inventoryManager: {fileID: 0} inventoryManager: {fileID: 0}
lifeStoneManager: {fileID: 0}
--- !u!114 &114906702720267008 --- !u!114 &114906702720267008
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -310,7 +289,6 @@ MonoBehaviour: ...@@ -310,7 +289,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d7635365ab870ce46bd38a4af729df1b, type: 3} m_Script: {fileID: 11500000, guid: d7635365ab870ce46bd38a4af729df1b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
LCUI: {fileID: 0}
ttx: 8 ttx: 8
tty: 0 tty: 0
--- !u!212 &212187280661781960 --- !u!212 &212187280661781960
......
This diff is collapsed.
fileFormatVersion: 2
guid: b1bf5cd583e214e448b83335f6c2d7a6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
...@@ -968,6 +968,26 @@ Prefab: ...@@ -968,6 +968,26 @@ Prefab:
propertyPath: lifeStoneManager propertyPath: lifeStoneManager
value: value:
objectReference: {fileID: 1206751493} objectReference: {fileID: 1206751493}
- target: {fileID: 114402380471012178, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: damage
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: normalAttack.Array.data[0]
value:
objectReference: {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: normalAttack.Array.data[1]
value:
objectReference: {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
- target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
type: 2}
propertyPath: normalAttack.Array.data[2]
value:
objectReference: {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2} m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
m_IsPrefabAsset: 0 m_IsPrefabAsset: 0
......
...@@ -13,9 +13,9 @@ public class AttackProperty : MonoBehaviour{ ...@@ -13,9 +13,9 @@ public class AttackProperty : MonoBehaviour{
if (collision.CompareTag("Enemy")) if (collision.CompareTag("Enemy"))
{ {
Debug.Log(damage);
PlayerAttackInfo curAttack = new PlayerAttackInfo(damage, knockBackMultiplier, debuffNum, debuffType, debuffTime); PlayerAttackInfo curAttack = new PlayerAttackInfo(damage, knockBackMultiplier, debuffNum, debuffType, debuffTime);
Enemy enemyInfo = collision.transform.GetChild(0).GetComponent<Enemy>(); Enemy enemyInfo = collision.transform.GetChild(0).GetComponent<Enemy>();
Debug.Log("Ugh!");
collision.transform.GetChild(0).GetComponent<Enemy>().GetDamaged(curAttack); collision.transform.GetChild(0).GetComponent<Enemy>().GetDamaged(curAttack);
} }
} }
......
...@@ -76,7 +76,7 @@ public class Enemy : MonoBehaviour { ...@@ -76,7 +76,7 @@ public class Enemy : MonoBehaviour {
processDeath(); processDeath();
return; return;
} }
animator.SetFloat("knockbackDistance", damage / this.weight); animator.SetFloat("knockbackDistance", attack.damage / this.weight * attack.knockBackMultiplier);
animator.SetTrigger("DamagedTrigger"); animator.SetTrigger("DamagedTrigger");
} }
......
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