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
3ebf24c4
Commit
3ebf24c4
authored
Feb 26, 2019
by
15김민규
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enemy2를 머지한 후 머지 컨플릭트 해결
parent
c007cdc3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
Enemy.cs
Assets/Scripts/Characters/Enemy/Enemy.cs
+2
-0
No files found.
Assets/Scripts/Characters/Enemy/Enemy.cs
View file @
3ebf24c4
...
...
@@ -87,6 +87,7 @@ public abstract class Enemy : MonoBehaviour {
// - Calculate value & Arrange information
public
void
GetDamaged
(
PlayerAttackInfo
attack
)
{
if
(
Invisible
)
{
return
;
}
string
objectName
=
gameObject
.
transform
.
parent
.
name
;
float
prevHealth
=
currHealth
;
currHealth
-=
attack
.
damage
;
...
...
@@ -156,6 +157,7 @@ public abstract class Enemy : MonoBehaviour {
public
void
GetDamaged
(
float
damage
)
{
if
(
Invisible
)
{
return
;
}
float
prevHealth
=
currHealth
;
currHealth
-=
damage
;
if
(
currHealth
<=
0
)
...
...
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