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
cd5ff227
Commit
cd5ff227
authored
6 years ago
by
15김민규
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
공격 모션 중에는 피격돼도 Damaged나 Stunned가 아닌 이상 방향 안바뀜
parent
81ba33bb
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
Goblin Attack.anim
Assets/Animation/Enemy/Goblin/Goblin Attack.anim
+7
-0
EnemyAir.cs
Assets/Scripts/Characters/Enemy/EnemyAir.cs
+4
-1
EnemyGround.cs
Assets/Scripts/Characters/Enemy/EnemyGround.cs
+2
-1
No files found.
Assets/Animation/Enemy/Goblin/Goblin Attack.anim
View file @
cd5ff227
...
...
@@ -232,3 +232,10 @@ AnimationClip:
floatParameter
:
0
intParameter
:
0
messageOptions
:
0
-
time
:
1.25
functionName
:
whileGetHitByAttackAnim
data
:
objectReferenceParameter
:
{
fileID
:
0
}
floatParameter
:
0
intParameter
:
0
messageOptions
:
0
This diff is collapsed.
Click to expand it.
Assets/Scripts/Characters/Enemy/EnemyAir.cs
View file @
cd5ff227
...
...
@@ -65,7 +65,10 @@ public class EnemyAir : Enemy {
ChangeVelocityXY
(
knockbackVelocity
);
yield
return
new
WaitForSeconds
(
knockbackTime
);
ChangeVelocityXY
(
Vector2
.
zero
);
if
(
movementLock
!=
EnemyMovementLock
.
Debuffed
)
movementLock
=
EnemyMovementLock
.
Free
;
if
(
movementLock
!=
EnemyMovementLock
.
Debuffed
)
{
movementLock
=
EnemyMovementLock
.
Free
;
}
}
protected
override
IEnumerator
OnIce
(
float
duration
)
...
...
This diff is collapsed.
Click to expand it.
Assets/Scripts/Characters/Enemy/EnemyGround.cs
View file @
cd5ff227
...
...
@@ -99,7 +99,7 @@ public class EnemyGround : Enemy {
{
int
knockbackDir
=
(
enemyManager
.
Player
.
transform
.
position
.
x
-
transform
.
parent
.
position
.
x
>=
0
)
?
-
1
:
1
;
float
knockbackVelocity
=
knockbackDir
*
knockbackDist
/
knockbackTime
;
ChangeDir
_movement
(
knockbackDir
*
-
1
);
ChangeDir
(
knockbackDir
*
-
1
);
ChangeVelocityX
(
knockbackVelocity
);
for
(
float
timer
=
0
;
timer
<=
knockbackTime
;
timer
+=
Time
.
deltaTime
)
...
...
@@ -128,6 +128,7 @@ public class EnemyGround : Enemy {
protected
override
IEnumerator
OnStun
(
float
duration
)
{
animator
.
SetTrigger
(
"StunnedTrigger"
);
yield
return
new
WaitUntil
(()
=>
animator
.
GetCurrentAnimatorStateInfo
(
0
).
IsName
(
"Stunned"
));
animator
.
speed
=
stunnedAnimLength
/
duration
;
yield
return
new
WaitForSeconds
(
duration
);
OffDebuff
(
EnemyDebuffCase
.
Stun
);
...
...
This diff is collapsed.
Click to expand it.
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