Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
tetra-tower
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Oenos
tetra-tower
Commits
70aeb693
Commit
70aeb693
authored
Feb 02, 2019
by
15김민규
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
넉백 구현. 너무 길다 싶으면 애니메이션 길이를 조정할 것
parent
e4de4bcb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
20 deletions
+41
-20
melee.controller
Assets/Animation/Enemy/melee.controller
+10
-4
Damaged.cs
Assets/Damaged.cs
+12
-4
Goblin.prefab
Assets/Prefabs/Characters/Enemy/Goblin.prefab
+6
-6
testEnemy.unity
Assets/Scenes/testEnemy.unity
+9
-4
Enemy.cs
Assets/Scripts/Characters/Enemy.cs
+4
-2
No files found.
Assets/Animation/Enemy/melee.controller
View file @
70aeb693
...
@@ -13,25 +13,31 @@ AnimatorController:
...
@@ -13,25 +13,31 @@ AnimatorController:
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
AttackTrigger
-
m_Name
:
AttackTrigger
m_Type
:
9
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
DamagedTrigger
-
m_Name
:
DamagedTrigger
m_Type
:
9
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
910000
0
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
DeadTrigger
-
m_Name
:
DeadTrigger
m_Type
:
9
m_Type
:
9
m_DefaultFloat
:
0
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
9100000
}
m_Controller
:
{
fileID
:
0
}
-
m_Name
:
knockbackDistance
m_Type
:
1
m_DefaultFloat
:
0
m_DefaultInt
:
0
m_DefaultBool
:
0
m_Controller
:
{
fileID
:
0
}
m_AnimatorLayers
:
m_AnimatorLayers
:
-
serializedVersion
:
5
-
serializedVersion
:
5
m_Name
:
Base Layer
m_Name
:
Base Layer
...
...
Assets/Damaged.cs
View file @
70aeb693
...
@@ -6,8 +6,11 @@ public class Damaged : StateMachineBehaviour {
...
@@ -6,8 +6,11 @@ public class Damaged : StateMachineBehaviour {
RuntimeAnimatorController
ac
;
RuntimeAnimatorController
ac
;
float
knockbackTime
;
float
knockbackTime
;
float
knockbackSpeed
;
float
knockbackDir
;
// 1: right \ -1: left
Vector3
leftsideAngle
=
new
Vector3
(
0
,
0
,
0
);
Vector3
leftsideAngle
=
new
Vector3
(
0
,
0
,
0
);
Vector3
rightsideAngle
=
new
Vector3
(
0
,
180
,
0
);
Vector3
rightsideAngle
=
new
Vector3
(
0
,
180
,
0
);
Transform
pivotTransform
;
// OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
// OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
override
public
void
OnStateEnter
(
Animator
animator
,
AnimatorStateInfo
stateInfo
,
int
layerIndex
)
{
override
public
void
OnStateEnter
(
Animator
animator
,
AnimatorStateInfo
stateInfo
,
int
layerIndex
)
{
...
@@ -19,15 +22,20 @@ public class Damaged : StateMachineBehaviour {
...
@@ -19,15 +22,20 @@ public class Damaged : StateMachineBehaviour {
knockbackTime
=
clip
.
length
;
knockbackTime
=
clip
.
length
;
}
}
}
}
knockbackSpeed
=
animator
.
GetFloat
(
"knockbackDistance"
)
/
knockbackTime
;
Transform
playerTransform
=
EnemyManager
.
Instance
.
player
.
transform
;
Transform
playerTransform
=
EnemyManager
.
Instance
.
player
.
transform
;
Transform
pivotTransform
=
animator
.
transform
.
parent
;
pivotTransform
=
animator
.
transform
.
parent
;
pivotTransform
.
eulerAngles
=
(
playerTransform
.
position
.
x
-
pivotTransform
.
position
.
x
<
0
)
?
leftsideAngle
:
rightsideAngle
;
pivotTransform
.
eulerAngles
=
(
playerTransform
.
position
.
x
-
pivotTransform
.
position
.
x
<
0
)
?
leftsideAngle
:
rightsideAngle
;
}
knockbackDir
=
(
playerTransform
.
position
.
x
-
pivotTransform
.
position
.
x
<
0
)
?
1
:
-
1
;
}
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
override
public
void
OnStateUpdate
(
Animator
animator
,
AnimatorStateInfo
stateInfo
,
int
layerIndex
)
{
override
public
void
OnStateUpdate
(
Animator
animator
,
AnimatorStateInfo
stateInfo
,
int
layerIndex
)
{
Vector2
currPosition
=
pivotTransform
.
position
;
}
Vector2
movingDistance
=
new
Vector2
(
knockbackSpeed
*
Time
.
deltaTime
,
0
)
*
knockbackDir
;
pivotTransform
.
gameObject
.
GetComponent
<
Rigidbody2D
>().
MovePosition
(
currPosition
+
movingDistance
);
}
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
//override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
//override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
...
...
Assets/Prefabs/Characters/Enemy/Goblin.prefab
View file @
70aeb693
...
@@ -71,7 +71,7 @@ Transform:
...
@@ -71,7 +71,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1225288737757304
}
m_GameObject
:
{
fileID
:
1225288737757304
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-0.
15799999
,
y
:
0.40100002
,
z
:
0
}
m_LocalPosition
:
{
x
:
-0.
234
,
y
:
0.621
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
m_Children
:
-
{
fileID
:
4140258981397796
}
-
{
fileID
:
4140258981397796
}
...
@@ -98,7 +98,7 @@ Transform:
...
@@ -98,7 +98,7 @@ Transform:
m_PrefabInternal
:
{
fileID
:
100100000
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1636491341446076
}
m_GameObject
:
{
fileID
:
1636491341446076
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
6.
876
,
y
:
1.034
,
z
:
-0.1645136
}
m_LocalPosition
:
{
x
:
6.
01
,
y
:
2.009
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
m_Children
:
-
{
fileID
:
4015301101001556
}
-
{
fileID
:
4015301101001556
}
...
@@ -133,11 +133,11 @@ BoxCollider2D:
...
@@ -133,11 +133,11 @@ BoxCollider2D:
m_GameObject
:
{
fileID
:
1636491341446076
}
m_GameObject
:
{
fileID
:
1636491341446076
}
m_Enabled
:
1
m_Enabled
:
1
m_Density
:
1
m_Density
:
1
m_Material
:
{
fileID
:
0
}
m_Material
:
{
fileID
:
6200000
,
guid
:
90e689a435f304c469db49daef28ed89
,
type
:
2
}
m_IsTrigger
:
0
m_IsTrigger
:
0
m_UsedByEffector
:
0
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0.08
,
y
:
0.325
}
m_Offset
:
{
x
:
-0.020877361
,
y
:
0.5497493
}
m_SpriteTilingProperty
:
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0
,
y
:
0
}
pivot
:
{
x
:
0
,
y
:
0
}
...
@@ -148,7 +148,7 @@ BoxCollider2D:
...
@@ -148,7 +148,7 @@ BoxCollider2D:
adaptiveTiling
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
serializedVersion
:
2
m_Size
:
{
x
:
0.5
5
,
y
:
1.1
}
m_Size
:
{
x
:
0.5
978651
,
y
:
1.1179954
}
m_EdgeRadius
:
0
m_EdgeRadius
:
0
---
!u!61
&61362187134790794
---
!u!61
&61362187134790794
BoxCollider2D
:
BoxCollider2D
:
...
@@ -206,7 +206,7 @@ MonoBehaviour:
...
@@ -206,7 +206,7 @@ MonoBehaviour:
m_EditorClassIdentifier
:
m_EditorClassIdentifier
:
monsterID
:
101
monsterID
:
101
maxHealth
:
5
maxHealth
:
5
weight
:
3
weight
:
1
patrolRange
:
2
patrolRange
:
2
noticeRange
:
2
noticeRange
:
2
attackRange
:
1
attackRange
:
1
...
...
Assets/Scenes/testEnemy.unity
View file @
70aeb693
...
@@ -1090,7 +1090,7 @@ Prefab:
...
@@ -1090,7 +1090,7 @@ Prefab:
-
target
:
{
fileID
:
114685218848006942
,
guid
:
e6794ab8e2e4c6340a23b382e9497cbb
,
-
target
:
{
fileID
:
114685218848006942
,
guid
:
e6794ab8e2e4c6340a23b382e9497cbb
,
type
:
2
}
type
:
2
}
propertyPath
:
m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
propertyPath
:
m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value
:
UpgradeStage
value
:
SummonEnemy
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
224008356030171754
,
guid
:
e6794ab8e2e4c6340a23b382e9497cbb
,
-
target
:
{
fileID
:
224008356030171754
,
guid
:
e6794ab8e2e4c6340a23b382e9497cbb
,
type
:
2
}
type
:
2
}
...
@@ -1117,6 +1117,11 @@ Prefab:
...
@@ -1117,6 +1117,11 @@ Prefab:
propertyPath
:
m_RootOrder
propertyPath
:
m_RootOrder
value
:
9
value
:
9
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
224667404527337120
,
guid
:
e6794ab8e2e4c6340a23b382e9497cbb
,
type
:
2
}
propertyPath
:
m_RootOrder
value
:
10
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
e6794ab8e2e4c6340a23b382e9497cbb
,
type
:
2
}
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
e6794ab8e2e4c6340a23b382e9497cbb
,
type
:
2
}
m_IsPrefabAsset
:
0
m_IsPrefabAsset
:
0
...
@@ -1240,15 +1245,15 @@ Prefab:
...
@@ -1240,15 +1245,15 @@ Prefab:
m_Modifications
:
m_Modifications
:
-
target
:
{
fileID
:
4639192263818050
,
guid
:
a164c147037e89448820f7387c724c42
,
type
:
2
}
-
target
:
{
fileID
:
4639192263818050
,
guid
:
a164c147037e89448820f7387c724c42
,
type
:
2
}
propertyPath
:
m_LocalPosition.x
propertyPath
:
m_LocalPosition.x
value
:
6.
876
value
:
6.
01
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4639192263818050
,
guid
:
a164c147037e89448820f7387c724c42
,
type
:
2
}
-
target
:
{
fileID
:
4639192263818050
,
guid
:
a164c147037e89448820f7387c724c42
,
type
:
2
}
propertyPath
:
m_LocalPosition.y
propertyPath
:
m_LocalPosition.y
value
:
1.034
value
:
2.009
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4639192263818050
,
guid
:
a164c147037e89448820f7387c724c42
,
type
:
2
}
-
target
:
{
fileID
:
4639192263818050
,
guid
:
a164c147037e89448820f7387c724c42
,
type
:
2
}
propertyPath
:
m_LocalPosition.z
propertyPath
:
m_LocalPosition.z
value
:
-0.1645136
value
:
0
objectReference
:
{
fileID
:
0
}
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
4639192263818050
,
guid
:
a164c147037e89448820f7387c724c42
,
type
:
2
}
-
target
:
{
fileID
:
4639192263818050
,
guid
:
a164c147037e89448820f7387c724c42
,
type
:
2
}
propertyPath
:
m_LocalRotation.x
propertyPath
:
m_LocalRotation.x
...
...
Assets/Scripts/Characters/Enemy.cs
View file @
70aeb693
...
@@ -40,6 +40,7 @@ public class Enemy : MonoBehaviour {
...
@@ -40,6 +40,7 @@ public class Enemy : MonoBehaviour {
// for animation
// for animation
[
HideInInspector
]
[
HideInInspector
]
public
float
playerDistance
;
public
float
playerDistance
;
private
Animator
animator
;
// drop item
// drop item
...
@@ -49,12 +50,12 @@ public class Enemy : MonoBehaviour {
...
@@ -49,12 +50,12 @@ public class Enemy : MonoBehaviour {
private
void
Awake
()
private
void
Awake
()
{
{
enemyManager
=
EnemyManager
.
Instance
;
enemyManager
=
EnemyManager
.
Instance
;
animator
=
GetComponent
<
Animator
>();
}
}
private
void
Start
()
private
void
Start
()
{
{
this
.
currHealth
=
maxHealth
;
this
.
currHealth
=
maxHealth
;
playerDistance
=
Vector2
.
Distance
(
enemyManager
.
player
.
transform
.
position
,
transform
.
parent
.
position
);
}
}
private
void
Update
()
private
void
Update
()
...
@@ -69,7 +70,8 @@ public class Enemy : MonoBehaviour {
...
@@ -69,7 +70,8 @@ public class Enemy : MonoBehaviour {
gameObject
.
SetActive
(
false
);
gameObject
.
SetActive
(
false
);
return
;
return
;
}
}
gameObject
.
GetComponent
<
Animator
>().
SetTrigger
(
"DamagedTrigger"
);
animator
.
SetFloat
(
"knockbackDistance"
,
damage
/
this
.
weight
);
animator
.
SetTrigger
(
"DamagedTrigger"
);
}
}
IEnumerator
DebuffCase
(
EnemyDebuffed
sCase
)
IEnumerator
DebuffCase
(
EnemyDebuffed
sCase
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment