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
66309959
Commit
66309959
authored
Feb 03, 2019
by
18류지석
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
서로 공격 들어감. 현재 적이 아이템 드랍하지 않음.
parent
539e6417
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
462 additions
and
31 deletions
+462
-31
PlayerIdleAnim.anim
Assets/Animation/Player/PlayerIdleAnim.anim
+1
-1
Player.prefab
Assets/Prefabs/Characters/Player.prefab
+6
-28
normalAttackA.anim
Assets/Resources/Animations/normalAttackA.anim
+425
-0
normalAttackA.anim.meta
Assets/Resources/Animations/normalAttackA.anim.meta
+8
-0
PlayScene.unity
Assets/Scenes/PlayScene.unity
+20
-0
AttackProperty.cs
Assets/Scripts/Characters/AttackProperty.cs
+1
-1
Enemy.cs
Assets/Scripts/Characters/Enemy.cs
+1
-1
No files found.
Assets/Animation/Player/PlayerIdleAnim.anim
View file @
66309959
...
...
@@ -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.6
166667
value
:
{
fileID
:
21300000
,
guid
:
0215c969b3c53c0488a9415e3281c949
,
type
:
3
}
-
time
:
0.7
value
:
{
fileID
:
21300000
,
guid
:
2eeae0d0619773f49912b81cd6dd5646
,
type
:
3
}
...
...
Assets/Prefabs/Characters/Player.prefab
View file @
66309959
...
...
@@ -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
...
...
Assets/Resources/Animations/normalAttackA.anim
0 → 100644
View file @
66309959
This diff is collapsed.
Click to expand it.
Assets/Resources/Animations/normalAttackA.anim.meta
0 → 100644
View file @
66309959
fileFormatVersion: 2
guid: b1bf5cd583e214e448b83335f6c2d7a6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/PlayScene.unity
View file @
66309959
...
...
@@ -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
...
...
Assets/Scripts/Characters/AttackProperty.cs
View file @
66309959
...
...
@@ -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
);
}
}
...
...
Assets/Scripts/Characters/Enemy.cs
View file @
66309959
...
...
@@ -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"
);
}
...
...
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