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
96b281ec
Commit
96b281ec
authored
Feb 27, 2019
by
15김민규
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
스태츄 소환 겨우 다 함
parent
cf901956
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
344 additions
and
31 deletions
+344
-31
Goblin.prefab
Assets/Prefabs/Characters/Enemy/Goblin.prefab
+2
-25
StatueTest.prefab
Assets/Prefabs/Characters/Enemy/StatueTest.prefab
+321
-0
StatueTest.prefab.meta
Assets/Prefabs/Characters/Enemy/StatueTest.prefab.meta
+8
-0
Scarecrow.cs
Assets/Scripts/Characters/Enemy/Scarecrow.cs
+3
-0
GameManager.cs
Assets/Scripts/GameManager.cs
+10
-6
No files found.
Assets/Prefabs/Characters/Enemy/Goblin.prefab
View file @
96b281ec
...
@@ -22,7 +22,6 @@ GameObject:
...
@@ -22,7 +22,6 @@ GameObject:
-
component
:
{
fileID
:
212540714587432698
}
-
component
:
{
fileID
:
212540714587432698
}
-
component
:
{
fileID
:
95413729269184064
}
-
component
:
{
fileID
:
95413729269184064
}
-
component
:
{
fileID
:
114118738857420128
}
-
component
:
{
fileID
:
114118738857420128
}
-
component
:
{
fileID
:
114537163463468708
}
m_Layer
:
0
m_Layer
:
0
m_Name
:
Body
m_Name
:
Body
m_TagString
:
Untagged
m_TagString
:
Untagged
...
@@ -285,14 +284,14 @@ MonoBehaviour:
...
@@ -285,14 +284,14 @@ MonoBehaviour:
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1225288737757304
}
m_GameObject
:
{
fileID
:
1225288737757304
}
m_Enabled
:
0
m_Enabled
:
1
m_EditorHideFlags
:
0
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
a11d071a77ab21c48882c6c6e4db8f17
,
type
:
3
}
m_Script
:
{
fileID
:
11500000
,
guid
:
a11d071a77ab21c48882c6c6e4db8f17
,
type
:
3
}
m_Name
:
m_Name
:
m_EditorClassIdentifier
:
m_EditorClassIdentifier
:
debuffState
:
debuffState
:
monsterID
:
101
monsterID
:
101
maxHealth
:
15
maxHealth
:
2
weight
:
15
weight
:
15
patrolRange
:
3
patrolRange
:
3
noticeRange
:
2
noticeRange
:
2
...
@@ -329,28 +328,6 @@ MonoBehaviour:
...
@@ -329,28 +328,6 @@ MonoBehaviour:
m_EditorClassIdentifier
:
m_EditorClassIdentifier
:
damage
:
4
damage
:
4
isBumpAttack
:
0
isBumpAttack
:
0
---
!u!114
&114537163463468708
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1225288737757304
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
bf69b9b0b3af3664e89e16eab14c1b0c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
debuffState
:
monsterID
:
251
maxHealth
:
3
weight
:
1
patrolRange
:
0
noticeRange
:
0
patrolSpeed
:
0
trackSpeed
:
0
knockbackPercentage
:
[]
movementLock
:
0
scarecrow_or_statue
:
0
---
!u!114
&114851997656688694
---
!u!114
&114851997656688694
MonoBehaviour
:
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_ObjectHideFlags
:
1
...
...
Assets/Prefabs/Characters/Enemy/StatueTest.prefab
0 → 100644
View file @
96b281ec
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!1001
&100100000
Prefab
:
m_ObjectHideFlags
:
1
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
[]
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
0
}
m_RootGameObject
:
{
fileID
:
1401848893116652
}
m_IsPrefabAsset
:
1
---
!u!1
&1162659259063058
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4005902780579934
}
-
component
:
{
fileID
:
114561536863273304
}
m_Layer
:
0
m_Name
:
HPBar
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!1
&1298248310005788
GameObject
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4202602386941338
}
-
component
:
{
fileID
:
61229995936087696
}
-
component
:
{
fileID
:
114160321880148730
}
m_Layer
:
17
m_Name
:
Anti Overlap
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
0
---
!u!1
&1401848893116652
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4836495397386794
}
-
component
:
{
fileID
:
50141707274670556
}
-
component
:
{
fileID
:
61258820314383134
}
m_Layer
:
16
m_Name
:
StatueTest
m_TagString
:
Enemy
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!1
&1917537518207390
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
4995664760293086
}
-
component
:
{
fileID
:
212389034539557544
}
-
component
:
{
fileID
:
95431596785065678
}
-
component
:
{
fileID
:
114639627468642258
}
m_Layer
:
0
m_Name
:
Body
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&4005902780579934
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1162659259063058
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
4836495397386794
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&4202602386941338
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1298248310005788
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0.133
,
y
:
0.009
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
4995664760293086
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&4836495397386794
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1401848893116652
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
11.29
,
y
:
-17.94
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
4995664760293086
}
-
{
fileID
:
4005902780579934
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!4
&4995664760293086
Transform
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1917537518207390
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-0.142
,
y
:
0.626
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
4202602386941338
}
m_Father
:
{
fileID
:
4836495397386794
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!50
&50141707274670556
Rigidbody2D
:
serializedVersion
:
4
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1401848893116652
}
m_BodyType
:
0
m_Simulated
:
1
m_UseFullKinematicContacts
:
0
m_UseAutoMass
:
0
m_Mass
:
1
m_LinearDrag
:
0
m_AngularDrag
:
0.05
m_GravityScale
:
1
m_Material
:
{
fileID
:
0
}
m_Interpolate
:
0
m_SleepingMode
:
1
m_CollisionDetection
:
0
m_Constraints
:
4
---
!u!61
&61229995936087696
BoxCollider2D
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1298248310005788
}
m_Enabled
:
1
m_Density
:
1
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
1
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0
,
y
:
-0.079675555
}
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0
,
y
:
0
}
oldSize
:
{
x
:
0
,
y
:
0
}
newSize
:
{
x
:
0
,
y
:
0
}
adaptiveTilingThreshold
:
0
drawMode
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
m_Size
:
{
x
:
0.19960898
,
y
:
1.1095564
}
m_EdgeRadius
:
0
---
!u!61
&61258820314383134
BoxCollider2D
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1401848893116652
}
m_Enabled
:
1
m_Density
:
1
m_Material
:
{
fileID
:
6200000
,
guid
:
90e689a435f304c469db49daef28ed89
,
type
:
2
}
m_IsTrigger
:
0
m_UsedByEffector
:
0
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0
,
y
:
0.5554246
}
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0
,
y
:
0
}
oldSize
:
{
x
:
0
,
y
:
0
}
newSize
:
{
x
:
0
,
y
:
0
}
adaptiveTilingThreshold
:
0
drawMode
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
m_Size
:
{
x
:
0.7505637
,
y
:
1.109323
}
m_EdgeRadius
:
0
---
!u!95
&95431596785065678
Animator
:
serializedVersion
:
3
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1917537518207390
}
m_Enabled
:
1
m_Avatar
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
9100000
,
guid
:
dd945695310e7314f8e3ae009064f45b
,
type
:
2
}
m_CullingMode
:
0
m_UpdateMode
:
0
m_ApplyRootMotion
:
0
m_LinearVelocityBlending
:
0
m_WarningMessage
:
m_HasTransformHierarchy
:
1
m_AllowConstantClipSamplingOptimization
:
1
m_KeepAnimatorControllerStateOnDisable
:
0
---
!u!114
&114160321880148730
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1298248310005788
}
m_Enabled
:
0
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
31d57aad92e0a1940b2258c8b7537027
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
pushForce
:
0
---
!u!114
&114561536863273304
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1162659259063058
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
493db5529c03fce44a56a2211507667e
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
width
:
0.4
height
:
0.1
yOffset
:
1.3
barPrefab
:
{
fileID
:
1489501648010076
,
guid
:
bd708b07601179842bbd803b54afda40
,
type
:
2
}
bor
:
{
fileID
:
21300000
,
guid
:
f978754916ff69444aa0bd613b44f2c5
,
type
:
3
}
red
:
{
fileID
:
21300000
,
guid
:
014c5204ddcb6e54e86aadaa34227552
,
type
:
3
}
---
!u!114
&114639627468642258
MonoBehaviour
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1917537518207390
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
bf69b9b0b3af3664e89e16eab14c1b0c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
debuffState
:
monsterID
:
251
maxHealth
:
3
weight
:
1
patrolRange
:
0
noticeRange
:
0
patrolSpeed
:
0
trackSpeed
:
0
knockbackPercentage
:
[]
movementLock
:
0
scarecrow_or_statue
:
0
---
!u!212
&212389034539557544
SpriteRenderer
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1917537518207390
}
m_Enabled
:
1
m_CastShadows
:
0
m_ReceiveShadows
:
0
m_DynamicOccludee
:
1
m_MotionVectors
:
1
m_LightProbeUsage
:
1
m_ReflectionProbeUsage
:
1
m_RenderingLayerMask
:
4294967295
m_Materials
:
-
{
fileID
:
10754
,
guid
:
0000000000000000f000000000000000
,
type
:
0
}
m_StaticBatchInfo
:
firstSubMesh
:
0
subMeshCount
:
0
m_StaticBatchRoot
:
{
fileID
:
0
}
m_ProbeAnchor
:
{
fileID
:
0
}
m_LightProbeVolumeOverride
:
{
fileID
:
0
}
m_ScaleInLightmap
:
1
m_PreserveUVs
:
0
m_IgnoreNormalsForChartDetection
:
0
m_ImportantGI
:
0
m_StitchLightmapSeams
:
0
m_SelectedEditorRenderState
:
0
m_MinimumChartSize
:
4
m_AutoUVMaxDistance
:
0.5
m_AutoUVMaxAngle
:
89
m_LightmapParameters
:
{
fileID
:
0
}
m_SortingLayerID
:
-2078941185
m_SortingLayer
:
8
m_SortingOrder
:
0
m_Sprite
:
{
fileID
:
21300000
,
guid
:
71335108d30aa0e4a90179a09895440e
,
type
:
3
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_FlipX
:
0
m_FlipY
:
0
m_DrawMode
:
0
m_Size
:
{
x
:
0.8
,
y
:
0.8
}
m_AdaptiveModeThreshold
:
0.5
m_SpriteTileMode
:
0
m_WasSpriteAssigned
:
1
m_MaskInteraction
:
0
m_SpriteSortPoint
:
1
Assets/Prefabs/Characters/Enemy/StatueTest.prefab.meta
0 → 100644
View file @
96b281ec
fileFormatVersion: 2
guid: d875fe2e4cea4674d93dd3edabafa311
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Characters/Enemy/Scarecrow.cs
View file @
96b281ec
...
@@ -35,6 +35,9 @@ public class Scarecrow : Enemy {
...
@@ -35,6 +35,9 @@ public class Scarecrow : Enemy {
}
}
else
else
{
{
if
(
transform
.
parent
.
GetComponentInChildren
<
HPBar
>())
{
transform
.
parent
.
GetComponentInChildren
<
HPBar
>().
Inactivate
();
}
MapManager
.
Instance
.
UpgradeRoom
(
RoomType
.
Gold
);
MapManager
.
Instance
.
UpgradeRoom
(
RoomType
.
Gold
);
Destroy
(
transform
.
parent
.
gameObject
);
Destroy
(
transform
.
parent
.
gameObject
);
}
}
...
...
Assets/Scripts/GameManager.cs
View file @
96b281ec
...
@@ -20,6 +20,7 @@ public class GameManager : Singleton<GameManager> {
...
@@ -20,6 +20,7 @@ public class GameManager : Singleton<GameManager> {
public
GameObject
player
;
public
GameObject
player
;
public
GameObject
minimap
;
public
GameObject
minimap
;
public
GameObject
statue
;
public
Canvas
gameOverCanvas
;
public
Canvas
gameOverCanvas
;
public
Canvas
inventoryCanvas
;
public
Canvas
inventoryCanvas
;
public
Canvas
textCanvas
;
public
Canvas
textCanvas
;
...
@@ -156,14 +157,17 @@ public class GameManager : Singleton<GameManager> {
...
@@ -156,14 +157,17 @@ public class GameManager : Singleton<GameManager> {
{
{
foreach
(
Transform
obj
in
MapManager
.
currentRoom
.
transform
)
foreach
(
Transform
obj
in
MapManager
.
currentRoom
.
transform
)
{
{
if
(
obj
.
gameObject
.
GetComponent
<
EnemyGround
>()
!=
null
&&
obj
.
gameObject
.
GetComponent
<
SpriteRenderer
>().
isVisible
)
if
(
obj
.
CompareTag
(
"Enemy"
))
{
GameObject
body
=
obj
.
GetChild
(
0
).
gameObject
;
if
(
body
.
GetComponent
<
EnemyGround
>()
!=
null
&&
body
.
GetComponent
<
SpriteRenderer
>().
isVisible
)
{
{
Vector3
pos
=
obj
.
position
;
Vector3
pos
=
obj
.
position
;
obj
.
gameObject
.
GetComponent
<
Enemy
>().
ResetForPool
();
body
.
gameObject
.
GetComponent
<
EnemyGround
>().
ResetForPool
();
// Instantiate
;
GameObject
tempStatue
=
Instantiate
(
statue
,
pos
,
Quaternion
.
identity
)
;
statueEvent
=
true
;
statueEvent
=
true
;
}
}
}
}
}
}
}
}
}
}
}
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