Commit 5e9338eb authored by 18김상언's avatar 18김상언

졸라쳐 화살 벽에 안박히던거 수정함

parent ea179f6d
...@@ -57,52 +57,74 @@ AnimatorController: ...@@ -57,52 +57,74 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1101 &1101073875083743828 --- !u!114 &114131752010043270
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5d509d59e6d33554080b80ace47f7582, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114636977847364968
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab425faa2b9642b44977de7c24fd4101, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1101 &1101424878863823022
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_Name: m_Name:
m_Conditions: m_Conditions: []
- m_ConditionMode: 1
m_ConditionEvent: TrackTrigger
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102880830689296870} m_DstState: {fileID: 1102969521151201376}
m_Solo: 0 m_Solo: 0
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0.1 m_TransitionDuration: 0.1
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.9 m_ExitTime: 0.8
m_HasExitTime: 0 m_HasExitTime: 1
m_HasFixedDuration: 0 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &1101170203279647456 --- !u!1101 &1101597768857747866
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_Name: m_Name:
m_Conditions: [] m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: TrackTrigger
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102880830689296870} m_DstState: {fileID: 1102969521151201376}
m_Solo: 0 m_Solo: 0
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0 m_TransitionDuration: 0.1
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.9942825 m_ExitTime: 0.9
m_HasExitTime: 1 m_HasExitTime: 0
m_HasFixedDuration: 0 m_HasFixedDuration: 0
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &1101349620510171120 --- !u!1101 &1101752245449424068
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -110,37 +132,40 @@ AnimatorStateTransition: ...@@ -110,37 +132,40 @@ AnimatorStateTransition:
m_Name: m_Name:
m_Conditions: [] m_Conditions: []
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102254794383740818} m_DstState: {fileID: 1102969521151201376}
m_Solo: 0 m_Solo: 0
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0.25 m_TransitionDuration: 0
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.28571433 m_ExitTime: 0.9942825
m_HasExitTime: 1 m_HasExitTime: 1
m_HasFixedDuration: 1 m_HasFixedDuration: 0
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &1101391724573513386 --- !u!1101 &1101759356497249524
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_Name: m_Name:
m_Conditions: [] m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: AttackTrigger
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102880830689296870} m_DstState: {fileID: 1102254794383740818}
m_Solo: 0 m_Solo: 0
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0.25 m_TransitionDuration: 0
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.73214287 m_ExitTime: 0.75
m_HasExitTime: 1 m_HasExitTime: 0
m_HasFixedDuration: 1 m_HasFixedDuration: 0
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
...@@ -184,11 +209,11 @@ AnimatorStateTransition: ...@@ -184,11 +209,11 @@ AnimatorStateTransition:
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0.25 m_TransitionDuration: 0
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.75 m_ExitTime: 0
m_HasExitTime: 0 m_HasExitTime: 0
m_HasFixedDuration: 1 m_HasFixedDuration: 0
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
...@@ -202,7 +227,7 @@ AnimatorState: ...@@ -202,7 +227,7 @@ AnimatorState:
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions:
- {fileID: 1101391724573513386} - {fileID: 1101424878863823022}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
...@@ -253,7 +278,7 @@ AnimatorState: ...@@ -253,7 +278,7 @@ AnimatorState:
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions:
- {fileID: 1101170203279647456} - {fileID: 1101752245449424068}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
...@@ -279,8 +304,9 @@ AnimatorState: ...@@ -279,8 +304,9 @@ AnimatorState:
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions:
- {fileID: 1101073875083743828} - {fileID: 1101597768857747866}
m_StateMachineBehaviours: [] m_StateMachineBehaviours:
- {fileID: 114131752010043270}
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
m_WriteDefaultValues: 1 m_WriteDefaultValues: 1
...@@ -295,7 +321,7 @@ AnimatorState: ...@@ -295,7 +321,7 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102880830689296870 --- !u!1102 &1102969521151201376
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 5
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -305,8 +331,9 @@ AnimatorState: ...@@ -305,8 +331,9 @@ AnimatorState:
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions:
- {fileID: 1101349620510171120} - {fileID: 1101759356497249524}
m_StateMachineBehaviours: [] m_StateMachineBehaviours:
- {fileID: 114636977847364968}
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
m_WriteDefaultValues: 1 m_WriteDefaultValues: 1
...@@ -331,19 +358,19 @@ AnimatorStateMachine: ...@@ -331,19 +358,19 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102254794383740818} m_State: {fileID: 1102254794383740818}
m_Position: {x: 456, y: 60, z: 0} m_Position: {x: 480, y: 60, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102869353070963680} m_State: {fileID: 1102869353070963680}
m_Position: {x: 300, y: -12, z: 0} m_Position: {x: 228, y: -12, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102659214475399548} m_State: {fileID: 1102659214475399548}
m_Position: {x: 84, y: 144, z: 0} m_Position: {x: 84, y: 132, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102616652379711304} m_State: {fileID: 1102616652379711304}
m_Position: {x: 432, y: 240, z: 0} m_Position: {x: 444, y: 192, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102880830689296870} m_State: {fileID: 1102969521151201376}
m_Position: {x: 204, y: 60, z: 0} m_Position: {x: 228, y: 60, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: m_AnyStateTransitions:
- {fileID: 1101917567614543640} - {fileID: 1101917567614543640}
...@@ -351,8 +378,8 @@ AnimatorStateMachine: ...@@ -351,8 +378,8 @@ AnimatorStateMachine:
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 228, y: 240, z: 0} m_AnyStatePosition: {x: 252, y: 204, z: 0}
m_EntryPosition: {x: 84, y: -12, z: 0} m_EntryPosition: {x: 24, y: -12, z: 0}
m_ExitPosition: {x: -12, y: 96, z: 0} m_ExitPosition: {x: 12, y: 60, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102869353070963680} m_DefaultState: {fileID: 1102869353070963680}
...@@ -19,7 +19,7 @@ AnimationClip: ...@@ -19,7 +19,7 @@ AnimationClip:
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 21300000, guid: 36d75f94dcf84304f9ca5464defb7a2a, type: 3} value: {fileID: 21300000, guid: cb0f904cc9010444a910949bf3fda776, type: 3}
- time: 0.13333334 - time: 0.13333334
value: {fileID: 21300000, guid: 612ebaaa5c4e8374391315e69101d75b, type: 3} value: {fileID: 21300000, guid: 612ebaaa5c4e8374391315e69101d75b, type: 3}
- time: 0.26666668 - time: 0.26666668
...@@ -51,7 +51,7 @@ AnimationClip: ...@@ -51,7 +51,7 @@ AnimationClip:
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: pptrCurveMapping:
- {fileID: 21300000, guid: 36d75f94dcf84304f9ca5464defb7a2a, type: 3} - {fileID: 21300000, guid: cb0f904cc9010444a910949bf3fda776, type: 3}
- {fileID: 21300000, guid: 612ebaaa5c4e8374391315e69101d75b, type: 3} - {fileID: 21300000, guid: 612ebaaa5c4e8374391315e69101d75b, type: 3}
- {fileID: 21300000, guid: 59d60f298bae5b54d84efb5d337c4eb3, type: 3} - {fileID: 21300000, guid: 59d60f298bae5b54d84efb5d337c4eb3, type: 3}
- {fileID: 21300000, guid: 22e2cb0334123cf4ab9b664a3095acc5, type: 3} - {fileID: 21300000, guid: 22e2cb0334123cf4ab9b664a3095acc5, type: 3}
...@@ -83,4 +83,11 @@ AnimationClip: ...@@ -83,4 +83,11 @@ AnimationClip:
m_HasGenericRootTransform: 0 m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0 m_HasMotionFloatCurves: 0
m_GenerateMotionCurves: 0 m_GenerateMotionCurves: 0
m_Events: [] m_Events:
- time: 0.75
functionName: DeadEvent
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
...@@ -207,8 +207,8 @@ MonoBehaviour: ...@@ -207,8 +207,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
monsterID: 103 monsterID: 103
maxHealth: 11 maxHealth: 15
weight: 6 weight: 15
patrolRange: 0 patrolRange: 0
noticeRange: 10 noticeRange: 10
attackRange: 10 attackRange: 10
......
...@@ -44,7 +44,7 @@ public class EnemyArrow : MonoBehaviour { ...@@ -44,7 +44,7 @@ public class EnemyArrow : MonoBehaviour {
Destroy(gameObject); Destroy(gameObject);
} }
if (stopLayer.Equals(stopLayer | 1 << collision.gameObject.layer)) if (stopLayer == (stopLayer | 1 << collision.gameObject.layer))
{ {
GetComponent<Rigidbody2D>().velocity = Vector2.zero; GetComponent<Rigidbody2D>().velocity = Vector2.zero;
GetComponent<Collider2D>().enabled = false; GetComponent<Collider2D>().enabled = false;
......
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