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

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

parent 539e6417
......@@ -30,7 +30,7 @@ AnimationClip:
value: {fileID: 21300000, guid: 0587a0b1b851de04585d1478bbdb94d6, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: b59c1dc664dd2244f9cd6e616c9cff3f, type: 3}
- time: 0.6
- time: 0.6166667
value: {fileID: 21300000, guid: 0215c969b3c53c0488a9415e3281c949, type: 3}
- time: 0.7
value: {fileID: 21300000, guid: 2eeae0d0619773f49912b81cd6dd5646, type: 3}
......
......@@ -44,7 +44,6 @@ GameObject:
- component: {fileID: 61129044981816742}
- component: {fileID: 114402380471012178}
- component: {fileID: 60342798607647292}
- component: {fileID: 114190796731463818}
m_Layer: 0
m_Name: AttackColider
m_TagString: Untagged
......@@ -195,22 +194,6 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
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
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -279,13 +262,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
m_Name:
m_EditorClassIdentifier:
attackRaw:
- 0
- 0
- 0
attackKeyState: 000000000000000000000000
cancelRaw: 0
cancelKeyState: 0
attack: 000000
cancel: 0
playingSkill: 0
comboTime: 1
time: {fileID: 0}
......@@ -295,10 +273,11 @@ MonoBehaviour:
anim: {fileID: 95992411616135034}
aoc: {fileID: 0}
normalAttack:
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
- {fileID: 7400000, guid: be4bdbaff27cc7c46a79b3ef4e1fe3f6, type: 2}
- {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
- {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
- {fileID: 7400000, guid: e27c281d8654edd4cafc9f13a3ba66e1, type: 2}
inventoryManager: {fileID: 0}
lifeStoneManager: {fileID: 0}
--- !u!114 &114906702720267008
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -310,7 +289,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d7635365ab870ce46bd38a4af729df1b, type: 3}
m_Name:
m_EditorClassIdentifier:
LCUI: {fileID: 0}
ttx: 8
tty: 0
--- !u!212 &212187280661781960
......
%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: normalAttackA
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.31666666
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.51
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.x
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.94
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0
- serializedVersion: 3
time: 0.75
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: damage
path: AttackColider
classID: 114
script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- time: 0.05
value: {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- time: 0.1
value: {fileID: 21300000, guid: c191e5872d94f364aa3fa64be8d10967, type: 3}
- time: 0.15
value: {fileID: 21300000, guid: 7cf972a4bd232314ea0f665e8ca511d4, type: 3}
- time: 0.2
value: {fileID: 21300000, guid: 0615a491335c9854680ea778373c616d, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- time: 0.3
value: {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- time: 0.35
value: {fileID: 21300000, guid: c191e5872d94f364aa3fa64be8d10967, type: 3}
- time: 0.4
value: {fileID: 21300000, guid: 0527e9dd1805ac943be4ba0b09f47ea4, type: 3}
- time: 0.45
value: {fileID: 21300000, guid: b9bcefb5c62dfd24c874250ffb5738d8, type: 3}
- time: 0.5
value: {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
- time: 0.75
value: {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, 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: 2942363444
attribute: 3305885265
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2942363444
attribute: 298341484
script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
typeID: 114
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
- serializedVersion: 2
path: 2942363444
attribute: 413499720
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2942363444
attribute: 1872933342
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2942363444
attribute: 4197328169
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2942363444
attribute: 2368279999
script: {fileID: 0}
typeID: 61
customType: 0
isPPtrCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- {fileID: 21300000, guid: c191e5872d94f364aa3fa64be8d10967, type: 3}
- {fileID: 21300000, guid: 7cf972a4bd232314ea0f665e8ca511d4, type: 3}
- {fileID: 21300000, guid: 0615a491335c9854680ea778373c616d, type: 3}
- {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
- {fileID: 21300000, guid: c191e5872d94f364aa3fa64be8d10967, type: 3}
- {fileID: 21300000, guid: 0527e9dd1805ac943be4ba0b09f47ea4, type: 3}
- {fileID: 21300000, guid: b9bcefb5c62dfd24c874250ffb5738d8, type: 3}
- {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
- {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.76666665
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
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:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.3
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.31666666
value: 0
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Enabled
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.51
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.x
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Offset.y
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.53
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.x
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.94
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Size.y
path: AttackColider
classID: 61
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: Infinity
outSlope: Infinity
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0
- serializedVersion: 3
time: 0.75
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: damage
path: AttackColider
classID: 114
script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0
m_Events: []
fileFormatVersion: 2
guid: b1bf5cd583e214e448b83335f6c2d7a6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -968,6 +968,26 @@ Prefab:
propertyPath: lifeStoneManager
value:
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_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
m_IsPrefabAsset: 0
......
......@@ -13,9 +13,9 @@ public class AttackProperty : MonoBehaviour{
if (collision.CompareTag("Enemy"))
{
Debug.Log(damage);
PlayerAttackInfo curAttack = new PlayerAttackInfo(damage, knockBackMultiplier, debuffNum, debuffType, debuffTime);
Enemy enemyInfo = collision.transform.GetChild(0).GetComponent<Enemy>();
Debug.Log("Ugh!");
collision.transform.GetChild(0).GetComponent<Enemy>().GetDamaged(curAttack);
}
}
......
......@@ -76,7 +76,7 @@ public class Enemy : MonoBehaviour {
processDeath();
return;
}
animator.SetFloat("knockbackDistance", damage / this.weight);
animator.SetFloat("knockbackDistance", attack.damage / this.weight * attack.knockBackMultiplier);
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